ruby_parser 3.9.0 → 3.10.0

data/test/test_ruby_lexer.rb

@@ -1153,6 +1153,47 @@ class TestRubyLexer < Minitest::Test
                 :tNL,             nil,             :expr_beg)
   end
 
+  def test_yylex_heredoc_double_squiggly
+    setup_lexer_class Ruby23Parser
+
+    assert_lex3("a = <<~\"EOF\"\n  blah blah\n  EOF\n\n",
+                nil,
+                :tIDENTIFIER,     "a",           :expr_cmdarg,
+                :tEQL,            "=",           :expr_beg,
+                :tSTRING_BEG,     "\"",          :expr_beg,
+                :tSTRING_CONTENT, "blah blah\n", :expr_beg,
+                :tSTRING_END,     "EOF",         :expr_end,
+                :tNL,             nil,           :expr_beg)
+  end
+
+  # mri handles tabs in a pretty specific way:
+  # https://github.com/ruby/ruby/blob/trunk/parse.y#L5925
+  def test_yylex_heredoc_double_squiggly_with_tab_indentation_remaining
+    setup_lexer_class Ruby23Parser
+
+    assert_lex3("a = <<~\"EOF\"\n  blah blah\n \tblah blah\n  EOF\n\n",
+                nil,
+                :tIDENTIFIER,     "a",                        :expr_cmdarg,
+                :tEQL,            "=",                        :expr_beg,
+                :tSTRING_BEG,     "\"",                       :expr_beg,
+                :tSTRING_CONTENT, "blah blah\n\tblah blah\n", :expr_beg,
+                :tSTRING_END,     "EOF",                      :expr_end,
+                :tNL,             nil,                        :expr_beg)
+  end
+
+  def test_yylex_heredoc_double_squiggly_with_tab_indentation_removed
+    setup_lexer_class Ruby23Parser
+
+    assert_lex3("a = <<~\"EOF\"\n        blah blah\n\t blah blah\n  EOF\n\n",
+                nil,
+                :tIDENTIFIER,     "a",                       :expr_cmdarg,
+                :tEQL,            "=",                       :expr_beg,
+                :tSTRING_BEG,     "\"",                      :expr_beg,
+                :tSTRING_CONTENT, "blah blah\n blah blah\n", :expr_beg,
+                :tSTRING_END,     "EOF",                     :expr_end,
+                :tNL,             nil,                       :expr_beg)
+  end
+
   def test_yylex_heredoc_double_eos
     refute_lex("a = <<\"EOF\"\nblah",
                :tIDENTIFIER, "a",
@@ -1223,6 +1264,19 @@ class TestRubyLexer < Minitest::Test
                 :tNL,             nil,            :expr_beg)
   end
 
+  def test_yylex_heredoc_none_squiggly
+    setup_lexer_class Ruby23Parser
+
+    assert_lex3("a = <<~EOF\n  blah\n  blah\n  EOF\n",
+                nil,
+                :tIDENTIFIER,     "a",            :expr_cmdarg,
+                :tEQL,            "=",            :expr_beg,
+                :tSTRING_BEG,     "\"",           :expr_beg,
+                :tSTRING_CONTENT, "blah\nblah\n", :expr_beg,
+                :tSTRING_END,     "EOF",          :expr_end,
+                :tNL,             nil,            :expr_beg)
+  end
+
   def test_yylex_heredoc_single
     assert_lex3("a = <<'EOF'\n  blah blah\nEOF\n\n",
                 nil,
@@ -1273,6 +1327,19 @@ class TestRubyLexer < Minitest::Test
                 :tNL,             nil,             :expr_beg)
   end
 
+  def test_yylex_heredoc_single_squiggly
+    setup_lexer_class Ruby23Parser
+
+    assert_lex3("a = <<~'EOF'\n  blah blah\n  EOF\n\n",
+                nil,
+                :tIDENTIFIER,     "a",           :expr_cmdarg,
+                :tEQL,            "=",           :expr_beg,
+                :tSTRING_BEG,     "\"",          :expr_beg,
+                :tSTRING_CONTENT, "blah blah\n", :expr_beg,
+                :tSTRING_END,     "EOF",         :expr_end,
+                :tNL,             nil,           :expr_beg)
+  end
+
   def test_yylex_identifier
     assert_lex3("identifier",
                 nil,

data/test/test_ruby_parser.rb

@@ -571,6 +571,14 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_str_newline_hash_line_number
+    rb = "\"\\n\\n\\n\\n#\"\n1"
+    pt = s(:block, s(:str, "\n\n\n\n#").line(1),
+                   s(:lit, 1).line(2))
+
+    assert_parse rb, pt
+  end
+
   def after_process_hook klass, node, data, input_name, output_name
     assert_equal 1, @result.line, "should have proper line number"
   end
@@ -811,7 +819,6 @@ module TestRubyParserShared
   end
 
   def test_parse_line_rescue
-    skip "not yet"
     rb = "begin\n a\n rescue\n b\n rescue\n c\n end\n"
     pt = s(:rescue,
            s(:call, nil, :a).line(2),
@@ -1709,6 +1716,16 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_defs_as_arg_with_do_block_inside
+    rb = "p def self.b; x.y do; end; end"
+    pt = s(:call,
+           nil,
+           :p,
+           s(:defs, s(:self), :b, s(:args),
+             s(:iter, s(:call, s(:call, nil, :x), :y), 0)))
+
+    assert_parse rb, pt
+  end
 end
 
 module TestRubyParserShared19Plus
@@ -3239,6 +3256,20 @@ module TestRubyParserShared20Plus
 
     assert_parse rb, pt
   end
+
+  def test_bug_249
+    rb = "mount (Class.new do\ndef initialize\nend\n end).new, :at => 'endpoint'"
+    pt = s(:call, nil, :mount,
+           s(:call,
+             s(:iter,
+               s(:call, s(:const, :Class), :new),
+               0,
+               s(:defn, :initialize, s(:args), s(:nil))),
+             :new),
+           s(:hash, s(:lit, :at), s(:str, "endpoint")))
+
+    assert_parse rb, pt
+  end
 end
 
 module TestRubyParserShared22Plus

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
   fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement