Start work on handling node supertypes

cli/src/generate/prepare_grammar/expand_repeats.rs

@@ -235,6 +235,7 @@ mod tests {
             external_tokens: Vec::new(),
             expected_conflicts: Vec::new(),
             variables_to_inline: Vec::new(),
+            supertype_symbols: Vec::new(),
             word_token: None,
         }
     }

cli/src/generate/prepare_grammar/extract_simple_aliases.rs

@@ -149,6 +149,7 @@ mod tests {
             extra_tokens: Vec::new(),
             expected_conflicts: Vec::new(),
             variables_to_inline: Vec::new(),
+            supertype_symbols: Vec::new(),
             external_tokens: Vec::new(),
             word_token: None,
         };

cli/src/generate/prepare_grammar/extract_tokens.rs

@@ -77,6 +77,12 @@ pub(super) fn extract_tokens(
         })
         .collect();
 
+    let supertype_symbols = grammar
+        .supertype_symbols
+        .into_iter()
+        .map(|symbol| symbol_replacer.replace_symbol(symbol))
+        .collect();
+
     let variables_to_inline = grammar
         .variables_to_inline
         .into_iter()
@@ -154,6 +160,7 @@ pub(super) fn extract_tokens(
             expected_conflicts,
             extra_tokens,
             variables_to_inline,
+            supertype_symbols,
             external_tokens,
             word_token,
         },
@@ -519,6 +526,7 @@ mod test {
             external_tokens: Vec::new(),
             expected_conflicts: Vec::new(),
             variables_to_inline: Vec::new(),
+            supertype_symbols: Vec::new(),
             word_token: None,
         }
     }

cli/src/generate/prepare_grammar/flatten_grammar.rs

@@ -203,6 +203,7 @@ unless they are used only as the grammar's start rule.
         expected_conflicts: grammar.expected_conflicts,
         variables_to_inline: grammar.variables_to_inline,
         external_tokens: grammar.external_tokens,
+        supertype_symbols: grammar.supertype_symbols,
         word_token: grammar.word_token,
         variables,
     })

cli/src/generate/prepare_grammar/intern_symbols.rs

@@ -35,6 +35,15 @@ pub(super) fn intern_symbols(grammar: &InputGrammar) -> Result<InternedGrammar>
         extra_tokens.push(interner.intern_rule(extra_token)?);
     }
 
+    let mut supertype_symbols = Vec::with_capacity(grammar.supertype_symbols.len());
+    for supertype_symbol_name in grammar.supertype_symbols.iter() {
+        supertype_symbols.push(
+            interner
+                .intern_name(supertype_symbol_name)
+                .ok_or_else(|| Error::undefined_symbol(supertype_symbol_name))?,
+        );
+    }
+
     let mut expected_conflicts = Vec::new();
     for conflict in grammar.expected_conflicts.iter() {
         let mut interned_conflict = Vec::with_capacity(conflict.len());
@@ -64,12 +73,15 @@ pub(super) fn intern_symbols(grammar: &InputGrammar) -> Result<InternedGrammar>
         );
     }
 
+    eprintln!("supertype_symbols: {:?}", supertype_symbols);
+
     Ok(InternedGrammar {
         variables,
         external_tokens,
         extra_tokens,
         expected_conflicts,
         variables_to_inline,
+        supertype_symbols,
         word_token,
     })
 }
@@ -230,6 +242,7 @@ mod tests {
             external_tokens: Vec::new(),
             expected_conflicts: Vec::new(),
             variables_to_inline: Vec::new(),
+            supertype_symbols: Vec::new(),
             word_token: None,
         }
     }

cli/src/generate/prepare_grammar/mod.rs

@@ -25,6 +25,7 @@ pub(crate) struct IntermediateGrammar<T, U> {
     expected_conflicts: Vec<Vec<Symbol>>,
     external_tokens: Vec<U>,
     variables_to_inline: Vec<Symbol>,
+    supertype_symbols: Vec<Symbol>,
     word_token: Option<Symbol>,
 }
 

cli/src/generate/prepare_grammar/process_inlines.rs

@@ -198,6 +198,7 @@ mod tests {
             expected_conflicts: Vec::new(),
             extra_tokens: Vec::new(),
             external_tokens: Vec::new(),
+            supertype_symbols: Vec::new(),
             word_token: None,
             variables_to_inline: vec![Symbol::non_terminal(1)],
             variables: vec![
@@ -328,6 +329,7 @@ mod tests {
             expected_conflicts: Vec::new(),
             extra_tokens: Vec::new(),
             external_tokens: Vec::new(),
+            supertype_symbols: Vec::new(),
             word_token: None,
         };
         let inline_map = process_inlines(&grammar);
@@ -429,6 +431,7 @@ mod tests {
             expected_conflicts: Vec::new(),
             extra_tokens: Vec::new(),
             external_tokens: Vec::new(),
+            supertype_symbols: Vec::new(),
             word_token: None,
         };