From 058945e08b7972e0e75db00eb1c09a0c411a7795 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Mon, 13 Mar 2023 16:14:50 -0400
Subject: [PATCH] Add Token struct with validity checks

---
 assets/parser.d.erb | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/assets/parser.d.erb b/assets/parser.d.erb
index 3bda15c..9db579d 100644
--- a/assets/parser.d.erb
+++ b/assets/parser.d.erb
@@ -11,16 +11,51 @@ import std.stdio;
 
 class <%= @classname %>
 {
-    enum : uint
+    alias TokenID = uint;
+
+    enum : TokenID
     {
 <% @grammar.tokens.each_with_index do |token, index| %>
         TOKEN_<%= token.code_name %> = <%= index %>,
+<%   unless token.id == index %>
+<%     raise "Token ID (#{token.id}) does not match index (#{index}) for token #{token.name}!" %>
+<%   end %>
 <% end %>
         _TOKEN_COUNT = <%= @grammar.tokens.size %>,
         _TOKEN_DECODE_ERROR = <%= TOKEN_DECODE_ERROR %>,
         _TOKEN_DROP = <%= TOKEN_DROP %>,
     }
 
+    struct Token
+    {
+        /* Number of tokens in this parser. */
+        enum count = <%= @grammar.tokens.size %>;
+        TokenID token;
+        alias token this;
+
+        @disable this();
+
+        this(TokenID token)
+        {
+            this.token = token;
+        }
+
+        static Token invalid()
+        {
+            return Token(count);
+        }
+
+        bool is_valid()
+        {
+            return token < count;
+        }
+
+        bool is_invalid()
+        {
+            return !is_valid();
+        }
+    }
+
     alias CodePoint = uint;
 
     static immutable string token_names[] = [