diff --git a/extractor/src/extractor.rs b/extractor/src/extractor.rs
index 0cb7c8073e7..999c7b75368 100644
--- a/extractor/src/extractor.rs
+++ b/extractor/src/extractor.rs
@@ -260,12 +260,12 @@ struct Visitor<'a> {
     /// A lookup table from type name to node types
     schema: &'a NodeTypeMap,
     /// A stack for gathering information from child nodes. Whenever a node is entered
-    /// the parent's [Label] and an empty list is pushed. All children append their data
+    /// the parent's [Label], child counter, and an empty list is pushed. All children append their data
     /// (field name, label, type) to the the list. When the visitor leaves a node the list
     /// containing the child data is popped from the stack and matched against the dbscheme
     /// for the node. If the expectations are met the corresponding row definitions are
     /// added to the trap_output.
-    stack: Vec<(Label, Vec<(Option<&'static str>, Label, TypeName)>)>,
+    stack: Vec<(Label, usize, Vec<(Option<&'static str>, Label, TypeName)>)>,
 }
 
 impl Visitor<'_> {
@@ -290,7 +290,7 @@ impl Visitor<'_> {
 
         let id = self.trap_writer.fresh_id();
 
-        self.stack.push((id, Vec::new()));
+        self.stack.push((id, 0, Vec::new()));
         return true;
     }
 
@@ -298,7 +298,7 @@ impl Visitor<'_> {
         if node.is_error() || node.is_missing() {
             return;
         }
-        let (id, child_nodes) = self.stack.pop().expect("Vistor: empty stack");
+        let (id, _, child_nodes) = self.stack.pop().expect("Vistor: empty stack");
         let (start_line, start_column, end_line, end_column) = location_for(&self.source, node);
         let loc = self.trap_writer.location(
             self.file_label,
@@ -315,9 +315,12 @@ impl Visitor<'_> {
             })
             .unwrap();
         let mut valid = true;
-        let parent_id = match self.stack.last_mut() {
-            Some(p) if !node.is_extra() => p.0,
-            _ => self.file_label,
+        let (parent_id, parent_index) = match self.stack.last_mut() {
+            Some(p) if !node.is_extra() => {
+                p.1 += 1;
+                (p.0, p.1 - 1)
+            }
+            _ => (self.file_label, 0),
         };
         match &table.kind {
             EntryKind::Token { kind_id, .. } => {
@@ -326,6 +329,7 @@ impl Visitor<'_> {
                     vec![
                         Arg::Label(id),
                         Arg::Label(parent_id),
+                        Arg::Int(parent_index),
                         Arg::Int(*kind_id),
                         Arg::Label(self.file_label),
                         Arg::Int(self.token_counter),
@@ -343,6 +347,7 @@ impl Visitor<'_> {
                     let mut all_args = Vec::new();
                     all_args.push(Arg::Label(id));
                     all_args.push(Arg::Label(parent_id));
+                    all_args.push(Arg::Int(parent_index));
                     all_args.extend(args);
                     all_args.push(Arg::Label(loc));
                     self.trap_writer.add_tuple(&table_name, all_args);
@@ -362,7 +367,7 @@ impl Visitor<'_> {
             // Extra nodes are independent root nodes and do not belong to the parent node
             // Therefore we should not register them in the parent vector
             if let Some(parent) = self.stack.last_mut() {
-                parent.1.push((
+                parent.2.push((
                     field_name,
                     id,
                     TypeName {
diff --git a/generator/src/main.rs b/generator/src/main.rs
index f2b0f071312..64a63fc2343 100644
--- a/generator/src/main.rs
+++ b/generator/src/main.rs
@@ -170,6 +170,13 @@ fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<dbscheme::Entry<
                             ql_type: ql::Type::AtType("ast_node_parent"),
                             ql_type_is_ref: true,
                         },
+                        dbscheme::Column {
+                            unique: false,
+                            db_type: dbscheme::DbColumnType::Int,
+                            name: "parent_index",
+                            ql_type: ql::Type::Int,
+                            ql_type_is_ref: true,
+                        },
                     ],
                     keysets: None,
                 };
@@ -265,6 +272,13 @@ fn create_tokeninfo<'a>(
                 ql_type: ql::Type::AtType("ast_node_parent"),
                 ql_type_is_ref: true,
             },
+            dbscheme::Column {
+                unique: false,
+                db_type: dbscheme::DbColumnType::Int,
+                name: "parent_index",
+                ql_type: ql::Type::Int,
+                ql_type_is_ref: true,
+            },
             dbscheme::Column {
                 unique: false,
                 db_type: dbscheme::DbColumnType::Int,
diff --git a/generator/src/ql_gen.rs b/generator/src/ql_gen.rs
index 35a1d6196ef..798f8d5d1c5 100644
--- a/generator/src/ql_gen.rs
+++ b/generator/src/ql_gen.rs
@@ -47,6 +47,7 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
     let get_a_field_or_child =
         create_none_predicate("getAFieldOrChild", false, Some(ql::Type::Normal("AstNode")));
     let get_parent = create_none_predicate("getParent", false, Some(ql::Type::Normal("AstNode")));
+    let get_parent_index = create_none_predicate("getParentIndex", false, Some(ql::Type::Int));
     let describe_ql_class = ql::Predicate {
         name: "describeQlClass",
         overridden: false,
@@ -66,6 +67,7 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
             to_string,
             get_location,
             get_parent,
+            get_parent_index,
             get_a_field_or_child,
             describe_ql_class,
         ],
@@ -78,54 +80,28 @@ fn create_token_class<'a>() -> ql::Class<'a> {
         overridden: true,
         return_type: Some(ql::Type::Normal("AstNode")),
         formal_parameters: vec![],
-        body: ql::Expression::Pred(
-            "tokeninfo",
-            vec![
-                ql::Expression::Var("this"),
-                ql::Expression::Var("result"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-            ],
-        ),
+        body: create_get_field_expr_for_column_storage("tokeninfo", 0, 8),
+    };
+    let get_parent_index = ql::Predicate {
+        name: "getParentIndex",
+        overridden: true,
+        return_type: Some(ql::Type::Int),
+        formal_parameters: vec![],
+        body: create_get_field_expr_for_column_storage("tokeninfo", 1, 8),
     };
     let get_value = ql::Predicate {
         name: "getValue",
         overridden: false,
         return_type: Some(ql::Type::String),
         formal_parameters: vec![],
-        body: ql::Expression::Pred(
-            "tokeninfo",
-            vec![
-                ql::Expression::Var("this"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("result"),
-                ql::Expression::Var("_"),
-            ],
-        ),
+        body: create_get_field_expr_for_column_storage("tokeninfo", 5, 8),
     };
     let get_location = ql::Predicate {
         name: "getLocation",
         overridden: true,
         return_type: Some(ql::Type::Normal("Location")),
         formal_parameters: vec![],
-        body: ql::Expression::Pred(
-            "tokeninfo",
-            vec![
-                ql::Expression::Var("this"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("_"),
-                ql::Expression::Var("result"),
-            ],
-        ),
+        body: create_get_field_expr_for_column_storage("tokeninfo", 6, 8),
     };
     let to_string = ql::Predicate {
         name: "toString",
@@ -146,6 +122,7 @@ fn create_token_class<'a>() -> ql::Class<'a> {
         characteristic_predicate: None,
         predicates: vec![
             get_parent,
+            get_parent_index,
             get_value,
             get_location,
             to_string,
@@ -434,10 +411,11 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                 // There will be:
                 // - one for the id
                 // - one for the parent
+                // - one for the parent index
                 // - one for the location
                 // - one for each field that's stored as a column
                 // - if there are no fields, one for the text column.
-                let main_table_arity = 3 + if fields.is_empty() {
+                let main_table_arity = 4 + if fields.is_empty() {
                     1
                 } else {
                     fields
@@ -468,7 +446,7 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                         .predicates
                         .push(create_get_text_predicate(&main_table_name));
                 } else {
-                    let mut main_table_column_index: usize = 1;
+                    let mut main_table_column_index: usize = 2;
                     let mut get_child_exprs: Vec<ql::Expression> = Vec::new();
 
                     // Iterate through the fields, creating:
@@ -499,6 +477,18 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                         ),
                     });
 
+                    main_class.predicates.push(ql::Predicate {
+                        name: "getParentIndex",
+                        overridden: true,
+                        return_type: Some(ql::Type::Int),
+                        formal_parameters: vec![],
+                        body: create_get_field_expr_for_column_storage(
+                            &main_table_name,
+                            1,
+                            main_table_arity,
+                        ),
+                    });
+
                     main_class.predicates.push(ql::Predicate {
                         name: "getAFieldOrChild",
                         overridden: true,
diff --git a/ql/src/codeql_ruby/ast.qll b/ql/src/codeql_ruby/ast.qll
index 6e8839cf97d..7933f90c81e 100644
--- a/ql/src/codeql_ruby/ast.qll
+++ b/ql/src/codeql_ruby/ast.qll
@@ -13,17 +13,21 @@ class AstNode extends @ast_node {
 
   AstNode getParent() { none() }
 
+  int getParentIndex() { none() }
+
   AstNode getAFieldOrChild() { none() }
 
   string describeQlClass() { result = "???" }
 }
 
 class Token extends @token, AstNode {
-  override AstNode getParent() { tokeninfo(this, result, _, _, _, _, _) }
+  override AstNode getParent() { tokeninfo(this, result, _, _, _, _, _, _) }
 
-  string getValue() { tokeninfo(this, _, _, _, _, result, _) }
+  override int getParentIndex() { tokeninfo(this, _, result, _, _, _, _, _) }
 
-  override Location getLocation() { tokeninfo(this, _, _, _, _, _, result) }
+  string getValue() { tokeninfo(this, _, _, _, _, _, result, _) }
+
+  override Location getLocation() { tokeninfo(this, _, _, _, _, _, _, result) }
 
   override string toString() { result = getValue() }
 
@@ -49,27 +53,31 @@ class UnderscoreVariable extends @underscore_variable, AstNode { }
 class Alias extends @alias, AstNode {
   override string describeQlClass() { result = "Alias" }
 
-  override Location getLocation() { alias_def(this, _, _, _, result) }
+  override Location getLocation() { alias_def(this, _, _, _, _, result) }
 
-  UnderscoreMethodName getAlias() { alias_def(this, _, result, _, _) }
+  UnderscoreMethodName getAlias() { alias_def(this, _, _, result, _, _) }
 
-  UnderscoreMethodName getName() { alias_def(this, _, _, result, _) }
+  UnderscoreMethodName getName() { alias_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { alias_def(this, result, _, _, _) }
+  override AstNode getParent() { alias_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { alias_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    alias_def(this, _, result, _, _) or alias_def(this, _, _, result, _)
+    alias_def(this, _, _, result, _, _) or alias_def(this, _, _, _, result, _)
   }
 }
 
 class ArgumentList extends @argument_list, AstNode {
   override string describeQlClass() { result = "ArgumentList" }
 
-  override Location getLocation() { argument_list_def(this, _, result) }
+  override Location getLocation() { argument_list_def(this, _, _, result) }
 
   AstNode getChild(int i) { argument_list_child(this, i, result) }
 
-  override AstNode getParent() { argument_list_def(this, result, _) }
+  override AstNode getParent() { argument_list_def(this, result, _, _) }
+
+  override int getParentIndex() { argument_list_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { argument_list_child(this, _, result) }
 }
@@ -77,11 +85,13 @@ class ArgumentList extends @argument_list, AstNode {
 class Array extends @array, AstNode {
   override string describeQlClass() { result = "Array" }
 
-  override Location getLocation() { array_def(this, _, result) }
+  override Location getLocation() { array_def(this, _, _, result) }
 
   AstNode getChild(int i) { array_child(this, i, result) }
 
-  override AstNode getParent() { array_def(this, result, _) }
+  override AstNode getParent() { array_def(this, result, _, _) }
+
+  override int getParentIndex() { array_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { array_child(this, _, result) }
 }
@@ -89,27 +99,31 @@ class Array extends @array, AstNode {
 class Assignment extends @assignment, AstNode {
   override string describeQlClass() { result = "Assignment" }
 
-  override Location getLocation() { assignment_def(this, _, _, _, result) }
+  override Location getLocation() { assignment_def(this, _, _, _, _, result) }
 
-  AstNode getLeft() { assignment_def(this, _, result, _, _) }
+  AstNode getLeft() { assignment_def(this, _, _, result, _, _) }
 
-  AstNode getRight() { assignment_def(this, _, _, result, _) }
+  AstNode getRight() { assignment_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { assignment_def(this, result, _, _, _) }
+  override AstNode getParent() { assignment_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { assignment_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    assignment_def(this, _, result, _, _) or assignment_def(this, _, _, result, _)
+    assignment_def(this, _, _, result, _, _) or assignment_def(this, _, _, _, result, _)
   }
 }
 
 class BareString extends @bare_string, AstNode {
   override string describeQlClass() { result = "BareString" }
 
-  override Location getLocation() { bare_string_def(this, _, result) }
+  override Location getLocation() { bare_string_def(this, _, _, result) }
 
   AstNode getChild(int i) { bare_string_child(this, i, result) }
 
-  override AstNode getParent() { bare_string_def(this, result, _) }
+  override AstNode getParent() { bare_string_def(this, result, _, _) }
+
+  override int getParentIndex() { bare_string_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { bare_string_child(this, _, result) }
 }
@@ -117,11 +131,13 @@ class BareString extends @bare_string, AstNode {
 class BareSymbol extends @bare_symbol, AstNode {
   override string describeQlClass() { result = "BareSymbol" }
 
-  override Location getLocation() { bare_symbol_def(this, _, result) }
+  override Location getLocation() { bare_symbol_def(this, _, _, result) }
 
   AstNode getChild(int i) { bare_symbol_child(this, i, result) }
 
-  override AstNode getParent() { bare_symbol_def(this, result, _) }
+  override AstNode getParent() { bare_symbol_def(this, result, _, _) }
+
+  override int getParentIndex() { bare_symbol_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { bare_symbol_child(this, _, result) }
 }
@@ -129,11 +145,13 @@ class BareSymbol extends @bare_symbol, AstNode {
 class Begin extends @begin, AstNode {
   override string describeQlClass() { result = "Begin" }
 
-  override Location getLocation() { begin_def(this, _, result) }
+  override Location getLocation() { begin_def(this, _, _, result) }
 
   AstNode getChild(int i) { begin_child(this, i, result) }
 
-  override AstNode getParent() { begin_def(this, result, _) }
+  override AstNode getParent() { begin_def(this, result, _, _) }
+
+  override int getParentIndex() { begin_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { begin_child(this, _, result) }
 }
@@ -141,11 +159,13 @@ class Begin extends @begin, AstNode {
 class BeginBlock extends @begin_block, AstNode {
   override string describeQlClass() { result = "BeginBlock" }
 
-  override Location getLocation() { begin_block_def(this, _, result) }
+  override Location getLocation() { begin_block_def(this, _, _, result) }
 
   AstNode getChild(int i) { begin_block_child(this, i, result) }
 
-  override AstNode getParent() { begin_block_def(this, result, _) }
+  override AstNode getParent() { begin_block_def(this, result, _, _) }
+
+  override int getParentIndex() { begin_block_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { begin_block_child(this, _, result) }
 }
@@ -153,31 +173,35 @@ class BeginBlock extends @begin_block, AstNode {
 class Binary extends @binary, AstNode {
   override string describeQlClass() { result = "Binary" }
 
-  override Location getLocation() { binary_def(this, _, _, _, _, result) }
+  override Location getLocation() { binary_def(this, _, _, _, _, _, result) }
 
-  AstNode getLeft() { binary_def(this, _, result, _, _, _) }
+  AstNode getLeft() { binary_def(this, _, _, result, _, _, _) }
 
-  AstNode getOperator() { binary_def(this, _, _, result, _, _) }
+  AstNode getOperator() { binary_def(this, _, _, _, result, _, _) }
 
-  AstNode getRight() { binary_def(this, _, _, _, result, _) }
+  AstNode getRight() { binary_def(this, _, _, _, _, result, _) }
 
-  override AstNode getParent() { binary_def(this, result, _, _, _, _) }
+  override AstNode getParent() { binary_def(this, result, _, _, _, _, _) }
+
+  override int getParentIndex() { binary_def(this, _, result, _, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    binary_def(this, _, result, _, _, _) or
-    binary_def(this, _, _, result, _, _) or
-    binary_def(this, _, _, _, result, _)
+    binary_def(this, _, _, result, _, _, _) or
+    binary_def(this, _, _, _, result, _, _) or
+    binary_def(this, _, _, _, _, result, _)
   }
 }
 
 class Block extends @block, AstNode {
   override string describeQlClass() { result = "Block" }
 
-  override Location getLocation() { block_def(this, _, result) }
+  override Location getLocation() { block_def(this, _, _, result) }
 
   AstNode getChild(int i) { block_child(this, i, result) }
 
-  override AstNode getParent() { block_def(this, result, _) }
+  override AstNode getParent() { block_def(this, result, _, _) }
+
+  override int getParentIndex() { block_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { block_child(this, _, result) }
 }
@@ -185,35 +209,41 @@ class Block extends @block, AstNode {
 class BlockArgument extends @block_argument, AstNode {
   override string describeQlClass() { result = "BlockArgument" }
 
-  override Location getLocation() { block_argument_def(this, _, _, result) }
+  override Location getLocation() { block_argument_def(this, _, _, _, result) }
 
-  UnderscoreArg getChild() { block_argument_def(this, _, result, _) }
+  UnderscoreArg getChild() { block_argument_def(this, _, _, result, _) }
 
-  override AstNode getParent() { block_argument_def(this, result, _, _) }
+  override AstNode getParent() { block_argument_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { block_argument_def(this, _, result, _) }
+  override int getParentIndex() { block_argument_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { block_argument_def(this, _, _, result, _) }
 }
 
 class BlockParameter extends @block_parameter, AstNode {
   override string describeQlClass() { result = "BlockParameter" }
 
-  override Location getLocation() { block_parameter_def(this, _, _, result) }
+  override Location getLocation() { block_parameter_def(this, _, _, _, result) }
 
-  Identifier getName() { block_parameter_def(this, _, result, _) }
+  Identifier getName() { block_parameter_def(this, _, _, result, _) }
 
-  override AstNode getParent() { block_parameter_def(this, result, _, _) }
+  override AstNode getParent() { block_parameter_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { block_parameter_def(this, _, result, _) }
+  override int getParentIndex() { block_parameter_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { block_parameter_def(this, _, _, result, _) }
 }
 
 class BlockParameters extends @block_parameters, AstNode {
   override string describeQlClass() { result = "BlockParameters" }
 
-  override Location getLocation() { block_parameters_def(this, _, result) }
+  override Location getLocation() { block_parameters_def(this, _, _, result) }
 
   AstNode getChild(int i) { block_parameters_child(this, i, result) }
 
-  override AstNode getParent() { block_parameters_def(this, result, _) }
+  override AstNode getParent() { block_parameters_def(this, result, _, _) }
+
+  override int getParentIndex() { block_parameters_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { block_parameters_child(this, _, result) }
 }
@@ -221,11 +251,13 @@ class BlockParameters extends @block_parameters, AstNode {
 class Break extends @break, AstNode {
   override string describeQlClass() { result = "Break" }
 
-  override Location getLocation() { break_def(this, _, result) }
+  override Location getLocation() { break_def(this, _, _, result) }
 
   ArgumentList getChild() { break_child(this, result) }
 
-  override AstNode getParent() { break_def(this, result, _) }
+  override AstNode getParent() { break_def(this, result, _, _) }
+
+  override int getParentIndex() { break_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { break_child(this, result) }
 }
@@ -233,29 +265,33 @@ class Break extends @break, AstNode {
 class Call extends @call, AstNode {
   override string describeQlClass() { result = "Call" }
 
-  override Location getLocation() { call_def(this, _, _, _, result) }
+  override Location getLocation() { call_def(this, _, _, _, _, result) }
 
-  AstNode getMethod() { call_def(this, _, result, _, _) }
+  AstNode getMethod() { call_def(this, _, _, result, _, _) }
 
-  AstNode getReceiver() { call_def(this, _, _, result, _) }
+  AstNode getReceiver() { call_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { call_def(this, result, _, _, _) }
+  override AstNode getParent() { call_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { call_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    call_def(this, _, result, _, _) or call_def(this, _, _, result, _)
+    call_def(this, _, _, result, _, _) or call_def(this, _, _, _, result, _)
   }
 }
 
 class Case extends @case__, AstNode {
   override string describeQlClass() { result = "Case" }
 
-  override Location getLocation() { case_def(this, _, result) }
+  override Location getLocation() { case_def(this, _, _, result) }
 
   UnderscoreStatement getValue() { case_value(this, result) }
 
   AstNode getChild(int i) { case_child(this, i, result) }
 
-  override AstNode getParent() { case_def(this, result, _) }
+  override AstNode getParent() { case_def(this, result, _, _) }
+
+  override int getParentIndex() { case_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { case_value(this, result) or case_child(this, _, result) }
 }
@@ -263,11 +299,13 @@ class Case extends @case__, AstNode {
 class ChainedString extends @chained_string, AstNode {
   override string describeQlClass() { result = "ChainedString" }
 
-  override Location getLocation() { chained_string_def(this, _, result) }
+  override Location getLocation() { chained_string_def(this, _, _, result) }
 
   String getChild(int i) { chained_string_child(this, i, result) }
 
-  override AstNode getParent() { chained_string_def(this, result, _) }
+  override AstNode getParent() { chained_string_def(this, result, _, _) }
+
+  override int getParentIndex() { chained_string_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { chained_string_child(this, _, result) }
 }
@@ -279,16 +317,18 @@ class Character extends @token_character, Token {
 class Class extends @class, AstNode {
   override string describeQlClass() { result = "Class" }
 
-  override Location getLocation() { class_def(this, _, _, result) }
+  override Location getLocation() { class_def(this, _, _, _, result) }
 
-  AstNode getName() { class_def(this, _, result, _) }
+  AstNode getName() { class_def(this, _, _, result, _) }
 
   AstNode getChild(int i) { class_child(this, i, result) }
 
-  override AstNode getParent() { class_def(this, result, _, _) }
+  override AstNode getParent() { class_def(this, result, _, _, _) }
+
+  override int getParentIndex() { class_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    class_def(this, _, result, _) or class_child(this, _, result)
+    class_def(this, _, _, result, _) or class_child(this, _, result)
   }
 }
 
@@ -307,20 +347,22 @@ class Complex extends @token_complex, Token {
 class Conditional extends @conditional, AstNode {
   override string describeQlClass() { result = "Conditional" }
 
-  override Location getLocation() { conditional_def(this, _, _, _, _, result) }
+  override Location getLocation() { conditional_def(this, _, _, _, _, _, result) }
 
-  UnderscoreArg getAlternative() { conditional_def(this, _, result, _, _, _) }
+  UnderscoreArg getAlternative() { conditional_def(this, _, _, result, _, _, _) }
 
-  UnderscoreArg getCondition() { conditional_def(this, _, _, result, _, _) }
+  UnderscoreArg getCondition() { conditional_def(this, _, _, _, result, _, _) }
 
-  UnderscoreArg getConsequence() { conditional_def(this, _, _, _, result, _) }
+  UnderscoreArg getConsequence() { conditional_def(this, _, _, _, _, result, _) }
 
-  override AstNode getParent() { conditional_def(this, result, _, _, _, _) }
+  override AstNode getParent() { conditional_def(this, result, _, _, _, _, _) }
+
+  override int getParentIndex() { conditional_def(this, _, result, _, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    conditional_def(this, _, result, _, _, _) or
-    conditional_def(this, _, _, result, _, _) or
-    conditional_def(this, _, _, _, result, _)
+    conditional_def(this, _, _, result, _, _, _) or
+    conditional_def(this, _, _, _, result, _, _) or
+    conditional_def(this, _, _, _, _, result, _)
   }
 }
 
@@ -331,11 +373,13 @@ class Constant extends @token_constant, Token {
 class DestructuredLeftAssignment extends @destructured_left_assignment, AstNode {
   override string describeQlClass() { result = "DestructuredLeftAssignment" }
 
-  override Location getLocation() { destructured_left_assignment_def(this, _, result) }
+  override Location getLocation() { destructured_left_assignment_def(this, _, _, result) }
 
   AstNode getChild(int i) { destructured_left_assignment_child(this, i, result) }
 
-  override AstNode getParent() { destructured_left_assignment_def(this, result, _) }
+  override AstNode getParent() { destructured_left_assignment_def(this, result, _, _) }
+
+  override int getParentIndex() { destructured_left_assignment_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { destructured_left_assignment_child(this, _, result) }
 }
@@ -343,11 +387,13 @@ class DestructuredLeftAssignment extends @destructured_left_assignment, AstNode
 class DestructuredParameter extends @destructured_parameter, AstNode {
   override string describeQlClass() { result = "DestructuredParameter" }
 
-  override Location getLocation() { destructured_parameter_def(this, _, result) }
+  override Location getLocation() { destructured_parameter_def(this, _, _, result) }
 
   AstNode getChild(int i) { destructured_parameter_child(this, i, result) }
 
-  override AstNode getParent() { destructured_parameter_def(this, result, _) }
+  override AstNode getParent() { destructured_parameter_def(this, result, _, _) }
+
+  override int getParentIndex() { destructured_parameter_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { destructured_parameter_child(this, _, result) }
 }
@@ -355,11 +401,13 @@ class DestructuredParameter extends @destructured_parameter, AstNode {
 class Do extends @do, AstNode {
   override string describeQlClass() { result = "Do" }
 
-  override Location getLocation() { do_def(this, _, result) }
+  override Location getLocation() { do_def(this, _, _, result) }
 
   AstNode getChild(int i) { do_child(this, i, result) }
 
-  override AstNode getParent() { do_def(this, result, _) }
+  override AstNode getParent() { do_def(this, result, _, _) }
+
+  override int getParentIndex() { do_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { do_child(this, _, result) }
 }
@@ -367,11 +415,13 @@ class Do extends @do, AstNode {
 class DoBlock extends @do_block, AstNode {
   override string describeQlClass() { result = "DoBlock" }
 
-  override Location getLocation() { do_block_def(this, _, result) }
+  override Location getLocation() { do_block_def(this, _, _, result) }
 
   AstNode getChild(int i) { do_block_child(this, i, result) }
 
-  override AstNode getParent() { do_block_def(this, result, _) }
+  override AstNode getParent() { do_block_def(this, result, _, _) }
+
+  override int getParentIndex() { do_block_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { do_block_child(this, _, result) }
 }
@@ -379,27 +429,31 @@ class DoBlock extends @do_block, AstNode {
 class ElementReference extends @element_reference, AstNode {
   override string describeQlClass() { result = "ElementReference" }
 
-  override Location getLocation() { element_reference_def(this, _, _, result) }
+  override Location getLocation() { element_reference_def(this, _, _, _, result) }
 
-  UnderscorePrimary getObject() { element_reference_def(this, _, result, _) }
+  UnderscorePrimary getObject() { element_reference_def(this, _, _, result, _) }
 
   AstNode getChild(int i) { element_reference_child(this, i, result) }
 
-  override AstNode getParent() { element_reference_def(this, result, _, _) }
+  override AstNode getParent() { element_reference_def(this, result, _, _, _) }
+
+  override int getParentIndex() { element_reference_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    element_reference_def(this, _, result, _) or element_reference_child(this, _, result)
+    element_reference_def(this, _, _, result, _) or element_reference_child(this, _, result)
   }
 }
 
 class Else extends @else, AstNode {
   override string describeQlClass() { result = "Else" }
 
-  override Location getLocation() { else_def(this, _, result) }
+  override Location getLocation() { else_def(this, _, _, result) }
 
   AstNode getChild(int i) { else_child(this, i, result) }
 
-  override AstNode getParent() { else_def(this, result, _) }
+  override AstNode getParent() { else_def(this, result, _, _) }
+
+  override int getParentIndex() { else_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { else_child(this, _, result) }
 }
@@ -407,19 +461,21 @@ class Else extends @else, AstNode {
 class Elsif extends @elsif, AstNode {
   override string describeQlClass() { result = "Elsif" }
 
-  override Location getLocation() { elsif_def(this, _, _, result) }
+  override Location getLocation() { elsif_def(this, _, _, _, result) }
 
   AstNode getAlternative() { elsif_alternative(this, result) }
 
-  UnderscoreStatement getCondition() { elsif_def(this, _, result, _) }
+  UnderscoreStatement getCondition() { elsif_def(this, _, _, result, _) }
 
   Then getConsequence() { elsif_consequence(this, result) }
 
-  override AstNode getParent() { elsif_def(this, result, _, _) }
+  override AstNode getParent() { elsif_def(this, result, _, _, _) }
+
+  override int getParentIndex() { elsif_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
     elsif_alternative(this, result) or
-    elsif_def(this, _, result, _) or
+    elsif_def(this, _, _, result, _) or
     elsif_consequence(this, result)
   }
 }
@@ -431,11 +487,13 @@ class EmptyStatement extends @token_empty_statement, Token {
 class EndBlock extends @end_block, AstNode {
   override string describeQlClass() { result = "EndBlock" }
 
-  override Location getLocation() { end_block_def(this, _, result) }
+  override Location getLocation() { end_block_def(this, _, _, result) }
 
   AstNode getChild(int i) { end_block_child(this, i, result) }
 
-  override AstNode getParent() { end_block_def(this, result, _) }
+  override AstNode getParent() { end_block_def(this, result, _, _) }
+
+  override int getParentIndex() { end_block_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { end_block_child(this, _, result) }
 }
@@ -443,11 +501,13 @@ class EndBlock extends @end_block, AstNode {
 class Ensure extends @ensure, AstNode {
   override string describeQlClass() { result = "Ensure" }
 
-  override Location getLocation() { ensure_def(this, _, result) }
+  override Location getLocation() { ensure_def(this, _, _, result) }
 
   AstNode getChild(int i) { ensure_child(this, i, result) }
 
-  override AstNode getParent() { ensure_def(this, result, _) }
+  override AstNode getParent() { ensure_def(this, result, _, _) }
+
+  override int getParentIndex() { ensure_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { ensure_child(this, _, result) }
 }
@@ -459,23 +519,27 @@ class EscapeSequence extends @token_escape_sequence, Token {
 class ExceptionVariable extends @exception_variable, AstNode {
   override string describeQlClass() { result = "ExceptionVariable" }
 
-  override Location getLocation() { exception_variable_def(this, _, _, result) }
+  override Location getLocation() { exception_variable_def(this, _, _, _, result) }
 
-  UnderscoreLhs getChild() { exception_variable_def(this, _, result, _) }
+  UnderscoreLhs getChild() { exception_variable_def(this, _, _, result, _) }
 
-  override AstNode getParent() { exception_variable_def(this, result, _, _) }
+  override AstNode getParent() { exception_variable_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { exception_variable_def(this, _, result, _) }
+  override int getParentIndex() { exception_variable_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { exception_variable_def(this, _, _, result, _) }
 }
 
 class Exceptions extends @exceptions, AstNode {
   override string describeQlClass() { result = "Exceptions" }
 
-  override Location getLocation() { exceptions_def(this, _, result) }
+  override Location getLocation() { exceptions_def(this, _, _, result) }
 
   AstNode getChild(int i) { exceptions_child(this, i, result) }
 
-  override AstNode getParent() { exceptions_def(this, result, _) }
+  override AstNode getParent() { exceptions_def(this, result, _, _) }
+
+  override int getParentIndex() { exceptions_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { exceptions_child(this, _, result) }
 }
@@ -491,18 +555,22 @@ class Float extends @token_float, Token {
 class For extends @for, AstNode {
   override string describeQlClass() { result = "For" }
 
-  override Location getLocation() { for_def(this, _, _, _, result) }
+  override Location getLocation() { for_def(this, _, _, _, _, result) }
 
-  Do getBody() { for_def(this, _, result, _, _) }
+  Do getBody() { for_def(this, _, _, result, _, _) }
 
   AstNode getPattern(int i) { for_pattern(this, i, result) }
 
-  In getValue() { for_def(this, _, _, result, _) }
+  In getValue() { for_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { for_def(this, result, _, _, _) }
+  override AstNode getParent() { for_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { for_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    for_def(this, _, result, _, _) or for_pattern(this, _, result) or for_def(this, _, _, result, _)
+    for_def(this, _, _, result, _, _) or
+    for_pattern(this, _, result) or
+    for_def(this, _, _, _, result, _)
   }
 }
 
@@ -513,11 +581,13 @@ class GlobalVariable extends @token_global_variable, Token {
 class Hash extends @hash, AstNode {
   override string describeQlClass() { result = "Hash" }
 
-  override Location getLocation() { hash_def(this, _, result) }
+  override Location getLocation() { hash_def(this, _, _, result) }
 
   AstNode getChild(int i) { hash_child(this, i, result) }
 
-  override AstNode getParent() { hash_def(this, result, _) }
+  override AstNode getParent() { hash_def(this, result, _, _) }
+
+  override int getParentIndex() { hash_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { hash_child(this, _, result) }
 }
@@ -525,23 +595,27 @@ class Hash extends @hash, AstNode {
 class HashSplatArgument extends @hash_splat_argument, AstNode {
   override string describeQlClass() { result = "HashSplatArgument" }
 
-  override Location getLocation() { hash_splat_argument_def(this, _, _, result) }
+  override Location getLocation() { hash_splat_argument_def(this, _, _, _, result) }
 
-  UnderscoreArg getChild() { hash_splat_argument_def(this, _, result, _) }
+  UnderscoreArg getChild() { hash_splat_argument_def(this, _, _, result, _) }
 
-  override AstNode getParent() { hash_splat_argument_def(this, result, _, _) }
+  override AstNode getParent() { hash_splat_argument_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { hash_splat_argument_def(this, _, result, _) }
+  override int getParentIndex() { hash_splat_argument_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { hash_splat_argument_def(this, _, _, result, _) }
 }
 
 class HashSplatParameter extends @hash_splat_parameter, AstNode {
   override string describeQlClass() { result = "HashSplatParameter" }
 
-  override Location getLocation() { hash_splat_parameter_def(this, _, result) }
+  override Location getLocation() { hash_splat_parameter_def(this, _, _, result) }
 
   Identifier getName() { hash_splat_parameter_name(this, result) }
 
-  override AstNode getParent() { hash_splat_parameter_def(this, result, _) }
+  override AstNode getParent() { hash_splat_parameter_def(this, result, _, _) }
+
+  override int getParentIndex() { hash_splat_parameter_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { hash_splat_parameter_name(this, result) }
 }
@@ -553,11 +627,13 @@ class HeredocBeginning extends @token_heredoc_beginning, Token {
 class HeredocBody extends @heredoc_body, AstNode {
   override string describeQlClass() { result = "HeredocBody" }
 
-  override Location getLocation() { heredoc_body_def(this, _, result) }
+  override Location getLocation() { heredoc_body_def(this, _, _, result) }
 
   AstNode getChild(int i) { heredoc_body_child(this, i, result) }
 
-  override AstNode getParent() { heredoc_body_def(this, result, _) }
+  override AstNode getParent() { heredoc_body_def(this, result, _, _) }
+
+  override int getParentIndex() { heredoc_body_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { heredoc_body_child(this, _, result) }
 }
@@ -577,47 +653,53 @@ class Identifier extends @token_identifier, Token {
 class If extends @if, AstNode {
   override string describeQlClass() { result = "If" }
 
-  override Location getLocation() { if_def(this, _, _, result) }
+  override Location getLocation() { if_def(this, _, _, _, result) }
 
   AstNode getAlternative() { if_alternative(this, result) }
 
-  UnderscoreStatement getCondition() { if_def(this, _, result, _) }
+  UnderscoreStatement getCondition() { if_def(this, _, _, result, _) }
 
   Then getConsequence() { if_consequence(this, result) }
 
-  override AstNode getParent() { if_def(this, result, _, _) }
+  override AstNode getParent() { if_def(this, result, _, _, _) }
+
+  override int getParentIndex() { if_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    if_alternative(this, result) or if_def(this, _, result, _) or if_consequence(this, result)
+    if_alternative(this, result) or if_def(this, _, _, result, _) or if_consequence(this, result)
   }
 }
 
 class IfModifier extends @if_modifier, AstNode {
   override string describeQlClass() { result = "IfModifier" }
 
-  override Location getLocation() { if_modifier_def(this, _, _, _, result) }
+  override Location getLocation() { if_modifier_def(this, _, _, _, _, result) }
 
-  UnderscoreStatement getBody() { if_modifier_def(this, _, result, _, _) }
+  UnderscoreStatement getBody() { if_modifier_def(this, _, _, result, _, _) }
 
-  AstNode getCondition() { if_modifier_def(this, _, _, result, _) }
+  AstNode getCondition() { if_modifier_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { if_modifier_def(this, result, _, _, _) }
+  override AstNode getParent() { if_modifier_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { if_modifier_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    if_modifier_def(this, _, result, _, _) or if_modifier_def(this, _, _, result, _)
+    if_modifier_def(this, _, _, result, _, _) or if_modifier_def(this, _, _, _, result, _)
   }
 }
 
 class In extends @in, AstNode {
   override string describeQlClass() { result = "In" }
 
-  override Location getLocation() { in_def(this, _, _, result) }
+  override Location getLocation() { in_def(this, _, _, _, result) }
 
-  UnderscoreArg getChild() { in_def(this, _, result, _) }
+  UnderscoreArg getChild() { in_def(this, _, _, result, _) }
 
-  override AstNode getParent() { in_def(this, result, _, _) }
+  override AstNode getParent() { in_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { in_def(this, _, result, _) }
+  override int getParentIndex() { in_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { in_def(this, _, _, result, _) }
 }
 
 class InstanceVariable extends @token_instance_variable, Token {
@@ -631,55 +713,63 @@ class Integer extends @token_integer, Token {
 class Interpolation extends @interpolation, AstNode {
   override string describeQlClass() { result = "Interpolation" }
 
-  override Location getLocation() { interpolation_def(this, _, _, result) }
+  override Location getLocation() { interpolation_def(this, _, _, _, result) }
 
-  UnderscoreStatement getChild() { interpolation_def(this, _, result, _) }
+  UnderscoreStatement getChild() { interpolation_def(this, _, _, result, _) }
 
-  override AstNode getParent() { interpolation_def(this, result, _, _) }
+  override AstNode getParent() { interpolation_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { interpolation_def(this, _, result, _) }
+  override int getParentIndex() { interpolation_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { interpolation_def(this, _, _, result, _) }
 }
 
 class KeywordParameter extends @keyword_parameter, AstNode {
   override string describeQlClass() { result = "KeywordParameter" }
 
-  override Location getLocation() { keyword_parameter_def(this, _, _, result) }
+  override Location getLocation() { keyword_parameter_def(this, _, _, _, result) }
 
-  Identifier getName() { keyword_parameter_def(this, _, result, _) }
+  Identifier getName() { keyword_parameter_def(this, _, _, result, _) }
 
   UnderscoreArg getValue() { keyword_parameter_value(this, result) }
 
-  override AstNode getParent() { keyword_parameter_def(this, result, _, _) }
+  override AstNode getParent() { keyword_parameter_def(this, result, _, _, _) }
+
+  override int getParentIndex() { keyword_parameter_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    keyword_parameter_def(this, _, result, _) or keyword_parameter_value(this, result)
+    keyword_parameter_def(this, _, _, result, _) or keyword_parameter_value(this, result)
   }
 }
 
 class Lambda extends @lambda, AstNode {
   override string describeQlClass() { result = "Lambda" }
 
-  override Location getLocation() { lambda_def(this, _, _, result) }
+  override Location getLocation() { lambda_def(this, _, _, _, result) }
 
-  AstNode getBody() { lambda_def(this, _, result, _) }
+  AstNode getBody() { lambda_def(this, _, _, result, _) }
 
   LambdaParameters getParameters() { lambda_parameters(this, result) }
 
-  override AstNode getParent() { lambda_def(this, result, _, _) }
+  override AstNode getParent() { lambda_def(this, result, _, _, _) }
+
+  override int getParentIndex() { lambda_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    lambda_def(this, _, result, _) or lambda_parameters(this, result)
+    lambda_def(this, _, _, result, _) or lambda_parameters(this, result)
   }
 }
 
 class LambdaParameters extends @lambda_parameters, AstNode {
   override string describeQlClass() { result = "LambdaParameters" }
 
-  override Location getLocation() { lambda_parameters_def(this, _, result) }
+  override Location getLocation() { lambda_parameters_def(this, _, _, result) }
 
   AstNode getChild(int i) { lambda_parameters_child(this, i, result) }
 
-  override AstNode getParent() { lambda_parameters_def(this, result, _) }
+  override AstNode getParent() { lambda_parameters_def(this, result, _, _) }
+
+  override int getParentIndex() { lambda_parameters_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { lambda_parameters_child(this, _, result) }
 }
@@ -687,11 +777,13 @@ class LambdaParameters extends @lambda_parameters, AstNode {
 class LeftAssignmentList extends @left_assignment_list, AstNode {
   override string describeQlClass() { result = "LeftAssignmentList" }
 
-  override Location getLocation() { left_assignment_list_def(this, _, result) }
+  override Location getLocation() { left_assignment_list_def(this, _, _, result) }
 
   AstNode getChild(int i) { left_assignment_list_child(this, i, result) }
 
-  override AstNode getParent() { left_assignment_list_def(this, result, _) }
+  override AstNode getParent() { left_assignment_list_def(this, result, _, _) }
+
+  override int getParentIndex() { left_assignment_list_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { left_assignment_list_child(this, _, result) }
 }
@@ -699,18 +791,20 @@ class LeftAssignmentList extends @left_assignment_list, AstNode {
 class Method extends @method, AstNode {
   override string describeQlClass() { result = "Method" }
 
-  override Location getLocation() { method_def(this, _, _, result) }
+  override Location getLocation() { method_def(this, _, _, _, result) }
 
-  UnderscoreMethodName getName() { method_def(this, _, result, _) }
+  UnderscoreMethodName getName() { method_def(this, _, _, result, _) }
 
   MethodParameters getParameters() { method_parameters(this, result) }
 
   AstNode getChild(int i) { method_child(this, i, result) }
 
-  override AstNode getParent() { method_def(this, result, _, _) }
+  override AstNode getParent() { method_def(this, result, _, _, _) }
+
+  override int getParentIndex() { method_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    method_def(this, _, result, _) or
+    method_def(this, _, _, result, _) or
     method_parameters(this, result) or
     method_child(this, _, result)
   }
@@ -719,31 +813,35 @@ class Method extends @method, AstNode {
 class MethodCall extends @method_call, AstNode {
   override string describeQlClass() { result = "MethodCall" }
 
-  override Location getLocation() { method_call_def(this, _, _, result) }
+  override Location getLocation() { method_call_def(this, _, _, _, result) }
 
   ArgumentList getArguments() { method_call_arguments(this, result) }
 
   AstNode getBlock() { method_call_block(this, result) }
 
-  AstNode getMethod() { method_call_def(this, _, result, _) }
+  AstNode getMethod() { method_call_def(this, _, _, result, _) }
 
-  override AstNode getParent() { method_call_def(this, result, _, _) }
+  override AstNode getParent() { method_call_def(this, result, _, _, _) }
+
+  override int getParentIndex() { method_call_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
     method_call_arguments(this, result) or
     method_call_block(this, result) or
-    method_call_def(this, _, result, _)
+    method_call_def(this, _, _, result, _)
   }
 }
 
 class MethodParameters extends @method_parameters, AstNode {
   override string describeQlClass() { result = "MethodParameters" }
 
-  override Location getLocation() { method_parameters_def(this, _, result) }
+  override Location getLocation() { method_parameters_def(this, _, _, result) }
 
   AstNode getChild(int i) { method_parameters_child(this, i, result) }
 
-  override AstNode getParent() { method_parameters_def(this, result, _) }
+  override AstNode getParent() { method_parameters_def(this, result, _, _) }
+
+  override int getParentIndex() { method_parameters_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { method_parameters_child(this, _, result) }
 }
@@ -751,27 +849,31 @@ class MethodParameters extends @method_parameters, AstNode {
 class Module extends @module, AstNode {
   override string describeQlClass() { result = "Module" }
 
-  override Location getLocation() { module_def(this, _, _, result) }
+  override Location getLocation() { module_def(this, _, _, _, result) }
 
-  AstNode getName() { module_def(this, _, result, _) }
+  AstNode getName() { module_def(this, _, _, result, _) }
 
   AstNode getChild(int i) { module_child(this, i, result) }
 
-  override AstNode getParent() { module_def(this, result, _, _) }
+  override AstNode getParent() { module_def(this, result, _, _, _) }
+
+  override int getParentIndex() { module_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    module_def(this, _, result, _) or module_child(this, _, result)
+    module_def(this, _, _, result, _) or module_child(this, _, result)
   }
 }
 
 class Next extends @next, AstNode {
   override string describeQlClass() { result = "Next" }
 
-  override Location getLocation() { next_def(this, _, result) }
+  override Location getLocation() { next_def(this, _, _, result) }
 
   ArgumentList getChild() { next_child(this, result) }
 
-  override AstNode getParent() { next_def(this, result, _) }
+  override AstNode getParent() { next_def(this, result, _, _) }
+
+  override int getParentIndex() { next_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { next_child(this, result) }
 }
@@ -787,59 +889,69 @@ class Operator extends @token_operator, Token {
 class OperatorAssignment extends @operator_assignment, AstNode {
   override string describeQlClass() { result = "OperatorAssignment" }
 
-  override Location getLocation() { operator_assignment_def(this, _, _, _, result) }
+  override Location getLocation() { operator_assignment_def(this, _, _, _, _, result) }
 
-  UnderscoreLhs getLeft() { operator_assignment_def(this, _, result, _, _) }
+  UnderscoreLhs getLeft() { operator_assignment_def(this, _, _, result, _, _) }
 
-  AstNode getRight() { operator_assignment_def(this, _, _, result, _) }
+  AstNode getRight() { operator_assignment_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { operator_assignment_def(this, result, _, _, _) }
+  override AstNode getParent() { operator_assignment_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { operator_assignment_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    operator_assignment_def(this, _, result, _, _) or operator_assignment_def(this, _, _, result, _)
+    operator_assignment_def(this, _, _, result, _, _) or
+    operator_assignment_def(this, _, _, _, result, _)
   }
 }
 
 class OptionalParameter extends @optional_parameter, AstNode {
   override string describeQlClass() { result = "OptionalParameter" }
 
-  override Location getLocation() { optional_parameter_def(this, _, _, _, result) }
+  override Location getLocation() { optional_parameter_def(this, _, _, _, _, result) }
 
-  Identifier getName() { optional_parameter_def(this, _, result, _, _) }
+  Identifier getName() { optional_parameter_def(this, _, _, result, _, _) }
 
-  UnderscoreArg getValue() { optional_parameter_def(this, _, _, result, _) }
+  UnderscoreArg getValue() { optional_parameter_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { optional_parameter_def(this, result, _, _, _) }
+  override AstNode getParent() { optional_parameter_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { optional_parameter_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    optional_parameter_def(this, _, result, _, _) or optional_parameter_def(this, _, _, result, _)
+    optional_parameter_def(this, _, _, result, _, _) or
+    optional_parameter_def(this, _, _, _, result, _)
   }
 }
 
 class Pair extends @pair, AstNode {
   override string describeQlClass() { result = "Pair" }
 
-  override Location getLocation() { pair_def(this, _, _, _, result) }
+  override Location getLocation() { pair_def(this, _, _, _, _, result) }
 
-  AstNode getKey() { pair_def(this, _, result, _, _) }
+  AstNode getKey() { pair_def(this, _, _, result, _, _) }
 
-  UnderscoreArg getValue() { pair_def(this, _, _, result, _) }
+  UnderscoreArg getValue() { pair_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { pair_def(this, result, _, _, _) }
+  override AstNode getParent() { pair_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { pair_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    pair_def(this, _, result, _, _) or pair_def(this, _, _, result, _)
+    pair_def(this, _, _, result, _, _) or pair_def(this, _, _, _, result, _)
   }
 }
 
 class ParenthesizedStatements extends @parenthesized_statements, AstNode {
   override string describeQlClass() { result = "ParenthesizedStatements" }
 
-  override Location getLocation() { parenthesized_statements_def(this, _, result) }
+  override Location getLocation() { parenthesized_statements_def(this, _, _, result) }
 
   AstNode getChild(int i) { parenthesized_statements_child(this, i, result) }
 
-  override AstNode getParent() { parenthesized_statements_def(this, result, _) }
+  override AstNode getParent() { parenthesized_statements_def(this, result, _, _) }
+
+  override int getParentIndex() { parenthesized_statements_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { parenthesized_statements_child(this, _, result) }
 }
@@ -847,23 +959,27 @@ class ParenthesizedStatements extends @parenthesized_statements, AstNode {
 class Pattern extends @pattern, AstNode {
   override string describeQlClass() { result = "Pattern" }
 
-  override Location getLocation() { pattern_def(this, _, _, result) }
+  override Location getLocation() { pattern_def(this, _, _, _, result) }
 
-  AstNode getChild() { pattern_def(this, _, result, _) }
+  AstNode getChild() { pattern_def(this, _, _, result, _) }
 
-  override AstNode getParent() { pattern_def(this, result, _, _) }
+  override AstNode getParent() { pattern_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { pattern_def(this, _, result, _) }
+  override int getParentIndex() { pattern_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { pattern_def(this, _, _, result, _) }
 }
 
 class Program extends @program, AstNode {
   override string describeQlClass() { result = "Program" }
 
-  override Location getLocation() { program_def(this, _, result) }
+  override Location getLocation() { program_def(this, _, _, result) }
 
   AstNode getChild(int i) { program_child(this, i, result) }
 
-  override AstNode getParent() { program_def(this, result, _) }
+  override AstNode getParent() { program_def(this, result, _, _) }
+
+  override int getParentIndex() { program_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { program_child(this, _, result) }
 }
@@ -871,11 +987,13 @@ class Program extends @program, AstNode {
 class Range extends @range, AstNode {
   override string describeQlClass() { result = "Range" }
 
-  override Location getLocation() { range_def(this, _, result) }
+  override Location getLocation() { range_def(this, _, _, result) }
 
   UnderscoreArg getChild(int i) { range_child(this, i, result) }
 
-  override AstNode getParent() { range_def(this, result, _) }
+  override AstNode getParent() { range_def(this, result, _, _) }
+
+  override int getParentIndex() { range_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { range_child(this, _, result) }
 }
@@ -883,23 +1001,27 @@ class Range extends @range, AstNode {
 class Rational extends @rational, AstNode {
   override string describeQlClass() { result = "Rational" }
 
-  override Location getLocation() { rational_def(this, _, _, result) }
+  override Location getLocation() { rational_def(this, _, _, _, result) }
 
-  Integer getChild() { rational_def(this, _, result, _) }
+  Integer getChild() { rational_def(this, _, _, result, _) }
 
-  override AstNode getParent() { rational_def(this, result, _, _) }
+  override AstNode getParent() { rational_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { rational_def(this, _, result, _) }
+  override int getParentIndex() { rational_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { rational_def(this, _, _, result, _) }
 }
 
 class Redo extends @redo, AstNode {
   override string describeQlClass() { result = "Redo" }
 
-  override Location getLocation() { redo_def(this, _, result) }
+  override Location getLocation() { redo_def(this, _, _, result) }
 
   ArgumentList getChild() { redo_child(this, result) }
 
-  override AstNode getParent() { redo_def(this, result, _) }
+  override AstNode getParent() { redo_def(this, result, _, _) }
+
+  override int getParentIndex() { redo_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { redo_child(this, result) }
 }
@@ -907,11 +1029,13 @@ class Redo extends @redo, AstNode {
 class Regex extends @regex, AstNode {
   override string describeQlClass() { result = "Regex" }
 
-  override Location getLocation() { regex_def(this, _, result) }
+  override Location getLocation() { regex_def(this, _, _, result) }
 
   AstNode getChild(int i) { regex_child(this, i, result) }
 
-  override AstNode getParent() { regex_def(this, result, _) }
+  override AstNode getParent() { regex_def(this, result, _, _) }
+
+  override int getParentIndex() { regex_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { regex_child(this, _, result) }
 }
@@ -919,7 +1043,7 @@ class Regex extends @regex, AstNode {
 class Rescue extends @rescue, AstNode {
   override string describeQlClass() { result = "Rescue" }
 
-  override Location getLocation() { rescue_def(this, _, result) }
+  override Location getLocation() { rescue_def(this, _, _, result) }
 
   Then getBody() { rescue_body(this, result) }
 
@@ -927,7 +1051,9 @@ class Rescue extends @rescue, AstNode {
 
   ExceptionVariable getVariable() { rescue_variable(this, result) }
 
-  override AstNode getParent() { rescue_def(this, result, _) }
+  override AstNode getParent() { rescue_def(this, result, _, _) }
+
+  override int getParentIndex() { rescue_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() {
     rescue_body(this, result) or rescue_exceptions(this, result) or rescue_variable(this, result)
@@ -937,27 +1063,31 @@ class Rescue extends @rescue, AstNode {
 class RescueModifier extends @rescue_modifier, AstNode {
   override string describeQlClass() { result = "RescueModifier" }
 
-  override Location getLocation() { rescue_modifier_def(this, _, _, _, result) }
+  override Location getLocation() { rescue_modifier_def(this, _, _, _, _, result) }
 
-  UnderscoreStatement getBody() { rescue_modifier_def(this, _, result, _, _) }
+  UnderscoreStatement getBody() { rescue_modifier_def(this, _, _, result, _, _) }
 
-  AstNode getHandler() { rescue_modifier_def(this, _, _, result, _) }
+  AstNode getHandler() { rescue_modifier_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { rescue_modifier_def(this, result, _, _, _) }
+  override AstNode getParent() { rescue_modifier_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { rescue_modifier_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    rescue_modifier_def(this, _, result, _, _) or rescue_modifier_def(this, _, _, result, _)
+    rescue_modifier_def(this, _, _, result, _, _) or rescue_modifier_def(this, _, _, _, result, _)
   }
 }
 
 class RestAssignment extends @rest_assignment, AstNode {
   override string describeQlClass() { result = "RestAssignment" }
 
-  override Location getLocation() { rest_assignment_def(this, _, result) }
+  override Location getLocation() { rest_assignment_def(this, _, _, result) }
 
   UnderscoreLhs getChild() { rest_assignment_child(this, result) }
 
-  override AstNode getParent() { rest_assignment_def(this, result, _) }
+  override AstNode getParent() { rest_assignment_def(this, result, _, _) }
+
+  override int getParentIndex() { rest_assignment_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { rest_assignment_child(this, result) }
 }
@@ -965,11 +1095,13 @@ class RestAssignment extends @rest_assignment, AstNode {
 class Retry extends @retry, AstNode {
   override string describeQlClass() { result = "Retry" }
 
-  override Location getLocation() { retry_def(this, _, result) }
+  override Location getLocation() { retry_def(this, _, _, result) }
 
   ArgumentList getChild() { retry_child(this, result) }
 
-  override AstNode getParent() { retry_def(this, result, _) }
+  override AstNode getParent() { retry_def(this, result, _, _) }
+
+  override int getParentIndex() { retry_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { retry_child(this, result) }
 }
@@ -977,11 +1109,13 @@ class Retry extends @retry, AstNode {
 class Return extends @return, AstNode {
   override string describeQlClass() { result = "Return" }
 
-  override Location getLocation() { return_def(this, _, result) }
+  override Location getLocation() { return_def(this, _, _, result) }
 
   ArgumentList getChild() { return_child(this, result) }
 
-  override AstNode getParent() { return_def(this, result, _) }
+  override AstNode getParent() { return_def(this, result, _, _) }
+
+  override int getParentIndex() { return_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { return_child(this, result) }
 }
@@ -989,11 +1123,13 @@ class Return extends @return, AstNode {
 class RightAssignmentList extends @right_assignment_list, AstNode {
   override string describeQlClass() { result = "RightAssignmentList" }
 
-  override Location getLocation() { right_assignment_list_def(this, _, result) }
+  override Location getLocation() { right_assignment_list_def(this, _, _, result) }
 
   AstNode getChild(int i) { right_assignment_list_child(this, i, result) }
 
-  override AstNode getParent() { right_assignment_list_def(this, result, _) }
+  override AstNode getParent() { right_assignment_list_def(this, result, _, _) }
+
+  override int getParentIndex() { right_assignment_list_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { right_assignment_list_child(this, _, result) }
 }
@@ -1001,16 +1137,18 @@ class RightAssignmentList extends @right_assignment_list, AstNode {
 class ScopeResolution extends @scope_resolution, AstNode {
   override string describeQlClass() { result = "ScopeResolution" }
 
-  override Location getLocation() { scope_resolution_def(this, _, _, result) }
+  override Location getLocation() { scope_resolution_def(this, _, _, _, result) }
 
-  AstNode getName() { scope_resolution_def(this, _, result, _) }
+  AstNode getName() { scope_resolution_def(this, _, _, result, _) }
 
   UnderscorePrimary getScope() { scope_resolution_scope(this, result) }
 
-  override AstNode getParent() { scope_resolution_def(this, result, _, _) }
+  override AstNode getParent() { scope_resolution_def(this, result, _, _, _) }
+
+  override int getParentIndex() { scope_resolution_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    scope_resolution_def(this, _, result, _) or scope_resolution_scope(this, result)
+    scope_resolution_def(this, _, _, result, _) or scope_resolution_scope(this, result)
   }
 }
 
@@ -1021,49 +1159,55 @@ class Self extends @token_self, Token {
 class Setter extends @setter, AstNode {
   override string describeQlClass() { result = "Setter" }
 
-  override Location getLocation() { setter_def(this, _, _, result) }
+  override Location getLocation() { setter_def(this, _, _, _, result) }
 
-  Identifier getChild() { setter_def(this, _, result, _) }
+  Identifier getChild() { setter_def(this, _, _, result, _) }
 
-  override AstNode getParent() { setter_def(this, result, _, _) }
+  override AstNode getParent() { setter_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { setter_def(this, _, result, _) }
+  override int getParentIndex() { setter_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { setter_def(this, _, _, result, _) }
 }
 
 class SingletonClass extends @singleton_class, AstNode {
   override string describeQlClass() { result = "SingletonClass" }
 
-  override Location getLocation() { singleton_class_def(this, _, _, result) }
+  override Location getLocation() { singleton_class_def(this, _, _, _, result) }
 
-  UnderscoreArg getValue() { singleton_class_def(this, _, result, _) }
+  UnderscoreArg getValue() { singleton_class_def(this, _, _, result, _) }
 
   AstNode getChild(int i) { singleton_class_child(this, i, result) }
 
-  override AstNode getParent() { singleton_class_def(this, result, _, _) }
+  override AstNode getParent() { singleton_class_def(this, result, _, _, _) }
+
+  override int getParentIndex() { singleton_class_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
-    singleton_class_def(this, _, result, _) or singleton_class_child(this, _, result)
+    singleton_class_def(this, _, _, result, _) or singleton_class_child(this, _, result)
   }
 }
 
 class SingletonMethod extends @singleton_method, AstNode {
   override string describeQlClass() { result = "SingletonMethod" }
 
-  override Location getLocation() { singleton_method_def(this, _, _, _, result) }
+  override Location getLocation() { singleton_method_def(this, _, _, _, _, result) }
 
-  UnderscoreMethodName getName() { singleton_method_def(this, _, result, _, _) }
+  UnderscoreMethodName getName() { singleton_method_def(this, _, _, result, _, _) }
 
-  AstNode getObject() { singleton_method_def(this, _, _, result, _) }
+  AstNode getObject() { singleton_method_def(this, _, _, _, result, _) }
 
   MethodParameters getParameters() { singleton_method_parameters(this, result) }
 
   AstNode getChild(int i) { singleton_method_child(this, i, result) }
 
-  override AstNode getParent() { singleton_method_def(this, result, _, _, _) }
+  override AstNode getParent() { singleton_method_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { singleton_method_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    singleton_method_def(this, _, result, _, _) or
-    singleton_method_def(this, _, _, result, _) or
+    singleton_method_def(this, _, _, result, _, _) or
+    singleton_method_def(this, _, _, _, result, _) or
     singleton_method_parameters(this, result) or
     singleton_method_child(this, _, result)
   }
@@ -1072,23 +1216,27 @@ class SingletonMethod extends @singleton_method, AstNode {
 class SplatArgument extends @splat_argument, AstNode {
   override string describeQlClass() { result = "SplatArgument" }
 
-  override Location getLocation() { splat_argument_def(this, _, _, result) }
+  override Location getLocation() { splat_argument_def(this, _, _, _, result) }
 
-  UnderscoreArg getChild() { splat_argument_def(this, _, result, _) }
+  UnderscoreArg getChild() { splat_argument_def(this, _, _, result, _) }
 
-  override AstNode getParent() { splat_argument_def(this, result, _, _) }
+  override AstNode getParent() { splat_argument_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { splat_argument_def(this, _, result, _) }
+  override int getParentIndex() { splat_argument_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { splat_argument_def(this, _, _, result, _) }
 }
 
 class SplatParameter extends @splat_parameter, AstNode {
   override string describeQlClass() { result = "SplatParameter" }
 
-  override Location getLocation() { splat_parameter_def(this, _, result) }
+  override Location getLocation() { splat_parameter_def(this, _, _, result) }
 
   Identifier getName() { splat_parameter_name(this, result) }
 
-  override AstNode getParent() { splat_parameter_def(this, result, _) }
+  override AstNode getParent() { splat_parameter_def(this, result, _, _) }
+
+  override int getParentIndex() { splat_parameter_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { splat_parameter_name(this, result) }
 }
@@ -1096,11 +1244,13 @@ class SplatParameter extends @splat_parameter, AstNode {
 class String extends @string__, AstNode {
   override string describeQlClass() { result = "String" }
 
-  override Location getLocation() { string_def(this, _, result) }
+  override Location getLocation() { string_def(this, _, _, result) }
 
   AstNode getChild(int i) { string_child(this, i, result) }
 
-  override AstNode getParent() { string_def(this, result, _) }
+  override AstNode getParent() { string_def(this, result, _, _) }
+
+  override int getParentIndex() { string_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { string_child(this, _, result) }
 }
@@ -1108,11 +1258,13 @@ class String extends @string__, AstNode {
 class StringArray extends @string_array, AstNode {
   override string describeQlClass() { result = "StringArray" }
 
-  override Location getLocation() { string_array_def(this, _, result) }
+  override Location getLocation() { string_array_def(this, _, _, result) }
 
   BareString getChild(int i) { string_array_child(this, i, result) }
 
-  override AstNode getParent() { string_array_def(this, result, _) }
+  override AstNode getParent() { string_array_def(this, result, _, _) }
+
+  override int getParentIndex() { string_array_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { string_array_child(this, _, result) }
 }
@@ -1124,11 +1276,13 @@ class StringContent extends @token_string_content, Token {
 class Subshell extends @subshell, AstNode {
   override string describeQlClass() { result = "Subshell" }
 
-  override Location getLocation() { subshell_def(this, _, result) }
+  override Location getLocation() { subshell_def(this, _, _, result) }
 
   AstNode getChild(int i) { subshell_child(this, i, result) }
 
-  override AstNode getParent() { subshell_def(this, result, _) }
+  override AstNode getParent() { subshell_def(this, result, _, _) }
+
+  override int getParentIndex() { subshell_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { subshell_child(this, _, result) }
 }
@@ -1140,23 +1294,27 @@ class Super extends @token_super, Token {
 class Superclass extends @superclass, AstNode {
   override string describeQlClass() { result = "Superclass" }
 
-  override Location getLocation() { superclass_def(this, _, _, result) }
+  override Location getLocation() { superclass_def(this, _, _, _, result) }
 
-  AstNode getChild() { superclass_def(this, _, result, _) }
+  AstNode getChild() { superclass_def(this, _, _, result, _) }
 
-  override AstNode getParent() { superclass_def(this, result, _, _) }
+  override AstNode getParent() { superclass_def(this, result, _, _, _) }
 
-  override AstNode getAFieldOrChild() { superclass_def(this, _, result, _) }
+  override int getParentIndex() { superclass_def(this, _, result, _, _) }
+
+  override AstNode getAFieldOrChild() { superclass_def(this, _, _, result, _) }
 }
 
 class Symbol extends @symbol, AstNode {
   override string describeQlClass() { result = "Symbol" }
 
-  override Location getLocation() { symbol_def(this, _, result) }
+  override Location getLocation() { symbol_def(this, _, _, result) }
 
   AstNode getChild(int i) { symbol_child(this, i, result) }
 
-  override AstNode getParent() { symbol_def(this, result, _) }
+  override AstNode getParent() { symbol_def(this, result, _, _) }
+
+  override int getParentIndex() { symbol_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { symbol_child(this, _, result) }
 }
@@ -1164,11 +1322,13 @@ class Symbol extends @symbol, AstNode {
 class SymbolArray extends @symbol_array, AstNode {
   override string describeQlClass() { result = "SymbolArray" }
 
-  override Location getLocation() { symbol_array_def(this, _, result) }
+  override Location getLocation() { symbol_array_def(this, _, _, result) }
 
   BareSymbol getChild(int i) { symbol_array_child(this, i, result) }
 
-  override AstNode getParent() { symbol_array_def(this, result, _) }
+  override AstNode getParent() { symbol_array_def(this, result, _, _) }
+
+  override int getParentIndex() { symbol_array_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { symbol_array_child(this, _, result) }
 }
@@ -1176,11 +1336,13 @@ class SymbolArray extends @symbol_array, AstNode {
 class Then extends @then, AstNode {
   override string describeQlClass() { result = "Then" }
 
-  override Location getLocation() { then_def(this, _, result) }
+  override Location getLocation() { then_def(this, _, _, result) }
 
   AstNode getChild(int i) { then_child(this, i, result) }
 
-  override AstNode getParent() { then_def(this, result, _) }
+  override AstNode getParent() { then_def(this, result, _, _) }
+
+  override int getParentIndex() { then_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { then_child(this, _, result) }
 }
@@ -1192,27 +1354,31 @@ class True extends @token_true, Token {
 class Unary extends @unary, AstNode {
   override string describeQlClass() { result = "Unary" }
 
-  override Location getLocation() { unary_def(this, _, _, _, result) }
+  override Location getLocation() { unary_def(this, _, _, _, _, result) }
 
-  AstNode getOperand() { unary_def(this, _, result, _, _) }
+  AstNode getOperand() { unary_def(this, _, _, result, _, _) }
 
-  AstNode getOperator() { unary_def(this, _, _, result, _) }
+  AstNode getOperator() { unary_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { unary_def(this, result, _, _, _) }
+  override AstNode getParent() { unary_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { unary_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    unary_def(this, _, result, _, _) or unary_def(this, _, _, result, _)
+    unary_def(this, _, _, result, _, _) or unary_def(this, _, _, _, result, _)
   }
 }
 
 class Undef extends @undef, AstNode {
   override string describeQlClass() { result = "Undef" }
 
-  override Location getLocation() { undef_def(this, _, result) }
+  override Location getLocation() { undef_def(this, _, _, result) }
 
   UnderscoreMethodName getChild(int i) { undef_child(this, i, result) }
 
-  override AstNode getParent() { undef_def(this, result, _) }
+  override AstNode getParent() { undef_def(this, result, _, _) }
+
+  override int getParentIndex() { undef_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { undef_child(this, _, result) }
 }
@@ -1224,19 +1390,21 @@ class Uninterpreted extends @token_uninterpreted, Token {
 class Unless extends @unless, AstNode {
   override string describeQlClass() { result = "Unless" }
 
-  override Location getLocation() { unless_def(this, _, _, result) }
+  override Location getLocation() { unless_def(this, _, _, _, result) }
 
   AstNode getAlternative() { unless_alternative(this, result) }
 
-  UnderscoreStatement getCondition() { unless_def(this, _, result, _) }
+  UnderscoreStatement getCondition() { unless_def(this, _, _, result, _) }
 
   Then getConsequence() { unless_consequence(this, result) }
 
-  override AstNode getParent() { unless_def(this, result, _, _) }
+  override AstNode getParent() { unless_def(this, result, _, _, _) }
+
+  override int getParentIndex() { unless_def(this, _, result, _, _) }
 
   override AstNode getAFieldOrChild() {
     unless_alternative(this, result) or
-    unless_def(this, _, result, _) or
+    unless_def(this, _, _, result, _) or
     unless_consequence(this, result)
   }
 }
@@ -1244,61 +1412,69 @@ class Unless extends @unless, AstNode {
 class UnlessModifier extends @unless_modifier, AstNode {
   override string describeQlClass() { result = "UnlessModifier" }
 
-  override Location getLocation() { unless_modifier_def(this, _, _, _, result) }
+  override Location getLocation() { unless_modifier_def(this, _, _, _, _, result) }
 
-  UnderscoreStatement getBody() { unless_modifier_def(this, _, result, _, _) }
+  UnderscoreStatement getBody() { unless_modifier_def(this, _, _, result, _, _) }
 
-  AstNode getCondition() { unless_modifier_def(this, _, _, result, _) }
+  AstNode getCondition() { unless_modifier_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { unless_modifier_def(this, result, _, _, _) }
+  override AstNode getParent() { unless_modifier_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { unless_modifier_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    unless_modifier_def(this, _, result, _, _) or unless_modifier_def(this, _, _, result, _)
+    unless_modifier_def(this, _, _, result, _, _) or unless_modifier_def(this, _, _, _, result, _)
   }
 }
 
 class Until extends @until, AstNode {
   override string describeQlClass() { result = "Until" }
 
-  override Location getLocation() { until_def(this, _, _, _, result) }
+  override Location getLocation() { until_def(this, _, _, _, _, result) }
 
-  Do getBody() { until_def(this, _, result, _, _) }
+  Do getBody() { until_def(this, _, _, result, _, _) }
 
-  UnderscoreStatement getCondition() { until_def(this, _, _, result, _) }
+  UnderscoreStatement getCondition() { until_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { until_def(this, result, _, _, _) }
+  override AstNode getParent() { until_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { until_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    until_def(this, _, result, _, _) or until_def(this, _, _, result, _)
+    until_def(this, _, _, result, _, _) or until_def(this, _, _, _, result, _)
   }
 }
 
 class UntilModifier extends @until_modifier, AstNode {
   override string describeQlClass() { result = "UntilModifier" }
 
-  override Location getLocation() { until_modifier_def(this, _, _, _, result) }
+  override Location getLocation() { until_modifier_def(this, _, _, _, _, result) }
 
-  UnderscoreStatement getBody() { until_modifier_def(this, _, result, _, _) }
+  UnderscoreStatement getBody() { until_modifier_def(this, _, _, result, _, _) }
 
-  AstNode getCondition() { until_modifier_def(this, _, _, result, _) }
+  AstNode getCondition() { until_modifier_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { until_modifier_def(this, result, _, _, _) }
+  override AstNode getParent() { until_modifier_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { until_modifier_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    until_modifier_def(this, _, result, _, _) or until_modifier_def(this, _, _, result, _)
+    until_modifier_def(this, _, _, result, _, _) or until_modifier_def(this, _, _, _, result, _)
   }
 }
 
 class When extends @when, AstNode {
   override string describeQlClass() { result = "When" }
 
-  override Location getLocation() { when_def(this, _, result) }
+  override Location getLocation() { when_def(this, _, _, result) }
 
   Then getBody() { when_body(this, result) }
 
   AstNode getPattern(int i) { when_pattern(this, i, result) }
 
-  override AstNode getParent() { when_def(this, result, _) }
+  override AstNode getParent() { when_def(this, result, _, _) }
+
+  override int getParentIndex() { when_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { when_body(this, result) or when_pattern(this, _, result) }
 }
@@ -1306,43 +1482,49 @@ class When extends @when, AstNode {
 class While extends @while, AstNode {
   override string describeQlClass() { result = "While" }
 
-  override Location getLocation() { while_def(this, _, _, _, result) }
+  override Location getLocation() { while_def(this, _, _, _, _, result) }
 
-  Do getBody() { while_def(this, _, result, _, _) }
+  Do getBody() { while_def(this, _, _, result, _, _) }
 
-  UnderscoreStatement getCondition() { while_def(this, _, _, result, _) }
+  UnderscoreStatement getCondition() { while_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { while_def(this, result, _, _, _) }
+  override AstNode getParent() { while_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { while_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    while_def(this, _, result, _, _) or while_def(this, _, _, result, _)
+    while_def(this, _, _, result, _, _) or while_def(this, _, _, _, result, _)
   }
 }
 
 class WhileModifier extends @while_modifier, AstNode {
   override string describeQlClass() { result = "WhileModifier" }
 
-  override Location getLocation() { while_modifier_def(this, _, _, _, result) }
+  override Location getLocation() { while_modifier_def(this, _, _, _, _, result) }
 
-  UnderscoreStatement getBody() { while_modifier_def(this, _, result, _, _) }
+  UnderscoreStatement getBody() { while_modifier_def(this, _, _, result, _, _) }
 
-  AstNode getCondition() { while_modifier_def(this, _, _, result, _) }
+  AstNode getCondition() { while_modifier_def(this, _, _, _, result, _) }
 
-  override AstNode getParent() { while_modifier_def(this, result, _, _, _) }
+  override AstNode getParent() { while_modifier_def(this, result, _, _, _, _) }
+
+  override int getParentIndex() { while_modifier_def(this, _, result, _, _, _) }
 
   override AstNode getAFieldOrChild() {
-    while_modifier_def(this, _, result, _, _) or while_modifier_def(this, _, _, result, _)
+    while_modifier_def(this, _, _, result, _, _) or while_modifier_def(this, _, _, _, result, _)
   }
 }
 
 class Yield extends @yield, AstNode {
   override string describeQlClass() { result = "Yield" }
 
-  override Location getLocation() { yield_def(this, _, result) }
+  override Location getLocation() { yield_def(this, _, _, result) }
 
   ArgumentList getChild() { yield_child(this, result) }
 
-  override AstNode getParent() { yield_def(this, result, _) }
+  override AstNode getParent() { yield_def(this, result, _, _) }
+
+  override int getParentIndex() { yield_def(this, _, result, _) }
 
   override AstNode getAFieldOrChild() { yield_child(this, result) }
 }
diff --git a/ql/src/ruby.dbscheme b/ql/src/ruby.dbscheme
index 76981b9126b..92f27c75f29 100644
--- a/ql/src/ruby.dbscheme
+++ b/ql/src/ruby.dbscheme
@@ -61,6 +61,7 @@ sourceLocationPrefix(
 alias_def(
   unique int id: @alias,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int alias: @underscore_method_name ref,
   int name: @underscore_method_name ref,
   int loc: @location ref
@@ -78,6 +79,7 @@ argument_list_child(
 argument_list_def(
   unique int id: @argument_list,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -93,6 +95,7 @@ array_child(
 array_def(
   unique int id: @array,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -103,6 +106,7 @@ array_def(
 assignment_def(
   unique int id: @assignment,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int left: @assignment_left_type ref,
   int right: @assignment_right_type ref,
   int loc: @location ref
@@ -120,6 +124,7 @@ bare_string_child(
 bare_string_def(
   unique int id: @bare_string,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -135,6 +140,7 @@ bare_symbol_child(
 bare_symbol_def(
   unique int id: @bare_symbol,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -150,6 +156,7 @@ begin_child(
 begin_def(
   unique int id: @begin,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -165,6 +172,7 @@ begin_block_child(
 begin_block_def(
   unique int id: @begin_block,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -177,6 +185,7 @@ begin_block_def(
 binary_def(
   unique int id: @binary,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int left: @binary_left_type ref,
   int operator: @binary_operator_type ref,
   int right: @binary_right_type ref,
@@ -195,12 +204,14 @@ block_child(
 block_def(
   unique int id: @block,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
 block_argument_def(
   unique int id: @block_argument,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @underscore_arg ref,
   int loc: @location ref
 );
@@ -208,6 +219,7 @@ block_argument_def(
 block_parameter_def(
   unique int id: @block_parameter,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int name: @token_identifier ref,
   int loc: @location ref
 );
@@ -224,6 +236,7 @@ block_parameters_child(
 block_parameters_def(
   unique int id: @block_parameters,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -235,6 +248,7 @@ break_child(
 break_def(
   unique int id: @break,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -245,6 +259,7 @@ break_def(
 call_def(
   unique int id: @call,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int method: @call_method_type ref,
   int receiver: @call_receiver_type ref,
   int loc: @location ref
@@ -267,6 +282,7 @@ case_child(
 case_def(
   unique int id: @case__,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -280,6 +296,7 @@ chained_string_child(
 chained_string_def(
   unique int id: @chained_string,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -297,6 +314,7 @@ class_child(
 class_def(
   unique int id: @class,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int name: @class_name_type ref,
   int loc: @location ref
 );
@@ -304,6 +322,7 @@ class_def(
 conditional_def(
   unique int id: @conditional,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int alternative: @underscore_arg ref,
   int condition: @underscore_arg ref,
   int consequence: @underscore_arg ref,
@@ -322,6 +341,7 @@ destructured_left_assignment_child(
 destructured_left_assignment_def(
   unique int id: @destructured_left_assignment,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -337,6 +357,7 @@ destructured_parameter_child(
 destructured_parameter_def(
   unique int id: @destructured_parameter,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -352,6 +373,7 @@ do_child(
 do_def(
   unique int id: @do,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -367,6 +389,7 @@ do_block_child(
 do_block_def(
   unique int id: @do_block,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -382,6 +405,7 @@ element_reference_child(
 element_reference_def(
   unique int id: @element_reference,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int object: @underscore_primary ref,
   int loc: @location ref
 );
@@ -398,6 +422,7 @@ else_child(
 else_def(
   unique int id: @else,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -416,6 +441,7 @@ elsif_consequence(
 elsif_def(
   unique int id: @elsif,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
 );
@@ -432,6 +458,7 @@ end_block_child(
 end_block_def(
   unique int id: @end_block,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -447,12 +474,14 @@ ensure_child(
 ensure_def(
   unique int id: @ensure,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
 exception_variable_def(
   unique int id: @exception_variable,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @underscore_lhs ref,
   int loc: @location ref
 );
@@ -469,6 +498,7 @@ exceptions_child(
 exceptions_def(
   unique int id: @exceptions,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -484,6 +514,7 @@ for_pattern(
 for_def(
   unique int id: @for,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @do ref,
   int value: @in ref,
   int loc: @location ref
@@ -501,12 +532,14 @@ hash_child(
 hash_def(
   unique int id: @hash,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
 hash_splat_argument_def(
   unique int id: @hash_splat_argument,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @underscore_arg ref,
   int loc: @location ref
 );
@@ -519,6 +552,7 @@ hash_splat_parameter_name(
 hash_splat_parameter_def(
   unique int id: @hash_splat_parameter,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -534,6 +568,7 @@ heredoc_body_child(
 heredoc_body_def(
   unique int id: @heredoc_body,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -552,6 +587,7 @@ if_consequence(
 if_def(
   unique int id: @if,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
 );
@@ -561,6 +597,7 @@ if_def(
 if_modifier_def(
   unique int id: @if_modifier,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @underscore_statement ref,
   int condition: @if_modifier_condition_type ref,
   int loc: @location ref
@@ -569,6 +606,7 @@ if_modifier_def(
 in_def(
   unique int id: @in,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @underscore_arg ref,
   int loc: @location ref
 );
@@ -576,6 +614,7 @@ in_def(
 interpolation_def(
   unique int id: @interpolation,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @underscore_statement ref,
   int loc: @location ref
 );
@@ -588,6 +627,7 @@ keyword_parameter_value(
 keyword_parameter_def(
   unique int id: @keyword_parameter,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int name: @token_identifier ref,
   int loc: @location ref
 );
@@ -602,6 +642,7 @@ lambda_parameters(
 lambda_def(
   unique int id: @lambda,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @lambda_body_type ref,
   int loc: @location ref
 );
@@ -618,6 +659,7 @@ lambda_parameters_child(
 lambda_parameters_def(
   unique int id: @lambda_parameters,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -633,6 +675,7 @@ left_assignment_list_child(
 left_assignment_list_def(
   unique int id: @left_assignment_list,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -653,6 +696,7 @@ method_child(
 method_def(
   unique int id: @method,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int name: @underscore_method_name ref,
   int loc: @location ref
 );
@@ -674,6 +718,7 @@ method_call_block(
 method_call_def(
   unique int id: @method_call,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int method: @method_call_method_type ref,
   int loc: @location ref
 );
@@ -690,6 +735,7 @@ method_parameters_child(
 method_parameters_def(
   unique int id: @method_parameters,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -707,6 +753,7 @@ module_child(
 module_def(
   unique int id: @module,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int name: @module_name_type ref,
   int loc: @location ref
 );
@@ -719,6 +766,7 @@ next_child(
 next_def(
   unique int id: @next,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -727,6 +775,7 @@ next_def(
 operator_assignment_def(
   unique int id: @operator_assignment,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int left: @underscore_lhs ref,
   int right: @operator_assignment_right_type ref,
   int loc: @location ref
@@ -735,6 +784,7 @@ operator_assignment_def(
 optional_parameter_def(
   unique int id: @optional_parameter,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int name: @token_identifier ref,
   int value: @underscore_arg ref,
   int loc: @location ref
@@ -745,6 +795,7 @@ optional_parameter_def(
 pair_def(
   unique int id: @pair,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int key__: @pair_key_type ref,
   int value: @underscore_arg ref,
   int loc: @location ref
@@ -762,6 +813,7 @@ parenthesized_statements_child(
 parenthesized_statements_def(
   unique int id: @parenthesized_statements,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -770,6 +822,7 @@ parenthesized_statements_def(
 pattern_def(
   unique int id: @pattern,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @pattern_child_type ref,
   int loc: @location ref
 );
@@ -786,6 +839,7 @@ program_child(
 program_def(
   unique int id: @program,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -799,12 +853,14 @@ range_child(
 range_def(
   unique int id: @range,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
 rational_def(
   unique int id: @rational,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @token_integer ref,
   int loc: @location ref
 );
@@ -817,6 +873,7 @@ redo_child(
 redo_def(
   unique int id: @redo,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -832,6 +889,7 @@ regex_child(
 regex_def(
   unique int id: @regex,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -853,6 +911,7 @@ rescue_variable(
 rescue_def(
   unique int id: @rescue,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -861,6 +920,7 @@ rescue_def(
 rescue_modifier_def(
   unique int id: @rescue_modifier,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @underscore_statement ref,
   int handler: @rescue_modifier_handler_type ref,
   int loc: @location ref
@@ -874,6 +934,7 @@ rest_assignment_child(
 rest_assignment_def(
   unique int id: @rest_assignment,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -885,6 +946,7 @@ retry_child(
 retry_def(
   unique int id: @retry,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -896,6 +958,7 @@ return_child(
 return_def(
   unique int id: @return,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -911,6 +974,7 @@ right_assignment_list_child(
 right_assignment_list_def(
   unique int id: @right_assignment_list,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -924,6 +988,7 @@ scope_resolution_scope(
 scope_resolution_def(
   unique int id: @scope_resolution,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int name: @scope_resolution_name_type ref,
   int loc: @location ref
 );
@@ -931,6 +996,7 @@ scope_resolution_def(
 setter_def(
   unique int id: @setter,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @token_identifier ref,
   int loc: @location ref
 );
@@ -947,6 +1013,7 @@ singleton_class_child(
 singleton_class_def(
   unique int id: @singleton_class,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int value: @underscore_arg ref,
   int loc: @location ref
 );
@@ -970,6 +1037,7 @@ singleton_method_child(
 singleton_method_def(
   unique int id: @singleton_method,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int name: @underscore_method_name ref,
   int object: @singleton_method_object_type ref,
   int loc: @location ref
@@ -978,6 +1046,7 @@ singleton_method_def(
 splat_argument_def(
   unique int id: @splat_argument,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @underscore_arg ref,
   int loc: @location ref
 );
@@ -990,6 +1059,7 @@ splat_parameter_name(
 splat_parameter_def(
   unique int id: @splat_parameter,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1005,6 +1075,7 @@ string_child(
 string_def(
   unique int id: @string__,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1018,6 +1089,7 @@ string_array_child(
 string_array_def(
   unique int id: @string_array,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1033,6 +1105,7 @@ subshell_child(
 subshell_def(
   unique int id: @subshell,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1041,6 +1114,7 @@ subshell_def(
 superclass_def(
   unique int id: @superclass,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int child: @superclass_child_type ref,
   int loc: @location ref
 );
@@ -1057,6 +1131,7 @@ symbol_child(
 symbol_def(
   unique int id: @symbol,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1070,6 +1145,7 @@ symbol_array_child(
 symbol_array_def(
   unique int id: @symbol_array,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1085,6 +1161,7 @@ then_child(
 then_def(
   unique int id: @then,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1095,6 +1172,7 @@ then_def(
 unary_def(
   unique int id: @unary,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int operand: @unary_operand_type ref,
   int operator: @unary_operator_type ref,
   int loc: @location ref
@@ -1110,6 +1188,7 @@ undef_child(
 undef_def(
   unique int id: @undef,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1128,6 +1207,7 @@ unless_consequence(
 unless_def(
   unique int id: @unless,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
 );
@@ -1137,6 +1217,7 @@ unless_def(
 unless_modifier_def(
   unique int id: @unless_modifier,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @underscore_statement ref,
   int condition: @unless_modifier_condition_type ref,
   int loc: @location ref
@@ -1145,6 +1226,7 @@ unless_modifier_def(
 until_def(
   unique int id: @until,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @do ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
@@ -1155,6 +1237,7 @@ until_def(
 until_modifier_def(
   unique int id: @until_modifier,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @underscore_statement ref,
   int condition: @until_modifier_condition_type ref,
   int loc: @location ref
@@ -1177,12 +1260,14 @@ when_pattern(
 when_def(
   unique int id: @when,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
 while_def(
   unique int id: @while,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @do ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
@@ -1193,6 +1278,7 @@ while_def(
 while_modifier_def(
   unique int id: @while_modifier,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int body: @underscore_statement ref,
   int condition: @while_modifier_condition_type ref,
   int loc: @location ref
@@ -1206,12 +1292,14 @@ yield_child(
 yield_def(
   unique int id: @yield,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int loc: @location ref
 );
 
 tokeninfo(
   unique int id: @token,
   int parent: @ast_node_parent ref,
+  int parent_index: int ref,
   int kind: int ref,
   int file: @file ref,
   int idx: int ref,