prism 0.27.0 → 0.29.0

data/lib/prism/serialize.rb

@@ -7,7 +7,7 @@ if you are looking to modify the template
 =end
 
 require "stringio"
-require_relative "polyfill/string"
+require_relative "polyfill/unpack1"
 
 module Prism
   # A module responsible for deserializing parse results.
@@ -18,7 +18,7 @@ module Prism
 
     # The minor version of prism that we are expecting to find in the serialized
     # strings.
-    MINOR_VERSION = 27
+    MINOR_VERSION = 29
 
     # The patch version of prism that we are expecting to find in the serialized
     # strings.
@@ -27,7 +27,7 @@ module Prism
     # Deserialize the AST represented by the given string into a parse result.
     def self.load(input, serialized)
       input = input.dup
-      source = Source.new(input)
+      source = Source.for(input)
       loader = Loader.new(source, serialized)
       result = loader.load_result
 
@@ -133,13 +133,16 @@ module Prism
         :argument_bare_hash,
         :argument_block_forwarding,
         :argument_block_multi,
+        :argument_conflict_ampersand,
+        :argument_conflict_star,
+        :argument_conflict_star_star,
         :argument_formal_class,
         :argument_formal_constant,
         :argument_formal_global,
         :argument_formal_ivar,
         :argument_forwarding_unbound,
         :argument_in,
-        :argument_no_forwarding_amp,
+        :argument_no_forwarding_ampersand,
         :argument_no_forwarding_ellipses,
         :argument_no_forwarding_star,
         :argument_no_forwarding_star_star,
@@ -221,6 +224,7 @@ module Prism
         :expect_expression_after_splat_hash,
         :expect_expression_after_star,
         :expect_ident_req_parameter,
+        :expect_in_delimiter,
         :expect_lparen_req_parameter,
         :expect_message,
         :expect_rbracket,
@@ -249,16 +253,18 @@ module Prism
         :hash_rocket,
         :hash_term,
         :hash_value,
+        :heredoc_identifier,
         :heredoc_term,
         :incomplete_question_mark,
         :incomplete_variable_class,
-        :incomplete_variable_class_3_3_0,
+        :incomplete_variable_class_3_3,
         :incomplete_variable_instance,
-        :incomplete_variable_instance_3_3_0,
+        :incomplete_variable_instance_3_3,
         :instance_variable_bare,
         :invalid_block_exit,
         :invalid_character,
         :invalid_encoding_magic_comment,
+        :invalid_escape_character,
         :invalid_float_exponent,
         :invalid_local_variable_read,
         :invalid_local_variable_write,
@@ -267,16 +273,19 @@ module Prism
         :invalid_multibyte_escape,
         :invalid_number_binary,
         :invalid_number_decimal,
+        :invalid_number_fraction,
         :invalid_number_hexadecimal,
         :invalid_number_octal,
-        :invalid_number_underscore,
+        :invalid_number_underscore_inner,
+        :invalid_number_underscore_trailing,
         :invalid_percent,
         :invalid_printable_character,
         :invalid_retry_after_else,
         :invalid_retry_after_ensure,
         :invalid_retry_without_rescue,
+        :invalid_symbol,
         :invalid_variable_global,
-        :invalid_variable_global_3_3_0,
+        :invalid_variable_global_3_3,
         :invalid_yield,
         :it_not_allowed_numbered,
         :it_not_allowed_ordinary,
@@ -310,6 +319,7 @@ module Prism
         :parameter_assoc_splat_multi,
         :parameter_block_multi,
         :parameter_circular,
+        :parameter_forwarding_after_rest,
         :parameter_method_name,
         :parameter_name_duplicated,
         :parameter_no_default,
@@ -320,6 +330,7 @@ module Prism
         :parameter_star,
         :parameter_unexpected_fwd,
         :parameter_wild_loose_comma,
+        :parameter_unexpected_no_kw,
         :pattern_capture_duplicate,
         :pattern_expression_after_bracket,
         :pattern_expression_after_comma,
@@ -331,8 +342,10 @@ module Prism
         :pattern_expression_after_pipe,
         :pattern_expression_after_range,
         :pattern_expression_after_rest,
+        :pattern_hash_implicit,
         :pattern_hash_key,
         :pattern_hash_key_duplicate,
+        :pattern_hash_key_interpolated,
         :pattern_hash_key_label,
         :pattern_hash_key_locals,
         :pattern_ident_after_hrocket,
@@ -373,6 +386,9 @@ module Prism
         :unary_receiver,
         :undef_argument,
         :unexpected_block_argument,
+        :unexpected_index_block,
+        :unexpected_index_keywords,
+        :unexpected_safe_navigation,
         :unexpected_token_close_context,
         :unexpected_token_ignore,
         :until_term,
@@ -391,7 +407,7 @@ module Prism
         :comparison_after_comparison,
         :dot_dot_dot_eol,
         :equal_in_conditional,
-        :equal_in_conditional_3_3_0,
+        :equal_in_conditional_3_3,
         :end_in_method,
         :duplicated_hash_key,
         :duplicated_when_clause,
@@ -404,6 +420,7 @@ module Prism
         :keyword_eol,
         :literal_in_condition_default,
         :literal_in_condition_verbose,
+        :shareable_constant_value_line,
         :shebang_carriage_return,
         :unexpected_carriage_return,
         :unreachable_statement,
@@ -721,7 +738,7 @@ module Prism
               source, load_node, load_location, load_node, location)
           when 37 then
             ConstantPathNode.new(
-              source, load_optional_node, load_node, load_location, location)
+              source, load_optional_node, load_optional_constant, load_location, load_location, location)
           when 38 then
             ConstantPathOperatorWriteNode.new(
               source, load_node, load_location, load_node, load_required_constant, location)
@@ -730,7 +747,7 @@ module Prism
               source, load_node, load_location, load_node, location)
           when 40 then
             ConstantPathTargetNode.new(
-              source, load_optional_node, load_node, load_location, location)
+              source, load_optional_node, load_optional_constant, load_location, load_location, location)
           when 41 then
             ConstantPathWriteNode.new(
               source, load_node, load_location, load_node, location)
@@ -1004,7 +1021,7 @@ module Prism
               source, location)
           when 131 then
             ReturnNode.new(
-              source, load_location, load_optional_node, location)
+              source, load_varuint, load_location, load_optional_node, location)
           when 132 then
             SelfNode.new(
               source, location)
@@ -1256,7 +1273,7 @@ module Prism
             -> {
               location = load_location
               ConstantPathNode.new(
-                source, load_optional_node, load_node, load_location, location)
+                source, load_optional_node, load_optional_constant, load_location, load_location, location)
             },
             -> {
               location = load_location
@@ -1271,7 +1288,7 @@ module Prism
             -> {
               location = load_location
               ConstantPathTargetNode.new(
-                source, load_optional_node, load_node, load_location, location)
+                source, load_optional_node, load_optional_constant, load_location, load_location, location)
             },
             -> {
               location = load_location
@@ -1727,7 +1744,7 @@ module Prism
             -> {
               location = load_location
               ReturnNode.new(
-                source, load_location, load_optional_node, location)
+                source, load_varuint, load_location, load_optional_node, location)
             },
             -> {
               location = load_location

data/lib/prism/translation/parser/compiler.rb

@@ -328,18 +328,48 @@ module Prism
               [],
               nil
             ),
-            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
             visit(node.value)
           )
         end
 
         # foo.bar &&= baz
         # ^^^^^^^^^^^^^^^
