RubyGems - yarp - Versions diffs - 0.9.0 → 0.10.0 - Mend

yarp 0.9.0 → 0.10.0

Files changed (54) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +15 -1
data/Makefile +5 -1
data/config.yml +156 -125
data/docs/encoding.md +5 -5
data/docs/serialization.md +2 -2
data/ext/yarp/api_node.c +142 -98
data/ext/yarp/extension.c +21 -7
data/ext/yarp/extension.h +1 -1
data/include/yarp/ast.h +327 -18
data/include/yarp/defines.h +2 -1
data/include/yarp/diagnostic.h +3 -3
data/include/yarp/enc/yp_encoding.h +10 -10
data/include/yarp/parser.h +19 -19
data/include/yarp/regexp.h +1 -1
data/include/yarp/unescape.h +4 -4
data/include/yarp/util/yp_buffer.h +3 -0
data/include/yarp/util/yp_char.h +16 -16
data/include/yarp/util/yp_constant_pool.h +2 -2
data/include/yarp/util/yp_newline_list.h +5 -5
data/include/yarp/util/yp_string.h +4 -4
data/include/yarp/util/yp_string_list.h +0 -3
data/include/yarp/util/yp_strpbrk.h +1 -1
data/include/yarp/version.h +2 -2
data/include/yarp.h +5 -4
data/lib/yarp/desugar_visitor.rb +59 -122
data/lib/yarp/node.rb +230 -240
data/lib/yarp/serialize.rb +16 -16
data/lib/yarp.rb +5 -5
data/src/diagnostic.c +1 -1
data/src/enc/yp_big5.c +15 -42
data/src/enc/yp_euc_jp.c +16 -43
data/src/enc/yp_gbk.c +19 -46
data/src/enc/yp_shift_jis.c +16 -43
data/src/enc/yp_tables.c +36 -38
data/src/enc/yp_unicode.c +20 -25
data/src/enc/yp_windows_31j.c +16 -43
data/src/node.c +1271 -899
data/src/prettyprint.c +87 -48
data/src/regexp.c +21 -21
data/src/serialize.c +28 -15
data/src/unescape.c +151 -121
data/src/util/yp_buffer.c +7 -2
data/src/util/yp_char.c +34 -34
data/src/util/yp_constant_pool.c +4 -4
data/src/util/yp_memchr.c +1 -1
data/src/util/yp_newline_list.c +5 -4
data/src/util/yp_string.c +22 -20
data/src/util/yp_string_list.c +0 -6
data/src/util/yp_strncasecmp.c +3 -6
data/src/util/yp_strpbrk.c +8 -8
data/src/yarp.c +355 -216
data/yarp.gemspec +1 -1
metadata +2 -2

data/config.yml CHANGED Viewed

@@ -361,7 +361,7 @@ flags:
         comment: "o - only interpolates values into the regular expression once"
 nodes:
   - name: AliasNode
-    child_nodes:
+    fields:
       - name: new_name
         type: node
       - name: old_name
@@ -374,7 +374,7 @@ nodes:
           alias foo bar
           ^^^^^^^^^^^^^
   - name: AlternationPatternNode
-    child_nodes:
+    fields:
       - name: left
         type: node
       - name: right
@@ -387,7 +387,7 @@ nodes:
           foo => bar | baz
                  ^^^^^^^^^
   - name: AndNode
-    child_nodes:
+    fields:
       - name: left
         type: node
       - name: right
@@ -400,7 +400,7 @@ nodes:
           left and right
           ^^^^^^^^^^^^^^
   - name: ArgumentsNode
-    child_nodes:
+    fields:
       - name: arguments
         type: node[]
     comment: |
@@ -409,7 +409,7 @@ nodes:
           return foo, bar, baz
                  ^^^^^^^^^^^^^
   - name: ArrayNode
-    child_nodes:
+    fields:
       - name: elements
         type: node[]
       - name: opening_loc
@@ -423,7 +423,7 @@ nodes:
           [1, 2, 3]
           ^^^^^^^^^
   - name: ArrayPatternNode
-    child_nodes:
+    fields:
       - name: constant
         type: node?
       - name: requireds
