prism 0.27.0 → 0.29.0

data/ext/prism/extconf.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rbconfig"
+
 if ARGV.delete("--help")
   print(<<~TEXT)
     USAGE: ruby #{$PROGRAM_NAME} [options]
@@ -40,26 +42,6 @@ def generate_templates
   end
 end
 
-# We're going to need to run `make` using prism's `Makefile`. We want to match
-# up as much of the configuration to the configuration that built the current
-# version of Ruby as possible.
-require "rbconfig"
-env = RbConfig::CONFIG.slice("SOEXT", "CPPFLAGS", "CFLAGS", "CC", "AR", "ARFLAGS", "MAKEDIRS", "RMALL")
-
-# It's possible that the Ruby that is being run wasn't actually compiled on this
-# machine, in which case the configuration might be incorrect. In this case
-# we'll need to do some additional checks and potentially fall back to defaults.
-if env.key?("CC") && !File.exist?(env["CC"])
-  env.delete("CC")
-  env.delete("CFLAGS")
-  env.delete("CPPFLAGS")
-end
-
-if env.key?("AR") && !File.exist?(env["AR"])
-  env.delete("AR")
-  env.delete("ARFLAGS")
-end
-
 # Runs `make` in the root directory of the project. Note that this is the
 # `Makefile` for the overall project, not the `Makefile` that is being generated
 # by this script.`
@@ -77,15 +59,37 @@ end
 
 # On non-CRuby we only need the shared library since we'll interface with it
 # through FFI, so we'll build only that and not the C extension. We also avoid
-# `require "mkmf"` as that prepends the LLVM toolchain to PATH on TruffleRuby,
-# but we want to use the native toolchain here since libprism is run natively.
+# `require "mkmf"` as that prepends the GraalVM LLVM toolchain to PATH on TruffleRuby < 24.0,
+# but we want to use the system toolchain here since libprism is run natively.
 if RUBY_ENGINE != "ruby"
   generate_templates
-  make(env, "build/libprism.#{RbConfig::CONFIG["SOEXT"]}")
+  soext = RbConfig::CONFIG["SOEXT"]
+  # Pass SOEXT to avoid an extra subprocess just to query that
+  make({ "SOEXT" => soext }, "build/libprism.#{soext}")
   File.write("Makefile", "all install clean:\n\t@#{RbConfig::CONFIG["NULLCMD"]}\n")
   return
 end
 
+# We're going to need to run `make` using prism's `Makefile`.
+# We want to use the same toolchain (compiler, flags, etc) to compile libprism.a and
+# the C extension since they will be linked together.
+# The C extension uses RbConfig, which contains values from the toolchain that built the running Ruby.
+env = RbConfig::CONFIG.slice("SOEXT", "CPPFLAGS", "CFLAGS", "CC", "AR", "ARFLAGS", "MAKEDIRS", "RMALL")
+
+# It's possible that the Ruby that is being run wasn't actually compiled on this
+# machine, in which case parts of RbConfig might be incorrect. In this case
+# we'll need to do some additional checks and potentially fall back to defaults.
+if env.key?("CC") && !File.exist?(env["CC"])
+  env.delete("CC")
+  env.delete("CFLAGS")
+  env.delete("CPPFLAGS")
+end
+
+if env.key?("AR") && !File.exist?(env["AR"])
+  env.delete("AR")
+  env.delete("ARFLAGS")
+end
+
 require "mkmf"
 
 # First, ensure that we can find the header for the prism library.

data/ext/prism/extension.c

@@ -32,6 +32,7 @@ ID rb_option_id_frozen_string_literal;
 ID rb_option_id_line;
 ID rb_option_id_scopes;
 ID rb_option_id_version;
+ID rb_prism_source_id_for;
 
 /******************************************************************************/
 /* IO of Ruby code                                                            */