-        alias visit_call_and_write_node visit_call_operator_write_node
+        def visit_call_and_write_node(node)
+          call_operator_loc = node.call_operator_loc
+
+          builder.op_assign(
+            builder.call_method(
+              visit(node.receiver),
+              call_operator_loc.nil? ? nil : [{ "." => :dot, "&." => :anddot, "::" => "::" }.fetch(call_operator_loc.slice), srange(call_operator_loc)],
+              node.message_loc ? [node.read_name, srange(node.message_loc)] : nil,
+              nil,
+              [],
+              nil
+            ),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # foo.bar ||= baz
         # ^^^^^^^^^^^^^^^
-        alias visit_call_or_write_node visit_call_operator_write_node
+        def visit_call_or_write_node(node)
+          call_operator_loc = node.call_operator_loc
+
+          builder.op_assign(
+            builder.call_method(
+              visit(node.receiver),
+              call_operator_loc.nil? ? nil : [{ "." => :dot, "&." => :anddot, "::" => "::" }.fetch(call_operator_loc.slice), srange(call_operator_loc)],
+              node.message_loc ? [node.read_name, srange(node.message_loc)] : nil,
+              nil,
+              [],
+              nil
+            ),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # foo.bar, = 1
         # ^^^^^^^
@@ -419,18 +449,30 @@ module Prism
         def visit_class_variable_operator_write_node(node)
           builder.op_assign(
             builder.assignable(builder.cvar(token(node.name_loc))),
-            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
             visit(node.value)
           )
         end
 
         # @@foo &&= bar
         # ^^^^^^^^^^^^^
-        alias visit_class_variable_and_write_node visit_class_variable_operator_write_node
+        def visit_class_variable_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.cvar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # @@foo ||= bar
         # ^^^^^^^^^^^^^
-        alias visit_class_variable_or_write_node visit_class_variable_operator_write_node
+        def visit_class_variable_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.cvar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # @@foo, = bar
         # ^^^^^
@@ -458,18 +500,30 @@ module Prism
         def visit_constant_operator_write_node(node)
           builder.op_assign(
             builder.assignable(builder.const([node.name, srange(node.name_loc)])),
-            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
             visit(node.value)
           )
         end
 
         # Foo &&= bar
         # ^^^^^^^^^^^^
-        alias visit_constant_and_write_node visit_constant_operator_write_node
+        def visit_constant_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.const([node.name, srange(node.name_loc)])),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # Foo ||= bar
         # ^^^^^^^^^^^^
-        alias visit_constant_or_write_node visit_constant_operator_write_node
+        def visit_constant_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.const([node.name, srange(node.name_loc)])),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # Foo, = bar
         # ^^^
@@ -483,13 +537,13 @@ module Prism
           if node.parent.nil?
             builder.const_global(
               token(node.delimiter_loc),
-              [node.child.name, srange(node.child.location)]
+              [node.name, srange(node.name_loc)]
             )
           else
             builder.const_fetch(
               visit(node.parent),
               token(node.delimiter_loc),
-              [node.child.name, srange(node.child.location)]
+              [node.name, srange(node.name_loc)]
             )
           end
         end
@@ -512,18 +566,30 @@ module Prism
         def visit_constant_path_operator_write_node(node)
           builder.op_assign(
             builder.assignable(visit(node.target)),
-            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
             visit(node.value)
           )
         end
 
         # Foo::Bar &&= baz
         # ^^^^^^^^^^^^^^^^
-        alias visit_constant_path_and_write_node visit_constant_path_operator_write_node
+        def visit_constant_path_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(visit(node.target)),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # Foo::Bar ||= baz
         # ^^^^^^^^^^^^^^^^
-        alias visit_constant_path_or_write_node visit_constant_path_operator_write_node
+        def visit_constant_path_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(visit(node.target)),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # Foo::Bar, = baz
         # ^^^^^^^^
@@ -711,18 +777,30 @@ module Prism
         def visit_global_variable_operator_write_node(node)
           builder.op_assign(
             builder.assignable(builder.gvar(token(node.name_loc))),
-            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
             visit(node.value)
           )
         end
 
         # $foo &&= bar
         # ^^^^^^^^^^^^
-        alias visit_global_variable_and_write_node visit_global_variable_operator_write_node
+        def visit_global_variable_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.gvar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # $foo ||= bar
         # ^^^^^^^^^^^^
-        alias visit_global_variable_or_write_node visit_global_variable_operator_write_node
+        def visit_global_variable_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.gvar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # $foo, = bar
         # ^^^^
@@ -857,18 +935,46 @@ module Prism
               visit_all(arguments),
               token(node.closing_loc)
             ),
-            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
             visit(node.value)
           )
         end
 
         # foo[bar] &&= baz
         # ^^^^^^^^^^^^^^^^
-        alias visit_index_and_write_node visit_index_operator_write_node
+        def visit_index_and_write_node(node)
+          arguments = node.arguments&.arguments || []
+          arguments << node.block if node.block
+
+          builder.op_assign(
+            builder.index(
+              visit(node.receiver),
+              token(node.opening_loc),
+              visit_all(arguments),
+              token(node.closing_loc)
+            ),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # foo[bar] ||= baz
         # ^^^^^^^^^^^^^^^^
-        alias visit_index_or_write_node visit_index_operator_write_node
+        def visit_index_or_write_node(node)
+          arguments = node.arguments&.arguments || []
+          arguments << node.block if node.block
+
+          builder.op_assign(
+            builder.index(
+              visit(node.receiver),
+              token(node.opening_loc),
+              visit_all(arguments),
+              token(node.closing_loc)
+            ),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # foo[bar], = 1
         # ^^^^^^^^
@@ -902,18 +1008,30 @@ module Prism
         def visit_instance_variable_operator_write_node(node)
           builder.op_assign(
             builder.assignable(builder.ivar(token(node.name_loc))),
-            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
             visit(node.value)
           )
         end
 
         # @foo &&= bar
         # ^^^^^^^^^^^^
-        alias visit_instance_variable_and_write_node visit_instance_variable_operator_write_node
+        def visit_instance_variable_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ivar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # @foo ||= bar
         # ^^^^^^^^^^^^
-        alias visit_instance_variable_or_write_node visit_instance_variable_operator_write_node
+        def visit_instance_variable_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ivar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # @foo, = bar
         # ^^^^
@@ -1108,18 +1226,30 @@ module Prism
         def visit_local_variable_operator_write_node(node)
           builder.op_assign(
             builder.assignable(builder.ident(token(node.name_loc))),
-            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
             visit(node.value)
           )
         end
 
         # foo &&= bar
         # ^^^^^^^^^^^
-        alias visit_local_variable_and_write_node visit_local_variable_operator_write_node
+        def visit_local_variable_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ident(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # foo ||= bar
         # ^^^^^^^^^^^
-        alias visit_local_variable_or_write_node visit_local_variable_operator_write_node
+        def visit_local_variable_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ident(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
 
         # foo, = bar
         # ^^^

data/lib/prism/translation/parser.rb

@@ -46,7 +46,7 @@ module Prism
         source = source_buffer.source
 
         offset_cache = build_offset_cache(source)
-        result = unwrap(Prism.parse(source, filepath: source_buffer.name, version: convert_for_prism(version)), offset_cache)
+        result = unwrap(Prism.parse(source, filepath: source_buffer.name, version: convert_for_prism(version), scopes: [[]]), offset_cache)
 
         build_ast(result.value, offset_cache)
       ensure
@@ -59,7 +59,7 @@ module Prism
         source = source_buffer.source
 
         offset_cache = build_offset_cache(source)
-        result = unwrap(Prism.parse(source, filepath: source_buffer.name, version: convert_for_prism(version)), offset_cache)
+        result = unwrap(Prism.parse(source, filepath: source_buffer.name, version: convert_for_prism(version), scopes: [[]]), offset_cache)
 
         [
           build_ast(result.value, offset_cache),
@@ -78,7 +78,7 @@ module Prism
         offset_cache = build_offset_cache(source)
         result =
           begin
-            unwrap(Prism.parse_lex(source, filepath: source_buffer.name, version: convert_for_prism(version)), offset_cache)
+            unwrap(Prism.parse_lex(source, filepath: source_buffer.name, version: convert_for_prism(version), scopes: [[]]), offset_cache)
           rescue ::Parser::SyntaxError
             raise if !recover
           end
@@ -149,17 +149,17 @@ module Prism
           Diagnostic.new(:error, :endless_setter, {}, diagnostic_location, [])
         when :embdoc_term
           Diagnostic.new(:error, :embedded_document, {}, diagnostic_location, [])
-        when :incomplete_variable_class, :incomplete_variable_class_3_3_0
+        when :incomplete_variable_class, :incomplete_variable_class_3_3
           location = location.copy(length: location.length + 1)
           diagnostic_location = build_range(location, offset_cache)
 
           Diagnostic.new(:error, :cvar_name, { name: location.slice }, diagnostic_location, [])
-        when :incomplete_variable_instance, :incomplete_variable_instance_3_3_0
+        when :incomplete_variable_instance, :incomplete_variable_instance_3_3
           location = location.copy(length: location.length + 1)
           diagnostic_location = build_range(location, offset_cache)
 
           Diagnostic.new(:error, :ivar_name, { name: location.slice }, diagnostic_location, [])
-        when :invalid_variable_global, :invalid_variable_global_3_3_0
+        when :invalid_variable_global, :invalid_variable_global_3_3
           Diagnostic.new(:error, :gvar_name, { name: location.slice }, diagnostic_location, [])
         when :module_in_method
           Diagnostic.new(:error, :module_in_def, {}, diagnostic_location, [])
@@ -284,7 +284,7 @@ module Prism
       def convert_for_prism(version)
         case version
         when 33
-          "3.3.0"
+          "3.3.1"
         when 34
           "3.4.0"
         else