prism 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7715842445523172c9593bae81ff5c1a889c6735b59f1c5a879fe63bbeacd724
-  data.tar.gz: 755dd34f1e20f374aa2910482a8fac4e709e332d5313a1c80bcc2b3fc9ffbad4
+  metadata.gz: 4ac8167684c0f975fdba449e77206d97756f6c39f22ce871f79a79a61260503f
+  data.tar.gz: 6a2dd5c0a47df7c8c575ad2e5b344c789d548e93cfe82e5fa29974d46a52bb3c
 SHA512:
-  metadata.gz: 37206e932b34156ad6b1679ea379e8665d987bf9673d37a1e5f74c1abb1a442adbdc0d2045d75624e60507794bd8dd56c5b7bbc8864d7ab9cec1f9a6c1c44b05
-  data.tar.gz: 15fc69115a30581010fb65d540f8d2a0c0cd1f76d59754d9b3c1d2f4c2f4354f2f9cbb5087a7989df6b85ff5285248875d6ed40b05d2fca89753f1235948bb0d
+  metadata.gz: dfa7fe63285b85cb45aa0be681916d6891ee5e5adf2162ab5c18423417f7938afc99f00eca8fd6187fbd0b7168af088d932fbda3c1361d1c73953f39329bed70
+  data.tar.gz: 79bc51db60600d74a6bfbeae5eba3a8ec505e9809d0f7ff0b05563f1f7a8cd284cc293233397323a443217a4a5271f90b4c40516168ae3a8be0ddc2d7376cef9

data/CHANGELOG.md

@@ -6,6 +6,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.29.0] - 2024-05-10
+
+### Added
+
+- Added `Prism::CallNode#full_message_loc`, which gives the location including the `=` if there is one.
+- A warning for when `# shareable_constant_value` is not used on its own line.
+- An error for invalid implicit local variable writes.
+- Implicit hash patterns in array patterns are disallowed.
+- We now validate that Unicode escape sequences are not surrogates.
+
+### Changed
+
+- All fields named `operator` have been renamed to `binary_operator` for `*OperatorWriteNode` nodes. This is to make it easier to provide C++ support. In the Ruby API, the old fields are aliased to the new fields with a deprecation warning.
+- Many updated error messages to more closely match CRuby.
+- We ensure keyword parameters do not end in `!` or `?`.
+- Fixed some escaping in string literals with control sequences and hex escapes.
+- Fix a bug with RBS types when used outside the `ruby/prism` codebase.
+
 ## [0.28.0] - 2024-05-03
 
 ### Added
@@ -500,7 +518,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby/prism/compare/v0.28.0...HEAD
+[unreleased]: https://github.com/ruby/prism/compare/v0.29.0...HEAD
+[0.29.0]: https://github.com/ruby/prism/compare/v0.28.0...v0.29.0
 [0.28.0]: https://github.com/ruby/prism/compare/v0.27.0...v0.28.0
 [0.27.0]: https://github.com/ruby/prism/compare/v0.26.0...v0.27.0
 [0.26.0]: https://github.com/ruby/prism/compare/v0.25.0...v0.26.0

data/config.yml

@@ -7,13 +7,16 @@ errors:
   - 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
@@ -95,6 +98,7 @@ errors:
   - EXPECT_EXPRESSION_AFTER_SPLAT_HASH
   - EXPECT_EXPRESSION_AFTER_STAR
   - EXPECT_IDENT_REQ_PARAMETER
+  - EXPECT_IN_DELIMITER
   - EXPECT_LPAREN_REQ_PARAMETER
   - EXPECT_MESSAGE
   - EXPECT_RBRACKET
@@ -134,6 +138,7 @@ errors:
   - INVALID_BLOCK_EXIT
   - INVALID_CHARACTER
   - INVALID_ENCODING_MAGIC_COMMENT
+  - INVALID_ESCAPE_CHARACTER
   - INVALID_FLOAT_EXPONENT
   - INVALID_LOCAL_VARIABLE_READ
   - INVALID_LOCAL_VARIABLE_WRITE
@@ -142,6 +147,7 @@ errors:
   - INVALID_MULTIBYTE_ESCAPE
   - INVALID_NUMBER_BINARY
   - INVALID_NUMBER_DECIMAL
+  - INVALID_NUMBER_FRACTION
   - INVALID_NUMBER_HEXADECIMAL
   - INVALID_NUMBER_OCTAL
   - INVALID_NUMBER_UNDERSCORE_INNER
@@ -187,6 +193,7 @@ errors:
   - PARAMETER_ASSOC_SPLAT_MULTI
   - PARAMETER_BLOCK_MULTI
   - PARAMETER_CIRCULAR
+  - PARAMETER_FORWARDING_AFTER_REST
   - PARAMETER_METHOD_NAME
   - PARAMETER_NAME_DUPLICATED
   - PARAMETER_NO_DEFAULT
@@ -209,8 +216,10 @@ errors:
   - 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
@@ -286,6 +295,7 @@ warnings:
   - KEYWORD_EOL
   - LITERAL_IN_CONDITION_DEFAULT
   - LITERAL_IN_CONDITION_VERBOSE
+  - SHAREABLE_CONSTANT_VALUE_LINE
   - SHEBANG_CARRIAGE_RETURN
   - UNEXPECTED_CARRIAGE_RETURN
   - UNREACHABLE_STATEMENT
@@ -1203,9 +1213,9 @@ nodes:
         type: constant
       - name: write_name
         type: constant
-      - name: operator
+      - name: binary_operator
         type: constant
-      - name: operator_loc
+      - name: binary_operator_loc
         type: location
       - name: value
         type: node
@@ -1361,11 +1371,11 @@ nodes:
         type: constant
       - name: name_loc
         type: location
-      - name: operator_loc
+      - name: binary_operator_loc
         type: location
       - name: value
         type: node
-      - name: operator
+      - name: binary_operator
         type: constant
     comment: |
       Represents assigning to a class variable using an operator that isn't `=`.
@@ -1471,11 +1481,11 @@ nodes:
         type: constant
       - name: name_loc
         type: location
-      - name: operator_loc
+      - name: binary_operator_loc
         type: location
       - name: value
         type: node
-      - name: operator
+      - name: binary_operator
         type: constant
     comment: |
       Represents assigning to a constant using an operator that isn't `=`.
@@ -1559,11 +1569,11 @@ nodes:
       - name: target
         type: node
         kind: ConstantPathNode
-      - name: operator_loc
+      - name: binary_operator_loc
         type: location
       - name: value
         type: node
-      - name: operator
+      - name: binary_operator
         type: constant
     comment: |
       Represents assigning to a constant path using an operator that isn't `=`.
@@ -1930,11 +1940,11 @@ nodes:
         type: constant
       - name: name_loc
         type: location
-      - name: operator_loc
+      - name: binary_operator_loc
         type: location
       - name: value
         type: node
-      - name: operator
+      - name: binary_operator
         type: constant
     comment: |
       Represents assigning to a global variable using an operator that isn't `=`.
@@ -2266,9 +2276,9 @@ nodes:
         type: location
       - name: block
         type: node?
-      - name: operator
+      - name: binary_operator
         type: constant
-      - name: operator_loc
+      - name: binary_operator_loc
         type: location
       - name: value
         type: node
@@ -2354,11 +2364,11 @@ nodes:
         type: constant
       - name: name_loc
         type: location
-      - name: operator_loc
+      - name: binary_operator_loc
         type: location
       - name: value
         type: node
-      - name: operator
+      - name: binary_operator
         type: constant
     comment: |
       Represents assigning to an instance variable using an operator that isn't `=`.
@@ -2634,13 +2644,13 @@ nodes:
     fields:
       - name: name_loc
         type: location
-      - name: operator_loc
+      - name: binary_operator_loc
         type: location
       - name: value
         type: node
       - name: name
         type: constant
-      - name: operator
+      - name: binary_operator
         type: constant
       - name: depth
         type: uint32
@@ -3075,6 +3085,8 @@ nodes:
           # On parsing error of `f(**kwargs, ...)` or `f(**nil, ...)`, the keyword_rest value is moved here:
           - KeywordRestParameterNode
           - NoKeywordsParameterNode
+          # On parsing error of `f(..., ...)`, the first forwarding parameter is moved here:
+          - ForwardingParameterNode
       - name: keywords
         type: node[]
         kind:

data/ext/prism/api_node.c

@@ -1708,14 +1708,14 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
                     assert(cast->write_name != 0);
                     argv[6] = RARRAY_AREF(constants, cast->write_name - 1);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[7] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[7] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[8] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[8] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
@@ -2009,18 +2009,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[2] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[3] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[3] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[4] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[6] = pm_location_new(parser, node->location.start, node->location.end);
@@ -2176,18 +2176,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[2] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[3] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[3] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[4] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[6] = pm_location_new(parser, node->location.start, node->location.end);
@@ -2293,18 +2293,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 186 "api_node.c.erb"
                     argv[1] = rb_ary_pop(value_stack);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[2] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[2] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[3] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[4] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[4] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[5] = pm_location_new(parser, node->location.start, node->location.end);
@@ -2894,18 +2894,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[2] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[3] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[3] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[4] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[6] = pm_location_new(parser, node->location.start, node->location.end);
@@ -3280,14 +3280,14 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 186 "api_node.c.erb"
                     argv[7] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[8] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[8] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[9] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[9] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
@@ -3435,18 +3435,18 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[2] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[3] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[3] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
                     argv[4] = rb_ary_pop(value_stack);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // location
                     argv[6] = pm_location_new(parser, node->location.start, node->location.end);
@@ -3889,9 +3889,9 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
 #line 211 "api_node.c.erb"
                     argv[1] = pm_location_new(parser, cast->name_loc.start, cast->name_loc.end);
 
-                    // operator_loc
+                    // binary_operator_loc
 #line 211 "api_node.c.erb"
-                    argv[2] = pm_location_new(parser, cast->operator_loc.start, cast->operator_loc.end);
+                    argv[2] = pm_location_new(parser, cast->binary_operator_loc.start, cast->binary_operator_loc.end);
 
                     // value
 #line 186 "api_node.c.erb"
@@ -3902,10 +3902,10 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
                     assert(cast->name != 0);
                     argv[4] = RARRAY_AREF(constants, cast->name - 1);
 
-                    // operator
+                    // binary_operator
 #line 198 "api_node.c.erb"
-                    assert(cast->operator != 0);
-                    argv[5] = RARRAY_AREF(constants, cast->operator - 1);
+                    assert(cast->binary_operator != 0);
+                    argv[5] = RARRAY_AREF(constants, cast->binary_operator - 1);
 
                     // depth
 #line 220 "api_node.c.erb"

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.h

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

data/include/prism/ast.h

@@ -1818,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
@@ -2129,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
@@ -2139,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;
 
 /**
@@ -2326,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
@@ -2336,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;
 
 /**
@@ -2478,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
@@ -2488,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;
 
 /**
@@ -3144,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
@@ -3154,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;
 
 /**
@@ -3651,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
@@ -3819,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
@@ -3829,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;
 
 /**
@@ -4304,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
@@ -4319,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