Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3dafa1835fe8
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6d1f7b5dd970
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 6, 2015

  1. Always assign encoding in SymbolNode. Fixes #3365.

    @headius
    headius committed Oct 6, 2015
    Copy the full SHA
    b0d118b View commit details

  2. Use JDK8 to avoid fiddling with permgen just for tests.

    @headius
    headius committed Oct 6, 2015
    Copy the full SHA
    6d1f7b5 View commit details
Showing with 5 additions and 3 deletions.
  1. +1 −1 .travis.yml
  2. +4 −2 core/src/main/java/org/jruby/ast/SymbolNode.java
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ matrix:
- env: PHASE='-Pjruby-jars'
jdk: openjdk7
- env: PHASE='-Pmain'
jdk: oraclejdk7
jdk: oraclejdk8
- env: PHASE='-Pcomplete'
jdk: oraclejdk8
- env: PHASE='-Posgi'
6 changes: 4 additions & 2 deletions core/src/main/java/org/jruby/ast/SymbolNode.java
View file
Original file line number Diff line number Diff line change
@@ -55,8 +55,8 @@
* Represents a symbol (:symbol_name).
*/
public class SymbolNode extends Node implements ILiteralNode, INameNode, SideEffectFree {
private String name;
private Encoding encoding;
private final String name;
private final Encoding encoding;

// Interned ident path (e.g. [':', ident]).
public SymbolNode(ISourcePosition position, String name, Encoding encoding, int cr) {
@@ -79,6 +79,8 @@ public SymbolNode(ISourcePosition position, ByteList value) {
int size = value.realSize();
this.encoding = value.getEncoding().strLength(value.unsafeBytes(), value.begin(), size) == size ?
USASCIIEncoding.INSTANCE : value.getEncoding();
} else {
this.encoding = USASCIIEncoding.INSTANCE;
}
}