parser 2.3.1.0 → 2.3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9403827537b14d96c76aee39812704f453daf0fd
-  data.tar.gz: 3e2fa957c7c68533af47e28e4c2e48fef5a28a14
+  metadata.gz: 87c2540f2a9f9c12e30397074ff44b6dc26326d8
+  data.tar.gz: 2d7dcc34d13dea8bd26ad5d2c3255da9458b694b
 SHA512:
-  metadata.gz: f5e0f974c0a580cd610c166a61eb6c65f9cb3c5458e4c759abb9c3858b2aa5772824d6b00d53707b5dca0cb6eab4d20d444d8b8cdb0a4705263ef3ea615c763c
-  data.tar.gz: 893aaddd0619465fd746ba816773f6add95a7e0e98e3090236e4cb0277bd600fcd10ecb41ec1f0a0da1077436ff479bc06791f8ad3fd1cfa3331a54398e73adb
+  metadata.gz: 3e8bbcc8a395ab2329190d5ed71baf2a9a24f1fcd548c1470a638fb9ed3364b44d1689699a29eaf5283420650e25cb94753f7b9c8dc7846e9a7e4c144ff443df
+  data.tar.gz: b224cee755968eeb44a1220afb6d1ed29559273c1178ae0783225542acd2bde2fc06d99e1cc3a65a01c055bbe34d251197e608564ba5b02805ac8a43783a9263

data/.gitignore

@@ -16,6 +16,8 @@ test/tmp
 test/version_tmp
 tmp
 *.output
+.ruby-version
+.ruby-gemset
 lib/parser/lexer.rb
 lib/parser/ruby18.rb
 lib/parser/ruby19.rb

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+v2.3.1.1 (2016-06-01)
+---------------------
+
+Bugs fixed:
+ * ruby{^18}.y: "lambda{|;a|a}": treat shadowarg as local inside block. (Ilya Bylich)
+ * Builders::Default: "foo&.bar{}": emit csend in block properly. (whitequark)
+ * runner.rb: re-add --23 (cremno)
+ * runner.rb: make --24 actually use the 2.4 parser (cremno)
+
 v2.3.1.0 (2016-04-27)
 ---------------------
 
@@ -54,7 +63,7 @@ Bugs fixed:
  * Add :csend to Parser::Meta::NODE_TYPES (Markus Schirp)
  * lexer/dedenter: "\<\<x\n  y\\n  z\nx": don't dedent after escaped newline. (whitequark)
 
-v2.3.1.0 (2016-01-16)
+v2.3.1.1 (2016-01-16)
 ---------------------
 
 v2.3.0.1 (2016-01-14)

data/Rakefile

@@ -148,6 +148,7 @@ rule '.rb' => '.y' do |t|
            t.source,
            "-o", t.name
          ]
+  opts << "--no-line-convert" unless ENV['RACC_DEBUG']
   opts << "--debug" if ENV['RACC_DEBUG']
 
   sh "racc", *opts

data/lib/parser/builders/default.rb

@@ -749,7 +749,7 @@ module Parser
         diagnostic :error, :block_and_blockarg, nil, last_arg.loc.expression, [loc(begin_t)]
       end
 
-      if [:send, :super, :zsuper, :lambda].include?(method_call.type)
+      if [:send, :csend, :super, :zsuper, :lambda].include?(method_call.type)
         n(:block, [ method_call, args, body ],
           block_map(method_call.loc.expression, begin_t, end_t))
       else

data/lib/parser/lexer/literal.rb

@@ -78,7 +78,7 @@ module Parser
                       !heredoc?)
 
       # Capture opening delimiter in percent-literals.
-      @str_type << delimiter if @str_type.start_with?('%'.freeze)
+      @str_type += delimiter if @str_type.start_with?('%'.freeze)
 
       clear_buffer
 
@@ -187,7 +187,7 @@ module Parser
       @buffer_s ||= ts
       @buffer_e = te
 
-      @buffer << string
+      @buffer += string
     end
 
     def flush_string

data/lib/parser/macruby.y

@@ -1443,6 +1443,7 @@ rule
 
             bvar: tIDENTIFIER
                     {
+                      @static_env.declare val[0][0]
                       result = @builder.shadowarg(val[0])
                     }
                 | f_bad_arg

data/lib/parser/ruby19.y

@@ -1423,6 +1423,7 @@ rule
 
             bvar: tIDENTIFIER
                     {
+                      @static_env.declare val[0][0]
                       result = @builder.shadowarg(val[0])
                     }
                 | f_bad_arg

data/lib/parser/ruby20.y

@@ -1475,6 +1475,7 @@ opt_block_args_tail:
 
             bvar: tIDENTIFIER
                     {
+                      @static_env.declare val[0][0]
                       result = @builder.shadowarg(val[0])
                     }
                 | f_bad_arg

data/lib/parser/ruby21.y

@@ -1455,6 +1455,7 @@ opt_block_args_tail:
 
             bvar: tIDENTIFIER
                     {
+                      @static_env.declare val[0][0]
                       result = @builder.shadowarg(val[0])
                     }
                 | f_bad_arg

data/lib/parser/ruby22.y

@@ -1454,6 +1454,7 @@ opt_block_args_tail:
 
             bvar: tIDENTIFIER
                     {
+                      @static_env.declare val[0][0]
                       result = @builder.shadowarg(val[0])
                     }
                 | f_bad_arg

data/lib/parser/ruby23.y

@@ -1454,6 +1454,7 @@ opt_block_args_tail:
 
             bvar: tIDENTIFIER
                     {
+                      @static_env.declare val[0][0]
                       result = @builder.shadowarg(val[0])
                     }
                 | f_bad_arg

data/lib/parser/ruby24.y

@@ -1454,6 +1454,7 @@ opt_block_args_tail:
 
             bvar: tIDENTIFIER
                     {
+                      @static_env.declare val[0][0]
                       result = @builder.shadowarg(val[0])
                     }
                 | f_bad_arg

data/lib/parser/rubymotion.y

@@ -1416,6 +1416,7 @@ rule
 
             bvar: tIDENTIFIER
                     {
+                      @static_env.declare val[0][0]
                       result = @builder.shadowarg(val[0])
                     }
                 | f_bad_arg

data/lib/parser/runner.rb

@@ -84,9 +84,14 @@ module Parser
         @parser_class = Parser::Ruby22
       end
 
+      opts.on '--23', 'Parse as Ruby 2.3 would' do
+        require 'parser/ruby23'
+        @parser_class = Parser::Ruby23
+      end
+
       opts.on '--24', 'Parse as Ruby 2.4 would' do
         require 'parser/ruby24'
-        @parser_class = Parser::Ruby23
+        @parser_class = Parser::Ruby24
       end
 
       opts.on '--mac', 'Parse as MacRuby 0.12 would' do

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.3.1.0'
+  VERSION = '2.3.1.1'
 end

data/test/test_parser.rb

@@ -2026,6 +2026,15 @@ class TestParser < Minitest::Test
       %q{def f(var: defined?(var)) var end},
       %q{},
       ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
+
+    assert_parses(
+      s(:block,
+        s(:send, nil, :lambda),
+        s(:args, s(:shadowarg, :a)),
+        s(:lvar, :a)),
+      %q{lambda{|;a|a}},
+      %q{},
+      ALL_VERSIONS - %w(1.8))
   end
 
   def assert_parses_args(ast, code, versions=ALL_VERSIONS)
@@ -3416,6 +3425,17 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8 1.9 2.0 2.1 2.2 ios mac))
   end
 
+  def test_send_block_conditional
+    assert_parses(
+      s(:block,
+        s(:csend,
+          s(:lvar, :foo), :bar),
+        s(:args), nil),
+      %q{foo&.bar {}},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1 2.2 ios mac))
+  end
+
   def test_lvar_injecting_match
     assert_parses(
       s(:begin,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.3.1.0
+  version: 2.3.1.1
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast