parser 2.5.1.2 → 2.5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999565504b59c7ad12546445a92d20f6ff6235ed29d76c8c52eb73513c23d9e7
-  data.tar.gz: e04475df2071b10e772259cc6697875067432121122541a5ef5a5092eeee4e1f
+  metadata.gz: 77bd0a20c41d5920ff53bc78caad94a0c2fc7d713ae9e6c2eeaf25e007b4eb87
+  data.tar.gz: e172d0fc395b41eefe2a4e2e522c62729ba7ba6ccbcf7c4caffe9a3d644d09dc
 SHA512:
-  metadata.gz: ef4a0c50b91ba31b62c2274a6d442589fa277e0a606811800e9590ae73e7f6236d80fbc01c1d180adf2d64532d87dc99fcfa4953a28fa272dcce2fb195e8b224
-  data.tar.gz: 88e285335392b9269787035fe5dccc073758157496bcade661be8acbb912ec134e86fa75e8a2e3fbc0a62f7fa8a38c9f581cbecd9059bbddfe03812f958002cd
+  metadata.gz: 07a1e0b7f53363979ca9a9a4601982adc897f82d7aad0dde87219c9510e4dd2f81a0b1d2bdb9c74ca60ea46f44a36c515caa7f009876dbbb2ab0f38046e4ab8e
+  data.tar.gz: cf89632cc8124a50e6d0964a527738f2deb98978f7caa66609d04e438c5daafafa30ba5cfd9b30a18f50b32e9319f6c478178267465eaa6385e222b1bf831dc3

data/CHANGELOG.md

@@ -1,9 +1,16 @@
 Changelog
 =========
 
-Not released (2018-07-10)
+Not released (2018-10-29)
 -------------------------
 
+Bugs fixed:
+ * lexer.rl: Fix parsing of 'm :key => m do; m() do end; end'. (#526) (Ilya Bylich)
+ * lexer.rl: Fix parsing of ambiguous 1re. (#523) (Ilya Bylich)
+
+v2.5.1.2 (2018-07-10)
+---------------------
+
 Bugs fixed:
  * lexer.rl: Partially revert 5ba072d and properly handle 'm = -> *args do end'. (Ilya Bylich)
 

data/lib/parser/current.rb

@@ -39,7 +39,7 @@ module Parser
     CurrentRuby = Ruby22
 
   when /^2\.3\./
-    current_version = '2.3.7'
+    current_version = '2.3.8'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby23', current_version
     end
@@ -48,7 +48,7 @@ module Parser
     CurrentRuby = Ruby23
 
   when /^2\.4\./
-    current_version = '2.4.4'
+    current_version = '2.4.5'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby24', current_version
     end
@@ -57,7 +57,7 @@ module Parser
     CurrentRuby = Ruby24
 
   when /^2\.5\./
-    current_version = '2.5.1'
+    current_version = '2.5.3'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby25', current_version
     end

data/lib/parser/lexer.rl

@@ -625,6 +625,7 @@ class Parser::Lexer
   | 'r'      % { @num_xfrm = lambda { |chars| emit(:tRATIONAL,  Rational(chars)) } }
   | 'i'      % { @num_xfrm = lambda { |chars| emit(:tIMAGINARY, Complex(0, chars)) } }
   | 'ri'     % { @num_xfrm = lambda { |chars| emit(:tIMAGINARY, Complex(0, Rational(chars))) } }
+  | 're'     % { @num_xfrm = lambda { |chars| emit(:tINTEGER,   chars, @ts, @te - 2); p -= 2 } }
   | 'if'     % { @num_xfrm = lambda { |chars| emit(:tINTEGER,   chars, @ts, @te - 2); p -= 2 } }
   | 'rescue' % { @num_xfrm = lambda { |chars| emit(:tINTEGER,   chars, @ts, @te - 6); p -= 6 } };
 
@@ -2243,16 +2244,16 @@ class Parser::Lexer
       # OPERATORS
       #
 
-      '*'
+      '*' | '=>'
       => {
-        emit(:tSTAR2)
+        emit_table(PUNCTUATION)
         fgoto expr_value;
       };
 
       # When '|', '~', '!', '=>' are used as operators
       # they do not accept any symbols (or quoted labels) after.
       # Other binary operators accept it.
-      ( operator_arithmetic | operator_rest ) - ( '|' | '~' | '!' - '*' )
+      ( operator_arithmetic | operator_rest ) - ( '|' | '~' | '!' | '*' )
       => {
         emit_table(PUNCTUATION);
         fnext expr_value; fbreak;

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '2.5.1.2'
+  VERSION = '2.5.3.0'
 end

data/test/test_lexer.rb

@@ -3534,4 +3534,10 @@ class TestLexer < Minitest::Test
                    :tNL,             nil,                [4, 5])
   end
 
+  def test_ambiguous_integer_re
+    assert_scanned('1re',
+                   :tINTEGER, 1, [0, 1],
+                   :tIDENTIFIER, 're', [1, 3])
+  end
+
 end

data/test/test_parser.rb

@@ -7035,4 +7035,21 @@ class TestParser < Minitest::Test
       %q{},
       ALL_VERSIONS)
   end
+
+  def test_parser_bug_525
+    assert_parses(
+      s(:block,
+        s(:send, nil, :m1,
+          s(:hash,
+            s(:pair,
+              s(:sym, :k),
+              s(:send, nil, :m2)))),
+        s(:args),
+        s(:block,
+          s(:send, nil, :m3),
+          s(:args), nil)),
+      'm1 :k => m2 do; m3() do end; end',
+      %q{},
+      ALL_VERSIONS)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.5.1.2
+  version: 2.5.3.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast