parser 2.3.1.2 → 2.3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 510fea6b1b64b2a9573e905d9640c0de0f3be4ce
-  data.tar.gz: 76a898e7833105f9fc41b8733c6c1e30e235316f
+  metadata.gz: 55f92d909ef9936b5de562036dfca9b1c0f080c7
+  data.tar.gz: a6b6013d253ee25ee86458e1b4c7a4b8f56ffd28
 SHA512:
-  metadata.gz: d500c0b1f3ab3db025246843159f69f0e52b1c98ac30782d33e5223f75869de16a254cf3889c7a6f6063aa039ac11ceb0e8e1a5e397f2262ea9588412cbf3cfe
-  data.tar.gz: 0843bbcecadaee915a1680470523046c86abb732d10f46cfc4444b69acaa3c8228695b90c508f1b87519e3906dfa61b3840c0c46b4db05eab85a5286127f7d15
+  metadata.gz: db2be0308e370feac7834afc58a64e7a63db55af0d6ed16d048f45389ba24662327e1114487979775ba62aaad91ea9a3d359943ca35542a7445228e8c935bc21
+  data.tar.gz: eae6a4291f22c79258b2986cde1d77954002df10f7d6a4f51ca2bb5ae145bfa6b2b285717e48d864ece4760844eb843868186de55fe21c6d65547997d7b219c9

data/.travis.yml

@@ -4,8 +4,8 @@ rvm:
  - 1.9.2
  - 1.9.3
  - 2.0.0
- - 2.2.4
- - 2.3.0
+ - 2.2.5
+ - 2.3.1
  - ruby-head
  - jruby-18mode
  - jruby-19mode
@@ -17,7 +17,7 @@ matrix:
 before_install:
  - gem update bundler
  - bundle --version
- - gem update --system 2.1.11
+ - gem update --system 2.6.6
  - gem --version
 script:
  - bundle exec rake test_cov

data/.yardopts

@@ -12,6 +12,8 @@
 --exclude lib/parser/ruby20.rb
 --exclude lib/parser/ruby21.rb
 --exclude lib/parser/ruby22.rb
+--exclude lib/parser/ruby23.rb
+--exclude lib/parser/ruby24.rb
 --exclude lib/parser/macruby.rb
 --exclude lib/parser/rubymotion.rb
 -

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 Changelog
 =========
 
+v2.3.1.3 (2016-09-17)
+---------------------
+
+API modifications:
+ * parser/current: latest 2.3 release is 2.3.2. (Chris Riddoch)
+
+Features implemented:
+ * ruby24.y: "f (g rescue nil)": allow stmt after tLPAREN_ARG. (whitequark)
+
+Bugs fixed:
+ * ruby{18,19,20,21,22,23,24}.y: parse trailing commas as mlhs for block args "a.b{ |c,| d }" (fixes #312) (John Backus)
+ * Builders::Default: "begin; 1; else; 2; end": do not drop else. (whitequark)
+ * Builders::Default: "a&.b &&= c": fix safe navigation in lhs of op-assignment. (Ilya Bylich)
+ * AST::Processor: handle "csend" as "send". (#301) (Ilya Bylich)
+ * Parser::AST::Processor: do not spuriously modify ASTs. (Ilya Bylich)
+ * lexer.rl: "%w\a b\": lex backslash-delimited words literals. (Masataka Kuwabara)
+
 v2.3.1.2 (2016-06-02)
 ---------------------
 
@@ -72,7 +89,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.2 (2016-01-16)
+v2.3.1.3 (2016-01-16)
 ---------------------
 
 v2.3.0.1 (2016-01-14)

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/parser.svg)](https://badge.fury.io/rb/parser)
 [![Build Status](https://travis-ci.org/whitequark/parser.svg?branch=master)](https://travis-ci.org/whitequark/parser)
-[![Coverage Status](https://coveralls.io/repos/whitequark/parser/badge.svg?branch=master)](https://coveralls.io/r/whitequark/parser)
 
 _Parser_ is a production-ready Ruby parser written in pure Ruby. It recognizes as
 much or more code than Ripper, Melbourne, JRubyParser or ruby\_parser, and

data/Rakefile

@@ -9,6 +9,7 @@ task :default => [:test]
 Rake::TestTask.new do |t|
   t.libs       = %w(test/ lib/)
   t.test_files = FileList["test/**/test_*.rb"]
+  t.warning    = false
 end
 
 task :test_cov do

data/lib/parser/ast/processor.rb

@@ -39,9 +39,13 @@ module Parser
       def on_vasgn(node)
         name, value_node = *node
 
-        node.updated(nil, [
-          name, process(value_node)
-        ])
+        if !value_node.nil?
+          node.updated(nil, [
+            name, process(value_node)
+          ])
+        else
+          node
+        end
       end
 
       # @private
@@ -79,9 +83,15 @@ module Parser
       def on_casgn(node)
         scope_node, name, value_node = *node
 
-        node.updated(nil, [
-          process(scope_node), name, process(value_node)
-        ])
+        if !value_node.nil?
+          node.updated(nil, [
+            process(scope_node), name, process(value_node)
+          ])
+        else
+          node.updated(nil, [
+            process(scope_node), name
+          ])
+        end
       end
 
       alias on_args     process_regular_node
@@ -89,9 +99,13 @@ module Parser
       def on_argument(node)
         arg_name, value_node = *node
 
-        node.updated(nil, [
-          arg_name, process(value_node)
-        ])
+        if !value_node.nil?
+          node.updated(nil, [
+            arg_name, process(value_node)
+          ])
+        else
+          node
+        end
       end
 
       # @private
@@ -147,6 +161,8 @@ module Parser
         ])
       end
 
+      alias on_csend on_send
+
       alias on_block    process_regular_node
 
       alias on_while      process_regular_node

data/lib/parser/builders/default.rb

@@ -487,7 +487,7 @@ module Parser
 
     def op_assign(lhs, op_t, rhs)
       case lhs.type
-      when :gvasgn, :ivasgn, :lvasgn, :cvasgn, :casgn, :send
+      when :gvasgn, :ivasgn, :lvasgn, :cvasgn, :casgn, :send, :csend
         operator   = value(op_t)[0..-1].to_sym
         source_map = lhs.loc.
                         with_operator(loc(op_t)).
@@ -982,6 +982,19 @@ module Parser
               [ compound_stmt, *(rescue_bodies + [ nil ]) ],
               eh_keyword_map(compound_stmt, nil, rescue_bodies, nil, nil))
         end
+      elsif else_t
+        statements = []
+        if compound_stmt.type == :begin
+          statements += compound_stmt.children
+        else
+          statements.push(compound_stmt)
+        end
+        statements.push(
+          n(:begin, [ else_ ],
+            collection_map(else_t, [ else_ ], nil)))
+        compound_stmt =
+          n(:begin, statements,
+            collection_map(nil, statements, nil))
       end
 
       if ensure_t

data/lib/parser/current.rb

@@ -55,7 +55,7 @@ module Parser
     CurrentRuby = Ruby22
 
   when /^2\.3\./
-    current_version = '2.3.1'
+    current_version = '2.3.2'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby23', current_version
     end

data/lib/parser/lexer.rl

@@ -385,13 +385,19 @@ class Parser::Lexer
     new_literal = Literal.new(self, *args)
     @literal_stack.push(new_literal)
 
-    if new_literal.words?
+    if new_literal.words? && new_literal.backslash_delimited?
+      if new_literal.interpolate?
+        self.class.lex_en_interp_backslash_delimited_words
+      else
+        self.class.lex_en_plain_backslash_delimited_words
+      end
+    elsif new_literal.words? && !new_literal.backslash_delimited?
       if new_literal.interpolate?
         self.class.lex_en_interp_words
       else
         self.class.lex_en_plain_words
       end
-    elsif new_literal.backslash_delimited?
+    elsif !new_literal.words? && new_literal.backslash_delimited?
       if new_literal.interpolate?
         self.class.lex_en_interp_backslash_delimited
       else
@@ -1066,6 +1072,20 @@ class Parser::Lexer
       c_any       => extend_string;
   *|;
 
+  interp_backslash_delimited_words := |*
+      interp_code => extend_interp_code;
+      interp_var  => extend_interp_var;
+      c_space+    => extend_string_space;
+      c_eol       => extend_string_eol;
+      c_any       => extend_string;
+  *|;
+
+  plain_backslash_delimited_words := |*
+      c_space+    => extend_string_space;
+      c_eol       => extend_string_eol;
+      c_any       => extend_string;
+  *|;
+
   regexp_modifiers := |*
       [A-Za-z]+
       => {

data/lib/parser/macruby.y

@@ -1350,6 +1350,9 @@ rule
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_f_block_arg
                     {
                       result = val[0].

data/lib/parser/ruby18.y

@@ -1259,6 +1259,9 @@ rule
 
        block_var: block_par
                 | block_par tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | block_par tCOMMA tAMPER lhs
                     {
                       result =  val[0].

data/lib/parser/ruby19.y

@@ -1330,6 +1330,9 @@ rule
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_f_block_arg
                     {
                       result = val[0].

data/lib/parser/ruby20.y

@@ -1385,6 +1385,9 @@ opt_block_args_tail:
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].

data/lib/parser/ruby21.y

@@ -1365,6 +1365,9 @@ opt_block_args_tail:
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].

data/lib/parser/ruby22.y

@@ -1364,6 +1364,9 @@ opt_block_args_tail:
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].

data/lib/parser/ruby23.y

@@ -1364,6 +1364,9 @@ opt_block_args_tail:
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].

data/lib/parser/ruby24.y

@@ -945,15 +945,15 @@ rule
                       result = @lexer.cmdarg.dup
                       @lexer.cmdarg.clear
                     }
-                    expr
+                    stmt
                     {
                       @lexer.state = :expr_endarg
                     }
-                    opt_nl tRPAREN
+                    rparen
                     {
                       @lexer.cmdarg = val[1]
 
-                      result = @builder.begin(val[0], val[2], val[5])
+                      result = @builder.begin(val[0], val[2], val[4])
                     }
                 | tLPAREN_ARG
                     {
@@ -1364,6 +1364,9 @@ opt_block_args_tail:
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].

data/lib/parser/rubymotion.y

@@ -1323,6 +1323,9 @@ rule
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
+                  {
+                    result = [@builder.multi_lhs(nil, val[0], nil)]
+                  }
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_f_block_arg
                     {
                       result = val[0].

data/lib/parser/source/rewriter.rb

@@ -388,8 +388,6 @@ module Parser
       end
 
       def merge_replacements(actions)
-        # `actions` must be sorted by beginning position
-        begin_pos = actions.first.range.begin_pos
         result    = ''
         prev_act  = nil
 

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.3.1.2'
+  VERSION = '2.3.1.3'
 end

data/parser.gemspec

@@ -41,12 +41,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'minitest',  '~> 5.0'
   spec.add_development_dependency 'simplecov', '~> 0.8.2'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'json_pure' # for coveralls on 1.9.2
-  spec.add_development_dependency 'mime-types', '~> 1.25' # for coveralls on 1.8.7
-  spec.add_development_dependency 'rest-client', '~> 1.6.7' # 1.8.7
-
-  spec.add_development_dependency 'simplecov-sublime-ruby-coverage'
 
   spec.add_development_dependency 'gauntlet'
 end

data/test/helper.rb

@@ -2,7 +2,6 @@ require 'tempfile'
 require 'minitest/test'
 
 require 'simplecov'
-require 'coveralls'
 
 if ENV.include?('COVERAGE') && SimpleCov.usable?
   if defined?(TracePoint)
@@ -15,13 +14,9 @@ if ENV.include?('COVERAGE') && SimpleCov.usable?
     at_exit { RaccCoverage.stop }
   end
 
-  require 'simplecov-sublime-ruby-coverage'
-
   SimpleCov.start do
     self.formatter = SimpleCov::Formatter::MultiFormatter[
       SimpleCov::Formatter::HTMLFormatter,
-      SimpleCov::Formatter::SublimeRubyCoverageFormatter,
-      Coveralls::SimpleCov::Formatter
     ]
 
     add_group 'Grammars' do |source_file|

data/test/parse_helper.rb

@@ -10,7 +10,7 @@ module ParseHelper
     require 'parser/macruby'
     require 'parser/rubymotion'
 
-    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 mac ios)
+    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 mac ios)
   end
 
   def setup

data/test/test_lexer.rb

@@ -2188,6 +2188,55 @@ class TestLexer < Minitest::Test
                    :tSTRING_END,     "\\",  [3, 4])
   end
 
+  def test_string_pct_w_backslash
+    assert_scanned("%w\\s1 s2 \\",
+                   :tQWORDS_BEG,     "%w\\", [0, 3],
+                   :tSTRING_CONTENT, "s1",  [3, 5],
+                   :tSPACE,          nil,   [5, 6],
+                   :tSTRING_CONTENT, "s2",  [6, 8],
+                   :tSPACE,          nil,   [8, 9],
+                   :tSTRING_END,     "\\",   [9, 10])
+  end
+
+  def test_string_pct_w_backslash_nl
+    assert_scanned("%w\\s1 s2 \\\n",
+                   :tQWORDS_BEG,     "%w\\", [0, 3],
+                   :tSTRING_CONTENT, "s1",   [3, 5],
+                   :tSPACE,          nil,    [5, 6],
+                   :tSTRING_CONTENT, "s2",   [6, 8],
+                   :tSPACE,          nil,    [8, 9],
+                   :tSTRING_END,     "\\",   [9, 10],
+                   :tNL,             nil,    [10, 11])
+  end
+
+  def test_string_pct_w_backslash_interp_nl
+    assert_scanned("%W\\blah #x a \#@a b \#$b c \#{3} # \\",
+                   :tWORDS_BEG,     "%W\\",  [0, 3],
+                   :tSTRING_CONTENT, "blah", [3, 7],
+                   :tSPACE,          nil,    [7, 8],
+                   :tSTRING_CONTENT, "#x",   [8, 10],
+                   :tSPACE,          nil,    [10, 11],
+                   :tSTRING_CONTENT, "a",    [11, 12],
+                   :tSPACE,          nil,    [12, 13],
+                   :tSTRING_DVAR,    nil,    [13, 14],
+                   :tIVAR,           "@a",   [14, 16],
+                   :tSPACE,          nil,    [16, 17],
+                   :tSTRING_CONTENT, "b",    [17, 18],
+                   :tSPACE,          nil,    [18, 19],
+                   :tSTRING_DVAR,    nil,    [19, 20],
+                   :tGVAR,           "$b",   [20, 22],
+                   :tSPACE,          nil,    [22, 23],
+                   :tSTRING_CONTENT, "c",    [23, 24],
+                   :tSPACE,          nil,    [24, 25],
+                   :tSTRING_DBEG,    '#{',   [25, 27],
+                   :tINTEGER,        3,      [27, 28],
+                   :tRCURLY,         "}",    [28, 29],
+                   :tSPACE,          nil,    [29, 30],
+                   :tSTRING_CONTENT, "#",    [30, 31],
+                   :tSPACE,          nil,    [31, 32],
+                   :tSTRING_END,     "\\",   [32, 33])
+  end
+
   def test_string_pct_backslash_with_bad_escape
     # No escapes are allowed in a backslash-delimited string
     refute_scanned("%\\a\\n\\",

data/test/test_parser.rb

@@ -2350,8 +2350,9 @@ class TestParser < Minitest::Test
       %w(1.8))
 
     assert_parses_blockargs(
-      s(:args, s(:arg, :a)),
-      %q{|a,|})
+      s(:args, s(:mlhs, s(:arg, :a))),
+      %q{|a,|}
+    )
 
     assert_parses_blockargs(
       s(:args, s(:arg, :a), s(:blockarg, :b)),
@@ -3436,6 +3437,14 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8 1.9 2.0 2.1 2.2 ios mac))
   end
 
+  def test_send_op_asgn_conditional
+    assert_parses(
+      s(:and_asgn, s(:csend, s(:send, nil, :a), :b), s(:int, 1)),
+      %q{a&.b &&= 1},
+      %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,
@@ -4207,10 +4216,11 @@ class TestParser < Minitest::Test
   end
 
   def test_if_masgn__24
-    assert_diagnoses(
-      [:error, :masgn_as_condition],
+    assert_parses(
+      s(:if,
+        s(:begin, nil), nil, nil),
       %q{if (a, b = foo); end},
-      %q{    ~~~~~~~~~~ location},
+      %q{},
       ALL_VERSIONS - %w(1.8 1.9 2.0 2.1 2.2 2.3 ios mac))
   end
 
@@ -4710,6 +4720,23 @@ class TestParser < Minitest::Test
   end
 
   def test_rescue_else_useless
+    assert_parses(
+      s(:kwbegin,
+        s(:int, 1),
+        s(:begin,
+          s(:int, 2))),
+      %q{begin; 1; else; 2; end},
+      %q{          ~~~~ begin (begin)})
+
+    assert_parses(
+      s(:kwbegin,
+        s(:int, 1),
+        s(:int, 2),
+        s(:begin,
+          s(:int, 3))),
+      %q{begin; 1; 2; else; 3; end},
+      %q{             ~~~~ begin (begin)})
+
     assert_diagnoses(
       [:warning, :useless_else],
       %q{begin; 1; else; 2; end},
@@ -5450,6 +5477,24 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8))
   end
 
+  def test_ruby_bug_12686
+    assert_parses(
+      s(:send, nil, :f,
+        s(:begin,
+          s(:rescue,
+            s(:send, nil, :g),
+            s(:resbody, nil, nil,
+              s(:nil)), nil))),
+      %q{f (g rescue nil)},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1 2.2 2.3 ios mac))
+
+    assert_diagnoses(
+      [:error, :unexpected_token, {:token => 'kRESCUE_MOD'}],
+      %q{f(g rescue nil)},
+      %q{    ^^^^^^ location})
+  end
+
   def test_parser_bug_198
     assert_parses(
       s(:array,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.3.1.2
+  version: 2.3.1.3
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -136,76 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.25'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.25'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.7
-- !ruby/object:Gem::Dependency
-  name: simplecov-sublime-ruby-coverage
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: gauntlet
   requirement: !ruby/object:Gem::Requirement