yarp 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d7fbd6801f30b7ad185ea9884ad6ab4a0b0fd07494dbf96d90a560d7c5223a3
-  data.tar.gz: a28e10e86eee28950106cea5be18020349ea5181111f4d45d540322677b5eed4
+  metadata.gz: 9d096d8bdda05ec360a58c8c6d98d1aeb6680b95a983a7d10d916d4a941be1c8
+  data.tar.gz: 7833c692ae2547f6628d15972b539484e06804179277d8f73a33cf448687f48b
 SHA512:
-  metadata.gz: c30fdd9590910182706dc3d6f0747ce8c467156ede3c2ed727d8a2efb2aa7f821abd2e5465e80ddfe122ba80c03af23ab1d60c50f7a39348d797106c9c4567d7
-  data.tar.gz: 8c877d31c11834e6e0d22b6acab729258cd87ce4a53e026c8b0ff4b92f98f90a0daa57b21811a29d3c4e2387a65b4a3935d165a4311985d40b3511f95c94f280
+  metadata.gz: 6c42795d64e15210922249c5b81a7bd8a4f04f6589f8266aaf73341afbd72bde016aeafa879eddb12dd0ae75b6e2b91bba7c28599495f31030031117d12be9cf
+  data.tar.gz: 6534173b9aa41bf180358750198c16749279723575045fffb819040509f6ca2e4f264653ad7857af152f64f7bdb16e95cbdedaab474bb62d86f9f920c5e44d83

data/CHANGELOG.md

@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.11.0] - 2023-09-08
+
+### Added
+
+- `Node#inspect` is much improved.
+- `YARP::Pattern` is introduced, which can construct procs to match against nodes.
+- `BlockLocalVariableNode` is introduced to take the place of the locations array on `BlockParametersNode`.
+- `ParseResult#attach_comments!` is now provided to attach comments to locations in the tree.
+- `MultiTargetNode` is introduced as the target of multi writes and for loops.
+- `Node#comment_targets` is introduced to return the list of objects that can have attached comments.
+
+### Changed
+
+- **BREAKING**: `GlobalVariable*Node#name` now returns a symbol.
+- **BREAKING**: `Constant*Node#name` now returns a symbol.
+- **BREAKING**: `BlockParameterNode`, `KeywordParameterNode`, `KeywordRestParameterNode`, `RestParameterNode`, `DefNode` all have their `name` methods returning symbols now.
+- **BREAKING**: `ClassNode#name` and `ModuleNode#name` now return symbols.
+- **BREAKING**: `Location#end_column` is now exclusive instead of inclusive.
+- `Location#slice` now returns a properly encoded string.
+- `CallNode#operator_loc` is now `CallNode#call_operator_loc`.
+- `CallOperatorAndWriteNode` is renamed to `CallAndWriteNode` and its structure has changed.
+- `CallOperatorOrWriteNode` is renamed to `CallOrWriteNode` and its structure has changed.
+
 ## [0.10.0] - 2023-09-01
 
 ### Added
@@ -94,7 +117,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby/yarp/compare/v0.10.0...HEAD
+[unreleased]: https://github.com/ruby/yarp/compare/v0.11.0...HEAD
+[0.11.0]: https://github.com/ruby/yarp/compare/v0.10.0...v0.11.0
 [0.10.0]: https://github.com/ruby/yarp/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/ruby/yarp/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/ruby/yarp/compare/v0.7.0...v0.8.0

data/CONTRIBUTING.md

@@ -32,6 +32,13 @@ bundle exec rake compile test
 bundle exec rake compile:yarp test
 ```
 
+To test the rust bindings (with caveats about setting up your Rust environment properly first):
+
+``` sh
+bundle exec rake compile test:rust
+```
+
+
 ## Documentation
 
 We could always use more documentation! If you want to contribute documentation, feel free to open a pull request. These will get merged in as soon as possible. Documenting functions or methods is always useful, but we also need more guides and tutorials. If you have an idea for a guide or tutorial, feel free to open an issue and we can discuss it.

data/config.yml

@@ -520,6 +520,15 @@ nodes:
 
           bar(&args)
           ^^^^^^^^^^
+  - name: BlockLocalVariableNode
+    fields:
+      - name: name
+        type: constant
+    comment: |
+      Represents a block local variable.
+
+          a { |; b| }
+                 ^
   - name: BlockNode
     fields:
       - name: locals
@@ -540,6 +549,8 @@ nodes:
                      ^^^^^^^^^^^^^^
   - name: BlockParameterNode
     fields:
+      - name: name
+        type: constant?
       - name: name_loc
         type: location?
       - name: operator_loc
@@ -556,7 +567,7 @@ nodes:
         type: node?
         kind: ParametersNode
       - name: locals
-        type: location[]
+        type: node[]
       - name: opening_loc
         type: location?
       - name: closing_loc
@@ -582,11 +593,42 @@ nodes:
 
           break foo
           ^^^^^^^^^
-  - name: CallNode
+  - name: CallAndWriteNode
     fields:
       - name: receiver
         type: node?
+      - name: call_operator_loc
+        type: location?
+      - name: message_loc
+        type: location?
+      - name: opening_loc
+        type: location?
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: closing_loc
+        type: location?
+      - name: flags
+        type: flags
+        kind: CallNodeFlags
+      - name: read_name
+        type: string
+      - name: write_name
+        type: string
       - name: operator_loc
+        type: location
+      - name: value
+        type: node
+    comment: |
+      Represents the use of the `&&=` operator on a call.
+
+          foo.bar &&= value
+          ^^^^^^^^^^^^^^^^^
+  - name: CallNode
+    fields:
+      - name: receiver
+        type: node?
+      - name: call_operator_loc
         type: location?
       - name: message_loc
         type: location?
@@ -625,50 +667,70 @@ nodes:
 
           foo&.bar
           ^^^^^^^^
-  - name: CallOperatorAndWriteNode
+  - name: CallOperatorWriteNode
     fields:
-      - name: target
-        type: node
-        kind: CallNode
+      - name: receiver
+        type: node?
+      - name: call_operator_loc
+        type: location?
+      - name: message_loc
+        type: location?
+      - name: opening_loc
+        type: location?
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: closing_loc
+        type: location?
+      - name: flags
+        type: flags
+        kind: CallNodeFlags
+      - name: read_name
+        type: string
+      - name: write_name
+        type: string
+      - name: operator
+        type: constant
       - name: operator_loc
         type: location
       - name: value
         type: node
     comment: |
-      Represents the use of the `&&=` operator on a call.
+      Represents the use of an assignment operator on a call.
 
-          foo.bar &&= value
-          ^^^^^^^^^^^^^^^^^
-  - name: CallOperatorOrWriteNode
+          foo.bar += baz
+          ^^^^^^^^^^^^^^
+  - name: CallOrWriteNode
     fields:
-      - name: target
-        type: node
-        kind: CallNode
-      - name: value
-        type: node
+      - name: receiver
+        type: node?
+      - name: call_operator_loc
+        type: location?
+      - name: message_loc
+        type: location?
+      - name: opening_loc
+        type: location?
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: closing_loc
+        type: location?
+      - name: flags
+        type: flags
+        kind: CallNodeFlags
+      - name: read_name
+        type: string
+      - name: write_name
+        type: string
       - name: operator_loc
         type: location
+      - name: value
+        type: node
     comment: |
       Represents the use of the `||=` operator on a call.
 
           foo.bar ||= value
           ^^^^^^^^^^^^^^^^^
-  - name: CallOperatorWriteNode
-    fields:
-      - name: target
-        type: node
-        kind: CallNode
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator
-        type: constant
-    comment: |
-      Represents the use of an assignment operator on a call.
-
-          foo.bar += baz
-          ^^^^^^^^^^^^^^
   - name: CapturePatternNode
     fields:
       - name: value
@@ -719,7 +781,7 @@ nodes:
       - name: end_keyword_loc
         type: location
       - name: name
-        type: string
+        type: constant
     comment: |
       Represents a class declaration involving the `class` keyword.
 
@@ -797,7 +859,7 @@ nodes:
       - name: name_loc
         type: location
       - name: value
-        type: node?
+        type: node
       - name: operator_loc
         type: location?
     comment: |
@@ -807,6 +869,8 @@ nodes:
           ^^^^^^^^^
   - name: ConstantAndWriteNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -820,6 +884,8 @@ nodes:
           ^^^^^^^^^^^^^^^^
   - name: ConstantOperatorWriteNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -835,6 +901,8 @@ nodes:
           ^^^^^^^^^^^^^^^
   - name: ConstantOrWriteNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -937,12 +1005,18 @@ nodes:
           ::Foo::Bar = 1
           ^^^^^^^^^^^^^^
   - name: ConstantReadNode
+    fields:
+      - name: name
+        type: constant
     comment: |
       Represents referencing a constant.
 
           Foo
           ^^^
   - name: ConstantTargetNode
+    fields:
+      - name: name
+        type: constant
     comment: |
       Represents writing to a constant in a context that doesn't have an explicit value.
 
@@ -950,6 +1024,8 @@ nodes:
           ^^^  ^^^
   - name: ConstantWriteNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: value
@@ -963,6 +1039,8 @@ nodes:
           ^^^^^^^
   - name: DefNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: receiver
@@ -1166,6 +1244,8 @@ nodes:
           ^^^^^
   - name: GlobalVariableAndWriteNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1179,6 +1259,8 @@ nodes:
           ^^^^^^^^^^^^^^^^^
   - name: GlobalVariableOperatorWriteNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1194,6 +1276,8 @@ nodes:
           ^^^^^^^^^^^^^^^^
   - name: GlobalVariableOrWriteNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1206,12 +1290,18 @@ nodes:
           $target ||= value
           ^^^^^^^^^^^^^^^^^
   - name: GlobalVariableReadNode
+    fields:
+      - name: name
+        type: constant
     comment: |
       Represents referencing a global variable.
 
           $foo
           ^^^^
   - name: GlobalVariableTargetNode
+    fields:
+      - name: name
+        type: constant
     comment: |
       Represents writing to a global variable in a context that doesn't have an explicit value.
 
@@ -1219,6 +1309,8 @@ nodes:
           ^^^^  ^^^^
   - name: GlobalVariableWriteNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: value
@@ -1466,6 +1558,8 @@ nodes:
               ^^^^
   - name: KeywordParameterNode
     fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: value
@@ -1482,10 +1576,12 @@ nodes:
           end
   - name: KeywordRestParameterNode
     fields:
-      - name: operator_loc
-        type: location
+      - name: name
+        type: constant?
       - name: name_loc
         type: location?
+      - name: operator_loc
+        type: location
     comment: |
       Represents a keyword rest parameter to a method, block, or lambda definition.
 
@@ -1649,20 +1745,16 @@ nodes:
       - name: end_keyword_loc
         type: location
       - name: name
-        type: string
+        type: constant
     comment: |
       Represents a module declaration involving the `module` keyword.
 
           module Foo end
           ^^^^^^^^^^^^^^
-  - name: MultiWriteNode
+  - name: MultiTargetNode
     fields:
       - name: targets
         type: node[]
-      - name: operator_loc
-        type: location?
-      - name: value
-        type: node?
       - name: lparen_loc
         type: location?
       - name: rparen_loc
@@ -1670,6 +1762,23 @@ nodes:
     comment: |
       Represents a multi-target expression.
 
+          a, b, c = 1, 2, 3
+          ^^^^^^^
+  - name: MultiWriteNode
+    fields:
+      - name: targets
+        type: node[]
+      - name: lparen_loc
+        type: location?
+      - name: rparen_loc
+        type: location?
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+    comment: |
+      Represents a write to a multi-target expression.
+
           a, b, c = 1, 2, 3
           ^^^^^^^^^^^^^^^^^
   - name: NextNode
@@ -1965,10 +2074,12 @@ nodes:
       `ex` is in the `exception` field.
   - name: RestParameterNode
     fields:
-      - name: operator_loc
-        type: location
+      - name: name
+        type: constant?
       - name: name_loc
         type: location?
+      - name: operator_loc
+        type: location
     comment: |
       Represents a rest parameter to a method, block, or lambda definition.
 

data/docs/configuration.md

@@ -51,7 +51,6 @@ The available values for `type` are:
 * `constant[]` - A child node that is an array of constants. This is a `yp_constant_id_list_t` in C.
 * `location` - A child node that is a location. This is a `yp_location_t` in C.
 * `location?` - A child node that is a location that is optionally present. This is a `yp_location_t` in C, but if the value is not present then the `start` and `end` fields will be `NULL`.
-* `location[]` - A child node that is an array of locations. This is a `yp_location_list_t` in C.
 * `uint32` - A child node that is a 32-bit unsigned integer. This is a `uint32_t` in C.
 
 If the type is `node` or `node?` then the value also accepts an optional `kind` key (a string). This key is expected to match to the name of another node type within `config.yml`. This changes a couple of places where code is templated out to use the more specific struct name instead of the generic `yp_node_t`. For example, with `kind: StatementsNode` the `yp_node_t *` in C becomes a `yp_statements_node_t *`.

data/docs/mapping.md

@@ -10,108 +10,108 @@ The following table shows how the various CRuby nodes are mapped to YARP nodes.
 | --- | --- |
 | `NODE_SCOPE` | |
 | `NODE_BLOCK` | |
-| `NODE_IF` | `YP_NODE_IF_NODE` |
-| `NODE_UNLESS` | `YP_NODE_UNLESS_NODE` |
-| `NODE_CASE` | `YP_NODE_CASE_NODE` |
-| `NODE_CASE2` | `YP_NODE_CASE_NODE` (with a null predicate) |
+| `NODE_IF` | `YP_IF_NODE` |
+| `NODE_UNLESS` | `YP_UNLESS_NODE` |
+| `NODE_CASE` | `YP_CASE_NODE` |
+| `NODE_CASE2` | `YP_CASE_NODE` (with a null predicate) |
 | `NODE_CASE3` | |
-| `NODE_WHEN` | `YP_NODE_WHEN_NODE` |
-| `NODE_IN` | `YP_NODE_IN_NODE` |
-| `NODE_WHILE` | `YP_NODE_WHILE_NODE` |
-| `NODE_UNTIL` | `YP_NODE_UNTIL_NODE` |
-| `NODE_ITER` | `YP_NODE_CALL_NODE` (with a non-null block) |
-| `NODE_FOR` | `YP_NODE_FOR_NODE` |
-| `NODE_FOR_MASGN` | `YP_NODE_FOR_NODE` (with a multi-write node as the index) |
-| `NODE_BREAK` | `YP_NODE_BREAK_NODE` |
-| `NODE_NEXT` | `YP_NODE_NEXT_NODE` |
-| `NODE_REDO` | `YP_NODE_REDO_NODE` |
-| `NODE_RETRY` | `YP_NODE_RETRY_NODE` |
-| `NODE_BEGIN` | `YP_NODE_BEGIN_NODE` |
-| `NODE_RESCUE` | `YP_NODE_RESCUE_NODE` |
+| `NODE_WHEN` | `YP_WHEN_NODE` |
+| `NODE_IN` | `YP_IN_NODE` |
+| `NODE_WHILE` | `YP_WHILE_NODE` |
+| `NODE_UNTIL` | `YP_UNTIL_NODE` |
+| `NODE_ITER` | `YP_CALL_NODE` (with a non-null block) |
+| `NODE_FOR` | `YP_FOR_NODE` |
+| `NODE_FOR_MASGN` | `YP_FOR_NODE` (with a multi-write node as the index) |
+| `NODE_BREAK` | `YP_BREAK_NODE` |
+| `NODE_NEXT` | `YP_NEXT_NODE` |
+| `NODE_REDO` | `YP_REDO_NODE` |
+| `NODE_RETRY` | `YP_RETRY_NODE` |
+| `NODE_BEGIN` | `YP_BEGIN_NODE` |
+| `NODE_RESCUE` | `YP_RESCUE_NODE` |
 | `NODE_RESBODY` | |
-| `NODE_ENSURE` | `YP_NODE_ENSURE_NODE` |
-| `NODE_AND` | `YP_NODE_AND_NODE` |
-| `NODE_OR` | `YP_NODE_OR_NODE` |
-| `NODE_MASGN` | `YP_NODE_MULTI_WRITE_NODE` |
-| `NODE_LASGN` | `YP_NODE_LOCAL_VARIABLE_WRITE_NODE` |
-| `NODE_DASGN` | `YP_NODE_LOCAL_VARIABLE_WRITE_NODE` |
-| `NODE_GASGN` | `YP_NODE_GLOBAL_VARIABLE_WRITE_NODE` |
-| `NODE_IASGN` | `YP_NODE_INSTANCE_VARIABLE_WRITE_NODE` |
-| `NODE_CDECL` | `YP_NODE_CONSTANT_PATH_WRITE_NODE` |
-| `NODE_CVASGN` | `YP_NODE_CLASS_VARIABLE_WRITE_NODE` |
+| `NODE_ENSURE` | `YP_ENSURE_NODE` |
+| `NODE_AND` | `YP_AND_NODE` |
+| `NODE_OR` | `YP_OR_NODE` |
+| `NODE_MASGN` | `YP_MULTI_WRITE_NODE` |
+| `NODE_LASGN` | `YP_LOCAL_VARIABLE_WRITE_NODE` |
+| `NODE_DASGN` | `YP_LOCAL_VARIABLE_WRITE_NODE` |
+| `NODE_GASGN` | `YP_GLOBAL_VARIABLE_WRITE_NODE` |
+| `NODE_IASGN` | `YP_INSTANCE_VARIABLE_WRITE_NODE` |
+| `NODE_CDECL` | `YP_CONSTANT_PATH_WRITE_NODE` |
+| `NODE_CVASGN` | `YP_CLASS_VARIABLE_WRITE_NODE` |
 | `NODE_OP_ASGN1` | |
 | `NODE_OP_ASGN2` | |
-| `NODE_OP_ASGN_AND` | `YP_NODE_OPERATOR_AND_ASSIGNMENT_NODE` |
-| `NODE_OP_ASGN_OR` | `YP_NODE_OPERATOR_OR_ASSIGNMENT_NODE` |
+| `NODE_OP_ASGN_AND` | `YP_OPERATOR_AND_ASSIGNMENT_NODE` |
+| `NODE_OP_ASGN_OR` | `YP_OPERATOR_OR_ASSIGNMENT_NODE` |
 | `NODE_OP_CDECL` | |
-| `NODE_CALL` | `YP_NODE_CALL_NODE` |
-| `NODE_OPCALL` | `YP_NODE_CALL_NODE` (with an operator as the method) |
-| `NODE_FCALL` | `YP_NODE_CALL_NODE` (with a null receiver and parentheses) |
-| `NODE_VCALL` | `YP_NODE_CALL_NODE` (with a null receiver and parentheses or arguments) |
-| `NODE_QCALL` | `YP_NODE_CALL_NODE` (with a &. operator) |
-| `NODE_SUPER` | `YP_NODE_SUPER_NODE` |
-| `NODE_ZSUPER` | `YP_NODE_FORWARDING_SUPER_NODE` |
-| `NODE_LIST` | `YP_NODE_ARRAY_NODE` |
-| `NODE_ZLIST` | `YP_NODE_ARRAY_NODE` (with no child elements) |
-| `NODE_VALUES` | `YP_NODE_ARGUMENTS_NODE` |
-| `NODE_HASH` | `YP_NODE_HASH_NODE` |
-| `NODE_RETURN` | `YP_NODE_RETURN_NODE` |
-| `NODE_YIELD` | `YP_NODE_YIELD_NODE` |
-| `NODE_LVAR` | `YP_NODE_LOCAL_VARIABLE_READ_NODE` |
-| `NODE_DVAR` | `YP_NODE_LOCAL_VARIABLE_READ_NODE` |
-| `NODE_GVAR` | `YP_NODE_GLOBAL_VARIABLE_READ_NODE` |
-| `NODE_IVAR` | `YP_NODE_INSTANCE_VARIABLE_READ_NODE` |
-| `NODE_CONST` | `YP_NODE_CONSTANT_PATH_READ_NODE` |
-| `NODE_CVAR` | `YP_NODE_CLASS_VARIABLE_READ_NODE` |
-| `NODE_NTH_REF` | `YP_NODE_NUMBERED_REFERENCE_READ_NODE` |
-| `NODE_BACK_REF` | `YP_NODE_BACK_REFERENCE_READ_NODE` |
+| `NODE_CALL` | `YP_CALL_NODE` |
+| `NODE_OPCALL` | `YP_CALL_NODE` (with an operator as the method) |
+| `NODE_FCALL` | `YP_CALL_NODE` (with a null receiver and parentheses) |
+| `NODE_VCALL` | `YP_CALL_NODE` (with a null receiver and parentheses or arguments) |
+| `NODE_QCALL` | `YP_CALL_NODE` (with a &. operator) |
+| `NODE_SUPER` | `YP_SUPER_NODE` |
+| `NODE_ZSUPER` | `YP_FORWARDING_SUPER_NODE` |
+| `NODE_LIST` | `YP_ARRAY_NODE` |
+| `NODE_ZLIST` | `YP_ARRAY_NODE` (with no child elements) |
+| `NODE_VALUES` | `YP_ARGUMENTS_NODE` |
+| `NODE_HASH` | `YP_HASH_NODE` |
+| `NODE_RETURN` | `YP_RETURN_NODE` |
+| `NODE_YIELD` | `YP_YIELD_NODE` |
+| `NODE_LVAR` | `YP_LOCAL_VARIABLE_READ_NODE` |
+| `NODE_DVAR` | `YP_LOCAL_VARIABLE_READ_NODE` |
+| `NODE_GVAR` | `YP_GLOBAL_VARIABLE_READ_NODE` |
+| `NODE_IVAR` | `YP_INSTANCE_VARIABLE_READ_NODE` |
+| `NODE_CONST` | `YP_CONSTANT_PATH_READ_NODE` |
+| `NODE_CVAR` | `YP_CLASS_VARIABLE_READ_NODE` |
+| `NODE_NTH_REF` | `YP_NUMBERED_REFERENCE_READ_NODE` |
+| `NODE_BACK_REF` | `YP_BACK_REFERENCE_READ_NODE` |
 | `NODE_MATCH` | |
-| `NODE_MATCH2` | `YP_NODE_CALL_NODE` (with regular expression as receiver) |
-| `NODE_MATCH3` | `YP_NODE_CALL_NODE` (with regular expression as only argument) |
+| `NODE_MATCH2` | `YP_CALL_NODE` (with regular expression as receiver) |
+| `NODE_MATCH3` | `YP_CALL_NODE` (with regular expression as only argument) |
 | `NODE_LIT` | |
-| `NODE_STR` | `YP_NODE_STRING_NODE` |
-| `NODE_DSTR` | `YP_NODE_INTERPOLATED_STRING_NODE` |
-| `NODE_XSTR` | `YP_NODE_X_STRING_NODE` |
-| `NODE_DXSTR` | `YP_NODE_INTERPOLATED_X_STRING_NODE` |
-| `NODE_EVSTR` | `YP_NODE_STRING_INTERPOLATED_NODE` |
-| `NODE_DREGX` | `YP_NODE_INTERPOLATED_REGULAR_EXPRESSION_NODE` |
+| `NODE_STR` | `YP_STRING_NODE` |
+| `NODE_DSTR` | `YP_INTERPOLATED_STRING_NODE` |
+| `NODE_XSTR` | `YP_X_STRING_NODE` |
+| `NODE_DXSTR` | `YP_INTERPOLATED_X_STRING_NODE` |
+| `NODE_EVSTR` | `YP_STRING_INTERPOLATED_NODE` |
+| `NODE_DREGX` | `YP_INTERPOLATED_REGULAR_EXPRESSION_NODE` |
 | `NODE_ONCE` | |
-| `NODE_ARGS` | `YP_NODE_PARAMETERS_NODE` |
+| `NODE_ARGS` | `YP_PARAMETERS_NODE` |
 | `NODE_ARGS_AUX` | |
-| `NODE_OPT_ARG` | `YP_NODE_OPTIONAL_PARAMETER_NODE` |
-| `NODE_KW_ARG` | `YP_NODE_KEYWORD_PARAMETER_NODE` |
-| `NODE_POSTARG` | `YP_NODE_REQUIRED_PARAMETER_NODE` |
+| `NODE_OPT_ARG` | `YP_OPTIONAL_PARAMETER_NODE` |
+| `NODE_KW_ARG` | `YP_KEYWORD_PARAMETER_NODE` |
+| `NODE_POSTARG` | `YP_REQUIRED_PARAMETER_NODE` |
 | `NODE_ARGSCAT` | |
 | `NODE_ARGSPUSH` | |
-| `NODE_SPLAT` | `YP_NODE_SPLAT_NODE` |
-| `NODE_BLOCK_PASS` | `YP_NODE_BLOCK_ARGUMENT_NODE` |
-| `NODE_DEFN` | `YP_NODE_DEF_NODE` (with a null receiver) |
-| `NODE_DEFS` | `YP_NODE_DEF_NODE` (with a non-null receiver) |
-| `NODE_ALIAS` | `YP_NODE_ALIAS_NODE` |
-| `NODE_VALIAS` | `YP_NODE_ALIAS_NODE` (with a global variable first argument) |
-| `NODE_UNDEF` | `YP_NODE_UNDEF_NODE` |
-| `NODE_CLASS` | `YP_NODE_CLASS_NODE` |
-| `NODE_MODULE` | `YP_NODE_MODULE_NODE` |
-| `NODE_SCLASS` | `YP_NODE_S_CLASS_NODE` |
-| `NODE_COLON2` | `YP_NODE_CONSTANT_PATH_NODE` |
-| `NODE_COLON3` | `YP_NODE_CONSTANT_PATH_NODE` (with a null receiver) |
-| `NODE_DOT2` | `YP_NODE_RANGE_NODE` (with a .. operator) |
-| `NODE_DOT3` | `YP_NODE_RANGE_NODE` (with a ... operator) |
-| `NODE_FLIP2` | `YP_NODE_RANGE_NODE` (with a .. operator) |
-| `NODE_FLIP3` | `YP_NODE_RANGE_NODE` (with a ... operator) |
-| `NODE_SELF` | `YP_NODE_SELF_NODE` |
-| `NODE_NIL` | `YP_NODE_NIL_NODE` |
-| `NODE_TRUE` | `YP_NODE_TRUE_NODE` |
-| `NODE_FALSE` | `YP_NODE_FALSE_NODE` |
+| `NODE_SPLAT` | `YP_SPLAT_NODE` |
+| `NODE_BLOCK_PASS` | `YP_BLOCK_ARGUMENT_NODE` |
+| `NODE_DEFN` | `YP_DEF_NODE` (with a null receiver) |
+| `NODE_DEFS` | `YP_DEF_NODE` (with a non-null receiver) |
+| `NODE_ALIAS` | `YP_ALIAS_NODE` |
+| `NODE_VALIAS` | `YP_ALIAS_NODE` (with a global variable first argument) |
+| `NODE_UNDEF` | `YP_UNDEF_NODE` |
+| `NODE_CLASS` | `YP_CLASS_NODE` |
+| `NODE_MODULE` | `YP_MODULE_NODE` |
+| `NODE_SCLASS` | `YP_S_CLASS_NODE` |
+| `NODE_COLON2` | `YP_CONSTANT_PATH_NODE` |
+| `NODE_COLON3` | `YP_CONSTANT_PATH_NODE` (with a null receiver) |
+| `NODE_DOT2` | `YP_RANGE_NODE` (with a .. operator) |
+| `NODE_DOT3` | `YP_RANGE_NODE` (with a ... operator) |
+| `NODE_FLIP2` | `YP_RANGE_NODE` (with a .. operator) |
+| `NODE_FLIP3` | `YP_RANGE_NODE` (with a ... operator) |
+| `NODE_SELF` | `YP_SELF_NODE` |
+| `NODE_NIL` | `YP_NIL_NODE` |
+| `NODE_TRUE` | `YP_TRUE_NODE` |
+| `NODE_FALSE` | `YP_FALSE_NODE` |
 | `NODE_ERRINFO` | |
-| `NODE_DEFINED` | `YP_NODE_DEFINED_NODE` |
-| `NODE_POSTEXE` | `YP_NODE_POST_EXECUTION_NODE` |
-| `NODE_DSYM` | `YP_NODE_INTERPOLATED_SYMBOL_NODE` |
-| `NODE_ATTRASGN` | `YP_NODE_CALL_NODE` (with a message that ends with =) |
-| `NODE_LAMBDA` | `YP_NODE_LAMBDA_NODE` |
-| `NODE_ARYPTN` | `YP_NODE_ARRAY_PATTERN_NODE` |
-| `NODE_HSHPTN` | `YP_NODE_HASH_PATTERN_NODE` |
-| `NODE_FNDPTN` | `YP_NODE_FIND_PATTERN_NODE` |
-| `NODE_ERROR` | `YP_NODE_MISSING_NODE` |
+| `NODE_DEFINED` | `YP_DEFINED_NODE` |
+| `NODE_POSTEXE` | `YP_POST_EXECUTION_NODE` |
+| `NODE_DSYM` | `YP_INTERPOLATED_SYMBOL_NODE` |
+| `NODE_ATTRASGN` | `YP_CALL_NODE` (with a message that ends with =) |
+| `NODE_LAMBDA` | `YP_LAMBDA_NODE` |
+| `NODE_ARYPTN` | `YP_ARRAY_PATTERN_NODE` |
+| `NODE_HSHPTN` | `YP_HASH_PATTERN_NODE` |
+| `NODE_FNDPTN` | `YP_FIND_PATTERN_NODE` |
+| `NODE_ERROR` | `YP_MISSING_NODE` |
 | `NODE_LAST` | |
 ```