From fbfa58edc8663e9c0a825a72bef42dcfff8a1aef Mon Sep 17 00:00:00 2001
From: Andrew Hlynskyi <ahlincq@gmail.com>
Date: Thu, 24 Aug 2023 15:23:44 +0300
Subject: [PATCH 1/2] chore(gen): move external scanner stuff closer to the end
 of `parser.c`

---
 cli/src/generate/render.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/src/generate/render.rs b/cli/src/generate/render.rs
index f92bf312..b4cf9150 100644
--- a/cli/src/generate/render.rs
+++ b/cli/src/generate/render.rs
@@ -129,6 +129,7 @@ impl Generator {
         }
 
         self.add_lex_modes_list();
+        self.add_parse_table();
 
         if !self.syntax_grammar.external_tokens.is_empty() {
             self.add_external_token_enum();
@@ -136,7 +137,6 @@ impl Generator {
             self.add_external_scanner_states_list();
         }
 
-        self.add_parse_table();
         self.add_parser_export();
 
         self.buffer

From b3fef28a1063a56c75a3ae114a6731ffb871961f Mon Sep 17 00:00:00 2001
From: Andrew Hlynskyi <ahlincq@gmail.com>
Date: Thu, 24 Aug 2023 19:09:10 +0300
Subject: [PATCH 2/2] chore(gen): add `parser.c` enum names to be better
 discoverable

---
 cli/src/generate/render.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/src/generate/render.rs b/cli/src/generate/render.rs
index b4cf9150..f0d8ddec 100644
--- a/cli/src/generate/render.rs
+++ b/cli/src/generate/render.rs
@@ -338,7 +338,7 @@ impl Generator {
     }
 
     fn add_symbol_enum(&mut self) {
-        add_line!(self, "enum {{");
+        add_line!(self, "enum ts_symbol_identifiers {{");
         indent!(self);
         self.symbol_order.insert(Symbol::end(), 0);
         let mut i = 1;
@@ -410,7 +410,7 @@ impl Generator {
     }
 
     fn add_field_name_enum(&mut self) {
-        add_line!(self, "enum {{");
+        add_line!(self, "enum ts_field_identifiers {{");
         indent!(self);
         for (i, field_name) in self.field_names.iter().enumerate() {
             add_line!(self, "{} = {},", self.field_id(field_name), i + 1);
@@ -1026,7 +1026,7 @@ impl Generator {
     }
 
     fn add_external_token_enum(&mut self) {
-        add_line!(self, "enum {{");
+        add_line!(self, "enum ts_external_scanner_symbol_identifiers {{");
         indent!(self);
         for i in 0..self.syntax_grammar.external_tokens.len() {
             add_line!(