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: 56643d93c66f
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e5f77ef0821
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 8, 2017

  1. /bin/bash was not getting proper value (was null instead of bytelist)

    @enebo
    enebo committed May 8, 2017
    Copy the full SHA
    349667d View commit details

  2. Remove dead code from IRBuilder

    @enebo
    enebo committed May 8, 2017
    Copy the full SHA
    6e5f77e View commit details
Showing with 1 addition and 12 deletions.
  1. +0 −12 core/src/main/java/org/jruby/ir/IRBuilder.java
  2. +1 −0 core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
12 changes: 0 additions & 12 deletions core/src/main/java/org/jruby/ir/IRBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -401,7 +401,6 @@ private Operand buildOperand(Variable result, Node node) throws NotCompilableExc
case CLASSNODE: return buildClass((ClassNode) node);
case CLASSVARNODE: return buildClassVar((ClassVarNode) node);
case CLASSVARASGNNODE: return buildClassVarAsgn((ClassVarAsgnNode) node);
case CLASSVARDECLNODE: return buildClassVarDecl((ClassVarDeclNode) node);
case COLON2NODE: return buildColon2((Colon2Node) node);
case COLON3NODE: return buildColon3((Colon3Node) node);
case COMPLEXNODE: return buildComplex((ComplexNode) node);
@@ -1405,17 +1404,6 @@ public Operand buildClassVarAsgn(final ClassVarAsgnNode classVarAsgnNode) {
return val;
}

// ClassVarDecl node is assignment outside method/closure scope (top-level, class, module)
//
// class C
// @@c = 1
// end
public Operand buildClassVarDecl(final ClassVarDeclNode classVarDeclNode) {
Operand val = build(classVarDeclNode.getValueNode());
addInstr(new PutClassVariableInstr(classVarDeclarationContainer(), classVarDeclNode.getName(), val));
return val;
}

public Operand classVarDeclarationContainer() {
return classVarContainer(true);
}
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
View file
Original file line number Diff line number Diff line change
@@ -1373,6 +1373,7 @@ private int dollar() throws IOException {
case '0':
setState(EXPR_END);

identifier = new ByteList(new byte[] {'$', (byte) c}, USASCII_ENCODING);
return identifierToken(Tokens.tGVAR, ("$" + (char) c).intern());
default:
if (!isIdentifierChar(c)) {