parser 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23913ce91aee27e303077bef4f422f30ac9bc50c
-  data.tar.gz: 2fb3c11a836c677360f7b17a9590e3a41c30abdc
+  metadata.gz: 2bf5ac94c180841ed95eb91426eb5925a01cec77
+  data.tar.gz: cf273795bd07e59f5dc23721435782d01579a287
 SHA512:
-  metadata.gz: 99b845aa3300fa99c75a726c41d81b33fc1019b6dc937d6eba139602c0c7f75b216344482f6ac57f288e1f1abb804a0ffdf315fc352f3d66ef680622cc7b8566
-  data.tar.gz: 72ce1310df9f19d5c16f7e4f61287ce187c250898cf15b70c4150e1315f7b57a78189feb48fc71448e9a16966cb44d0abb9d65cd95cba173c8297252a74e76fa
+  metadata.gz: 7bae46f95f8443fc99fdb681a8ef7d6aeb03dd7effc3cd214aab37e72da007e701c830a780c8898672c5be5250a21cf768010921018171e73ee9659b4839b57c
+  data.tar.gz: e3d932d2f489a690d1f3cf0535820288d8b8af1f0c7d00d41f48eaec79c69853a7e28d9fcc58718218b493fea0acf1d899f5b2a79b6ee7bb22c681c04dd2fe89

data/lib/parser/lexer.rl

@@ -1006,7 +1006,7 @@ class Parser::Lexer
 
       # If the handling was to be delegated to expr_end,
       # these cases would transition to something else than
-      # expr_end, which is undesirable.
+      # expr_endfn, which is incorrect.
       operator_fname      |
       operator_arithmetic |
       operator_rest
@@ -1519,13 +1519,12 @@ class Parser::Lexer
   #
   expr_value := |*
       # a:b: a(:b), a::B, A::B
-      bareword ':'
-      => { p = @ts - 1
+      bareword ':' (c_any - ':')
+      => { p = @ts - 2
            fgoto expr_end; };
 
       # TODO whitespace rule
       c_space;
-      e_heredoc_nl;
 
       c_any
       => { fhold; fgoto expr_beg; };

data/lib/parser/lexer/explanation.rb

@@ -4,16 +4,23 @@ module Parser
 
     # Like #advance, but also pretty-print the token and its position
     # in the stream to `stdout`.
-    def advance_and_explain
-      type, (val, range) = advance
+    def advance
+      type, (val, range) = super
 
       puts decorate(range,
                     "\e[0;32m#{type} #{val.inspect}\e[0m",
-                    "#{state.to_s.ljust(10)} #{@cond} #{@cmdarg}\e[0m")
+                    "#{state.to_s.ljust(12)} #{@cond} #{@cmdarg}\e[0m")
 
       [ type, [val, range] ]
     end
 
+    def state=(new_state)
+      puts "  \e[1;33m>>> STATE SET <<<\e[0m " +
+           "#{new_state.to_s.ljust(12)} #{@cond} #{@cmdarg}".rjust(66)
+
+      super
+    end
+
     private
 
     def decorate(range, token, info)
@@ -32,6 +39,4 @@ module Parser
 
   end
 
-  Lexer.send :include, Lexer::Explanation
-
 end

data/lib/parser/ruby19.y

@@ -1881,8 +1881,6 @@ keyword_variable: kNIL
                 | f_args term
                     {
                       result = @builder.args(nil, val[0], nil)
-
-                      @lexer.state = :expr_value
                     }
 
           f_args: f_arg tCOMMA f_optarg tCOMMA f_rest_arg              opt_f_block_arg

data/lib/parser/ruby20.y

@@ -1987,8 +1987,6 @@ keyword_variable: kNIL
                 | f_args term
                     {
                       result = @builder.args(nil, val[0], nil)
-
-                      @lexer.state = :expr_value
                     }
 
        args_tail: f_kwarg tCOMMA f_kwrest opt_f_block_arg

data/lib/parser/ruby21.y

@@ -1988,8 +1988,6 @@ keyword_variable: kNIL
                 | f_args term
                     {
                       result = @builder.args(nil, val[0], nil)
-
-                      @lexer.state = :expr_value
                     }
 
        args_tail: f_kwarg tCOMMA f_kwrest opt_f_block_arg

data/lib/parser/runner/ruby_parse.rb

@@ -107,11 +107,7 @@ module Parser
       @slop.on 'E', 'explain', 'Explain how the source is tokenized' do
         ENV['RACC_DEBUG'] = '1'
 
-        Parser::Base.class_eval do
-          def next_token
-            @lexer.advance_and_explain
-          end
-        end
+        Lexer.send :prepend, Lexer::Explanation
       end
     end
 

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/test/parse_helper.rb

@@ -71,7 +71,13 @@ module ParseHelper
       source_file = Parser::Source::Buffer.new('(assert_parses)')
       source_file.source = code
 
-      parsed_ast = parser.parse(source_file)
+      begin
+        parsed_ast = parser.parse(source_file)
+      rescue => exc
+        new_exc = exc.class.new("(#{version}) #{exc.message}")
+        new_exc.set_backtrace(exc.backtrace)
+        raise new_exc
+      end
 
       assert_equal ast, parsed_ast,
                    "(#{version}) AST equality"

data/test/test_lexer.rb

@@ -2168,6 +2168,16 @@ class TestLexer < MiniTest::Unit::TestCase
                    :tREGEXP_OPT,     "")
   end
 
+  def test_bug_expr_beg_heredoc
+    util_lex_token("<<EOL % [\nfoo\nEOL\n]",
+                   :tSTRING_BEG,      '"',
+                   :tSTRING_CONTENT,  "foo\n",
+                   :tSTRING_END,      'EOL',
+                   :tPERCENT,         '%',
+                   :tLBRACK,          '[',
+                   :tRBRACK,          ']')
+  end
+
   def test_bug_expr_arg_percent
     @lex.state = :expr_arg
     util_lex_token("%[",
@@ -2286,6 +2296,12 @@ class TestLexer < MiniTest::Unit::TestCase
                    :tIDENTIFIER, 'print')
   end
 
+  def test_bug_expr_value_document
+    util_lex_token("1;\n=begin\n=end",
+                   :tINTEGER, 1,
+                   :tSEMI,    ";")
+  end
+
   def test_bug_expr_end_colon
     util_lex_token("'foo':'bar'",
                    :tSTRING, 'foo',
@@ -2303,14 +2319,12 @@ class TestLexer < MiniTest::Unit::TestCase
                    :tNL,     nil)
   end
 
-  def test_bug_expr_beg_heredoc
-    util_lex_token("<<EOL % [\nfoo\nEOL\n]",
-                   :tSTRING_BEG,      '"',
-                   :tSTRING_CONTENT,  "foo\n",
-                   :tSTRING_END,      'EOL',
-                   :tPERCENT,         '%',
-                   :tLBRACK,          '[',
-                   :tRBRACK,          ']')
+  def test_bug_expr_value_rescue_colon2
+    @lex.state = :expr_value
+    util_lex_token("rescue::Exception",
+                   :kRESCUE,    'rescue',
+                   :tCOLON3,    '::',
+                   :tCONSTANT,  'Exception')
   end
 
   def test_bug_ragel_stack

data/test/test_parser.rb

@@ -4172,4 +4172,10 @@ class TestParser < MiniTest::Unit::TestCase
       s(:array, s(:dstr, s(:int, 1))),
       %q{%W"#{1}"})
   end
+
+  def test_bug_def_no_paren_eql_begin
+    assert_parses(
+      s(:def, :foo, s(:args), s(:nil)),
+      %Q{def foo\n=begin\n=end\nend})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast