ruby_parser 3.15.1 → 3.16.0

data/lib/ruby_lexer.rb

@@ -25,6 +25,11 @@ class RubyLexer
 
   HAS_ENC = "".respond_to? :encoding
 
+  BTOKENS = {
+    ".."  => :tBDOT2,
+    "..." => :tBDOT3,
+  }
+
   TOKENS = {
     "!"   => :tBANG,
     "!="  => :tNEQ,
@@ -131,6 +136,10 @@ class RubyLexer
     ss.eos?
   end
 
+  def expr_beg?
+    lex_state =~ EXPR_BEG
+  end
+
   def expr_dot?
     lex_state =~ EXPR_DOT
   end
@@ -580,6 +589,12 @@ class RubyLexer
     end
   end
 
+  def process_dots text
+    tokens = ruby27plus? && expr_beg? ? BTOKENS : TOKENS
+
+    result EXPR_BEG, tokens[text], text
+  end
+
   def process_float text
     rb_compile_error "Invalid numeric format" if text =~ /__/
 
@@ -1136,6 +1151,10 @@ class RubyLexer
     parser.class.version <= 24
   end
 
+  def ruby27plus?
+    parser.class.version >= 27
+  end
+
   def scan re
     ss.scan re
   end

data/lib/ruby_lexer.rex

@@ -48,7 +48,7 @@ rule
 |               /\![=~]?/               { result :arg_state, TOKENS[text], text }
 
 : /\./
-|               /\.\.\.?/               { result EXPR_BEG, TOKENS[text], text }
+|               /\.\.\.?/               process_dots
 |               /\.\d/                  { rb_compile_error "no .<digit> floating literal anymore put 0 before dot" }
 |               /\./                    { self.lex_state = EXPR_BEG; result EXPR_DOT, :tDOT, "." }
 

data/lib/ruby_lexer.rex.rb

@@ -138,7 +138,7 @@ class RubyLexer
           when ss.match?(/\./) then
             case
             when text = ss.scan(/\.\.\.?/) then
-              action { result EXPR_BEG, TOKENS[text], text }
+              process_dots text
             when ss.skip(/\.\d/) then
               action { rb_compile_error "no .<digit> floating literal anymore put 0 before dot" }
             when ss.skip(/\./) then

data/lib/ruby_parser.rb

@@ -79,10 +79,12 @@ require "ruby24_parser"
 require "ruby25_parser"
 require "ruby26_parser"
 require "ruby27_parser"
+require "ruby30_parser"
 
 class RubyParser # HACK
   VERSIONS.clear # also a HACK caused by racc namespace issues
 
+  class V30 < ::Ruby30Parser; end
   class V27 < ::Ruby27Parser; end
   class V26 < ::Ruby26Parser; end
   class V25 < ::Ruby25Parser; end

data/lib/ruby_parser.yy

@@ -16,6 +16,8 @@ class Ruby25Parser
 class Ruby26Parser
 #elif V == 27
 class Ruby27Parser
+#elif V == 30
+class Ruby30Parser
 #else
 fail "version not specified or supported on code generation"
 #endif
@@ -46,6 +48,9 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
 #if V >= 23
        tLONELY
 #endif
+#if V >= 26
+       tBDOT2 tBDOT3
+#endif
 
 preclow
   nonassoc tLOWEST
@@ -57,7 +62,7 @@ preclow
   right    tEQL tOP_ASGN
   left     kRESCUE_MOD
   right    tEH tCOLON
-  nonassoc tDOT2 tDOT3
+  nonassoc tDOT2 tDOT3 tBDOT2 tBDOT3
   left     tOROP
   left     tANDOP
   nonassoc tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
@@ -80,6 +85,9 @@ rule
                     top_compstmt
                     {
                       result = new_compstmt val
+
+                      lexer.cond.pop # local_pop
+                      lexer.cmdarg.pop
                     }
 
     top_compstmt: top_stmts opt_terms
@@ -856,6 +864,24 @@ rule
                       result = s(:dot3, v1, v2).line v1.line
                     }
 #endif
+
+#if V >= 27
+                | tBDOT2 arg
+                    {
+                      _, v2, = val
+                      v1 = nil
+
+                      result = s(:dot2, v1, v2).line v2.line
+                    }
+                | tBDOT3 arg
+                    {
+                      _, v2 = val
+                      v1 = nil
+
+                      result = s(:dot3, v1, v2).line v2.line
+                    }
+#endif
+
                 | arg tPLUS arg
                     {
                       result = new_call val[0], :+, argl(val[2])

data/lib/ruby_parser_extras.rb

@@ -29,7 +29,7 @@ class Sexp
 end
 
 module RubyParserStuff
-  VERSION = "3.15.1"
+  VERSION = "3.16.0"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_accessor :in_kwarg
@@ -115,7 +115,7 @@ module RubyParserStuff
   def initialize(options = {})
     super()
 
-    v = self.class.name[/2\d/]
+    v = self.class.name[/[23]\d/]
     raise "Bad Class name #{self.class}" unless v
 
     self.lexer = RubyLexer.new v && v.to_i

data/test/test_ruby_lexer.rb

@@ -478,6 +478,22 @@ class TestRubyLexer < Minitest::Test
     assert_lex3("!~", nil, :tNMATCH, "!~", EXPR_BEG)
   end
 
+  def test_yylex_bdot2
+    assert_lex3("..42",
+                nil, # TODO: s(:dot2, nil, s(:lit, 42)),
+
+                :tBDOT2,   "..", EXPR_BEG,
+                :tINTEGER, 42,   EXPR_END|EXPR_ENDARG)
+  end
+
+  def test_yylex_bdot3
+    assert_lex3("...42",
+                nil, # TODO: s(:dot2, nil, s(:lit, 42)),
+
+                :tBDOT3,   "...", EXPR_BEG,
+                :tINTEGER, 42,    EXPR_END|EXPR_ENDARG)
+  end
+
   def test_yylex_block_bug_1
     assert_lex3("a do end",
                 s(:iter, s(:call, nil, :a), 0),
@@ -749,10 +765,26 @@ class TestRubyLexer < Minitest::Test
   end
 
   def test_yylex_dot2
+    assert_lex3("1..2",
+                s(:lit, 1..2),
+
+                :tINTEGER, 1,    EXPR_END|EXPR_ENDARG,
+                :tDOT2,    "..", EXPR_BEG,
+                :tINTEGER, 2,    EXPR_END|EXPR_ENDARG)
+
+    self.lex_state = EXPR_END|EXPR_ENDARG
     assert_lex3("..", nil, :tDOT2, "..", EXPR_BEG)
   end
 
   def test_yylex_dot3
+    assert_lex3("1...2",
+                s(:lit, 1...2),
+
+                :tINTEGER, 1,     EXPR_END|EXPR_ENDARG,
+                :tDOT3,    "...", EXPR_BEG,
+                :tINTEGER, 2,     EXPR_END|EXPR_ENDARG)
+
+    self.lex_state = EXPR_END|EXPR_ENDARG
     assert_lex3("...", nil, :tDOT3, "...", EXPR_BEG)
   end
 

data/test/test_ruby_parser.rb

@@ -3080,6 +3080,8 @@ module TestRubyParserShared19Plus
   end
 
   def test_motherfuckin_leading_dots
+    skip if processor.class.version >= 27
+
     rb = "a\n.b"
     pt = s(:call, s(:call, nil, :a), :b)
 
@@ -3087,6 +3089,8 @@ module TestRubyParserShared19Plus
   end
 
   def test_motherfuckin_leading_dots2
+    skip if processor.class.version >= 27
+
     rb = "a\n..b"
 
     assert_parse_error rb, '(string):2 :: parse error on value ".." (tDOT2)'
@@ -4136,6 +4140,10 @@ module TestRubyParserShared27Plus
   include TestRubyParserShared26Plus
 end
 
+module TestRubyParserShared30Plus
+  include TestRubyParserShared27Plus
+end
+
 class TestRubyParser < Minitest::Test
   def test_cls_version
     assert_equal 23, RubyParser::V23.version
@@ -4440,8 +4448,37 @@ class TestRubyParserV27 < RubyParserTestCase
 
     self.processor = RubyParser::V27.new
   end
+
+  def test_bdot2
+    rb = "..10\n; ..a\n; c"
+    pt = s(:block,
+           s(:dot2, nil, s(:lit, 10).line(1)).line(1),
+           s(:dot2, nil, s(:call, nil, :a).line(2)).line(2),
+           s(:call, nil, :c).line(3)).line(1)
+
+    assert_parse_line rb, pt, 1
+  end
+
+  def test_bdot3
+    rb = "...10\n; ...a\n; c"
+    pt = s(:block,
+           s(:dot3, nil, s(:lit, 10).line(1)).line(1),
+           s(:dot3, nil, s(:call, nil, :a).line(2)).line(2),
+           s(:call, nil, :c).line(3)).line(1)
+
+    assert_parse_line rb, pt, 1
+  end
 end
 
+class TestRubyParserV30 < RubyParserTestCase
+  include TestRubyParserShared30Plus
+
+  def setup
+    super
+
+    self.processor = RubyParser::V30.new
+  end
+end
 
 RubyParser::VERSIONS.each do |klass|
   v = klass.version

data/tools/munge.rb

@@ -197,8 +197,8 @@ ARGF.each_line do |line|
     puts line.gsub("true", "1").gsub("false", "0")
   when /^lex_state: :?([\w|]+) -> :?([\w|]+)(?: (?:at|from) (.*))?/ then
     a, b, c = $1.upcase, $2.upcase, $3
-    a.gsub! /EXPR_/, ""
-    b.gsub! /EXPR_/, ""
+    a.gsub!(/EXPR_/, "")
+    b.gsub!(/EXPR_/, "")
     if c && $v then
       puts "lex_state: #{a} -> #{b} at #{c}"
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.15.1
+  version: 3.16.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   d/AHw/kcnU6iuMUoJEcGiJd4gVCTn1l3cDcIvxakGslCA88Jubw0Sqatan0TnC9g
   KToW560QIey7SPfHWduzFJnV
   -----END CERTIFICATE-----
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -37,28 +37,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.9'
+        version: '4.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.9'
+        version: '4.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.15.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '15'
 - !ruby/object:Gem::Dependency
   name: oedipus_lex
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +85,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -93,20 +119,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +200,8 @@ files:
 - lib/ruby26_parser.y
 - lib/ruby27_parser.rb
 - lib/ruby27_parser.y
+- lib/ruby30_parser.rb
+- lib/ruby30_parser.y
 - lib/ruby_lexer.rb
 - lib/ruby_lexer.rex
 - lib/ruby_lexer.rex.rb
@@ -225,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which