@@ -599,8 +600,7 @@ parse_lex_input(pm_string_t *input, const pm_options_t *options, bool return_nod
 
     VALUE source_string = rb_str_new((const char *) pm_string_source(input), pm_string_length(input));
     VALUE offsets = rb_ary_new();
-    VALUE source_argv[] = { source_string, LONG2NUM(parser.start_line), offsets };
-    VALUE source = rb_class_new_instance(3, source_argv, rb_cPrismSource);
+    VALUE source = rb_funcall(rb_cPrismSource, rb_prism_source_id_for, 3, source_string, LONG2NUM(parser.start_line), offsets);
 
     parse_lex_data_t parse_lex_data = {
         .source = source,
@@ -1243,7 +1243,7 @@ static_inspect(int argc, VALUE *argv, VALUE self) {
     pm_node_t *node = ((pm_program_node_t *) program)->statements->body.nodes[0];
 
     pm_buffer_t buffer = { 0 };
-    pm_static_literal_inspect(&buffer, &parser, node);
+    pm_static_literal_inspect(&buffer, &parser.newline_list, parser.start_line, parser.encoding->name, node);
 
     rb_encoding *encoding = rb_enc_find(parser.encoding->name);
     VALUE result = rb_enc_str_new(pm_buffer_value(&buffer), pm_buffer_length(&buffer), encoding);
@@ -1379,6 +1379,8 @@ Init_prism(void) {
     rb_option_id_scopes = rb_intern_const("scopes");
     rb_option_id_version = rb_intern_const("version");
 
+    rb_prism_source_id_for = rb_intern("for");
+
     /**
      * The version of the prism library.
      */

data/ext/prism/extension.h

@@ -1,7 +1,7 @@
 #ifndef PRISM_EXT_NODE_H
 #define PRISM_EXT_NODE_H
 
-#define EXPECTED_PRISM_VERSION "0.27.0"
+#define EXPECTED_PRISM_VERSION "0.29.0"
 
 #include <ruby.h>
 #include <ruby/encoding.h>

data/include/prism/ast.h

@@ -1235,6 +1235,7 @@ typedef struct pm_and_node {
  *
  * Type: PM_ARGUMENTS_NODE
  * Flags:
+ *    PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS
  *    PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORD_SPLAT
  *
  * @extends pm_node_t
@@ -1817,14 +1818,14 @@ typedef struct pm_call_operator_write_node {
     pm_constant_id_t write_name;
 
     /**
-     * CallOperatorWriteNode#operator
+     * CallOperatorWriteNode#binary_operator
      */
-    pm_constant_id_t operator;
+    pm_constant_id_t binary_operator;
 
     /**
-     * CallOperatorWriteNode#operator_loc
+     * CallOperatorWriteNode#binary_operator_loc
      */
-    pm_location_t operator_loc;
+    pm_location_t binary_operator_loc;
 
     /**
      * CallOperatorWriteNode#value
@@ -2128,9 +2129,9 @@ typedef struct pm_class_variable_operator_write_node {
     pm_location_t name_loc;
 
     /**
-     * ClassVariableOperatorWriteNode#operator_loc
+     * ClassVariableOperatorWriteNode#binary_operator_loc
      */
-    pm_location_t operator_loc;
+    pm_location_t binary_operator_loc;
 
     /**
      * ClassVariableOperatorWriteNode#value
@@ -2138,9 +2139,9 @@ typedef struct pm_class_variable_operator_write_node {
     struct pm_node *value;
 
     /**
-     * ClassVariableOperatorWriteNode#operator
+     * ClassVariableOperatorWriteNode#binary_operator
      */
-    pm_constant_id_t operator;
+    pm_constant_id_t binary_operator;
 } pm_class_variable_operator_write_node_t;
 
 /**
@@ -2325,9 +2326,9 @@ typedef struct pm_constant_operator_write_node {
     pm_location_t name_loc;
 
     /**
-     * ConstantOperatorWriteNode#operator_loc
+     * ConstantOperatorWriteNode#binary_operator_loc
      */
-    pm_location_t operator_loc;
+    pm_location_t binary_operator_loc;
 
     /**
      * ConstantOperatorWriteNode#value
@@ -2335,9 +2336,9 @@ typedef struct pm_constant_operator_write_node {
     struct pm_node *value;
 
     /**
-     * ConstantOperatorWriteNode#operator
+     * ConstantOperatorWriteNode#binary_operator
      */
-    pm_constant_id_t operator;
+    pm_constant_id_t binary_operator;
 } pm_constant_operator_write_node_t;
 
 /**
@@ -2427,21 +2428,11 @@ typedef struct pm_constant_path_node {
     struct pm_node *parent;
 
     /**
-     * ConstantPathNode#child
-     *
-     * The right-hand node of the path. Always a `ConstantReadNode` in a
-     * valid Ruby syntax tree.
-     *
-     *     ::Foo
-     *       ^^^
-     *
-     *     self::Test
-     *           ^^^^
+     * ConstantPathNode#name
      *
-     *     a.b::C
-     *          ^
+     * The name of the constant being accessed. This could be `nil` in the event of a syntax error.
      */
-    struct pm_node *child;
+    pm_constant_id_t name;
 
     /**
      * ConstantPathNode#delimiter_loc
@@ -2455,6 +2446,19 @@ typedef struct pm_constant_path_node {
      *        ^^
      */
     pm_location_t delimiter_loc;
+
+    /**
+     * ConstantPathNode#name_loc
+     *
+     * The location of the name of the constant.
+     *
+     *     ::Foo
+     *       ^^^
+     *
+     *     One::Two
+     *          ^^^
+     */
+    pm_location_t name_loc;
 } pm_constant_path_node_t;
 
 /**
@@ -2474,9 +2478,9 @@ typedef struct pm_constant_path_operator_write_node {
     struct pm_constant_path_node *target;
 
     /**
-     * ConstantPathOperatorWriteNode#operator_loc
+     * ConstantPathOperatorWriteNode#binary_operator_loc
      */
-    pm_location_t operator_loc;
+    pm_location_t binary_operator_loc;
 
     /**
      * ConstantPathOperatorWriteNode#value
@@ -2484,9 +2488,9 @@ typedef struct pm_constant_path_operator_write_node {
     struct pm_node *value;
 
     /**
-     * ConstantPathOperatorWriteNode#operator
+     * ConstantPathOperatorWriteNode#binary_operator
      */
-    pm_constant_id_t operator;
+    pm_constant_id_t binary_operator;
 } pm_constant_path_operator_write_node_t;
 
 /**
@@ -2533,14 +2537,19 @@ typedef struct pm_constant_path_target_node {
     struct pm_node *parent;
 
     /**
-     * ConstantPathTargetNode#child
+     * ConstantPathTargetNode#name
      */
-    struct pm_node *child;
+    pm_constant_id_t name;
 
     /**
      * ConstantPathTargetNode#delimiter_loc
      */
     pm_location_t delimiter_loc;
+
+    /**
+     * ConstantPathTargetNode#name_loc
+     */
+    pm_location_t name_loc;
 } pm_constant_path_target_node_t;
 
 /**
@@ -3135,9 +3144,9 @@ typedef struct pm_global_variable_operator_write_node {
     pm_location_t name_loc;
 
     /**
-     * GlobalVariableOperatorWriteNode#operator_loc
+     * GlobalVariableOperatorWriteNode#binary_operator_loc
      */
-    pm_location_t operator_loc;
+    pm_location_t binary_operator_loc;
 
     /**
      * GlobalVariableOperatorWriteNode#value
@@ -3145,9 +3154,9 @@ typedef struct pm_global_variable_operator_write_node {
     struct pm_node *value;
 
     /**
-     * GlobalVariableOperatorWriteNode#operator
+     * GlobalVariableOperatorWriteNode#binary_operator
      */
-    pm_constant_id_t operator;
+    pm_constant_id_t binary_operator;
 } pm_global_variable_operator_write_node_t;
 
 /**
@@ -3642,14 +3651,14 @@ typedef struct pm_index_operator_write_node {
     struct pm_node *block;
 
     /**
-     * IndexOperatorWriteNode#operator
+     * IndexOperatorWriteNode#binary_operator
      */
