ruby_parser 3.11.0 → 3.12.0

data/test/test_ruby_lexer.rb

@@ -494,6 +494,19 @@ class TestRubyLexer < Minitest::Test
                :tRCURLY,     "}", :expr_endarg, 0, 0)
   end
 
+  def test_yylex_lambda_as_args_with_block__20
+    setup_lexer_class RubyParser::V20
+
+    assert_lex3("a -> do end do end",
+                nil,
+                :tIDENTIFIER, "a",   :expr_cmdarg,
+                :tLAMBDA,     nil,   :expr_endfn,
+                :kDO,         "do",  :expr_beg,
+                :kEND,        "end", :expr_end,
+                :kDO_BLOCK,   "do",  :expr_beg,
+                :kEND,        "end", :expr_end)
+  end
+
   def test_yylex_lambda_args_opt__20
     setup_lexer_class RubyParser::V20
 
@@ -2598,6 +2611,10 @@ class TestRubyLexer < Minitest::Test
     assert_lex3("'blah\\\nblah'", nil, :tSTRING, "blah\\\nblah", :expr_end)
   end
 
+  def test_yylex_string_single_escaped_quote
+    assert_lex3("'foo\\'bar'", nil, :tSTRING, "foo'bar", :expr_end)
+  end
+
   def test_yylex_symbol
     assert_lex3(":symbol", nil, :tSYMBOL, "symbol", :expr_end)
   end
@@ -2641,6 +2658,16 @@ class TestRubyLexer < Minitest::Test
                 :tSYMBOL,   'symbol#{1+1}', :expr_end)
   end
 
+  def test_yylex_symbol_single_escape_chars
+    assert_lex3(":'s\\tri\\ng'",
+                nil,
+                :tSYMBOL,   "s\\tri\\ng", :expr_end)
+  end
+
+  def test_yylex_string_single_escape_quote_and_backslash
+    assert_lex3(":'foo\\'bar\\\\baz'", nil, :tSYMBOL, "foo'bar\\baz", :expr_end)
+  end
+
   def test_yylex_ternary1
     assert_lex3("a ? b : c",
                 nil,
@@ -2819,6 +2846,30 @@ class TestRubyLexer < Minitest::Test
                 :kEND, "end", :expr_end)
   end
 
+  def test_yylex_hash_colon_double_quoted_with_escapes
+    setup_lexer_class RubyParser::V22
+
+    assert_lex3("{\"s\\tr\\i\\ng\\\\foo\\'bar\":1}",
+               nil,
+
+               :tLBRACE, "{", :expr_beg,
+               :tLABEL,  "s\tr\i\ng\\foo'bar", :expr_labelarg,
+               :tINTEGER, 1,  :expr_end,
+               :tRCURLY, "}", :expr_endarg)
+  end
+
+  def test_yylex_hash_colon_quoted_with_escapes
+    setup_lexer_class RubyParser::V22
+
+    assert_lex3("{'s\\tr\\i\\ng\\\\foo\\'bar':1}",
+               nil,
+
+               :tLBRACE, "{", :expr_beg,
+               :tLABEL,  "s\\tr\\i\\ng\\foo'bar", :expr_labelarg,
+               :tINTEGER, 1,  :expr_end,
+               :tRCURLY, "}", :expr_endarg)
+  end
+
   def test_ruby21_rational_literal
     setup_lexer_class RubyParser::V21
 

data/test/test_ruby_parser.rb

@@ -2029,6 +2029,20 @@ module TestRubyParserShared19Plus
     assert_parse rb, pt
   end
 
+  def test_call_stabby_with_braces_block
+    rb = "a -> {} do\nend"
+    pt = s(:iter, s(:call, nil, :a, s(:iter, s(:call, nil, :lambda), 0)), 0)
+
+    assert_parse rb, pt
+  end
+
+  def test_call_stabby_do_end_with_block
+    rb = "a -> do end do end"
+    pt = s(:iter, s(:call, nil, :a, s(:iter, s(:call, nil, :lambda), 0)), 0)
+
+    assert_parse rb, pt
+  end
+
   def test_call_trailing_comma
     rb = "f(1,)"
     pt = s(:call, nil, :f, s(:lit, 1))
@@ -3766,6 +3780,72 @@ class TestRubyParserV25 < RubyParserTestCase
 
     self.processor = RubyParser::V25.new
   end
+
+  def test_rescue_in_block
+    rb = "blah do\nrescue\n  stuff\nend"
+    pt = s(:iter, s(:call, nil, :blah), 0, s(:rescue, s(:resbody, s(:array), s(:call, nil, :stuff))))
+    assert_parse rb, pt
+  end
+
+  def test_rescue_do_end_raised
+    rb = "tap do\n  raise\nensure\n  :ensure\nend"
+    pt = s(:iter,
+           s(:call, nil, :tap),
+           0,
+           s(:ensure,
+             s(:call, nil, :raise),
+             s(:lit, :ensure)))
+
+    assert_parse rb, pt
+  end
+
+  def test_rescue_do_end_rescued
+    rb = "tap do\n  raise\nrescue\n  :rescue\nelse\n  :else\nensure\n  :ensure\nend"
+    pt = s(:iter,
+           s(:call, nil, :tap),
+           0,
+           s(:ensure,
+             s(:rescue,
+               s(:call, nil, :raise),
+               s(:resbody,
+                 s(:array),
+                 s(:lit, :rescue)),
+               s(:lit, :else)),
+             s(:lit, :ensure)))
+
+    assert_parse rb, pt
+  end
+
+  def test_rescue_do_end_no_raise
+    rb = "tap do\n  :begin\nrescue\n  :rescue\nelse\n  :else\nensure\n  :ensure\nend"
+    pt = s(:iter,
+           s(:call, nil, :tap),
+           0,
+           s(:ensure,
+             s(:rescue,
+               s(:lit, :begin),
+               s(:resbody,
+                 s(:array),
+                 s(:lit, :rescue)),
+               s(:lit, :else)),
+             s(:lit, :ensure)))
+
+    assert_parse rb, pt
+  end
+
+  def test_rescue_do_end_ensure_result
+    rb = "proc do\n  :begin\nensure\n  :ensure\nend.call"
+    pt = s(:call,
+           s(:iter,
+             s(:call, nil, :proc),
+             0,
+             s(:ensure,
+               s(:lit, :begin),
+               s(:lit, :ensure))),
+           :call)
+
+    assert_parse rb, pt
+  end
 end
 
 RubyParser::VERSIONS.each do |klass|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
   V+HB+LYYhXWitInO/eXxDrFB
   -----END CERTIFICATE-----
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -82,7 +82,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.17'
 description: |-
   ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
   racc--which does by default use a C extension). RP's output is