Merge branch 'master' into truffle-symbol-refactor

jruby · Jun 9, 2015 · 294bf27 · 294bf27
2 parents 3528613 + eb4f675
commit 294bf27
Showing 23 changed files with 9,239 additions and 8,863 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -44,8 +44,8 @@
   jar 'com.github.jnr:jnr-enxio:0.9'
   jar 'com.github.jnr:jnr-x86asm:1.0.2'
   jar 'com.github.jnr:jnr-unixsocket:0.8'
-  jar 'com.github.jnr:jnr-posix:3.0.13-SNAPSHOT'
-  jar 'com.github.jnr:jnr-constants:0.8.7'
+  jar 'com.github.jnr:jnr-posix:3.0.14'
+  jar 'com.github.jnr:jnr-constants:0.8.8'
   jar 'com.github.jnr:jnr-ffi:2.0.3'
   jar 'com.github.jnr:jffi:${jffi.version}'
   jar 'com.github.jnr:jffi:${jffi.version}:native'

diff --git a/core/pom.xml b/core/pom.xml
@@ -105,12 +105,12 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.0.13-SNAPSHOT</version>
+      <version>3.0.14</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-constants</artifactId>
-      <version>0.8.7</version>
+      <version>0.8.8</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -46,6 +46,7 @@
 import org.jruby.ast.FCallNode;
 import org.jruby.ast.GlobalAsgnNode;
 import org.jruby.ast.GlobalVarNode;
+import org.jruby.ast.StrNode;
 import org.jruby.ast.VCallNode;
 import org.jruby.ast.WhileNode;
 import org.jruby.compiler.Constantizable;
@@ -702,6 +703,7 @@ private RootNode addGetsLoop(RootNode oldRoot, boolean printing, boolean process
             whileBody.add(oldRoot.getBodyNode());
         }
 
+        newBody.prepend(new GlobalAsgnNode(pos, "$/", new StrNode(pos, new ByteList(getInstanceConfig().getRecordSeparator().getBytes()))));
         GlobalVarNode dollarUnderscore = new GlobalVarNode(pos, "$_");
 
         newBody.add(new WhileNode(pos, new VCallNode(pos, "gets"), whileBody));

diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -965,18 +965,18 @@ public RubyString newFrozen() {
         klass = getMetaClass();
         str = strDup(klass.getClassRuntime());
         str.setCodeRange(getCodeRange());
-        str.modify();
         str.setFrozen(true);
         return str;
     }
 
     /** rb_str_resize
      */
     public final void resize(int length) {
-        modify();
         if (value.getRealSize() > length) {
+            modify();
             value.setRealSize(length);
         } else if (value.length() < length) {
+            modify();
             value.length(length);
         }
     }

diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperLexer.java b/core/src/main/java/org/jruby/ext/ripper/RipperLexer.java
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.java b/core/src/main/java/org/jruby/ext/ripper/RipperParser.java
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.y b/core/src/main/java/org/jruby/ext/ripper/RipperParser.y
@@ -887,8 +887,12 @@ arg             : lhs '=' arg {
                 | kDEFINED opt_nl arg {
                     $$ = p.dispatch("on_defined", $3);
                 }
-                | arg '?' arg opt_nl ':' arg {
-                    $$ = p.dispatch("on_ifop", $1, $3, $6);
+                | arg '?' {
+                    p.getConditionState().begin();
+                } arg opt_nl ':' {
+                    p.getConditionState().end();
+                } arg {
+                    $$ = p.dispatch("on_ifop", $1, $4, $8);
                 }
                 | primary {
                     $$ = $1;
@@ -1024,19 +1028,27 @@ primary         : literal
                 | tFID {
                     $$ = p.dispatch("on_method_add_arg", p.dispatch("on_fcall", $1), p.dispatch("on_args_new"));
                 }
-                | kBEGIN bodystmt kEND {
-                    $$ = p.dispatch("on_begin", $2);
+                | kBEGIN {
+                    $$ = p.getCmdArgumentState().getStack();
+                    p.getCmdArgumentState().reset();
+                } bodystmt kEND {
+                    p.getCmdArgumentState().reset($<Long>2.longValue());
+                    $$ = p.dispatch("on_begin", $3);
                 }
                 | tLPAREN_ARG {
                     p.setState(LexState.EXPR_ENDARG);
                 } rparen {
                     $$ = p.dispatch("on_paren", null);
                 }
-                | tLPAREN_ARG expr {
+                | tLPAREN_ARG {
+                    $$ = p.getCmdArgumentState().getStack();
+                    p.getCmdArgumentState().reset();
+                } expr {
                     p.setState(LexState.EXPR_ENDARG); 
                 } rparen {
+                    p.getCmdArgumentState().reset($<Long>2.longValue());
                     p.warning("(...) interpreted as grouped expression");
-                    $$ = p.dispatch("on_paren", $2);
+                    $$ = p.dispatch("on_paren", $3);
                 }
                 | tLPAREN compstmt tRPAREN {
                     $$ = p.dispatch("on_paren", $2);
@@ -1611,15 +1623,24 @@ string_content  : tSTRING_CONTENT
                 }
                 | tSTRING_DBEG {
                    $$ = p.getStrTerm();
-                   p.getConditionState().stop();
-                   p.getCmdArgumentState().stop();
                    p.setStrTerm(null);
+                   p.getConditionState().stop();
+                } {
+                   $$ = p.getCmdArgumentState().getStack();
+                   p.getCmdArgumentState().reset();
+                } {
+                   $$ = p.getState();
                    p.setState(LexState.EXPR_BEG);
-                } compstmt tRCURLY {
+                } {
+                   $$ = p.getBraceNest();
+                   p.setBraceNest(0);
+                } compstmt tSTRING_DEND {
                    p.getConditionState().restart();
-                   p.getCmdArgumentState().restart();
                    p.setStrTerm($<StrTerm>2);
-                   $$ = p.dispatch("on_string_embexpr", $3);
+                   p.getCmdArgumentState().reset($<Long>3.longValue());
+                   p.setState($<LexState>4);
+                   p.setBraceNest($<Integer>5);
+                   $$ = p.dispatch("on_string_embexpr", $6);
                 }
 
 string_dvar     : tGVAR {

diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParserBase.java b/core/src/main/java/org/jruby/ext/ripper/RipperParserBase.java
@@ -210,11 +210,16 @@ public IRubyObject method_optarg(IRubyObject method, IRubyObject arg) {
     }
 
     public IRubyObject keyword_arg(IRubyObject key, IRubyObject value) {
-        RubyHash hash = RubyHash.newHash(context.runtime);
+        RubyArray array = RubyArray.newArray(context.runtime, 2);
 
-        hash.fastASet(key, value);
+        array.append(key);
+        if (value != null) {
+            array.append(value);
+        } else {
+            array.append(context.nil);
+        }
 
-        return hash;
+        return array;
     }
 
     public IRubyObject new_args(IRubyObject f, IRubyObject o, IRubyObject r, IRubyObject p, ArgsTailHolder tail) {
@@ -351,6 +356,18 @@ public int getInSingle() {
         return inSingleton;
     }
 
+    public int getBraceNest() {
+        return lexer.getBraceNest();
+    }
+
+    public LexState getState() {
+        return lexer.getState();
+    }
+
+    public void setBraceNest(int braceNest) {
+        lexer.setBraceNest(braceNest);
+    }
+
     public void setState(LexState lexState) {
         lexer.setState(lexState);
     }

diff --git a/core/src/main/java/org/jruby/ext/ripper/YyTables.java b/core/src/main/java/org/jruby/ext/ripper/YyTables.java
diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -1941,13 +1941,12 @@ private int identifier(int c, boolean commandState) throws IOException {
         String tempVal = createTokenString();
 
         if (isLabelPossible(commandState)) {
-            int c2 = nextc();
-            if (c2 == ':' && !peek(':')) {
+            if (isLabelSuffix()) {
                 setState(LexState.EXPR_LABELARG);
+                nextc();
                 yaccValue = tempVal.intern();
                 return Tokens.tLABEL;
             }
-            pushback(c2);
         }
 
         if (lex_state != LexState.EXPR_DOT) {

diff --git a/core/src/main/java/org/jruby/lexer/yacc/StackState.java b/core/src/main/java/org/jruby/lexer/yacc/StackState.java
@@ -43,6 +43,10 @@ public void reset(long backup) {
         stack = backup;
     }
 
+    public long getStack() {
+        return stack;
+    }
+
     // PUSH(1)
     public long begin() {
         long old = stack;

diff --git a/core/src/main/java/org/jruby/parser/RubyParser.java b/core/src/main/java/org/jruby/parser/RubyParser.java
diff --git a/core/src/main/java/org/jruby/parser/RubyParser.y b/core/src/main/java/org/jruby/parser/RubyParser.y
@@ -1331,21 +1331,29 @@ primary         : literal
                 | tFID {
                     $$ = support.new_fcall($1);
                 }
-                | kBEGIN bodystmt kEND {
-                    $$ = new BeginNode($1, $2 == null ? NilImplicitNode.NIL : $2);
+                | kBEGIN {
+                    $$ = lexer.getCmdArgumentState().getStack();
+                    lexer.getCmdArgumentState().reset();
+                } bodystmt kEND {
+                    lexer.getCmdArgumentState().reset($<Long>2.longValue());
+                    $$ = new BeginNode($1, $3 == null ? NilImplicitNode.NIL : $3);
                 }
                 | tLPAREN_ARG {
                     lexer.setState(LexState.EXPR_ENDARG);
                 } rparen {
                     $$ = null; //FIXME: Should be implicit nil?
                 }
-                | tLPAREN_ARG expr {
+                | tLPAREN_ARG {
+                    $$ = lexer.getCmdArgumentState().getStack();
+                    lexer.getCmdArgumentState().reset();
+                } expr {
                     lexer.setState(LexState.EXPR_ENDARG); 
                 } rparen {
+                    lexer.getCmdArgumentState().reset($<Long>2.longValue());
                     if (Options.PARSER_WARN_GROUPED_EXPRESSIONS.load()) {
                       support.warning(ID.GROUPED_EXPRESSION, $1, "(...) interpreted as grouped expression");
                     }
-                    $$ = $2;
+                    $$ = $3;
                 }
                 | tLPAREN compstmt tRPAREN {
                     if ($2 != null) {
@@ -2011,7 +2019,9 @@ string_content  : tSTRING_CONTENT {
                    $$ = lexer.getStrTerm();
                    lexer.setStrTerm(null);
                    lexer.getConditionState().stop();
-                   lexer.getCmdArgumentState().stop();
+                } {
+                   $$ = lexer.getCmdArgumentState().getStack();
+                   lexer.getCmdArgumentState().reset();
                 } {
                    $$ = lexer.getState();
                    lexer.setState(LexState.EXPR_BEG);
@@ -2020,12 +2030,12 @@ string_content  : tSTRING_CONTENT {
                    lexer.setBraceNest(0);
                 } compstmt tSTRING_DEND {
                    lexer.getConditionState().restart();
-                   lexer.getCmdArgumentState().restart();
                    lexer.setStrTerm($<StrTerm>2);
-                   lexer.setState($<LexState>3);
-                   lexer.setBraceNest($<Integer>4);
+                   lexer.getCmdArgumentState().reset($<Long>3.longValue());
+                   lexer.setState($<LexState>4);
+                   lexer.setBraceNest($<Integer>5);
 
-                   $$ = support.newEvStrNode(support.getPosition($5), $5);
+                   $$ = support.newEvStrNode(support.getPosition($6), $6);
                 }
 
 string_dvar     : tGVAR {

diff --git a/core/src/main/java/org/jruby/parser/YyTables.java b/core/src/main/java/org/jruby/parser/YyTables.java
diff --git a/spec/regression/parser_regressions_spec.rb b/spec/regression/parser_regressions_spec.rb
@@ -0,0 +1,37 @@
+require 'rspec'
+
+describe "The Parsing experience" do
+  it "parses a cond which used to get confused as a tLABEL" do
+    cond = true
+    x = '('
+    a = cond ? x + ')': ''
+    a.should eq('()')
+  end
+
+  it "parse the stabby lambda even if args params separated by space" do
+    a = -> () { 1 }
+    a.call.should eq(1)
+  end
+
+  it "parses a jumbled mess of nestng" do
+    self.class.send(:define_method, :foo) { |a| a[:key].call[:key] }
+    var = 1
+    res = foo key: (proc do
+                      {
+                        key: "#{var}#{var}",
+                        other_key: proc do
+                        end
+                      }
+                    end)
+
+    res.should eq("11")
+  end
+
+  it "parsers a block do inside of a call arg list" do
+    self.class.send(:define_method, :foo) { |a| a }
+    res = foo (10.times.to_a.map do |i|
+                 7 + i
+               end)
+    res.should eq([7,8,9,10,11,12,13,14,15,16])
+  end
+end
diff --git a/test/jruby/test_objectspace.rb b/test/jruby/test_objectspace.rb
@@ -35,12 +35,12 @@ def test_id2ref
     assert_equal(-19, -10.object_id)
 
     assert_equal(0, false.object_id)
-    assert_equal(2, true.object_id)
-    assert_equal(4, nil.object_id)
+    assert_equal(20, true.object_id)
+    assert_equal(8, nil.object_id)
 
     assert_equal(false, ObjectSpace._id2ref(0))
-    assert_equal(true, ObjectSpace._id2ref(2))
-    assert_equal(nil, ObjectSpace._id2ref(4))
+    assert_equal(true, ObjectSpace._id2ref(20))
+    assert_equal(nil, ObjectSpace._id2ref(8))
   end
 
   def test_jruby_objectspace
@@ -65,27 +65,32 @@ def finalizer(results)
     end
   end
 
-  # JRUBY-4839
-  def test_finalization
-    [true, false].each do |objectspace|
-      JRuby.objectspace = objectspace
-      obj1 = "lemon"
-      obj2 = "apple"
-      results = []
+  def body(objectspace, results)
+    JRuby.objectspace = objectspace
+    obj1 = "lemon"
+    obj2 = "apple"
 
-      ObjectSpace.define_finalizer obj1, finalizer(results)
-      ObjectSpace.define_finalizer obj2, finalizer(results)
+    ObjectSpace.define_finalizer obj1, finalizer(results)
+    ObjectSpace.define_finalizer obj2, finalizer(results)
 
-      obj1_id = obj1.object_id
+    results << obj1.object_id
 
-      ObjectSpace.undefine_finalizer obj2
+    ObjectSpace.undefine_finalizer obj2
+
+    obj1 = nil
+    obj2 = nil
+  end
+
+  # JRUBY-4839 GH #3028
+  def test_finalization
+    [true, false].each do |objectspace|
+      results = []
 
-      obj1 = nil
-      obj2 = nil
+      body(objectspace, results)
 
       t = Time.now
-      (JRuby.gc; sleep 0.1) until (Time.now - t > 5) || results.length > 0
-      assert_equal ["finalizing #{obj1_id}"], results
+      (JRuby.gc; sleep 0.1) until (Time.now - t > 5) || results.length > 1
+      assert_equal "finalizing #{results[0]}", results[1]
     end
   end
 end
diff --git a/test/mri/excludes/TestRipper/Filter.rb b/test/mri/excludes/TestRipper/Filter.rb
@@ -1,6 +1,3 @@
-exclude :test_filter_column, "needs investigation"
-exclude :test_filter_filename, "needs investigation"
-exclude :test_filter_filename_unset, "needs investigation"
 exclude :test_filter_lineno, "needs investigation"
 exclude :test_filter_lineno_set, "needs investigation"
-exclude :test_filter_token, "needs investigation"
+
diff --git a/test/mri/excludes/TestRipper/ScannerEvents.rb b/test/mri/excludes/TestRipper/ScannerEvents.rb
@@ -1,4 +1,3 @@
-exclude :test_embexpr_end, "needs investigation"
-exclude :test_event_coverage, "embexpr_end due to parser/lexer bug"
-exclude :test_tokenize, "needs investigation"
+exclude :test_lex, "off-by-one one-liner no newline"
+exclude :test_location, "off-by-one one-liner no newline"
 
diff --git a/test/objectspace.index b/test/objectspace.index
@@ -1,2 +1,2 @@
-test_objectspace
-test_cache_map_leak
+jruby/test_objectspace
+jruby/test_cache_map_leak
diff --git a/test/slow.index b/test/slow.index
@@ -1,2 +1,2 @@
-test_command_line_switches
-test_launching_by_shell_script
+jruby/test_command_line_switches
+jruby/test_launching_by_shell_script
diff --git a/truffle/README.md b/truffle/README.md
@@ -15,6 +15,7 @@ University Linz](http://ssw.jku.at).
 * Chris Seaton
 * Benoit Daloze
 * Kevin Menard
+* Petr Chalupa
 * Thomas Würthinger
 * Matthias Grimmer
 * Josef Haider

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -1275,7 +1275,7 @@ public NameNode(RubyContext context, SourceSection sourceSection) {
         public Object name(RubyModule module) {
             CompilerDirectives.transferToInterpreter();
 
-            if (!module.hasName()) {
+            if (!module.hasPartialName()) {
                 return nil();
             }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
@@ -417,7 +417,11 @@ public String getName() {
     }
 
     public boolean hasName() {
-        return name != null || givenBaseName != null;
+        return name != null;
+    }
+
+    public boolean hasPartialName() {
+        return hasName() || givenBaseName != null;
     }
 
     @Override