-    pm_constant_id_t operator;
+    pm_constant_id_t binary_operator;
 
     /**
-     * IndexOperatorWriteNode#operator_loc
+     * IndexOperatorWriteNode#binary_operator_loc
      */
-    pm_location_t operator_loc;
+    pm_location_t binary_operator_loc;
 
     /**
      * IndexOperatorWriteNode#value
@@ -3810,9 +3819,9 @@ typedef struct pm_instance_variable_operator_write_node {
     pm_location_t name_loc;
 
     /**
-     * InstanceVariableOperatorWriteNode#operator_loc
+     * InstanceVariableOperatorWriteNode#binary_operator_loc
      */
-    pm_location_t operator_loc;
+    pm_location_t binary_operator_loc;
 
     /**
      * InstanceVariableOperatorWriteNode#value
@@ -3820,9 +3829,9 @@ typedef struct pm_instance_variable_operator_write_node {
     struct pm_node *value;
 
     /**
-     * InstanceVariableOperatorWriteNode#operator
+     * InstanceVariableOperatorWriteNode#binary_operator
      */
-    pm_constant_id_t operator;
+    pm_constant_id_t binary_operator;
 } pm_instance_variable_operator_write_node_t;
 
 /**
@@ -4295,9 +4304,9 @@ typedef struct pm_local_variable_operator_write_node {
     pm_location_t name_loc;
 
     /**
-     * LocalVariableOperatorWriteNode#operator_loc
+     * LocalVariableOperatorWriteNode#binary_operator_loc
      */
-    pm_location_t operator_loc;
+    pm_location_t binary_operator_loc;
 
     /**
      * LocalVariableOperatorWriteNode#value
@@ -4310,9 +4319,9 @@ typedef struct pm_local_variable_operator_write_node {
     pm_constant_id_t name;
 
     /**
-     * LocalVariableOperatorWriteNode#operator
+     * LocalVariableOperatorWriteNode#binary_operator
      */
-    pm_constant_id_t operator;
+    pm_constant_id_t binary_operator;
 
     /**
      * LocalVariableOperatorWriteNode#depth
@@ -5455,6 +5464,8 @@ typedef struct pm_retry_node {
  * ReturnNode
  *
  * Type: PM_RETURN_NODE
+ * Flags:
+ *    PM_RETURN_NODE_FLAGS_REDUNDANT
  *
  * @extends pm_node_t
  */
@@ -6029,8 +6040,11 @@ typedef struct pm_yield_node {
  * Flags for arguments nodes.
  */
 typedef enum pm_arguments_node_flags {
+    /** if arguments contain keywords */
+    PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS = 1,
+
     /** if arguments contain keyword splat */
-    PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORD_SPLAT = 1,
+    PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORD_SPLAT = 2,
 } pm_arguments_node_flags_t;
 
 /**
@@ -6167,6 +6181,14 @@ typedef enum pm_regular_expression_flags {
     PM_REGULAR_EXPRESSION_FLAGS_FORCED_US_ASCII_ENCODING = 1024,
 } pm_regular_expression_flags_t;
 
+/**
+ * Flags for return nodes.
+ */
+typedef enum pm_return_node_flags {
+    /** a return statement that is redundant because it is the last statement in a method */
+    PM_RETURN_NODE_FLAGS_REDUNDANT = 1,
+} pm_return_node_flags_t;
+
 /**
  * Flags for shareable constant nodes.
  */

data/include/prism/diagnostic.h

@@ -36,13 +36,16 @@ typedef enum {
     PM_ERR_ARGUMENT_BARE_HASH,
     PM_ERR_ARGUMENT_BLOCK_FORWARDING,
     PM_ERR_ARGUMENT_BLOCK_MULTI,
+    PM_ERR_ARGUMENT_CONFLICT_AMPERSAND,
+    PM_ERR_ARGUMENT_CONFLICT_STAR,
+    PM_ERR_ARGUMENT_CONFLICT_STAR_STAR,
     PM_ERR_ARGUMENT_FORMAL_CLASS,
     PM_ERR_ARGUMENT_FORMAL_CONSTANT,
     PM_ERR_ARGUMENT_FORMAL_GLOBAL,
     PM_ERR_ARGUMENT_FORMAL_IVAR,
     PM_ERR_ARGUMENT_FORWARDING_UNBOUND,
     PM_ERR_ARGUMENT_IN,
-    PM_ERR_ARGUMENT_NO_FORWARDING_AMP,
+    PM_ERR_ARGUMENT_NO_FORWARDING_AMPERSAND,
     PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES,
     PM_ERR_ARGUMENT_NO_FORWARDING_STAR,
     PM_ERR_ARGUMENT_NO_FORWARDING_STAR_STAR,
@@ -124,6 +127,7 @@ typedef enum {
     PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT_HASH,
     PM_ERR_EXPECT_EXPRESSION_AFTER_STAR,
     PM_ERR_EXPECT_IDENT_REQ_PARAMETER,
+    PM_ERR_EXPECT_IN_DELIMITER,
     PM_ERR_EXPECT_LPAREN_REQ_PARAMETER,
     PM_ERR_EXPECT_MESSAGE,
     PM_ERR_EXPECT_RBRACKET,
@@ -152,16 +156,18 @@ typedef enum {
     PM_ERR_HASH_ROCKET,
     PM_ERR_HASH_TERM,
     PM_ERR_HASH_VALUE,
+    PM_ERR_HEREDOC_IDENTIFIER,
     PM_ERR_HEREDOC_TERM,
     PM_ERR_INCOMPLETE_QUESTION_MARK,
     PM_ERR_INCOMPLETE_VARIABLE_CLASS,
-    PM_ERR_INCOMPLETE_VARIABLE_CLASS_3_3_0,
+    PM_ERR_INCOMPLETE_VARIABLE_CLASS_3_3,
     PM_ERR_INCOMPLETE_VARIABLE_INSTANCE,
-    PM_ERR_INCOMPLETE_VARIABLE_INSTANCE_3_3_0,
+    PM_ERR_INCOMPLETE_VARIABLE_INSTANCE_3_3,
     PM_ERR_INSTANCE_VARIABLE_BARE,
     PM_ERR_INVALID_BLOCK_EXIT,
     PM_ERR_INVALID_CHARACTER,
     PM_ERR_INVALID_ENCODING_MAGIC_COMMENT,
+    PM_ERR_INVALID_ESCAPE_CHARACTER,
     PM_ERR_INVALID_FLOAT_EXPONENT,
     PM_ERR_INVALID_LOCAL_VARIABLE_READ,
     PM_ERR_INVALID_LOCAL_VARIABLE_WRITE,
@@ -170,16 +176,19 @@ typedef enum {
     PM_ERR_INVALID_MULTIBYTE_ESCAPE,
     PM_ERR_INVALID_NUMBER_BINARY,
     PM_ERR_INVALID_NUMBER_DECIMAL,
+    PM_ERR_INVALID_NUMBER_FRACTION,
     PM_ERR_INVALID_NUMBER_HEXADECIMAL,
     PM_ERR_INVALID_NUMBER_OCTAL,
-    PM_ERR_INVALID_NUMBER_UNDERSCORE,
+    PM_ERR_INVALID_NUMBER_UNDERSCORE_INNER,
+    PM_ERR_INVALID_NUMBER_UNDERSCORE_TRAILING,
     PM_ERR_INVALID_PERCENT,
     PM_ERR_INVALID_PRINTABLE_CHARACTER,
     PM_ERR_INVALID_RETRY_AFTER_ELSE,
     PM_ERR_INVALID_RETRY_AFTER_ENSURE,
     PM_ERR_INVALID_RETRY_WITHOUT_RESCUE,
+    PM_ERR_INVALID_SYMBOL,
     PM_ERR_INVALID_VARIABLE_GLOBAL,
-    PM_ERR_INVALID_VARIABLE_GLOBAL_3_3_0,
+    PM_ERR_INVALID_VARIABLE_GLOBAL_3_3,
     PM_ERR_INVALID_YIELD,
     PM_ERR_IT_NOT_ALLOWED_NUMBERED,
     PM_ERR_IT_NOT_ALLOWED_ORDINARY,
@@ -213,6 +222,7 @@ typedef enum {
     PM_ERR_PARAMETER_ASSOC_SPLAT_MULTI,
     PM_ERR_PARAMETER_BLOCK_MULTI,
     PM_ERR_PARAMETER_CIRCULAR,
+    PM_ERR_PARAMETER_FORWARDING_AFTER_REST,
     PM_ERR_PARAMETER_METHOD_NAME,
     PM_ERR_PARAMETER_NAME_DUPLICATED,
     PM_ERR_PARAMETER_NO_DEFAULT,
@@ -223,6 +233,7 @@ typedef enum {
     PM_ERR_PARAMETER_STAR,
     PM_ERR_PARAMETER_UNEXPECTED_FWD,
     PM_ERR_PARAMETER_WILD_LOOSE_COMMA,
+    PM_ERR_PARAMETER_UNEXPECTED_NO_KW,
     PM_ERR_PATTERN_CAPTURE_DUPLICATE,
     PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET,
     PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA,
@@ -234,8 +245,10 @@ typedef enum {
     PM_ERR_PATTERN_EXPRESSION_AFTER_PIPE,
     PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE,
     PM_ERR_PATTERN_EXPRESSION_AFTER_REST,
+    PM_ERR_PATTERN_HASH_IMPLICIT,
     PM_ERR_PATTERN_HASH_KEY,
     PM_ERR_PATTERN_HASH_KEY_DUPLICATE,
+    PM_ERR_PATTERN_HASH_KEY_INTERPOLATED,
     PM_ERR_PATTERN_HASH_KEY_LABEL,
     PM_ERR_PATTERN_HASH_KEY_LOCALS,
     PM_ERR_PATTERN_IDENT_AFTER_HROCKET,
@@ -276,6 +289,9 @@ typedef enum {
     PM_ERR_UNARY_RECEIVER,
     PM_ERR_UNDEF_ARGUMENT,
     PM_ERR_UNEXPECTED_BLOCK_ARGUMENT,
+    PM_ERR_UNEXPECTED_INDEX_BLOCK,
+    PM_ERR_UNEXPECTED_INDEX_KEYWORDS,
+    PM_ERR_UNEXPECTED_SAFE_NAVIGATION,
     PM_ERR_UNEXPECTED_TOKEN_CLOSE_CONTEXT,
     PM_ERR_UNEXPECTED_TOKEN_IGNORE,
     PM_ERR_UNTIL_TERM,
@@ -296,7 +312,7 @@ typedef enum {
     PM_WARN_COMPARISON_AFTER_COMPARISON,
     PM_WARN_DOT_DOT_DOT_EOL,
     PM_WARN_EQUAL_IN_CONDITIONAL,
-    PM_WARN_EQUAL_IN_CONDITIONAL_3_3_0,
+    PM_WARN_EQUAL_IN_CONDITIONAL_3_3,
     PM_WARN_END_IN_METHOD,
     PM_WARN_DUPLICATED_HASH_KEY,
     PM_WARN_DUPLICATED_WHEN_CLAUSE,
@@ -309,6 +325,7 @@ typedef enum {
     PM_WARN_KEYWORD_EOL,
     PM_WARN_LITERAL_IN_CONDITION_DEFAULT,
     PM_WARN_LITERAL_IN_CONDITION_VERBOSE,
+    PM_WARN_SHAREABLE_CONSTANT_VALUE_LINE,
     PM_WARN_SHEBANG_CARRIAGE_RETURN,
     PM_WARN_UNEXPECTED_CARRIAGE_RETURN,
     PM_WARN_UNREACHABLE_STATEMENT,

data/include/prism/options.h

@@ -49,8 +49,8 @@ typedef enum {
     /** The current version of prism. */
     PM_OPTIONS_VERSION_LATEST = 0,
 
-    /** The vendored version of prism in CRuby 3.3.0. */
-    PM_OPTIONS_VERSION_CRUBY_3_3_0 = 1
+    /** The vendored version of prism in CRuby 3.3.x. */
+    PM_OPTIONS_VERSION_CRUBY_3_3 = 1
 } pm_options_version_t;
 
 /**

data/include/prism/parser.h

@@ -10,6 +10,7 @@
 #include "prism/ast.h"
 #include "prism/encoding.h"
 #include "prism/options.h"
+#include "prism/static_literals.h"
 #include "prism/util/pm_constant_pool.h"
 #include "prism/util/pm_list.h"
 #include "prism/util/pm_newline_list.h"
@@ -717,6 +718,15 @@ struct pm_parser {
     /** The current parsing context. */
     pm_context_node_t *current_context;
 
+    /**
+     * The hash keys for the hash that is currently being parsed. This is not
+     * usually necessary because it can pass it down the various call chains,
+     * but in the event that you're parsing a hash that is being directly
+     * pushed into another hash with **, we need to share the hash keys so that
+     * we can warn for the nested hash as well.
+     */
+    pm_static_literals_t *current_hash_keys;
+
     /**
      * The encoding functions for the current file is attached to the parser as
      * it's parsing so that it can change with a magic comment.

data/include/prism/static_literals.h

@@ -8,8 +8,7 @@
 
 #include "prism/defines.h"
 #include "prism/ast.h"
-#include "prism/node.h"
-#include "prism/parser.h"
+#include "prism/util/pm_newline_list.h"
 
 #include <assert.h>
 #include <stdbool.h>
@@ -92,12 +91,13 @@ typedef struct {
 /**
  * Add a node to the set of static literals.
  *
- * @param parser The parser that created the node.
+ * @param newline_list The list of newline offsets to use to calculate lines.
+ * @param start_line The line number that the parser starts on.
  * @param literals The set of static literals to add the node to.
  * @param node The node to add to the set.
  * @return A pointer to the node that is being overwritten, if there is one.
  */
-pm_node_t * pm_static_literals_add(const pm_parser_t *parser, pm_static_literals_t *literals, pm_node_t *node);
+pm_node_t * pm_static_literals_add(const pm_newline_list_t *newline_list, int32_t start_line, pm_static_literals_t *literals, pm_node_t *node);
 
 /**
  * Free the internal memory associated with the given static literals set.
@@ -110,9 +110,11 @@ void pm_static_literals_free(pm_static_literals_t *literals);
  * Create a string-based representation of the given static literal.
  *
  * @param buffer The buffer to write the string to.
- * @param parser The parser that created the node.
+ * @param newline_list The list of newline offsets to use to calculate lines.
+ * @param start_line The line number that the parser starts on.
+ * @param encoding_name The name of the encoding of the source being parsed.
  * @param node The node to create a string representation of.
  */
-PRISM_EXPORTED_FUNCTION void pm_static_literal_inspect(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *node);
+PRISM_EXPORTED_FUNCTION void pm_static_literal_inspect(pm_buffer_t *buffer, const pm_newline_list_t *newline_list, int32_t start_line, const char *encoding_name, const pm_node_t *node);
 
 #endif

data/include/prism/version.h

@@ -14,7 +14,7 @@
 /**
  * The minor version of the Prism library as an int.
  */
-#define PRISM_VERSION_MINOR 27
+#define PRISM_VERSION_MINOR 29
 
 /**
  * The patch version of the Prism library as an int.
@@ -24,6 +24,6 @@
 /**
  * The version of the Prism library as a constant string.
  */
-#define PRISM_VERSION "0.27.0"
+#define PRISM_VERSION "0.29.0"
 
 #endif

data/lib/prism/desugar_compiler.rb

@@ -73,7 +73,7 @@ module Prism
 
     # Desugar `x += y` to `x = x + y`
     def compile
-      operator_loc = node.operator_loc.chop
+      binary_operator_loc = node.binary_operator_loc.chop
 
       write_class.new(
         source,
@@ -84,15 +84,15 @@ module Prism
           0,
           read_class.new(source, *arguments, node.name_loc),
           nil,
-          operator_loc.slice.to_sym,
-          operator_loc,
+          binary_operator_loc.slice.to_sym,
+          binary_operator_loc,
           nil,
           ArgumentsNode.new(source, 0, [node.value], node.value.location),
           nil,
           nil,
           node.location
         ),
-        node.operator_loc.copy(start_offset: node.operator_loc.end_offset - 1, length: 1),
+        node.binary_operator_loc.copy(start_offset: node.binary_operator_loc.end_offset - 1, length: 1),
         node.location
       )
     end