parser 2.3.2.0 → 2.3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73ca61e5ab86f82798f86bc14407c958d2b08a40
-  data.tar.gz: 9d88b4bc43581891ee5612e9c1c1d2288aa6fcc7
+  metadata.gz: dd2d228218210c32b6e5257ffd3c910a84fe19a9
+  data.tar.gz: 761ee5efcfcc19a1b849c375e14dff4dfaff4290
 SHA512:
-  metadata.gz: c5c8232ddd5b94e0aff2dddec620201e99ad7db4bc4d7362e2feb2d5d4fb7456f861d6905750325cc4429e4f9a2946d9ff475d6ae3f5914af78c45fbe3e3a21e
-  data.tar.gz: 61255e34c1b006ec82b946aa173c6e2e4a48f7491db05392e0d667c3e834dfbb598e204eefd6e871a8d4bec2d254e71a1de5e65bf1db8917dfe06b76f26b34b1
+  metadata.gz: d37084ea8b0ed43ade75af6e1a320f50eafa88373ebfcf4fd630e599d918866f12e0bd00457048a2651d8d775cc1c215c846cb6bd50f85df31665781596d7881
+  data.tar.gz: 562737dae75b78b7672b77adf556614a27f1679ce9283e125171358ae393b48b841f208baf6a726698838c73e8e332e872e0b95748b67817ff1c7d271e4eda0e

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+v2.3.3.0 (2016-11-28)
+---------------------
+
+API modifications:
+ * parser/current: update 2.3 branch to 2.3.3. (Philip Arndt)
+
+Bugs fixed:
+ * ruby24.y: "a += b += raise :x": fix errors with chained op-assignments. (whitequark)
+ * ruby24.y: "p p{p(p);p p}, tap do end": preserve cmdarg stack. (whitequark)
+ * ruby24.y: "a b{c d}, :e do end": go to EXPR_ENDARG after literal. (whitequark)
+
 v2.3.2.0 (2016-11-20)
 ---------------------
 
@@ -105,7 +116,7 @@ Bugs fixed:
  * Add :csend to Parser::Meta::NODE_TYPES (Markus Schirp)
  * lexer/dedenter: "\<\<x\n  y\\n  z\nx": don't dedent after escaped newline. (whitequark)
 
-v2.3.2.0 (2016-01-16)
+v2.3.3.0 (2016-01-16)
 ---------------------
 
 v2.3.0.1 (2016-01-14)

data/lib/parser/current.rb

@@ -55,7 +55,7 @@ module Parser
     CurrentRuby = Ruby22
 
   when /^2\.3\./
-    current_version = '2.3.2'
+    current_version = '2.3.3'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby23', current_version
     end

data/lib/parser/lexer.rl

@@ -1565,8 +1565,15 @@ class Parser::Lexer
   # `do` (as `kDO_BLOCK` in `expr_beg`).
   expr_endarg := |*
       e_lbrace
-      => { emit(:tLBRACE_ARG, '{'.freeze)
-           fnext expr_value; };
+      => {
+        if @lambda_stack.last == @paren_nest
+          @lambda_stack.pop
+          emit(:tLAMBEG, '{'.freeze)
+        else
+          emit(:tLBRACE_ARG, '{'.freeze)
+        end
+        fnext expr_value;
+      };
 
       'do'
       => { emit_do(true)

data/lib/parser/ruby24.y

@@ -183,6 +183,21 @@ rule
                     {
                       result = @builder.multi_assign(val[0], val[1], val[2])
                     }
+                | lhs tEQL mrhs
+                    {
+                      result = @builder.assign(val[0], val[1],
+                                  @builder.array(nil, val[2], nil))
+                    }
+                | mlhs tEQL mrhs_arg
+                    {
+                      result = @builder.multi_assign(val[0], val[1], val[2])
+                    }
+                | expr
+
+    command_asgn: lhs tEQL command_rhs
+                    {
+                      result = @builder.assign(val[0], val[1], val[2])
+                    }
                 | var_lhs tOP_ASGN command_rhs
                     {
                       result = @builder.op_assign(val[0], val[1], val[2])
@@ -225,21 +240,6 @@ rule
                     {
                       @builder.op_assign(val[0], val[1], val[2])
                     }
-                | lhs tEQL mrhs
-                    {
-                      result = @builder.assign(val[0], val[1],
-                                  @builder.array(nil, val[2], nil))
-                    }
-                | mlhs tEQL mrhs_arg
-                    {
-                      result = @builder.multi_assign(val[0], val[1], val[2])
-                    }
-                | expr
-
-    command_asgn: lhs tEQL command_rhs
-                    {
-                      result = @builder.assign(val[0], val[1], val[2])
-                    }
 
      command_rhs: command_call =tOP_ASGN
                 | command_call kRESCUE_MOD stmt
@@ -1587,21 +1587,33 @@ opt_block_args_tail:
       brace_body:   {
                       @static_env.extend_dynamic
                     }
+                    {
+                      result = @lexer.cmdarg.dup
+                      @lexer.cmdarg.clear
+                    }
                     opt_block_param compstmt
                     {
-                      result = [ val[1], val[2] ]
+                      result = [ val[2], val[3] ]
 
                       @static_env.unextend
+                      @lexer.cmdarg = val[1]
+                      @lexer.cmdarg.pop
                     }
 
          do_body:   {
                       @static_env.extend_dynamic
                     }
+                    {
+                      result = @lexer.cmdarg.dup
+                      @lexer.cmdarg.clear
+                    }
                     opt_block_param compstmt
                     {
-                      result = [ val[1], val[2] ]
+                      result = [ val[2], val[3] ]
 
                       @static_env.unextend
+                      @lexer.cmdarg = val[1]
+                      @lexer.cmdarg.pop
                     }
 
        case_body: kWHEN args then compstmt cases
@@ -1828,11 +1840,13 @@ regexp_contents: # nothing
 
           symbol: tSYMBOL
                     {
+                      @lexer.state = :expr_endarg
                       result = @builder.symbol(val[0])
                     }
 
             dsym: tSYMBEG xstring_contents tSTRING_END
                     {
+                      @lexer.state = :expr_endarg
                       result = @builder.symbol_compose(val[0], val[1], val[2])
                     }
 
@@ -1847,18 +1861,22 @@ regexp_contents: # nothing
 
   simple_numeric: tINTEGER
                     {
+                      @lexer.state = :expr_endarg
                       result = @builder.integer(val[0])
                     }
                 | tFLOAT
                     {
+                      @lexer.state = :expr_endarg
                       result = @builder.float(val[0])
                     }
                 | tRATIONAL
                     {
+                      @lexer.state = :expr_endarg
                       result = @builder.rational(val[0])
                     }
                 | tIMAGINARY
                     {
+                      @lexer.state = :expr_endarg
                       result = @builder.complex(val[0])
                     }
 

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.3.2.0'
+  VERSION = '2.3.3.0'
 end

data/test/test_parser.rb

@@ -5489,6 +5489,73 @@ class TestParser < Minitest::Test
       SINCE_2_1) # no 1.9 backport
   end
 
+  def test_ruby_bug_11873_a
+    [[":e",   s(:sym, :e)],
+     ["1",    s(:int, 1)],
+     ["1.0",  s(:float, 1.0)],
+     ["1.0r", s(:rational, Rational(1, 1))],
+     ["1.0i", s(:complex,  Complex(0.0, 1.0))]].each do |code, node|
+      expect_a = \
+        s(:block,
+          s(:send, nil, :a,
+            s(:block,
+              s(:send, nil, :b),
+              s(:args),
+              s(:send, nil, :c,
+                s(:send, nil, :d))),
+            node),
+          s(:args), nil)
+      assert_parses(
+        expect_a,
+        %Q{a b{c d}, #{code} do end},
+        %q{},
+        SINCE_2_4)
+      assert_parses(
+        expect_a,
+        %Q{a b{c(d)}, #{code} do end},
+        %q{},
+        SINCE_2_4)
+
+      expect_b = \
+        s(:block,
+          s(:send, nil, :a,
+            s(:send, nil, :b,
+              s(:send, nil, :c,
+                s(:send, nil, :d))),
+            node),
+          s(:args), nil)
+      assert_parses(
+        expect_b,
+        %Q{a b(c d), #{code} do end},
+        %q{},
+        SINCE_2_4)
+      assert_parses(
+        expect_b,
+        %Q{a b(c(d)), #{code} do end},
+        %q{},
+        SINCE_2_4)
+    end
+  end
+
+  def test_ruby_bug_11873_b
+    assert_parses(
+      s(:block,
+        s(:send, nil, :p,
+          s(:block,
+            s(:send, nil, :p),
+            s(:args),
+            s(:begin,
+              s(:send, nil, :p,
+                s(:send, nil, :p)),
+              s(:send, nil, :p,
+                s(:send, nil, :p)))),
+          s(:send, nil, :tap)),
+        s(:args), nil),
+      %q{p p{p(p);p p}, tap do end},
+      %q{},
+      SINCE_2_4)
+  end
+
   def test_ruby_bug_11989
     assert_parses(
       s(:send, nil, :p,
@@ -5716,6 +5783,44 @@ class TestParser < Minitest::Test
       SINCE_2_4)
   end
 
+  def test_ruby_bug_12669
+    assert_parses(
+      s(:lvasgn, :a,
+        s(:lvasgn, :b,
+          s(:send, nil, :raise,
+            s(:sym, :x)))),
+      %q{a = b = raise :x},
+      %q{},
+      SINCE_2_0)
+
+    assert_parses(
+      s(:op_asgn, s(:lvasgn, :a), :+,
+        s(:lvasgn, :b,
+          s(:send, nil, :raise,
+            s(:sym, :x)))),
+      %q{a += b = raise :x},
+      %q{},
+      SINCE_2_4)
+
+    assert_parses(
+      s(:lvasgn, :a,
+        s(:op_asgn, s(:lvasgn, :b), :+,
+          s(:send, nil, :raise,
+            s(:sym, :x)))),
+      %q{a = b += raise :x},
+      %q{},
+      SINCE_2_4)
+
+    assert_parses(
+      s(:op_asgn, s(:lvasgn, :a), :+,
+        s(:op_asgn, s(:lvasgn, :b), :+,
+          s(:send, nil, :raise,
+            s(:sym, :x)))),
+      %q{a += b += raise :x},
+      %q{},
+      SINCE_2_4)
+  end
+
   def test_ruby_bug_12686
     assert_parses(
       s(:send, nil, :f,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.3.2.0
+  version: 2.3.3.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-20 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast