parser 2.5.0.3 → 2.5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2b09926b92e95874cfa6295ffa913a0d282c063d
-  data.tar.gz: 10036043ab11e9fd97f36ddf29615f8f25247b78
+SHA256:
+  metadata.gz: eae6cafd7a3fce8e37c8659d938ebaf9c07809373b09e67aadfce5812e270798
+  data.tar.gz: f5c5cbe528398b002fd7663fcd87083a4a6674a9c506b2d57c0c94015a3a006a
 SHA512:
-  metadata.gz: 78ade228a7b0d40884bd06a6b2241d1282693f15d359bf73e0ae4f56e08b90da90586ecca947666fdf00b5d2a6a9ec7851627cd870a00cab49eafe6368c245fa
-  data.tar.gz: f4109e28f013c637ad30b616115037264756b05eadfde190987564831b1f3ef9071cfafc764b731098639524f28c06d80738437a8c60f4d0062de3cf52daf1ec
+  metadata.gz: 8721c4dd25927f9913423c7a5a1076b40d9652b2e327b6d74d02f9994e45a4bb53a69c1889d0fa271f1fb4756600a809cf11876add173fd4c65e64c4316c4225
+  data.tar.gz: 6b356ff3f6889594738f9b5c2ded84bc0abf20cf506caaaa627ff2ce5759edc68f0b73f6e4a9c0cab4dbf377df821979cd2fb179bf24ee3939868ec871fe3396

data/CHANGELOG.md

@@ -1,8 +1,14 @@
 Changelog
 =========
 
-Not released (2018-03-06)
--------------------------
+v2.5.0.4 (2018-03-13)
+---------------------
+
+Bugs fixed:
+ * AST::Processor: handle on_index, on_indexasgn, on_lambda. (Ilya Bylich)
+
+v2.5.0.3 (2018-03-06)
+---------------------
 
 Bugs fixed:
  * Accept `BEGIN` and `END` as correct method name (#463) (Masataka Pocke Kuwabara)

data/lib/parser/ast/processor.rb

@@ -166,7 +166,11 @@ module Parser
 
       alias on_csend on_send
 
+      alias on_index     process_regular_node
+      alias on_indexasgn process_regular_node
+
       alias on_block    process_regular_node
+      alias on_lambda   process_regular_node
 
       alias on_while      process_regular_node
       alias on_while_post process_regular_node

data/lib/parser/base.rb

@@ -131,6 +131,9 @@ module Parser
       @builder.parser = self
       @context = Context.new
 
+      # Last emitted token
+      @last_token = nil
+
       if self.class::Racc_debug_parser && ENV['RACC_DEBUG']
         @yydebug = true
       end
@@ -222,7 +225,9 @@ module Parser
     private
 
     def next_token
-      @lexer.advance
+      token = @lexer.advance
+      @last_token = token
+      token
     end
 
     def check_kwarg_name(name_t)

data/lib/parser/color.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Parser
+  module Color
+    def self.color(str, code, bold: false)
+      return str unless STDOUT.tty?
+      code = Array(code)
+      code.unshift(1) if bold
+      "\e[#{code.join(';')}m#{str}\e[0m"
+    end
+
+    def self.red(str, bold: false)
+      color(str, 31, bold: bold)
+    end
+
+    def self.green(str, bold: false)
+      color(str, 32, bold: bold)
+    end
+
+    def self.yellow(str, bold: false)
+      color(str, 33, bold: bold)
+    end
+
+    def self.magenta(str, bold: false)
+      color(str, 35, bold: bold)
+    end
+
+    def self.underline(str)
+      color(str, 4)
+    end
+  end
+end

data/lib/parser/lexer.rl

@@ -89,7 +89,7 @@ class Parser::Lexer
 
   REGEXP_META_CHARACTERS = Regexp.union(*"\\$()*+.<>?[]^{|}".chars).freeze
 
-  attr_reader   :source_buffer, :last_token
+  attr_reader   :source_buffer
 
   attr_accessor :diagnostics
   attr_accessor :static_env
@@ -175,9 +175,6 @@ class Parser::Lexer
 
     # State before =begin / =end block comment
     @cs_before_block_comment = self.class.lex_en_line_begin
-
-    # Last emitted token
-    @last_token = nil
   end
 
   def source_buffer=(source_buffer)
@@ -328,7 +325,6 @@ class Parser::Lexer
     token = [ type, [ value, range(s, e) ] ]
 
     @token_queue.push(token)
-    @last_token = token
 
     @tokens.push(token) if @tokens
 

data/lib/parser/lexer/explanation.rb

@@ -21,14 +21,14 @@ module Parser
       more = "(in-kwarg)" if @in_kwarg
 
       puts decorate(range,
-                    "\e[0;32m#{type} #{val.inspect}\e[0m",
-                    "#{state.to_s.ljust(12)} #{@cond} #{@cmdarg} #{more}\e[0m")
+                    Color.green("#{type} #{val.inspect}"),
+                    "#{state.to_s.ljust(12)} #{@cond} #{@cmdarg} #{more}")
 
       [ type, [val, range] ]
     end
 
     def state=(new_state)
-      puts "  \e[1;33m>>> STATE SET <<<\e[0m " +
+      puts "  #{Color.yellow(">>> STATE SET <<<", bold: true)} " +
            "#{new_state.to_s.ljust(12)} #{@cond} #{@cmdarg}".rjust(66)
 
       self.state_before_explanation = new_state
@@ -40,12 +40,12 @@ module Parser
       from, to = range.begin.column, range.end.column
 
       line = range.source_line + '   '
-      line[from...to] = "\e[4m#{line[from...to]}\e[0m"
+      line[from...to] = Color.underline(line[from...to])
 
       tail_len   = to - from - 1
       tail       = '~' * (tail_len >= 0 ? tail_len : 0)
-      decoration =  "#{" " * from}\e[1;31m^#{tail}\e[0m #{token} ".
-                        ljust(70) + info
+      decoration =  "#{" " * from}#{Color.red("^#{tail}", bold: true)} #{token} ".
+                        ljust(68) + info
 
       [ line, decoration ]
     end

data/lib/parser/ruby24.y

@@ -862,7 +862,7 @@ rule
                       #
                       # For all other cases (like `m n` or `m n, []`) we simply put 1 to the stack
                       # and later lexer pushes corresponding bits on top of it.
-                      last_token = @lexer.last_token[0]
+                      last_token = @last_token[0]
                       lookahead = last_token == :tLBRACK || last_token == :tLPAREN_ARG
 
                       if lookahead
@@ -1845,13 +1845,13 @@ regexp_contents: # nothing
                     }
                 | tSTRING_DBEG
                     {
-                      @lexer.cond.push(false)
-                      @lexer.cmdarg.push(false)
+                      @lexer.push_cmdarg
+                      @lexer.push_cond
                     }
                     compstmt tSTRING_DEND
                     {
-                      @lexer.cond.pop
-                      @lexer.cmdarg.pop
+                      @lexer.pop_cmdarg
+                      @lexer.pop_cond
 
                       result = @builder.begin(val[0], val[2], val[3])
                     }

data/lib/parser/ruby25.y

@@ -872,7 +872,7 @@ rule
                       #
                       # For all other cases (like `m n` or `m n, []`) we simply put 1 to the stack
                       # and later lexer pushes corresponding bits on top of it.
-                      last_token = @lexer.last_token[0]
+                      last_token = @last_token[0]
                       lookahead = last_token == :tLBRACK || last_token == :tLPAREN_ARG
 
                       if lookahead
@@ -1842,13 +1842,13 @@ regexp_contents: # nothing
                     }
                 | tSTRING_DBEG
                     {
-                      @lexer.cond.push(false)
-                      @lexer.cmdarg.push(false)
+                      @lexer.push_cmdarg
+                      @lexer.push_cond
                     }
                     compstmt tSTRING_DEND
                     {
-                      @lexer.cond.pop
-                      @lexer.cmdarg.pop
+                      @lexer.pop_cmdarg
+                      @lexer.pop_cond
 
                       result = @builder.begin(val[0], val[2], val[3])
                     }

data/lib/parser/runner/ruby_parse.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'parser/runner'
+require 'parser/color'
 require 'parser/lexer/explanation'
 require 'json'
 
@@ -20,15 +21,15 @@ module Parser
           print_line = lambda do
             unless hilight_line.empty?
               puts hilight_line.
-                gsub(/[a-z_]+/) { |m| "\e[1;33m#{m}\e[0m" }.
-                gsub(/[~.]+/)   { |m| "\e[1;35m#{m}\e[0m" }
+                gsub(/[a-z_]+/) { |m| Color.yellow(m, bold: true) }.
+                gsub(/[~.]+/)   { |m| Color.magenta(m, bold: true) }
               hilight_line = ''
             end
           end
 
           print_source = lambda do |range|
             source_line = range.source_line
-            puts "\e[32m#{source_line}\e[0m"
+            puts Color.green(source_line)
             source_line
           end
 

data/lib/parser/version.rb

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

data/test/test_parser.rb

@@ -6814,4 +6814,32 @@ class TestParser < Minitest::Test
       %q{},
       ALL_VERSIONS)
   end
+
+  def test_bug_466
+    assert_parses(
+      s(:block,
+        s(:send, nil, :foo,
+          s(:dstr,
+            s(:begin,
+              s(:send,
+                s(:begin,
+                  s(:send,
+                    s(:int, 1), :+,
+                    s(:int, 1))), :to_i)))),
+        s(:args), nil),
+      %q{foo "#{(1+1).to_i}" do; end},
+      %q{},
+      ALL_VERSIONS)
+  end
+
+  def test_bug_473
+    assert_parses(
+      s(:send, nil, :m,
+        s(:dstr,
+          s(:begin,
+            s(:array)))),
+      %q{m "#{[]}"},
+      %q{},
+      ALL_VERSIONS)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.5.0.3
+  version: 2.5.0.5
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -183,6 +183,7 @@ files:
 - lib/parser/base.rb
 - lib/parser/builders/default.rb
 - lib/parser/clobbering_error.rb
+- lib/parser/color.rb
 - lib/parser/context.rb
 - lib/parser/current.rb
 - lib/parser/deprecation.rb
@@ -296,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.