@@ -454,7 +454,7 @@ nodes:
           foo in Bar[1, 2, 3]
           ^^^^^^^^^^^^^^^^^^^
   - name: AssocNode
-    child_nodes:
+    fields:
       - name: key
         type: node
       - name: value
@@ -467,7 +467,7 @@ nodes:
           { a => b }
             ^^^^^^
   - name: AssocSplatNode
-    child_nodes:
+    fields:
       - name: value
         type: node?
       - name: operator_loc
@@ -484,7 +484,7 @@ nodes:
           $'
           ^^
   - name: BeginNode
-    child_nodes:
+    fields:
       - name: begin_keyword_loc
         type: location?
       - name: statements
@@ -510,7 +510,7 @@ nodes:
           end
           ^^^^^
   - name: BlockArgumentNode
-    child_nodes:
+    fields:
       - name: expression
         type: node?
       - name: operator_loc
@@ -521,7 +521,7 @@ nodes:
           bar(&args)
           ^^^^^^^^^^
   - name: BlockNode
-    child_nodes:
+    fields:
       - name: locals
         type: constant[]
       - name: parameters
@@ -539,7 +539,7 @@ nodes:
       [1, 2, 3].each { |i| puts x }
                      ^^^^^^^^^^^^^^
   - name: BlockParameterNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location?
       - name: operator_loc
@@ -551,7 +551,7 @@ nodes:
                 ^^
           end
   - name: BlockParametersNode
-    child_nodes:
+    fields:
       - name: parameters
         type: node?
         kind: ParametersNode
@@ -571,7 +571,7 @@ nodes:
                  ^^^^^^^^^^^^^^^^^
           end
   - name: BreakNode
-    child_nodes:
+    fields:
       - name: arguments
         type: node?
         kind: ArgumentsNode
@@ -583,7 +583,7 @@ nodes:
           break foo
           ^^^^^^^^^
   - name: CallNode
-    child_nodes:
+    fields:
       - name: receiver
         type: node?
       - name: operator_loc
@@ -626,7 +626,7 @@ nodes:
           foo&.bar
           ^^^^^^^^
   - name: CallOperatorAndWriteNode
-    child_nodes:
+    fields:
       - name: target
         type: node
         kind: CallNode
@@ -640,7 +640,7 @@ nodes:
           foo.bar &&= value
           ^^^^^^^^^^^^^^^^^
   - name: CallOperatorOrWriteNode
-    child_nodes:
+    fields:
       - name: target
         type: node
         kind: CallNode
@@ -654,7 +654,7 @@ nodes:
           foo.bar ||= value
           ^^^^^^^^^^^^^^^^^
   - name: CallOperatorWriteNode
-    child_nodes:
+    fields:
       - name: target
         type: node
         kind: CallNode
@@ -662,7 +662,7 @@ nodes:
         type: location
       - name: value
         type: node
-      - name: operator_id
+      - name: operator
         type: constant
     comment: |
       Represents the use of an assignment operator on a call.
@@ -670,7 +670,7 @@ nodes:
           foo.bar += baz
           ^^^^^^^^^^^^^^
   - name: CapturePatternNode
-    child_nodes:
+    fields:
       - name: value
         type: node
       - name: target
@@ -683,7 +683,7 @@ nodes:
           foo => [bar => baz]
                  ^^^^^^^^^^^^
   - name: CaseNode
-    child_nodes:
+    fields:
       - name: predicate
         type: node?
       - name: conditions
@@ -703,7 +703,7 @@ nodes:
       when false
       end
   - name: ClassNode
-    child_nodes:
+    fields:
       - name: locals
         type: constant[]
       - name: class_keyword_loc
@@ -726,7 +726,9 @@ nodes:
           class Foo end
           ^^^^^^^^^^^^^
   - name: ClassVariableAndWriteNode
-    child_nodes:
+    fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -739,7 +741,9 @@ nodes:
           @@target &&= value
           ^^^^^^^^^^^^^^^^
   - name: ClassVariableOperatorWriteNode
-    child_nodes:
+    fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -754,7 +758,9 @@ nodes:
           @@target += value
           ^^^^^^^^^^^^^^^^^
   - name: ClassVariableOrWriteNode
-    child_nodes:
+    fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -767,19 +773,27 @@ nodes:
           @@target ||= value
           ^^^^^^^^^^^^^^^^^^
   - name: ClassVariableReadNode
+    fields:
+      - name: name
+        type: constant
     comment: |
       Represents referencing a class variable.
           @@foo
           ^^^^^
   - name: ClassVariableTargetNode
+    fields:
+      - name: name
+        type: constant
     comment: |
       Represents writing to a class variable in a context that doesn't have an explicit value.
           @@foo, @@bar = baz
           ^^^^^  ^^^^^
   - name: ClassVariableWriteNode
-    child_nodes:
+    fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: value
@@ -792,7 +806,7 @@ nodes:
           @@foo = 1
           ^^^^^^^^^
   - name: ConstantAndWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
@@ -805,7 +819,7 @@ nodes:
           Target &&= value
           ^^^^^^^^^^^^^^^^
   - name: ConstantOperatorWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
@@ -820,7 +834,7 @@ nodes:
           Target += value
           ^^^^^^^^^^^^^^^
   - name: ConstantOrWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
@@ -833,7 +847,7 @@ nodes:
           Target ||= value
           ^^^^^^^^^^^^^^^^
   - name: ConstantPathAndWriteNode
-    child_nodes:
+    fields:
       - name: target
         type: node
         kind: ConstantPathNode
@@ -847,7 +861,7 @@ nodes:
           Parent::Child &&= value
           ^^^^^^^^^^^^^^^^^^^^^^^
   - name: ConstantPathNode
-    child_nodes:
+    fields:
       - name: parent
         type: node?
       - name: child
@@ -860,7 +874,7 @@ nodes:
           Foo::Bar
           ^^^^^^^^
   - name: ConstantPathOperatorWriteNode
-    child_nodes:
+    fields:
       - name: target
         type: node
         kind: ConstantPathNode
@@ -876,7 +890,7 @@ nodes:
           Parent::Child += value
           ^^^^^^^^^^^^^^^^^^^^^^
   - name: ConstantPathOrWriteNode
-    child_nodes:
+    fields:
       - name: target
         type: node
         kind: ConstantPathNode
@@ -890,7 +904,7 @@ nodes:
           Parent::Child ||= value
           ^^^^^^^^^^^^^^^^^^^^^^^
   - name: ConstantPathTargetNode
-    child_nodes:
+    fields:
       - name: parent
         type: node?
       - name: child
@@ -903,7 +917,7 @@ nodes:
           Foo::Foo, Bar::Bar = baz
           ^^^^^^^^  ^^^^^^^^
   - name: ConstantPathWriteNode
-    child_nodes:
+    fields:
       - name: target
         type: node
         kind: ConstantPathNode
@@ -935,7 +949,7 @@ nodes:
           Foo, Bar = baz
           ^^^  ^^^
   - name: ConstantWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: value
@@ -948,7 +962,7 @@ nodes:
           Foo = 1
           ^^^^^^^
   - name: DefNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: receiver
@@ -979,7 +993,7 @@ nodes:
           end
           ^^^^^^^^^^
   - name: DefinedNode
-    child_nodes:
+    fields:
       - name: lparen_loc
         type: location?
       - name: value
@@ -994,7 +1008,7 @@ nodes:
           defined?(a)
           ^^^^^^^^^^^
   - name: ElseNode
-    child_nodes:
+    fields:
       - name: else_keyword_loc
         type: location
       - name: statements
@@ -1008,7 +1022,7 @@ nodes:
           if a then b else c end
                       ^^^^^^^^^^
   - name: EmbeddedStatementsNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location
       - name: statements
@@ -1022,7 +1036,7 @@ nodes:
           "foo #{bar}"
                ^^^^^^
   - name: EmbeddedVariableNode
-    child_nodes:
+    fields:
       - name: operator_loc
         type: location
       - name: variable
@@ -1033,7 +1047,7 @@ nodes:
           "foo #@bar"
                ^^^^^
   - name: EnsureNode
-    child_nodes:
+    fields:
       - name: ensure_keyword_loc
         type: location
       - name: statements
@@ -1057,7 +1071,7 @@ nodes:
           false
           ^^^^^
   - name: FindPatternNode
-    child_nodes:
+    fields:
       - name: constant
         type: node?
       - name: left
@@ -1082,7 +1096,7 @@ nodes:
           foo in Foo(*bar, baz, *qux)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   - name: FlipFlopNode
-    child_nodes:
+    fields:
       - name: left
         type: node?
       - name: right
@@ -1104,7 +1118,7 @@ nodes:
           1.0
           ^^^
   - name: ForNode
-    child_nodes:
+    fields:
       - name: index
         type: node
       - name: collection
@@ -1141,7 +1155,7 @@ nodes:
                   ^^^
           end
   - name: ForwardingSuperNode
-    child_nodes:
+    fields:
       - name: block
         type: node?
         kind: BlockNode
@@ -1151,7 +1165,7 @@ nodes:
           super
           ^^^^^
   - name: GlobalVariableAndWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1164,7 +1178,7 @@ nodes:
           $target &&= value
           ^^^^^^^^^^^^^^^^^
   - name: GlobalVariableOperatorWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1179,7 +1193,7 @@ nodes:
           $target += value
           ^^^^^^^^^^^^^^^^
   - name: GlobalVariableOrWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1204,20 +1218,20 @@ nodes:
           $foo, $bar = baz
           ^^^^  ^^^^
   - name: GlobalVariableWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
-      - name: operator_loc
-        type: location
       - name: value
         type: node
+      - name: operator_loc
+        type: location
     comment: |
       Represents writing to a global variable.
           $foo = 1
           ^^^^^^^^
   - name: HashNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location
       - name: elements
@@ -1230,7 +1244,7 @@ nodes:
           { a => b }
           ^^^^^^^^^^
   - name: HashPatternNode
-    child_nodes:
+    fields:
       - name: constant
         type: node?
       - name: assocs
@@ -1250,7 +1264,7 @@ nodes:
           foo => { a: 1, b: 2, **c }
                  ^^^^^^^^^^^^^^^^^^^
   - name: IfNode
-    child_nodes:
+    fields:
       - name: if_keyword_loc
         type: location?
       - name: predicate
@@ -1272,7 +1286,7 @@ nodes:
           if foo then bar end
           ^^^^^^^^^^^^^^^^^^^
   - name: ImaginaryNode
-    child_nodes:
+    fields:
       - name: numeric
         type: node
     comment: |
@@ -1281,7 +1295,7 @@ nodes:
           1.0i
           ^^^^
   - name: InNode
-    child_nodes:
+    fields:
       - name: pattern
         type: node
       - name: statements
@@ -1297,7 +1311,9 @@ nodes:
           case a; in b then c end
                   ^^^^^^^^^^^
   - name: InstanceVariableAndWriteNode
-    child_nodes:
+    fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1310,7 +1326,9 @@ nodes:
           @target &&= value
           ^^^^^^^^^^^^^^^^^
   - name: InstanceVariableOperatorWriteNode
-    child_nodes:
+    fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1325,7 +1343,9 @@ nodes:
           @target += value
           ^^^^^^^^^^^^^^^^
   - name: InstanceVariableOrWriteNode
-    child_nodes:
+    fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: operator_loc
@@ -1338,19 +1358,27 @@ nodes:
           @target ||= value
           ^^^^^^^^^^^^^^^^^
   - name: InstanceVariableReadNode
+    fields:
+      - name: name
+        type: constant
     comment: |
       Represents referencing an instance variable.
           @foo
           ^^^^
   - name: InstanceVariableTargetNode
+    fields:
+      - name: name
+        type: constant
     comment: |
       Represents writing to an instance variable in a context that doesn't have an explicit value.
           @foo, @bar = baz
           ^^^^  ^^^^
   - name: InstanceVariableWriteNode
-    child_nodes:
+    fields:
+      - name: name
+        type: constant
       - name: name_loc
         type: location
       - name: value
@@ -1369,7 +1397,7 @@ nodes:
           1
           ^
   - name: InterpolatedRegularExpressionNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location
       - name: parts
@@ -1386,7 +1414,7 @@ nodes:
           /foo #{bar} baz/
           ^^^^^^^^^^^^^^^^
   - name: InterpolatedStringNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location?
       - name: parts
@@ -1400,7 +1428,7 @@ nodes:
           "foo #{bar} baz"
           ^^^^^^^^^^^^^^^^
   - name: InterpolatedSymbolNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location?
       - name: parts
@@ -1414,7 +1442,7 @@ nodes:
           :"foo #{bar} baz"
           ^^^^^^^^^^^^^^^^^
   - name: InterpolatedXStringNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location
       - name: parts
@@ -1428,7 +1456,7 @@ nodes:
           `foo #{bar} baz`
           ^^^^^^^^^^^^^^^^
   - name: KeywordHashNode
-    child_nodes:
+    fields:
       - name: elements
         type: node[]
     comment: |
@@ -1437,7 +1465,7 @@ nodes:
           foo(a: b)
               ^^^^
   - name: KeywordParameterNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: value
@@ -1453,7 +1481,7 @@ nodes:
                 ^^^^
           end
   - name: KeywordRestParameterNode
-    child_nodes:
+    fields:
       - name: operator_loc
         type: location
       - name: name_loc
@@ -1465,7 +1493,7 @@ nodes:
                 ^^^
           end
   - name: LambdaNode
-    child_nodes:
+    fields:
       - name: locals
         type: constant[]
       - name: operator_loc
@@ -1485,14 +1513,14 @@ nodes:
           ->(value) { value * 2 }
           ^^^^^^^^^^^^^^^^^^^^^^^
   - name: LocalVariableAndWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
         type: location
       - name: value
         type: node
-      - name: constant_id
+      - name: name
         type: constant
       - name: depth
         type: uint32
@@ -1502,16 +1530,16 @@ nodes:
           target &&= value
           ^^^^^^^^^^^^^^^^
   - name: LocalVariableOperatorWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
         type: location
       - name: value
         type: node
-      - name: constant_id
+      - name: name
         type: constant
-      - name: operator_id
+      - name: operator
         type: constant
       - name: depth
         type: uint32
@@ -1521,14 +1549,14 @@ nodes:
           target += value
           ^^^^^^^^^^^^^^^
   - name: LocalVariableOrWriteNode
-    child_nodes:
+    fields:
       - name: name_loc
         type: location
       - name: operator_loc
         type: location
       - name: value
         type: node
-      - name: constant_id
+      - name: name
         type: constant
       - name: depth
         type: uint32
@@ -1538,8 +1566,8 @@ nodes:
           target ||= value
           ^^^^^^^^^^^^^^^^
   - name: LocalVariableReadNode
-    child_nodes:
-      - name: constant_id
+    fields:
+      - name: name
         type: constant
       - name: depth
         type: uint32
@@ -1551,8 +1579,8 @@ nodes:
           foo
           ^^^
   - name: LocalVariableTargetNode
-    child_nodes:
-      - name: constant_id
+    fields:
+      - name: name
         type: constant
       - name: depth
         type: uint32
@@ -1562,15 +1590,15 @@ nodes:
           foo, bar = baz
           ^^^  ^^^
   - name: LocalVariableWriteNode
-    child_nodes:
-      - name: constant_id
+    fields:
+      - name: name
         type: constant
       - name: depth
         type: uint32
-      - name: value
-        type: node
       - name: name_loc
         type: location
+      - name: value
+        type: node
       - name: operator_loc
         type: location
     comment: |
@@ -1579,7 +1607,7 @@ nodes:
           foo = 1
           ^^^^^^^
   - name: MatchPredicateNode
-    child_nodes:
+    fields:
       - name: value
         type: node
       - name: pattern
@@ -1592,7 +1620,7 @@ nodes:
           foo in bar
           ^^^^^^^^^^
   - name: MatchRequiredNode
-    child_nodes:
+    fields:
       - name: value
         type: node
       - name: pattern
@@ -1609,7 +1637,7 @@ nodes:
       Represents a node that is missing from the source and results in a syntax
       error.
   - name: ModuleNode
-    child_nodes:
+    fields:
       - name: locals
         type: constant[]
       - name: module_keyword_loc
@@ -1628,7 +1656,7 @@ nodes:
           module Foo end
           ^^^^^^^^^^^^^^
   - name: MultiWriteNode
-    child_nodes:
+    fields:
       - name: targets
         type: node[]
       - name: operator_loc
@@ -1645,7 +1673,7 @@ nodes:
           a, b, c = 1, 2, 3
           ^^^^^^^^^^^^^^^^^
   - name: NextNode
-    child_nodes:
+    fields:
       - name: arguments
         type: node?
         kind: ArgumentsNode
@@ -1663,7 +1691,7 @@ nodes:
           nil
           ^^^
   - name: NoKeywordsParameterNode
-    child_nodes:
+    fields:
       - name: operator_loc
         type: location
       - name: keyword_loc
@@ -1675,14 +1703,17 @@ nodes:
                 ^^^^^
           end
   - name: NumberedReferenceReadNode
+    fields:
+      - name: number
+        type: uint32
     comment: |
       Represents reading a numbered reference to a capture in the previous match.
           $1
           ^^
   - name: OptionalParameterNode
-    child_nodes:
-      - name: constant_id
+    fields:
+      - name: name
         type: constant
       - name: name_loc
         type: location
@@ -1697,7 +1728,7 @@ nodes:
                 ^^^^^
           end
   - name: OrNode
-    child_nodes:
+    fields:
       - name: left
         type: node
       - name: right
@@ -1710,7 +1741,7 @@ nodes:
           left or right
           ^^^^^^^^^^^^^
   - name: ParametersNode
-    child_nodes:
+    fields:
       - name: requireds
         type: node[]
       - name: optionals
@@ -1734,7 +1765,7 @@ nodes:
                 ^^^^^^^
           end
   - name: ParenthesesNode
-    child_nodes:
+    fields:
       - name: body
         type: node?
       - name: opening_loc
@@ -1748,7 +1779,7 @@ nodes:
           (10 + 34)
           ^^^^^^^^^
   - name: PinnedExpressionNode
-    child_nodes:
+    fields:
       - name: expression
         type: node
       - name: operator_loc
@@ -1764,7 +1795,7 @@ nodes:
           foo in ^(bar)
                  ^^^^^^
   - name: PinnedVariableNode
-    child_nodes:
+    fields:
       - name: variable
         type: node
       - name: operator_loc
@@ -1776,7 +1807,7 @@ nodes:
           foo in ^bar
                  ^^^^
   - name: PostExecutionNode
-    child_nodes:
+    fields:
       - name: statements
         type: node?
         kind: StatementsNode
@@ -1792,7 +1823,7 @@ nodes:
           END { foo }
           ^^^^^^^^^^^
   - name: PreExecutionNode
-    child_nodes:
+    fields:
       - name: statements
         type: node?
         kind: StatementsNode
@@ -1808,7 +1839,7 @@ nodes:
           BEGIN { foo }
           ^^^^^^^^^^^^^
   - name: ProgramNode
-    child_nodes:
+    fields:
       - name: locals
         type: constant[]
       - name: statements
@@ -1816,7 +1847,7 @@ nodes:
         kind: StatementsNode
     comment: The top level node of any parse tree.
   - name: RangeNode
-    child_nodes:
+    fields:
       - name: left
         type: node?
       - name: right
@@ -1835,7 +1866,7 @@ nodes:
           c if a =~ /left/ ... b =~ /right/
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   - name: RationalNode
-    child_nodes:
+    fields:
       - name: numeric
         type: node
     comment: |
@@ -1850,7 +1881,7 @@ nodes:
           redo
           ^^^^
   - name: RegularExpressionNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location
       - name: content_loc
@@ -1868,7 +1899,7 @@ nodes:
           /foo/i
           ^^^^^^
   - name: RequiredDestructuredParameterNode
-    child_nodes:
+    fields:
       - name: parameters
         type: node[]
       - name: opening_loc
@@ -1882,8 +1913,8 @@ nodes:
                   ^^^^^^^^^^
           end
   - name: RequiredParameterNode
-    child_nodes:
-      - name: constant_id
+    fields:
+      - name: name
         type: constant
     comment: |
       Represents a required parameter to a method, block, or lambda definition.
@@ -1892,7 +1923,7 @@ nodes:
                 ^
           end
   - name: RescueModifierNode
-    child_nodes:
+    fields:
       - name: expression
         type: node
       - name: keyword_loc
