parser 2.2.0.pre.2 → 2.2.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7904839f6015d6a616f8b09ccbda8bdda64642aa
-  data.tar.gz: 34617415104be887b446c2eeaef48a9679b9674b
+  metadata.gz: 9fdd84e2bf0afe8d344da8823488765821b9587d
+  data.tar.gz: ec152fc432ac23d54613a3a525ecc383b541b937
 SHA512:
-  metadata.gz: a18caf32936e91ac87217aad5b8d4085762c14d1f163ca79a5a08427815e62447312ea1ebadb78d0f50b13da6ea8349377e259ba99353f9f75911513aa1f3a5b
-  data.tar.gz: 614967deaa69a24f8d7a752cd827ddf8d0d27d3c6ace0ba14a23a331ea89e877d0186e396722b50d611253cbad94b12c349d377d7592e4ffe0f9e9421c4776a3
+  metadata.gz: 348b7a975ec3011a255009d9d0f02942c2cfaeb5515f39648b16673a8226a60b88bd00ab2b6cc47f67bc9001e6b26ab1c28cf938854c0dcaf910dfa40eb133ab
+  data.tar.gz: a53e9736e8aeaf38714ddd5944d349a36104eb288190dacac123770b2d7f41cc1dc7484d8562ab1a10cc6c01beea9337ddecb591df520da93ec9df5b05db953d

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+v2.2.0.pre.3 (2014-06-30)
+-------------------------
+
+Features implemented:
+ * Raise EncodingError when source includes invalid byte sequence (Yuji Nakayama)
+
+Bugs fixed:
+ * ruby{19,20,21}.y: "x def y; z do end end": save cmdarg stack to isolate command argument state from outer scope. (Peter Zotov)
+ * ruby{19,20,21}.y: "tap (proc do end)": allow parenthesed do-block in cmdarg. (Peter Zotov)
+
 v2.2.0.pre.2 (2014-06-14)
 -------------------------
 

data/lib/parser/ruby19.y

@@ -931,13 +931,20 @@ rule
                     {
                       result = @builder.begin_keyword(val[0], val[1], val[2])
                     }
-                | tLPAREN_ARG expr
+                | tLPAREN_ARG
+                    {
+                      result = @lexer.cmdarg.dup
+                      @lexer.cmdarg.clear
+                    }
+                    expr
                     {
                       @lexer.state = :expr_endarg
                     }
                     opt_nl tRPAREN
                     {
-                      result = @builder.begin(val[0], val[1], val[4])
+                      @lexer.cmdarg = val[1]
+
+                      result = @builder.begin(val[0], val[2], val[5])
                     }
                 | tLPAREN compstmt tRPAREN
                     {
@@ -1084,6 +1091,7 @@ rule
                 | kCLASS cpath superclass
                     {
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
@@ -1096,6 +1104,7 @@ rule
                                                   lt_t, superclass,
                                                   val[4], val[5])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                     }
                 | kCLASS tLSHFT expr term
@@ -1104,12 +1113,14 @@ rule
                       @def_level = 0
 
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
                       result = @builder.def_sclass(val[0], val[1], val[2],
                                                    val[5], val[6])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
 
                       @def_level = val[4]
@@ -1117,6 +1128,7 @@ rule
                 | kMODULE cpath
                     {
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
@@ -1127,18 +1139,21 @@ rule
                       result = @builder.def_module(val[0], val[1],
                                                    val[3], val[4])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                     }
                 | kDEF fname
                     {
                       @def_level += 1
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     f_arglist bodystmt kEND
                     {
                       result = @builder.def_method(val[0], val[1],
                                   val[3], val[4], val[5])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                       @def_level -= 1
                     }
@@ -1150,12 +1165,14 @@ rule
                     {
                       @def_level += 1
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     f_arglist bodystmt kEND
                     {
                       result = @builder.def_singleton(val[0], val[1], val[2],
                                   val[4], val[6], val[7], val[8])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                       @def_level -= 1
                     }

data/lib/parser/ruby20.y

@@ -951,13 +951,20 @@ rule
 
                       result = @builder.begin_keyword(val[0], val[2], val[3])
                     }
-                | tLPAREN_ARG expr
+                | tLPAREN_ARG
+                    {
+                      result = @lexer.cmdarg.dup
+                      @lexer.cmdarg.clear
+                    }
+                    expr
                     {
                       @lexer.state = :expr_endarg
                     }
                     opt_nl tRPAREN
                     {
-                      result = @builder.begin(val[0], val[1], val[4])
+                      @lexer.cmdarg = val[1]
+
+                      result = @builder.begin(val[0], val[2], val[5])
                     }
                 | tLPAREN_ARG
                     {
@@ -1112,6 +1119,7 @@ rule
                 | kCLASS cpath superclass
                     {
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
@@ -1124,6 +1132,7 @@ rule
                                                   lt_t, superclass,
                                                   val[4], val[5])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                     }
                 | kCLASS tLSHFT expr term
@@ -1132,12 +1141,14 @@ rule
                       @def_level = 0
 
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
                       result = @builder.def_sclass(val[0], val[1], val[2],
                                                    val[5], val[6])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
 
                       @def_level = val[4]
@@ -1145,6 +1156,7 @@ rule
                 | kMODULE cpath
                     {
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
@@ -1155,18 +1167,21 @@ rule
                       result = @builder.def_module(val[0], val[1],
                                                    val[3], val[4])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                     }
                 | kDEF fname
                     {
                       @def_level += 1
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     f_arglist bodystmt kEND
                     {
                       result = @builder.def_method(val[0], val[1],
                                   val[3], val[4], val[5])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                       @def_level -= 1
                     }
@@ -1178,12 +1193,14 @@ rule
                     {
                       @def_level += 1
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     f_arglist bodystmt kEND
                     {
                       result = @builder.def_singleton(val[0], val[1], val[2],
                                   val[4], val[6], val[7], val[8])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                       @def_level -= 1
                     }

data/lib/parser/ruby21.y

@@ -941,13 +941,20 @@ rule
 
                       result = @builder.begin_keyword(val[0], val[2], val[3])
                     }
-                | tLPAREN_ARG expr
+                | tLPAREN_ARG
+                    {
+                      result = @lexer.cmdarg.dup
+                      @lexer.cmdarg.clear
+                    }
+                    expr
                     {
                       @lexer.state = :expr_endarg
                     }
                     opt_nl tRPAREN
                     {
-                      result = @builder.begin(val[0], val[1], val[4])
+                      @lexer.cmdarg = val[1]
+
+                      result = @builder.begin(val[0], val[2], val[5])
                     }
                 | tLPAREN_ARG
                     {
@@ -1102,6 +1109,7 @@ rule
                 | kCLASS cpath superclass
                     {
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
@@ -1114,6 +1122,7 @@ rule
                                                   lt_t, superclass,
                                                   val[4], val[5])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                     }
                 | kCLASS tLSHFT expr term
@@ -1122,12 +1131,14 @@ rule
                       @def_level = 0
 
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
                       result = @builder.def_sclass(val[0], val[1], val[2],
                                                    val[5], val[6])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
 
                       @def_level = val[4]
@@ -1135,6 +1146,7 @@ rule
                 | kMODULE cpath
                     {
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     bodystmt kEND
                     {
@@ -1145,18 +1157,21 @@ rule
                       result = @builder.def_module(val[0], val[1],
                                                    val[3], val[4])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                     }
                 | kDEF fname
                     {
                       @def_level += 1
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     f_arglist bodystmt kEND
                     {
                       result = @builder.def_method(val[0], val[1],
                                   val[3], val[4], val[5])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                       @def_level -= 1
                     }
@@ -1168,12 +1183,14 @@ rule
                     {
                       @def_level += 1
                       @static_env.extend_static
+                      @lexer.push_cmdarg
                     }
                     f_arglist bodystmt kEND
                     {
                       result = @builder.def_singleton(val[0], val[1], val[2],
                                   val[4], val[6], val[7], val[8])
 
+                      @lexer.pop_cmdarg
                       @static_env.unextend
                       @def_level -= 1
                     }

data/lib/parser/source/buffer.rb

@@ -145,12 +145,17 @@ module Parser
       #
       # @param [String] input
       # @raise [ArgumentError] if already populated
+      # @raise [EncodingError] if `input` includes invalid byte sequence for the encoding
       # @return [String]
       #
       def source=(input)
         if defined?(Encoding)
           input = input.dup if input.frozen?
           input = self.class.reencode_string(input)
+
+          unless input.valid_encoding?
+            raise EncodingError, "invalid byte sequence in #{input.encoding.name}"
+          end
         end
 
         self.raw_source = input

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.2.0.pre.2'
+  VERSION = '2.2.0.pre.3'
 end

data/test/test_diagnostic.rb

@@ -10,9 +10,11 @@ class TestDiagnostic < Minitest::Test
   end
 
   def test_verifies_levels
-    assert_raises ArgumentError, /level/ do
-      Parser::Diagnostic.new(:foobar, :escape_eof, @range1)
+    error = assert_raises ArgumentError do
+      Parser::Diagnostic.new(:foobar, :escape_eof, {}, @range1)
     end
+
+    assert_match /level/, error.message
   end
 
   def test_freezes

data/test/test_diagnostic_engine.rb

@@ -32,7 +32,7 @@ class TestDiagnosticEngine < Minitest::Test
 
     error = Parser::Diagnostic.new(:error, :invalid_escape, @buffer, 1..2)
 
-    err = assert_raises Parser::SyntaxError, error.message do
+    err = assert_raises Parser::SyntaxError do
       @engine.process(error)
     end
 

data/test/test_parser.rb

@@ -4796,7 +4796,7 @@ class TestParser < Minitest::Test
             nil))),
       %q{bar def foo; self.each do end end},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
+      ALL_VERSIONS - %w(1.8))
   end
 
   def test_bug_do_block_in_cmdarg
@@ -4809,7 +4809,7 @@ class TestParser < Minitest::Test
             s(:args), nil))),
       %q{tap (proc do end)},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
+      ALL_VERSIONS - %w(1.8))
   end
 
   def test_bug_interp_single

data/test/test_source_buffer.rb

@@ -29,6 +29,19 @@ class TestSourceBuffer < Minitest::Test
     end
   end
 
+  if defined?(Encoding)
+    def test_source_setter_encoding_error
+      error = assert_raises EncodingError do
+        @buffer.source = [
+          '# encoding: utf-8',
+          "# \xf9"
+        ].join("\n")
+      end
+
+      assert_match /invalid byte sequence in UTF\-8/, error.message
+    end
+  end
+
   def test_read
     tempfile = Tempfile.new('parser')
     tempfile.write('foobar')

data/test/test_source_rewriter.rb

@@ -157,20 +157,24 @@ class TestSourceRewriter < Minitest::Test
   end
 
   def test_nested_transaction_raises_error
-    assert_raises RuntimeError, /nested/ do
+    error = assert_raises RuntimeError do
       @rewriter.transaction do
         @rewriter.transaction do
         end
       end
     end
+
+    assert_match /nested/i, error.message
   end
 
   def test_process_in_transaction_raises_error
-    assert_raises RuntimeError, /transaction/ do
+    error = assert_raises RuntimeError do
       @rewriter.transaction do
         @rewriter.process
       end
     end
+
+    assert_match /transaction/, error.message
   end
 
   def silence_diagnostics

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.2
+  version: 2.2.0.pre.3
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast