prism 1.0.0 → 1.1.0

data/config.yml

@@ -15,7 +15,6 @@ errors:
   - ARGUMENT_FORMAL_GLOBAL
   - ARGUMENT_FORMAL_IVAR
   - ARGUMENT_FORWARDING_UNBOUND
-  - ARGUMENT_IN
   - ARGUMENT_NO_FORWARDING_AMPERSAND
   - ARGUMENT_NO_FORWARDING_ELLIPSES
   - ARGUMENT_NO_FORWARDING_STAR
@@ -99,6 +98,7 @@ errors:
   - EXPECT_EXPRESSION_AFTER_SPLAT
   - EXPECT_EXPRESSION_AFTER_SPLAT_HASH
   - EXPECT_EXPRESSION_AFTER_STAR
+  - EXPECT_FOR_DELIMITER
   - EXPECT_IDENT_REQ_PARAMETER
   - EXPECT_IN_DELIMITER
   - EXPECT_LPAREN_REQ_PARAMETER
@@ -107,6 +107,7 @@ errors:
   - EXPECT_RPAREN
   - EXPECT_RPAREN_AFTER_MULTI
   - EXPECT_RPAREN_REQ_PARAMETER
+  - EXPECT_SINGLETON_CLASS_DELIMITER
   - EXPECT_STRING_CONTENT
   - EXPECT_WHEN_DELIMITER
   - EXPRESSION_BARE_HASH
@@ -185,7 +186,9 @@ errors:
   - MODULE_TERM
   - MULTI_ASSIGN_MULTI_SPLATS
   - MULTI_ASSIGN_UNEXPECTED_REST
+  - NESTING_TOO_DEEP
   - NO_LOCAL_VARIABLE
+  - NON_ASSOCIATIVE_OPERATOR
   - NOT_EXPRESSION
   - NUMBER_LITERAL_UNDERSCORE
   - NUMBERED_PARAMETER_INNER_BLOCK
@@ -271,6 +274,7 @@ errors:
   - UNEXPECTED_BLOCK_ARGUMENT
   - UNEXPECTED_INDEX_BLOCK
   - UNEXPECTED_INDEX_KEYWORDS
+  - UNEXPECTED_LABEL
   - UNEXPECTED_MULTI_WRITE
   - UNEXPECTED_RANGE_OPERATOR
   - UNEXPECTED_SAFE_NAVIGATION
@@ -647,12 +651,16 @@ tokens:
 flags:
   - name: ArgumentsNodeFlags
     values:
+      - name: CONTAINS_FORWARDING
+        comment: "if the arguments contain forwarding"
       - name: CONTAINS_KEYWORDS
-        comment: "if arguments contain keywords"
+        comment: "if the arguments contain keywords"
       - name: CONTAINS_KEYWORD_SPLAT
-        comment: "if arguments contain keyword splat"
+        comment: "if the arguments contain a keyword splat"
       - name: CONTAINS_SPLAT
-        comment: "if arguments contain splat"
+        comment: "if the arguments contain a splat"
+      - name: CONTAINS_MULTIPLE_SPLATS
+        comment: "if the arguments contain multiple splats"
     comment: Flags for arguments nodes.
   - name: ArrayNodeFlags
     values:
@@ -789,8 +797,8 @@ nodes:
           - GlobalVariableReadNode
           - BackReferenceReadNode
           - NumberedReferenceReadNode
-          - SymbolNode # On parsing error of `alias $a b`
-          - MissingNode # On parsing error of `alias $a 42`
+          - on error: SymbolNode # alias $a b
+          - on error: MissingNode # alias $a 42
         comment: |
           Represents the old name of the global variable that can be used before aliasing.
 
@@ -815,13 +823,35 @@ nodes:
         kind:
           - SymbolNode
           - InterpolatedSymbolNode
+        comment: |
+          Represents the new name of the method that will be aliased.
+
+              alias foo bar
+                    ^^^
+
+              alias :foo :bar
+                    ^^^^
+
+              alias :"#{foo}" :"#{bar}"
+                    ^^^^^^^^^
       - name: old_name
         type: node
         kind:
           - SymbolNode
           - InterpolatedSymbolNode
-          - GlobalVariableReadNode # On parsing error of `alias a $b`
-          - MissingNode # On parsing error of `alias a 42`
+          - on error: GlobalVariableReadNode # alias a $b
+          - on error: MissingNode # alias a 42
+        comment: |
+          Represents the old name of the method that will be aliased.
+
+              alias foo bar
+                        ^^^
+
+              alias :foo :bar
+                         ^^^^
+
+              alias :"#{foo}" :"#{bar}"
+                              ^^^^^^^^^
       - name: keyword_loc
         type: location
     comment: |
@@ -833,10 +863,27 @@ nodes:
     fields:
       - name: left
         type: node
+        kind: pattern expression
+        comment: |
+          Represents the left side of the expression.
+
+              foo => bar | baz
+                     ^^^
       - name: right
         type: node
+        kind: pattern expression
+        comment: |
+          Represents the right side of the expression.
+
+              foo => bar | baz
+                           ^^^
       - name: operator_loc
         type: location
+        comment: |
+          Represents the alternation operator location.
+
+              foo => bar | baz
+                         ^
     comment: |
       Represents an alternation pattern in pattern matching.
 
@@ -846,6 +893,7 @@ nodes:
     fields:
       - name: left
         type: node
+        kind: non-void expression
         comment: |
           Represents the left side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -856,8 +904,9 @@ nodes:
               ^
       - name: right
         type: node
+        kind: Node
         comment: |
-          Represents the right side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+          Represents the right side of the expression.
 
               left && right
                       ^^^^^
@@ -881,6 +930,7 @@ nodes:
     fields:
       - name: arguments
         type: node[]
+        kind: non-void expression
     comment: |
       Represents a set of arguments to a method or a keyword.
 
@@ -891,6 +941,7 @@ nodes:
     fields:
       - name: elements
         type: node[]
+        kind: non-void expression
         comment: Represent the list of zero or more [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression) within the array.
       - name: opening_loc
         type: location?
@@ -919,12 +970,18 @@ nodes:
     fields:
       - name: constant
         type: node?
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
       - name: requireds
         type: node[]
+        kind: pattern expression
       - name: rest
         type: node?
+        kind: pattern expression
       - name: posts
         type: node[]
+        kind: pattern expression
       - name: opening_loc
         type: location?
       - name: closing_loc
@@ -950,6 +1007,7 @@ nodes:
     fields:
       - name: key
         type: node
+        kind: non-void expression
         comment: |
           The key of the association. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -963,6 +1021,7 @@ nodes:
                 ^^^^^^^^^^
       - name: value
         type: node
+        kind: non-void expression
         comment: |
           The value of the association, if present. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -987,6 +1046,7 @@ nodes:
     fields:
       - name: value
         type: node?
+        kind: non-void expression
         comment: |
           The value to be splatted, if present. Will be missing when keyword rest argument forwarding is used.
 
@@ -1049,6 +1109,7 @@ nodes:
     fields:
       - name: expression
         type: node?
+        kind: non-void expression
       - name: operator_loc
         type: location
     comment: |
@@ -1153,6 +1214,7 @@ nodes:
     fields:
       - name: receiver
         type: node?
+        kind: non-void expression
       - name: call_operator_loc
         type: location?
       - name: message_loc
@@ -1165,6 +1227,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `&&=` operator on a call.
 
@@ -1175,6 +1238,7 @@ nodes:
     fields:
       - name: receiver
         type: node?
+        kind: non-void expression
         comment: |
           The object that the method is being called on. This can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -1201,6 +1265,9 @@ nodes:
         type: location?
       - name: block
         type: node?
+        kind:
+          - BlockNode
+          - BlockArgumentNode
     comment: |
       Represents a method call, in all of the various forms that can take.
 
@@ -1226,6 +1293,7 @@ nodes:
     fields:
       - name: receiver
         type: node?
+        kind: non-void expression
       - name: call_operator_loc
         type: location?
       - name: message_loc
@@ -1240,6 +1308,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of an assignment operator on a call.
 
@@ -1250,6 +1319,7 @@ nodes:
     fields:
       - name: receiver
         type: node?
+        kind: non-void expression
       - name: call_operator_loc
         type: location?
       - name: message_loc
@@ -1262,6 +1332,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `||=` operator on a call.
 
@@ -1272,6 +1343,7 @@ nodes:
     fields:
       - name: receiver
         type: node
+        kind: non-void expression
       - name: call_operator_loc
         type: location
       - name: name
@@ -1295,8 +1367,10 @@ nodes:
     fields:
       - name: value
         type: node
+        kind: pattern expression
       - name: target
         type: node
+        kind: LocalVariableTargetNode
       - name: operator_loc
         type: location
     comment: |
@@ -1308,8 +1382,10 @@ nodes:
     fields:
       - name: predicate
         type: node?
+        kind: non-void expression
       - name: conditions
         type: node[]
+        kind: InNode
       - name: else_clause
         type: node?
         kind: ElseNode
@@ -1328,8 +1404,10 @@ nodes:
     fields:
       - name: predicate
         type: node?
+        kind: non-void expression
       - name: conditions
         type: node[]
+        kind: WhenNode
       - name: else_clause
         type: node?
         kind: ElseNode
@@ -1352,12 +1430,20 @@ nodes:
         type: location
       - name: constant_path
         type: node
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
+          - on error: CallNode # class 0.X end
       - name: inheritance_operator_loc
         type: location?
       - name: superclass
         type: node?
+        kind: non-void expression
       - name: body
         type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
       - name: end_keyword_loc
         type: location
       - name: name
@@ -1377,6 +1463,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `&&=` operator for assignment to a class variable.
 
@@ -1392,6 +1479,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
       - name: binary_operator
         type: constant
     comment: |
@@ -1409,6 +1497,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `||=` operator for assignment to a class variable.
 
@@ -1457,6 +1546,7 @@ nodes:
               ^^^^^
       - name: value
         type: node
+        kind: non-void expression
         comment: |
           The value to write to the class variable. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -1487,6 +1577,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `&&=` operator for assignment to a constant.
 
@@ -1502,6 +1593,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
       - name: binary_operator
         type: constant
     comment: |
@@ -1519,6 +1611,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `||=` operator for assignment to a constant.
 
@@ -1533,6 +1626,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `&&=` operator for assignment to a constant path.
 
@@ -1542,6 +1636,7 @@ nodes:
     fields:
       - name: parent
         type: node?
+        kind: non-void expression
         comment: |
           The left-hand node of the path, if present. It can be `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression). It will be `nil` when the constant lookup is at the root of the module tree.
 
@@ -1590,6 +1685,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
       - name: binary_operator
         type: constant
     comment: |
@@ -1606,6 +1702,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `||=` operator for assignment to a constant path.
 
@@ -1615,6 +1712,7 @@ nodes:
     fields:
       - name: parent
         type: node?
+        kind: non-void expression
       - name: name
         type: constant?
       - name: delimiter_loc
@@ -1648,6 +1746,7 @@ nodes:
                     ^
       - name: value
         type: node
+        kind: non-void expression
         comment: |
           The value to write to the constant path. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -1707,6 +1806,7 @@ nodes:
               ^^^
       - name: value
         type: node
+        kind: non-void expression
         comment: |
           The value to write to the constant. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -1735,11 +1835,15 @@ nodes:
         type: location
       - name: receiver
         type: node?
+        kind: non-void expression
       - name: parameters
         type: node?
         kind: ParametersNode
       - name: body
         type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
       - name: locals
         type: constant[]
       - name: def_keyword_loc
@@ -1766,6 +1870,7 @@ nodes:
         type: location?
       - name: value
         type: node
+        kind: Node # More than non-void expression as defined?(return) is allowed, yet defined?(BEGIN{}) is SyntaxError
       - name: rparen_loc
         type: location?
       - name: keyword_loc
@@ -1809,6 +1914,12 @@ nodes:
         type: location
       - name: variable
         type: node
+        kind:
+          - InstanceVariableReadNode
+          - ClassVariableReadNode
+          - GlobalVariableReadNode
+          - BackReferenceReadNode
+          - NumberedReferenceReadNode
     comment: |
       Represents an interpolated variable.
 
@@ -1842,12 +1953,20 @@ nodes:
     fields:
       - name: constant
         type: node?
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
       - name: left
         type: node
+        kind: SplatNode
       - name: requireds
         type: node[]
+        kind: pattern expression
       - name: right
         type: node
+        kind:
+          - SplatNode
+          - on error: MissingNode
       - name: opening_loc
         type: location?
       - name: closing_loc
@@ -1868,8 +1987,10 @@ nodes:
     fields:
       - name: left
         type: node?
+        kind: non-void expression
       - name: right
         type: node?
+        kind: non-void expression
       - name: operator_loc
         type: location
     comment: |
@@ -1891,6 +2012,19 @@ nodes:
     fields:
       - name: index
         type: node
+        kind:
+          - LocalVariableTargetNode
+          - InstanceVariableTargetNode
+          - ClassVariableTargetNode
+          - GlobalVariableTargetNode
+          - ConstantTargetNode
+          - ConstantPathTargetNode
+          - CallTargetNode
+          - IndexTargetNode
+          - MultiTargetNode
+          - on error: BackReferenceReadNode # for $& in a end
+          - on error: NumberedReferenceReadNode # for $1 in a end
+          - on error: MissingNode # for in 1..10; end
         comment: |
           The index expression for `for` loops.
 
@@ -1898,6 +2032,7 @@ nodes:
                   ^
       - name: collection
         type: node
+        kind: non-void expression
         comment: |
           The collection to iterate over.
 
@@ -1981,6 +2116,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `&&=` operator for assignment to a global variable.
 
@@ -1996,6 +2132,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
       - name: binary_operator
         type: constant
     comment: |
@@ -2013,6 +2150,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `||=` operator for assignment to a global variable.
 
@@ -2061,6 +2199,7 @@ nodes:
               ^^^^
       - name: value
         type: node
+        kind: non-void expression
         comment: |
           The value to write to the global variable. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -2119,6 +2258,9 @@ nodes:
     fields:
       - name: constant
         type: node?
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
       - name: elements
         type: node[]
         kind: AssocNode
@@ -2152,6 +2294,7 @@ nodes:
           The `if_keyword_loc` field will be `nil` when the `IfNode` represents a ternary expression.
       - name: predicate
         type: node
+        kind: non-void expression
         comment: |
           The node for the condition the `IfNode` is testing.
 
@@ -2244,6 +2387,11 @@ nodes:
     fields:
       - name: value
         type: node
+        kind:
+          - LocalVariableReadNode
+          - CallNode
+          - ConstantReadNode
+          - LocalVariableTargetNode
     comment: |
       Represents a node that is implicitly being added to the tree but doesn't correspond directly to a node in the source.
 
@@ -2274,6 +2422,7 @@ nodes:
     fields:
       - name: pattern
         type: node
+        kind: pattern expression
       - name: statements
         type: node?
         kind: StatementsNode
@@ -2291,6 +2440,7 @@ nodes:
     fields:
       - name: receiver
         type: node?
+        kind: non-void expression
       - name: call_operator_loc
         type: location?
       - name: opening_loc
@@ -2302,10 +2452,12 @@ nodes:
         type: location
       - name: block
         type: node?
+        kind: BlockArgumentNode # foo[&b] &&= value, only valid on Ruby < 3.4
       - name: operator_loc
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `&&=` operator on a call to the `[]` method.
 
@@ -2316,6 +2468,7 @@ nodes:
     fields:
       - name: receiver
         type: node?
+        kind: non-void expression
       - name: call_operator_loc
         type: location?
       - name: opening_loc
@@ -2327,12 +2480,14 @@ nodes:
         type: location
       - name: block
         type: node?
+        kind: BlockArgumentNode # foo[&b] += value, only valid on Ruby < 3.4
       - name: binary_operator
         type: constant
       - name: binary_operator_loc
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of an assignment operator on a call to `[]`.
 
@@ -2343,6 +2498,7 @@ nodes:
     fields:
       - name: receiver
         type: node?
+        kind: non-void expression
       - name: call_operator_loc
         type: location?
       - name: opening_loc
@@ -2354,10 +2510,12 @@ nodes:
         type: location
       - name: block
         type: node?
+        kind: BlockArgumentNode # foo[&b] ||= value, only valid on Ruby < 3.4
       - name: operator_loc
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `||=` operator on a call to `[]`.
 
@@ -2368,6 +2526,7 @@ nodes:
     fields:
       - name: receiver
         type: node
+        kind: non-void expression
       - name: opening_loc
         type: location
       - name: arguments
@@ -2377,6 +2536,7 @@ nodes:
         type: location
       - name: block
         type: node?
+        kind: BlockArgumentNode # foo[&b], = 1, only valid on Ruby < 3.4
     comment: |
       Represents assigning to an index.
 
@@ -2400,6 +2560,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `&&=` operator for assignment to an instance variable.
 
@@ -2415,6 +2576,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
       - name: binary_operator
         type: constant
     comment: |
@@ -2432,6 +2594,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents the use of the `||=` operator for assignment to an instance variable.
 
@@ -2480,6 +2643,7 @@ nodes:
               ^^^
       - name: value
         type: node
+        kind: non-void expression
         comment: |
           The value to write to the instance variable. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -2657,8 +2821,15 @@ nodes:
         type: location
       - name: parameters
         type: node?
+        kind:
+          - BlockParametersNode
+          - NumberedParametersNode
+          - ItParametersNode
       - name: body
         type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
     comment: |
       Represents using a lambda literal (not the lambda method call).
 
@@ -2672,6 +2843,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
       - name: name
         type: constant
       - name: depth
@@ -2689,6 +2861,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
       - name: name
         type: constant
       - name: binary_operator
@@ -2708,6 +2881,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
       - name: name
         type: constant
       - name: depth
@@ -2787,6 +2961,7 @@ nodes:
               ^^^
       - name: value
         type: node
+        kind: non-void expression
         comment: |
           The value to write to the local variable. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -2831,8 +3006,10 @@ nodes:
     fields:
       - name: value
         type: node
+        kind: non-void expression
       - name: pattern
         type: node
+        kind: pattern expression
       - name: operator_loc
         type: location
     comment: |
@@ -2844,8 +3021,10 @@ nodes:
     fields:
       - name: value
         type: node
+        kind: non-void expression
       - name: pattern
         type: node
+        kind: pattern expression
       - name: operator_loc
         type: location
     comment: |
@@ -2877,8 +3056,15 @@ nodes:
         type: location
       - name: constant_path
         type: node
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
+          - on error: MissingNode # module Parent module end
       - name: body
         type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
       - name: end_keyword_loc
         type: location
       - name: name
@@ -2902,9 +3088,9 @@ nodes:
           - CallTargetNode
           - IndexTargetNode
           - MultiTargetNode
-          - RequiredParameterNode
-          - BackReferenceReadNode # On parsing error of `$',`
-          - NumberedReferenceReadNode # On parsing error of `$1,`
+          - RequiredParameterNode # def m((a,b)); end
+          - on error: BackReferenceReadNode # a, (b, $&) = z
+          - on error: NumberedReferenceReadNode # a, (b, $1) = z
         comment: |
           Represents the targets expressions before a splat node.
 
@@ -2931,7 +3117,7 @@ nodes:
               a, (b, *) = 1, 2, 3, 4
                      ^
 
-          If the `*` is omitted, the field will containt an `ImplicitRestNode`
+          If the `*` is omitted, this field will contain an `ImplicitRestNode`
 
               a, (b,) = 1, 2, 3, 4
                    ^
@@ -2947,8 +3133,9 @@ nodes:
           - CallTargetNode
           - IndexTargetNode
           - MultiTargetNode
-          - RequiredParameterNode
-          - BackReferenceReadNode # On parsing error of `*,$'`
+          - RequiredParameterNode # def m((*,b)); end
+          - on error: BackReferenceReadNode # a, (*, $&) = z
+          - on error: NumberedReferenceReadNode # a, (*, $1) = z
         comment: |
           Represents the targets expressions after a splat node.
 
@@ -2992,6 +3179,8 @@ nodes:
           - CallTargetNode
           - IndexTargetNode
           - MultiTargetNode
+          - on error: BackReferenceReadNode # $&, = z
+          - on error: NumberedReferenceReadNode # $1, = z
         comment: |
           Represents the targets expressions before a splat node.
 
@@ -3018,7 +3207,7 @@ nodes:
               a, b, * = 1, 2, 3, 4
                     ^
 
-          If the `*` is omitted, the field will containt an `ImplicitRestNode`
+          If the `*` is omitted, this field will contain an `ImplicitRestNode`
 
               a, b, = 1, 2, 3, 4
                   ^
@@ -3034,6 +3223,8 @@ nodes:
           - CallTargetNode
           - IndexTargetNode
           - MultiTargetNode
+          - on error: BackReferenceReadNode # *, $& = z
+          - on error: NumberedReferenceReadNode # *, $1 = z
         comment: |
           Represents the targets expressions after a splat node.
 
@@ -3062,6 +3253,7 @@ nodes:
                       ^
       - name: value
         type: node
+        kind: non-void expression
         comment: |
           The value to write to the targets. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -3137,6 +3329,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents an optional keyword parameter to a method, block, or lambda definition.
 
@@ -3154,6 +3347,7 @@ nodes:
         type: location
       - name: value
         type: node
+        kind: non-void expression
     comment: |
       Represents an optional parameter to a method, block, or lambda definition.
 
@@ -3164,6 +3358,7 @@ nodes:
     fields:
       - name: left
         type: node
+        kind: non-void expression
         comment: |
           Represents the left side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -3174,8 +3369,9 @@ nodes:
               ^
       - name: right
         type: node
+        kind: Node
         comment: |
-          Represents the right side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+          Represents the right side of the expression.
 
               left || right
                       ^^^^^
@@ -3215,10 +3411,10 @@ nodes:
           - RequiredParameterNode
           - MultiTargetNode
           # On parsing error of `f(**kwargs, ...)` or `f(**nil, ...)`, the keyword_rest value is moved here:
-          - KeywordRestParameterNode
-          - NoKeywordsParameterNode
+          - on error: KeywordRestParameterNode
+          - on error: NoKeywordsParameterNode
           # On parsing error of `f(..., ...)`, the first forwarding parameter is moved here:
-          - ForwardingParameterNode
+          - on error: ForwardingParameterNode
       - name: keywords
         type: node[]
         kind:
@@ -3243,6 +3439,7 @@ nodes:
     fields:
       - name: body
         type: node?
+        kind: non-void expression # Usually a StatementsNode but not always e.g. `1 in (..10)`
       - name: opening_loc
         type: location
       - name: closing_loc
@@ -3257,6 +3454,7 @@ nodes:
     fields:
       - name: expression
         type: node
+        kind: non-void expression
       - name: operator_loc
         type: location
       - name: lparen_loc
@@ -3272,6 +3470,15 @@ nodes:
     fields:
       - name: variable
         type: node
+        kind:
+          - LocalVariableReadNode
+          - InstanceVariableReadNode
+          - ClassVariableReadNode
+          - GlobalVariableReadNode # foo in ^$a
+          - BackReferenceReadNode # foo in ^$&
+          - NumberedReferenceReadNode # foo in ^$1
+          - ItLocalVariableReadNode # proc { 1 in ^it }
+          - on error: MissingNode # foo in ^Bar
       - name: operator_loc
         type: location
     comment: |
@@ -3324,6 +3531,7 @@ nodes:
     fields:
       - name: left
         type: node?
+        kind: non-void expression
         comment: |
           The left-hand side of the range, if present. It can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -3334,6 +3542,7 @@ nodes:
               ^^^^^
       - name: right
         type: node?
+        kind: non-void expression
         comment: |
           The right-hand side of the range, if present. It can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -3425,10 +3634,12 @@ nodes:
     fields:
       - name: expression
         type: node
+        kind: Node
       - name: keyword_loc
         type: location
       - name: rescue_expression
         type: node
+        kind: Node
     newline: expression
     comment: |
       Represents an expression modified with a rescue.
@@ -3441,10 +3652,23 @@ nodes:
         type: location
       - name: exceptions
         type: node[]
+        kind: non-void expression
       - name: operator_loc
         type: location?
       - name: reference
         type: node?
+        kind:
+          - LocalVariableTargetNode
+          - InstanceVariableTargetNode
+          - ClassVariableTargetNode
+          - GlobalVariableTargetNode
+          - ConstantTargetNode
+          - ConstantPathTargetNode
+          - CallTargetNode
+          - IndexTargetNode
+          - on error: BackReferenceReadNode # => begin; rescue => $&; end
+          - on error: NumberedReferenceReadNode # => begin; rescue => $1; end
+          - on error: MissingNode # begin; rescue =>; end
       - name: statements
         type: node?
         kind: StatementsNode
@@ -3531,8 +3755,12 @@ nodes:
         type: location
       - name: expression
         type: node
+        kind: non-void expression
       - name: body
         type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
       - name: end_keyword_loc
         type: location
     comment: |
@@ -3569,6 +3797,7 @@ nodes:
         type: location
       - name: expression
         type: node?
+        kind: non-void expression
     comment: |
       Represents the use of the splat operator.
 
@@ -3578,6 +3807,7 @@ nodes:
     fields:
       - name: body
         type: node[]
+        kind: Node
     comment: |
       Represents a set of statements contained within some scope.
 
@@ -3618,6 +3848,9 @@ nodes:
         type: location?
       - name: block
         type: node?
+        kind:
+          - BlockNode
+          - BlockArgumentNode
     comment: |
       Represents the use of the `super` keyword with parentheses or arguments.
 
@@ -3679,6 +3912,7 @@ nodes:
                   ^^^^^^
       - name: predicate
         type: node
+        kind: non-void expression
         comment: |
           The condition to be evaluated for the unless expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
 
@@ -3736,6 +3970,7 @@ nodes:
         type: location?
       - name: predicate
         type: node
+        kind: non-void expression
       - name: statements
         type: node?
         kind: StatementsNode
@@ -3754,6 +3989,7 @@ nodes:
         type: location
       - name: conditions
         type: node[]
+        kind: non-void expression
       - name: then_keyword_loc
         type: location?
       - name: statements
@@ -3775,6 +4011,7 @@ nodes:
         type: location?
       - name: predicate
         type: node
+        kind: non-void expression
       - name: statements
         type: node?
         kind: StatementsNode