@@ -1906,7 +1937,7 @@ nodes:
         foo rescue nil
         ^^^^^^^^^^^^^^
   - name: RescueNode
-    child_nodes:
+    fields:
       - name: keyword_loc
         type: location
       - name: exceptions
@@ -1933,7 +1964,7 @@ nodes:
       `Foo, *splat, Bar` are in the `exceptions` field.
       `ex` is in the `exception` field.
   - name: RestParameterNode
-    child_nodes:
+    fields:
       - name: operator_loc
         type: location
       - name: name_loc
@@ -1951,7 +1982,7 @@ nodes:
           retry
           ^^^^^
   - name: ReturnNode
-    child_nodes:
+    fields:
       - name: keyword_loc
         type: location
       - name: arguments
@@ -1969,7 +2000,7 @@ nodes:
           self
           ^^^^
   - name: SingletonClassNode
-    child_nodes:
+    fields:
       - name: locals
         type: constant[]
       - name: class_keyword_loc
@@ -1994,7 +2025,7 @@ nodes:
           __ENCODING__
           ^^^^^^^^^^^^
   - name: SourceFileNode
-    child_nodes:
+    fields:
       - name: filepath
         type: string
     comment: |
@@ -2009,7 +2040,7 @@ nodes:
           __LINE__
           ^^^^^^^^
   - name: SplatNode
-    child_nodes:
+    fields:
       - name: operator_loc
         type: location
       - name: expression
@@ -2020,7 +2051,7 @@ nodes:
           [*a]
            ^^
   - name: StatementsNode
-    child_nodes:
+    fields:
       - name: body
         type: node[]
     comment: |
@@ -2029,7 +2060,7 @@ nodes:
           foo; bar; baz
           ^^^^^^^^^^^^^
   - name: StringConcatNode
-    child_nodes:
+    fields:
       - name: left
         type: node
       - name: right
@@ -2040,7 +2071,7 @@ nodes:
           "foo" "bar"
           ^^^^^^^^^^^
   - name: StringNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location?
       - name: content_loc
@@ -2062,7 +2093,7 @@ nodes:
           "foo #{bar} baz"
            ^^^^      ^^^^
   - name: SuperNode
-    child_nodes:
+    fields:
       - name: keyword_loc
         type: location
       - name: lparen_loc
@@ -2084,7 +2115,7 @@ nodes:
           super foo, bar
           ^^^^^^^^^^^^^^
   - name: SymbolNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location?
       - name: value_loc
@@ -2108,7 +2139,7 @@ nodes:
           true
           ^^^^
   - name: UndefNode
-    child_nodes:
+    fields:
       - name: names
         type: node[]
       - name: keyword_loc
@@ -2119,7 +2150,7 @@ nodes:
           undef :foo, :bar, :baz
           ^^^^^^^^^^^^^^^^^^^^^^
   - name: UnlessNode
-    child_nodes:
+    fields:
       - name: keyword_loc
         type: location
       - name: predicate
@@ -2142,7 +2173,7 @@ nodes:
           unless foo then bar end
           ^^^^^^^^^^^^^^^^^^^^^^^
   - name: UntilNode
-    child_nodes:
+    fields:
       - name: keyword_loc
         type: location
       - name: closing_loc
@@ -2165,7 +2196,7 @@ nodes:
           until foo do bar end
           ^^^^^^^^^^^^^^^^^^^^
   - name: WhenNode
-    child_nodes:
+    fields:
       - name: keyword_loc
         type: location
       - name: conditions
@@ -2181,7 +2212,7 @@ nodes:
           ^^^^^^^^^
           end
   - name: WhileNode
-    child_nodes:
+    fields:
       - name: keyword_loc
         type: location
       - name: closing_loc
@@ -2204,7 +2235,7 @@ nodes:
           while foo do bar end
           ^^^^^^^^^^^^^^^^^^^^
   - name: XStringNode
-    child_nodes:
+    fields:
       - name: opening_loc
         type: location
       - name: content_loc
@@ -2219,7 +2250,7 @@ nodes:
           `foo`
           ^^^^^
   - name: YieldNode
-    child_nodes:
+    fields:
       - name: keyword_loc
         type: location
       - name: lparen_loc