ruby-next-parser 3.2.2.0 → 3.4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73904c549d34418483631fcb2ad1ceb3e2093454d8370f9594b35c37f029eab7
-  data.tar.gz: 2ba3538042e09b993d2e8283a66b686cc20ee5907ef8875908fea4139e500962
+  metadata.gz: 599fb2ab28d4c14213e0f239c8c61f109bb99b250870c14473bd44b7d3bfb24c
+  data.tar.gz: dfbdb998d62c61daa43db9ed88f50039b12b7c0689d8e39102f4270ef1640559
 SHA512:
-  metadata.gz: 74663daa4754d89b9ec0ee4f54ccb648b5d22182b897c297449e3e0c28ba74071fa080f3d1d886e34c296f0c101537ebd28fa525321eb3b4848662bbaab5a7cb
-  data.tar.gz: 5cce4bdfba933b91f8559cb8ca747d897a18b174d46ac8f69f88091d648f7a622daf9dbaf67b26c1e6c4b73f5d06ffdb93924f0c38fda3903ec8b564ba6e14a1
+  metadata.gz: e7d9d5aa13d446c071d51b466bf00974eafa328fba0895a3b52d96bcc536d2128d7301e948cf5fcda778dffdd0b21df0ba6711bcef1efa2400b9ebd0cca9cd67
+  data.tar.gz: f0dfb8fc79df212ac1f1856ac11fd2b57b7530317cec3540fd1cef7d0235a5a1c9386a953f8299adae492688ced8d2792941d1b21e19fa644093e9c3c12f6004

data/lib/parser/ruby-next/AST_FORMAT.md

@@ -1,14 +1,24 @@
 Ruby Next AST format additions
 =======================
 
-### Method reference operator
+### Pattern matching non-local variables
 
 Format:
 
 ~~~
-(meth-ref (self) :foo)
-"self.:foo"
-     ^^ dot
-       ^^^ selector
- ^^^^^^^^^ expression
+(in_pattern
+  (match_as
+    (int 1),
+    (match_var (ivar :@a))))
+
+"in 1 => @a then true"
+~~~
+
+~~~
+(in_pattern
+  (match_as
+    (int 1),
+    (match_var (gvar :$a))))
+
+"in 1 => $a then true"
 ~~~

data/lib/parser/ruby-next/ast/processor.rb

@@ -6,9 +6,11 @@ require "parser/ast/processor"
 module Parser
   module AST
     class Processor
-      def on_meth_ref(node)
-        node
-      end
+      # Define new node callbacks here
+      #
+      # def on_meth_ref(node)
+      #   node
+      # end
     end
   end
 end

data/lib/parser/ruby-next/builder.rb

@@ -6,11 +6,6 @@ require_relative "meta"
 module Parser
   # Add RubyNext specific builder methods
   module Builders::Next
-    def method_ref(receiver, dot_t, selector_t)
-      n(:meth_ref, [ receiver, value(selector_t).to_sym ],
-          send_map(receiver, dot_t, selector_t, nil, [], nil))
-    end
-
     def match_var(var)
       return super(var) unless var.is_a?(::Parser::AST::Node)
 

data/lib/parser/ruby-next/meta.rb

@@ -5,9 +5,11 @@ require "parser/meta"
 module Parser
   # Parser metadata
   module Meta
-    NEXT_NODE_TYPES = (NODE_TYPES + %i[meth_ref]).to_set.freeze
+    # This is how you can add new node types to the parser
+    #
+    # NEXT_NODE_TYPES = (NODE_TYPES + %i[meth_ref]).to_set.freeze
 
-    remove_const(:NODE_TYPES)
-    const_set(:NODE_TYPES, NEXT_NODE_TYPES)
+    # remove_const(:NODE_TYPES)
+    # const_set(:NODE_TYPES, NEXT_NODE_TYPES)
   end
 end

data/lib/parser/ruby-next/parser_ext.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 
-if RUBY_ENGINE == 'truffleruby'
-  require_relative "lexer-F0"
-else
-  require_relative "lexer-F1"
-end
+# if RUBY_ENGINE == 'truffleruby'
+#   require_relative "lexer-F0"
+# else
+#   require_relative "lexer-F1"
+# end
 require_relative "builder"
 require_relative "ast/processor"
 
@@ -18,11 +18,12 @@ module Parser
       # Extend builder
       @builder.singleton_class.prepend(Builders::Next)
 
-      # Use custom lexer
-      @lexer = Lexer::Next.new(version)
-      @lexer.diagnostics = @diagnostics
-      @lexer.static_env  = @static_env
-      @lexer.context     = @context
+      # Here is how to use a custom lexer
+      #
+      # @lexer = Lexer::Next.new(version)
+      # @lexer.diagnostics = @diagnostics
+      # @lexer.static_env  = @static_env
+      # @lexer.context     = @context
 
       # Reset the state again
       reset

data/lib/parser/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  NEXT_VERSION = "3.2.2.0"
+  NEXT_VERSION = "3.4.0.0"
 end

data/lib/parser/rubynext.y

@@ -18,7 +18,6 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       tSTRING_DVAR tSTRING_END tSTRING_DEND tSTRING tSYMBOL
       tNL tEH tCOLON tCOMMA tSPACE tSEMI tLAMBDA tLAMBEG tCHARACTER
       tRATIONAL tIMAGINARY tLABEL_END tANDDOT tBDOT2 tBDOT3
-      tMETHREF
 
 prechigh
   right    tBANG tTILDE tUPLUS
@@ -262,7 +261,7 @@ rule
                                     val[0], val[1], val[2]),
                                   val[3], val[4])
                     }
-                | defn_head f_opt_paren_args tEQL command
+                | defn_head f_opt_paren_args tEQL endless_command
                     {
                       def_t, (name_t, ctx) = val[0]
                       endless_method_name(name_t)
@@ -274,25 +273,7 @@ rule
                       @current_arg_stack.pop
                       @context.in_def = ctx.in_def
                     }
-                | defn_head f_opt_paren_args tEQL command kRESCUE_MOD arg
-                    {
-                      def_t, (name_t, ctx) = val[0]
-                      endless_method_name(name_t)
-
-                      rescue_body = @builder.rescue_body(val[4],
-                                        nil, nil, nil,
-                                        nil, val[5])
-
-                      method_body = @builder.begin_body(val[3], [ rescue_body ])
-
-                      result = @builder.def_endless_method(def_t, name_t,
-                                 val[1], val[2], method_body)
-
-                      local_pop
-                      @current_arg_stack.pop
-                      @context.in_def = ctx.in_def
-                    }
-                | defs_head f_opt_paren_args tEQL command
+                | defs_head f_opt_paren_args tEQL endless_command
                     {
                       def_t, recv, dot_t, (name_t, ctx) = val[0]
                       endless_method_name(name_t)
@@ -304,27 +285,23 @@ rule
                       @current_arg_stack.pop
                       @context.in_def = ctx.in_def
                     }
-                | defs_head f_opt_paren_args tEQL command kRESCUE_MOD arg
+                | backref tOP_ASGN command_rhs
                     {
-                      def_t, recv, dot_t, (name_t, ctx) = val[0]
-                      endless_method_name(name_t)
+                      @builder.op_assign(val[0], val[1], val[2])
+                    }
 
-                      rescue_body = @builder.rescue_body(val[4],
+ endless_command: command
+                | endless_command kRESCUE_MOD arg
+                    {
+                      rescue_body = @builder.rescue_body(val[1],
                                         nil, nil, nil,
-                                        nil, val[5])
-
-                      method_body = @builder.begin_body(val[3], [ rescue_body ])
-
-                      result = @builder.def_endless_singleton(def_t, recv, dot_t, name_t,
-                                 val[1], val[2], method_body)
+                                        nil, val[2])
 
-                      local_pop
-                      @current_arg_stack.pop
-                      @context.in_def = ctx.in_def
+                      result = @builder.begin_body(val[0], [ rescue_body ])
                     }
-                | backref tOP_ASGN command_rhs
+                | kNOT opt_nl endless_command
                     {
-                      @builder.op_assign(val[0], val[1], val[2])
+                      result = @builder.not_op(val[0], nil, val[2], nil)
                     }
 
      command_rhs: command_call =tOP_ASGN
@@ -355,39 +332,19 @@ rule
                     {
                       result = @builder.not_op(val[0], nil, val[1], nil)
                     }
-                | arg tASSOC
-                    {
-                      @lexer.state = :expr_beg
-                      @lexer.command_start = false
-                      @pattern_variables.push
-                      @pattern_hash_keys.push
-
-                      result = @context.in_kwarg
-                      @context.in_kwarg = true
-                    }
-                  p_top_expr_body
+                | arg tASSOC p_in_kwarg p_pvtbl p_pktbl p_top_expr_body
                     {
                       @pattern_variables.pop
                       @pattern_hash_keys.pop
                       @context.in_kwarg = val[2]
-                      result = @builder.match_pattern(val[0], val[1], val[3])
+                      result = @builder.match_pattern(val[0], val[1], val[5])
                     }
-                | arg kIN
-                    {
-                      @lexer.state = :expr_beg
-                      @lexer.command_start = false
-                      @pattern_variables.push
-                      @pattern_hash_keys.push
-
-                      result = @context.in_kwarg
-                      @context.in_kwarg = true
-                    }
-                  p_top_expr_body
+                | arg kIN p_in_kwarg p_pvtbl p_pktbl p_top_expr_body
                     {
                       @pattern_variables.pop
                       @pattern_hash_keys.pop
                       @context.in_kwarg = val[2]
-                      result = @builder.match_pattern_p(val[0], val[1], val[3])
+                      result = @builder.match_pattern_p(val[0], val[1], val[5])
                     }
                 | arg =tLBRACE_ARG
 
@@ -409,6 +366,7 @@ rule
 
                       result = [ val[0], @context.dup ]
                       @context.in_def = true
+                      @context.cant_return = false
                     }
 
        defn_head: k_def def_name
@@ -492,6 +450,14 @@ rule
                       result      = @builder.block(method_call,
                                       begin_t, args, body, end_t)
                     }
+                | primary_value tCOLON2 tCONSTANT tLCURLY brace_body tRCURLY
+                    {
+                      method_call = @builder.call_method(val[0], val[1], val[2],
+                                        nil, [], nil)
+
+                      args, body = val[4]
+                      result = @builder.block(method_call, val[3], args, body, val[5])
+                    }
                 | kSUPER command_args
                     {
                       result = @builder.keyword_cmd(:super, val[0],
@@ -926,13 +892,9 @@ rule
                     {
                       result = @builder.logical_op(:or, val[0], val[1], val[2])
                     }
-                | kDEFINED opt_nl
-                    {
-                      @context.in_defined = true
-                    }
-                  arg
+                | kDEFINED opt_nl begin_defined arg
                     {
-                      @context.in_defined = false
+                      @context.in_defined = val[2].in_defined
                       result = @builder.keyword_cmd(:defined?, val[0], nil, [ val[3] ], nil)
                     }
                 | arg tEH arg opt_nl tCOLON arg
@@ -940,7 +902,7 @@ rule
                       result = @builder.ternary(val[0], val[1],
                                                 val[2], val[4], val[5])
                     }
-                | defn_head f_opt_paren_args tEQL arg
+                | defn_head f_opt_paren_args tEQL endless_arg
                     {
                       def_t, (name_t, ctx) = val[0]
                       endless_method_name(name_t)
@@ -952,25 +914,7 @@ rule
                       @current_arg_stack.pop
                       @context.in_def = ctx.in_def
                     }
-                | defn_head f_opt_paren_args tEQL arg kRESCUE_MOD arg
-                    {
-                      def_t, (name_t, ctx) = val[0]
-                      endless_method_name(name_t)
-
-                      rescue_body = @builder.rescue_body(val[4],
-                                        nil, nil, nil,
-                                        nil, val[5])
-
-                      method_body = @builder.begin_body(val[3], [ rescue_body ])
-
-                      result = @builder.def_endless_method(def_t, name_t,
-                                 val[1], val[2], method_body)
-
-                      local_pop
-                      @current_arg_stack.pop
-                      @context.in_def = ctx.in_def
-                    }
-                | defs_head f_opt_paren_args tEQL arg
+                | defs_head f_opt_paren_args tEQL endless_arg
                     {
                       def_t, recv, dot_t, (name_t, ctx) = val[0]
                       endless_method_name(name_t)
@@ -982,25 +926,21 @@ rule
                       @current_arg_stack.pop
                       @context.in_def = ctx.in_def
                     }
-                | defs_head f_opt_paren_args tEQL arg kRESCUE_MOD arg
-                    {
-                      def_t, recv, dot_t, (name_t, ctx) = val[0]
-                      endless_method_name(name_t)
+                | primary
 
-                      rescue_body = @builder.rescue_body(val[4],
+     endless_arg: arg=kRESCUE_MOD
+                | endless_arg kRESCUE_MOD arg
+                    {
+                      rescue_body = @builder.rescue_body(val[1],
                                         nil, nil, nil,
-                                        nil, val[5])
-
-                      method_body = @builder.begin_body(val[3], [ rescue_body ])
-
-                      result = @builder.def_endless_singleton(def_t, recv, dot_t, name_t,
-                                 val[1], val[2], method_body)
+                                        nil, val[2])
 
-                      local_pop
-                      @current_arg_stack.pop
-                      @context.in_def = ctx.in_def
+                      result = @builder.begin_body(val[0], [ rescue_body ])
+                    }
+                | kNOT opt_nl endless_arg
+                    {
+                      result = @builder.not_op(val[0], nil, val[2], nil)
                     }
-                | primary
 
            relop: tGT | tLT | tGEQ | tLEQ
 
@@ -1013,6 +953,11 @@ rule
                       result = @builder.binary_op(val[0], val[1], val[2])
                     }
 
+   begin_defined: none
+                    {
+                      result = @context.dup
+                    }
+
        arg_value: arg
 
        aref_args: none
@@ -1156,6 +1101,11 @@ rule
                         diagnostic :error, :no_anonymous_blockarg, nil, val[0]
                       end
 
+                      if @context.in_dynamic_block? && context.in_def &&
+                        @static_env.declared_anonymous_blockarg_in_current_scpe? && @static_env.parent_has_anonymous_blockarg?
+                        diagnostic :error, :ambiguous_anonymous_blockarg, nil, val[0]
+                      end
+
                       result = @builder.block_pass(val[0], nil)
                     }
 
@@ -1172,7 +1122,17 @@ rule
                     {
                       result = [ val[0] ]
                     }
-                | tSTAR arg_value
+                | arg_splat
+                | args tCOMMA arg_value
+                    {
+                      result = val[0] << val[2]
+                    }
+                | args tCOMMA arg_splat
+                    {
+                      result = val[0].concat(val[2])
+                    }
+
+       arg_splat: tSTAR arg_value
                     {
                       result = [ @builder.splat(val[0], val[1]) ]
                     }
@@ -1182,23 +1142,12 @@ rule
                         diagnostic :error, :no_anonymous_restarg, nil, val[0]
                       end
 
-                      result = [ @builder.forwarded_restarg(val[0]) ]
-                    }
-                | args tCOMMA arg_value
-                    {
-                      result = val[0] << val[2]
-                    }
-                | args tCOMMA tSTAR arg_value
-                    {
-                      result = val[0] << @builder.splat(val[2], val[3])
-                    }
-                | args tCOMMA tSTAR
-                    {
-                      if !@static_env.declared_anonymous_restarg?
-                        diagnostic :error, :no_anonymous_restarg, nil, val[2]
+                      if @context.in_dynamic_block? && context.in_def &&
+                        @static_env.declared_anonymous_restarg_in_current_scope? && @static_env.parent_has_anonymous_restarg?
+                        diagnostic :error, :ambiguous_anonymous_restarg, nil, val[0]
                       end
 
-                      result = val[0] << @builder.forwarded_restarg(val[2])
+                      result = [ @builder.forwarded_restarg(val[0]) ]
                     }
 
         mrhs_arg: mrhs
@@ -1244,22 +1193,14 @@ rule
 
                       result = @builder.begin_keyword(val[0], val[2], val[3])
                     }
-                | tLPAREN_ARG stmt
+                | tLPAREN_ARG compstmt
                     {
                       @lexer.state = :expr_endarg
                     }
-                    rparen
+                    tRPAREN
                     {
                       result = @builder.begin(val[0], val[1], val[3])
                     }
-                | tLPAREN_ARG
-                    {
-                      @lexer.state = :expr_endarg
-                    }
-                    opt_nl tRPAREN
-                    {
-                      result = @builder.begin(val[0], nil, val[3])
-                    }
                 | tLPAREN compstmt tRPAREN
                     {
                       result = @builder.begin(val[0], val[1], val[2])
@@ -1296,13 +1237,9 @@ rule
                     {
                       result = @builder.keyword_cmd(:yield, val[0])
                     }
-                | kDEFINED opt_nl tLPAREN2
-                    {
-                      @context.in_defined = true
-                    }
-                  expr rparen
+                | kDEFINED opt_nl tLPAREN2 begin_defined expr rparen
                     {
-                      @context.in_defined = false
+                      @context.in_defined = val[3].in_defined
                       result = @builder.keyword_cmd(:defined?, val[0],
                                                     val[2], [ val[4] ], val[5])
                     }
@@ -1383,6 +1320,7 @@ rule
                 | k_class cpath superclass
                     {
                       @context.in_class = true
+                      @context.cant_return = true
                       local_push
                     }
                     bodystmt kEND
@@ -1398,11 +1336,13 @@ rule
 
                       local_pop
                       @context.in_class = ctx.in_class
+                      @context.cant_return = ctx.cant_return
                     }
-                | k_class tLSHFT expr term
+                | k_class tLSHFT expr_value term
                     {
                       @context.in_def = false
                       @context.in_class = false
+                      @context.cant_return = true
                       local_push
                     }
                     bodystmt kEND
@@ -1414,10 +1354,12 @@ rule
                       local_pop
                       @context.in_def = ctx.in_def
                       @context.in_class = ctx.in_class
+                      @context.cant_return = ctx.cant_return
                     }
                 | k_module cpath
                     {
                       @context.in_class = true
+                      @context.cant_return = true
                       local_push
                     }
                     bodystmt kEND
@@ -1431,6 +1373,7 @@ rule
 
                       local_pop
                       @context.in_class = ctx.in_class
+                      @context.cant_return = ctx.cant_return
                     }
                 | defn_head f_arglist bodystmt kEND
                     {
@@ -1468,10 +1411,6 @@ rule
                     {
                       result = @builder.keyword_cmd(:retry, val[0])
                     }
-                | primary_value tMETHREF operation2
-                    {
-                      result = @builder.method_ref(val[0], val[1], val[2])
-                    }
 
    primary_value: primary
 
@@ -1493,7 +1432,7 @@ rule
 
         k_return: kRETURN
                     {
-                      if @context.in_class && !@context.in_def && !(context.in_block || context.in_lambda)
+                      if @context.cant_return && !(context.in_block || context.in_lambda)
                         diagnostic :error, :invalid_return, nil, val[0]
                       end
                     }
@@ -1970,17 +1909,26 @@ opt_block_args_tail:
                     }
                 | case_body
 
-     p_case_body: kIN
+         p_pvtbl: none
                     {
-                      @lexer.state = :expr_beg
-                      @lexer.command_start = false
                       @pattern_variables.push
+                    }
+
+         p_pktbl: none
+                    {
                       @pattern_hash_keys.push
+                    }
 
