parser 2.6.4.0 → 2.6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e113f6f42c44591674f288ebda60f8c4f17f5b6aee601d1cc5c2e20c50ef2e6
-  data.tar.gz: '08cf94385ef5cd8f211de395e1c272e5b7950e155463160e327cda2eb047dfad'
+  metadata.gz: 7d7b8b9f67b6aaacdb9a0d545465e924b4f648b111da6be699663c5c67c84e4f
+  data.tar.gz: 171070fa439abfe6279d7e0c713d46a28528669085cfc643ab808569d17357c1
 SHA512:
-  metadata.gz: 25fd7715c94cf32eb097e8c0049d48f7b8185bef6ea4dafe21f0f7013c13892ff6d929e2e45f18480903f081ed9738aa8f0059287dd528cdb63feb94a47fd42e
-  data.tar.gz: 8dfe6966704a8b5b662f99a2ee15d525f6d4cd3d74b62b0c3946f01933c86f50075572cf32a81de3bfe2fe96a07d8197a55a11906f870b80daa2d81e50987944
+  metadata.gz: ab3de4f196504df68763d5efaa347b4febf2e2feed3dc1f0b407565a6f93434d4b1709dbe7a1fa36f28e39b25d67434ad861818ca7d570e0b2b0d8b5b1e71ff9
+  data.tar.gz: 8634d57721f51fa9dd91c843960fb6c20a7bbb0331c6e62b3f29da3a770f5471f9adcaad14efb5a68904f2e93767e835022abcb9b739c113898822942085f112

data/CHANGELOG.md

@@ -1,88 +1,6 @@
 Changelog
 =========
 
-v2.6.4.0 (2019-08-30)
----------------------
-
-API modifications:
- * Added specs for heredocs with mixed encoding. (#581) (Ilya Bylich)
-
-Features implemented:
- * ruby27.y: Revert "pipeline operator" (#601) (Koichi ITO)
- * ruby27.y: Fix parsing of mutiple assignment with rescue modifier (#600) (Koichi ITO)
- * ruby27.y: hoisted out f_rest_marg. (#594) (Ilya Bylich)
- * ruby27.y: added pipeline operator. (#592) (Ilya Bylich)
- * ruby27.y: reject safe navigator in LHS of mass-assignment. (#586) (Ilya Bylich)
- * lexer.rl: reject whitespaces in meta and control chars. (#585) (Ilya Bylich)
- * lexer.rl: Reject numparams as symbol literals. (#582) (Ilya Bylich)
- * ruby27.y: Added numbered parameters support. (#565) (Ilya Bylich)
- * lexer.rl: Reject \n and \r in heredoc identifiers starting from 2.7. (#575) (Ilya Bylich)
-
-Bugs fixed:
- * ruby-parse: print empty string when --emit-json and empty input are given. (#590) (Ilya Bylich)
- * AST_FORMAT: fixed documentation of the string with interpolation. (#589) (Ilya Bylich)
- * builder.rb, processor.rb: Changed format of the procarg0 node. (#587) (Ilya Bylich)
-
-v2.6.3.0 (2019-04-28)
----------------------
-
-Features implemented:
- * ruby27.y: Added beginless ranges support. (#570) (Ilya Bylich)
-
-v2.6.2.1 (2019-04-05)
----------------------
-
-API modifications:
- * Bump 2.4 branch to 2.4.6. (#569) (Ilya Bylich)
- * Lexer should know about current parsing context. (#566) (Ilya Bylich)
-
-v2.6.2.0 (2019-03-21)
----------------------
-
-API modifications:
- * Bump ruby versions to 2.5.5 and 2.6.2. (#563) (Ilya Bylich)
- * Bump Ruby version to 2.6.1. (#554) (Ilya Bylich)
-
-Features implemented:
- * ruby27.y: dsym should be treated as string. (#560) (Ilya Bylich)
- * ruby27.y: Refactored symbol rules. (#557) (Ilya Bylich)
- * ruby27.y: Added method reference operator. (#556) (Ilya Bylich)
- * ruby27.y: branch parser. (#546) (Ilya Bylich)
-
-v2.6.0.0 (2019-01-16)
----------------------
-
-API modifications:
- * 2.6.0 was released, unmark is as -dev. (#538) (Ilya Bylich)
-
-Bugs fixed:
- * Fix parsing of "\\\n" escaped sequences in various literals. (#539) (Ilya Bylich)
-
-v2.5.3.0 (2018-10-29)
----------------------
-
-Bugs fixed:
- * lexer.rl: Fix parsing of 'm :key => m do; m() do end; end'. (#526) (Ilya Bylich)
- * lexer.rl: Fix parsing of ambiguous 1re. (#523) (Ilya Bylich)
-
-v2.5.1.2 (2018-07-10)
----------------------
-
-Bugs fixed:
- * lexer.rl: Partially revert 5ba072d and properly handle 'm = -> *args do end'. (Ilya Bylich)
-
-v2.5.1.1 (2018-07-10)
----------------------
-
-Features implemented:
- * ruby26.y: Endless ranges support. (Ilya Bylich)
-
-Bugs fixed:
- * lexer.rl: Fix parsing of 'm = -> *args do end'. (Ilya Bylich)
- * AST::Processor: Properly recurse into "kwsplat" nodes (Nelson Elhage)
- * ruby24, ruby25, ruby26: Fix cmdargs after command_args followed by tLBRACE_ARG. This commit tracks upstream commit ruby/ruby@f168dbd. (Ilya Bylich)
- * lexer.rl: Fix parsing of `let (:a) { m do; end }`. (Ilya Bylich)
-
 v2.5.1.0 (2018-04-12)
 ---------------------
 

data/doc/AST_FORMAT.md

@@ -1032,6 +1032,17 @@ Format:
  ~~ expression
 ~~~
 
+### Keyword nil argument
+
+Format:
+
+~~~
+(kwnilarg)
+"**nil"
+   ~~~ name
+ ~~~~~ expression
+~~~
+
 ### Objective-C arguments
 
 MacRuby includes a few more syntactic "arguments" whose name becomes

data/lib/parser/builders/default.rb

@@ -730,6 +730,11 @@ module Parser
       end
     end
 
+    def kwnilarg(dstar_t, nil_t)
+      n0(:kwnilarg,
+        arg_prefix_map(dstar_t, nil_t))
+    end
+
     def shadowarg(name_t)
       n(:shadowarg, [ value(name_t).to_sym ],
         variable_map(name_t))

data/lib/parser/lexer.rl

@@ -172,7 +172,7 @@ class Parser::Lexer
     # If the lexer is in `command state' (aka expr_value)
     # at the entry to #advance, it will transition to expr_cmdarg
     # instead of expr_arg at certain points.
-    @command_state = false
+    @command_start = true
 
     # True at the end of "def foo a:"
     @in_kwarg      = false
@@ -287,8 +287,8 @@ class Parser::Lexer
     pe = @source_pts.size + 2
     p, eof = @p, pe
 
-    @command_state = (@cs == klass.lex_en_expr_value ||
-                      @cs == klass.lex_en_line_begin)
+    cmd_state = @command_start
+    @command_start = false
 
     %% write exec;
     # %
@@ -358,8 +358,8 @@ class Parser::Lexer
     end
   end
 
-  def arg_or_cmdarg
-    if @command_state
+  def arg_or_cmdarg(cmd_state)
+    if cmd_state
       self.class.lex_en_expr_cmdarg
     else
       self.class.lex_en_expr_arg
@@ -1089,6 +1089,7 @@ class Parser::Lexer
     end
 
     current_literal.start_interp_brace
+    @command_start = true
     fnext expr_value;
     fbreak;
   }
@@ -1275,6 +1276,10 @@ class Parser::Lexer
     @cond.push(false); @cmdarg.push(false)
 
     @paren_nest += 1
+
+    if version?(18)
+      @command_start = true
+    end
   };
 
   e_rparen = ')' % {
@@ -1288,7 +1293,7 @@ class Parser::Lexer
     if !@static_env.nil? && @static_env.declared?(tok)
       fnext expr_endfn; fbreak;
     else
-      fnext *arg_or_cmdarg; fbreak;
+      fnext *arg_or_cmdarg(cmd_state); fbreak;
     end
   }
 
@@ -1445,15 +1450,15 @@ class Parser::Lexer
   expr_dot := |*
       constant
       => { emit(:tCONSTANT)
-           fnext *arg_or_cmdarg; fbreak; };
+           fnext *arg_or_cmdarg(cmd_state); fbreak; };
 
       call_or_var
       => { emit(:tIDENTIFIER)
-           fnext *arg_or_cmdarg; fbreak; };
+           fnext *arg_or_cmdarg(cmd_state); fbreak; };
 
       bareword ambiguous_fid_suffix
       => { emit(:tFID, tok(@ts, tm), @ts, tm)
-           fnext *arg_or_cmdarg; p = tm - 1; fbreak; };
+           fnext *arg_or_cmdarg(cmd_state); p = tm - 1; fbreak; };
 
       # See the comment in `expr_fname`.
       operator_fname      |
@@ -1513,6 +1518,7 @@ class Parser::Lexer
         else
           emit(:tLCURLY, '{'.freeze, @te - 1, @te)
         end
+        @command_start = true
         fnext expr_value; fbreak;
       };
 
@@ -1673,6 +1679,7 @@ class Parser::Lexer
         else
           emit(:tLBRACE_ARG, '{'.freeze)
         end
+        @command_start = true
         fnext expr_value; fbreak;
       };
 
@@ -1929,6 +1936,7 @@ class Parser::Lexer
       => {
         if @lambda_stack.last == @paren_nest
           @lambda_stack.pop
+          @command_start = true
           emit(:tLAMBEG, '{'.freeze)
         else
           emit(:tLBRACE, '{'.freeze)
@@ -1961,6 +1969,7 @@ class Parser::Lexer
       # if a: Statement if.
       keyword_modifier
       => { emit_table(KEYWORDS_BEGIN)
+           @command_start = true
            fnext expr_value; fbreak; };
 
       #
@@ -1981,7 +1990,7 @@ class Parser::Lexer
           if !@static_env.nil? && @static_env.declared?(ident)
             fnext expr_end;
           else
-            fnext *arg_or_cmdarg;
+            fnext *arg_or_cmdarg(cmd_state);
           end
         else
           emit(:tLABEL, tok(@ts, @te - 2), @ts, @te - 1)
@@ -2150,6 +2159,7 @@ class Parser::Lexer
             emit_do
           end
         end
+        @command_start = true
 
         fnext expr_value; fbreak;
       };
@@ -2175,6 +2185,7 @@ class Parser::Lexer
       # elsif b:c: elsif b(:c)
       keyword_with_value
       => { emit_table(KEYWORDS)
+           @command_start = true
            fnext expr_value; fbreak; };
 
       keyword_with_mid
@@ -2198,7 +2209,7 @@ class Parser::Lexer
           emit(:tIDENTIFIER)
 
           unless !@static_env.nil? && @static_env.declared?(tok)
-            fnext *arg_or_cmdarg;
+            fnext *arg_or_cmdarg(cmd_state);
           end
         else
           emit(:k__ENCODING__, '__ENCODING__'.freeze)
@@ -2309,7 +2320,7 @@ class Parser::Lexer
 
       constant
       => { emit(:tCONSTANT)
-           fnext *arg_or_cmdarg; fbreak; };
+           fnext *arg_or_cmdarg(cmd_state); fbreak; };
 
       constant ambiguous_const_suffix
       => { emit(:tCONSTANT, tok(@ts, tm), @ts, tm)
@@ -2423,6 +2434,7 @@ class Parser::Lexer
 
       ';'
       => { emit(:tSEMI, ';'.freeze)
+           @command_start = true
            fnext expr_value; fbreak; };
 
       '\\' c_line {
@@ -2481,7 +2493,7 @@ class Parser::Lexer
       => { p = pe - 3 };
 
       c_any
-      => { fhold; fgoto expr_value; };
+      => { cmd_state = true; fhold; fgoto expr_value; };
 
       c_eof => do_eof;
   *|;

data/lib/parser/meta.rb

@@ -18,7 +18,7 @@ module Parser
         match_with_lvasgn match_current_line
         module class sclass def defs undef alias args
         cbase arg optarg restarg blockarg block_pass kwarg kwoptarg
-        kwrestarg send csend super zsuper yield block
+        kwrestarg kwnilarg send csend super zsuper yield block
         and not or if when case while until while_post
         until_post for break next redo return resbody
         kwbegin begin retry preexe postexe iflipflop eflipflop

data/lib/parser/ruby27.y

@@ -1352,6 +1352,10 @@ rule
                     {
                       result = val[0].concat(val[1])
                     }
+                | f_no_kwarg opt_f_block_arg
+                    {
+                      result = val[0].concat(val[1])
+                    }
                 | f_block_arg
                     {
                       result = [ val[0] ]
@@ -2092,6 +2096,10 @@ keyword_variable: kNIL
                     {
                       result = val[0].concat(val[1])
                     }
+                | f_no_kwarg opt_f_block_arg
+                    {
+                      result = val[0].concat(val[1])
+                    }
                 | f_block_arg
                     {
                       result = [ val[0] ]
@@ -2295,6 +2303,11 @@ keyword_variable: kNIL
 
      kwrest_mark: tPOW | tDSTAR
 
+      f_no_kwarg: kwrest_mark kNIL
+                    {
+                      result = [ @builder.kwnilarg(val[0], val[1]) ]
+                    }
+
         f_kwrest: kwrest_mark tIDENTIFIER
                     {
                       @static_env.declare val[1][0]

data/lib/parser/source/tree_rewriter.rb

@@ -281,7 +281,7 @@ module Parser
       def enforce_policy(event)
         return if @policy[event] == :accept
         return unless (values = yield)
-        trigger_policy(event, values)
+        trigger_policy(event, **values)
       end
 
       POLICY_TO_LEVEL = {warn: :warning, raise: :error}.freeze

data/lib/parser/version.rb

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

data/test/test_parser.rb

@@ -2095,6 +2095,37 @@ class TestParser < Minitest::Test
       SINCE_2_0)
   end
 
+  def test_kwnilarg
+    assert_parses(
+      s(:def, :f,
+        s(:args, s(:kwnilarg)),
+        nil),
+      %q{def f(**nil); end},
+      %q{      ~~~~~ expression (args.kwnilarg)
+        |        ~~~ name (args.kwnilarg)},
+      SINCE_2_7)
+
+    assert_parses(
+      s(:block,
+        s(:send, nil, :m),
+        s(:args,
+          s(:kwnilarg)), nil),
+      %q{m { |**nil| }},
+      %q{     ~~~~~ expression (args.kwnilarg)
+        |       ~~~ name (args.kwnilarg)},
+      SINCE_2_7)
+
+    assert_parses(
+      s(:block,
+        s(:lambda),
+        s(:args,
+          s(:kwnilarg)), nil),
+      %q{->(**nil) {}},
+      %q{   ~~~~~ expression (args.kwnilarg)
+        |     ~~~ name (args.kwnilarg)},
+      SINCE_2_7)
+  end
+
   def test_blockarg
     assert_parses(
       s(:def, :f,
@@ -7532,4 +7563,17 @@ class TestParser < Minitest::Test
       %q{  ^^ location},
       SINCE_2_7)
   end
+
+  def test_parser_bug_604
+    assert_parses(
+      s(:block,
+        s(:send, nil, :m,
+          s(:send,
+            s(:send, nil, :a), :+,
+            s(:send, nil, :b))),
+        s(:args), nil),
+      %q{m a + b do end},
+      %q{},
+      ALL_VERSIONS)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.6.4.0
+  version: 2.6.4.1
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.