Turn T_EOF into a properly registered token.

diff --git a/token.c b/token.c
index f80d432..9db11b1 100644 (file)
--- a/token.c
+++ b/token.c
@@ -86,11 +86,6 @@ void exit_tokens(void)
 
 void print_token_kind(FILE *f, token_kind_t token_kind)
 {
-       if(token_kind == T_EOF) {
-               fputs("end of file", f);
-               return;
-       }
-
        if (token_kind >= lengthof(token_symbols)) {
                fputs("invalid token", f);
                return;

diff --git a/token_t.h b/token_t.h
index 7843dc8..3e14d3d 100644 (file)
--- a/token_t.h
+++ b/token_t.h
@@ -28,7 +28,6 @@
 
 typedef enum token_kind_tag_t {
        T_NULL  =  0,
-       T_EOF   = '\x04', // EOT
 #define T(mode,x,str,val) T_##x val,
 #define TS(x,str,val) T_##x val,
 #include "tokens.inc"

diff --git a/tokens.inc b/tokens.inc
index 74dc86c..36ab9c7 100644 (file)
--- a/tokens.inc
+++ b/tokens.inc
@@ -9,6 +9,7 @@
 #undef PUNCTUATOR
 #undef ALTERNATE
 
+TS(EOF,                "end of input",)
 TS(IDENTIFIER,         "identifier",)
 TS(NUMBER,             "number constant",)
 TS(CHARACTER_CONSTANT, "character constant",)