+      p_in_kwarg: none
+                    {
                       result = @context.in_kwarg
+
+                      @lexer.state = :expr_beg
+                      @lexer.command_start = false
                       @context.in_kwarg = true
                     }
-                  p_top_expr then
+
+     p_case_body: kIN p_in_kwarg p_pvtbl p_pktbl p_top_expr then
                     {
                       @pattern_variables.pop
                       @pattern_hash_keys.pop
@@ -1988,8 +1936,8 @@ opt_block_args_tail:
                     }
                   compstmt p_cases
                     {
-                      result = [ @builder.in_pattern(val[0], *val[2], val[3], val[5]),
-                                 *val[6] ]
+                      result = [ @builder.in_pattern(val[0], *val[4], val[5], val[7]),
+                                 *val[8] ]
                     }
 
          p_cases: opt_else
@@ -2465,6 +2413,9 @@ opt_block_args_tail:
                       result = @builder.regexp_compose(val[0], val[1], val[2], opts)
                     }
 
+       words_sep: tSPACE
+                | words_sep tSPACE
+
            words: tWORDS_BEG word_list tSTRING_END
                     {
                       result = @builder.words_compose(val[0], val[1], val[2])
@@ -2474,7 +2425,7 @@ opt_block_args_tail:
                     {
                       result = []
                     }
-                | word_list word tSPACE
+                | word_list word words_sep
                     {
                       result = val[0] << @builder.word(val[1])
                     }
@@ -2497,7 +2448,7 @@ opt_block_args_tail:
                     {
                       result = []
                     }
-                | symbol_list word tSPACE
+                | symbol_list word words_sep
                     {
                       result = val[0] << @builder.word(val[1])
                     }
@@ -2516,7 +2467,7 @@ opt_block_args_tail:
                     {
                       result = []
                     }
-                | qword_list tSTRING_CONTENT tSPACE
+                | qword_list tSTRING_CONTENT words_sep
                     {
                       result = val[0] << @builder.string_internal(val[1])
                     }
@@ -2525,7 +2476,7 @@ opt_block_args_tail:
                     {
                       result = []
                     }
-                | qsym_list tSTRING_CONTENT tSPACE
+                | qsym_list tSTRING_CONTENT words_sep
                     {
                       result = val[0] << @builder.symbol_internal(val[1])
                     }
@@ -2570,7 +2521,7 @@ regexp_contents: # nothing
                       @lexer.cmdarg.push(false)
                       @lexer.cond.push(false)
                     }
-                    compstmt tSTRING_DEND
+                    compstmt string_dend
                     {
                       @lexer.cmdarg.pop
                       @lexer.cond.pop
@@ -2578,17 +2529,11 @@ regexp_contents: # nothing
                       result = @builder.begin(val[0], val[2], val[3])
                     }
 
-     string_dvar: tGVAR
-                    {
-                      result = @builder.gvar(val[0])
-                    }
-                | tIVAR
-                    {
-                      result = @builder.ivar(val[0])
-                    }
-                | tCVAR
+     string_dend: tSTRING_DEND
+
+     string_dvar: nonlocal_var
                     {
-                      result = @builder.cvar(val[0])
+                      result = @builder.accessible(val[0])
                     }
                 | backref
 
@@ -3134,6 +3079,11 @@ f_opt_paren_args: f_paren_args
                         diagnostic :error, :no_anonymous_kwrestarg, nil, val[0]
                       end
 
+                      if @context.in_dynamic_block? && context.in_def &&
+                        @static_env.declared_anonymous_kwrestarg_in_current_scope? && @static_env.parent_has_anonymous_kwrestarg?
+                        diagnostic :error, :ambiguous_anonymous_kwrestarg, nil, val[0]
+                      end
+
                       result = @builder.forwarded_kwrestarg(val[0])
                     }
 
@@ -3190,7 +3140,7 @@ require 'parser/ruby-next/parser_ext'
 prepend Parser::NextExt
 
   def version
-    33
+    34
   end
 
   def default_encoding