From 4d716f6c10101cd39df2f2ede6f1f2f17f9cd303 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Sun, 25 Sep 2022 14:48:49 -0400
Subject: [PATCH] Remove Token#c_name; use given token case in token constants

---
 assets/parser.d.erb  |  2 +-
 lib/propane/token.rb |  4 ----
 spec/test_d_lexer.d  | 14 +++++++-------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/assets/parser.d.erb b/assets/parser.d.erb
index 25aab31..a4d5224 100644
--- a/assets/parser.d.erb
+++ b/assets/parser.d.erb
@@ -10,7 +10,7 @@ class <%= @classname %>
     enum
     {
 <% @grammar.tokens.each_with_index do |token, index| %>
-        TOKEN_<%= token.c_name %> = <%= index %>,
+        TOKEN_<%= token.name %> = <%= index %>,
 <% end %>
         _TOKEN_COUNT = <%= @grammar.tokens.size %>,
         _TOKEN_EOF = <%= TOKEN_EOF %>,
diff --git a/lib/propane/token.rb b/lib/propane/token.rb
index 52e6774..8cd7920 100644
--- a/lib/propane/token.rb
+++ b/lib/propane/token.rb
@@ -30,10 +30,6 @@ class Propane
       @line_number = options[:line_number]
     end
 
-    def c_name
-      @name.upcase
-    end
-
     def to_s
       @name
     end
diff --git a/spec/test_d_lexer.d b/spec/test_d_lexer.d
index a0e3e3c..6f08a29 100644
--- a/spec/test_d_lexer.d
+++ b/spec/test_d_lexer.d
@@ -70,13 +70,13 @@ unittest
     alias LT = Testparser.Lexer.LexedToken;
     string input = "5 + 4 * \n677 + 567";
     Testparser.Lexer lexer = new Testparser.Lexer(cast(const(ubyte) *)input.ptr, input.length);
-    assert(lexer.lex_token() == LT(0, 0, 1, Testparser.TOKEN_INT));
-    assert(lexer.lex_token() == LT(0, 2, 1, Testparser.TOKEN_PLUS));
-    assert(lexer.lex_token() == LT(0, 4, 1, Testparser.TOKEN_INT));
-    assert(lexer.lex_token() == LT(0, 6, 1, Testparser.TOKEN_TIMES));
-    assert(lexer.lex_token() == LT(1, 0, 3, Testparser.TOKEN_INT));
-    assert(lexer.lex_token() == LT(1, 4, 1, Testparser.TOKEN_PLUS));
-    assert(lexer.lex_token() == LT(1, 6, 3, Testparser.TOKEN_INT));
+    assert(lexer.lex_token() == LT(0, 0, 1, Testparser.TOKEN_int));
+    assert(lexer.lex_token() == LT(0, 2, 1, Testparser.TOKEN_plus));
+    assert(lexer.lex_token() == LT(0, 4, 1, Testparser.TOKEN_int));
+    assert(lexer.lex_token() == LT(0, 6, 1, Testparser.TOKEN_times));
+    assert(lexer.lex_token() == LT(1, 0, 3, Testparser.TOKEN_int));
+    assert(lexer.lex_token() == LT(1, 4, 1, Testparser.TOKEN_plus));
+    assert(lexer.lex_token() == LT(1, 6, 3, Testparser.TOKEN_int));
     assert(lexer.lex_token() == LT(1, 9, 0, Testparser._TOKEN_EOF));
 
     lexer = new Testparser.Lexer(null, 0u);