From ba38eff1c22cab91fc1a47a24dc7c03a458640aa Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 24 Aug 2020 13:13:08 +0200 Subject: lexer.c, eval.c: move T_EXCEPTION definition to lexer header Signed-off-by: Jo-Philipp Wich --- eval.c | 3 --- lexer.c | 2 +- lexer.h | 5 ++++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eval.c b/eval.c index d49356b..8860078 100644 --- a/eval.c +++ b/eval.c @@ -25,9 +25,6 @@ #include #include -#define T_MAX (sizeof(tokennames) / sizeof(tokennames[0])) -#define T_EXCEPTION (T_MAX + 0) - static struct ut_opcode exception_tag = { .type = T_EXCEPTION }; diff --git a/lexer.c b/lexer.c index c0fd154..67d390a 100644 --- a/lexer.c +++ b/lexer.c @@ -136,7 +136,7 @@ static const struct token reserved_words[] = { { T_IN, "in", 2 }, }; -const char *tokennames[69] = { +const char *tokennames[__T_MAX] = { [0] = "End of file", [T_FUNC] = "'function'", [T_LOCAL] = "'local'", diff --git a/lexer.h b/lexer.h index b8ed7bc..ff653bd 100644 --- a/lexer.h +++ b/lexer.h @@ -19,7 +19,10 @@ #include "ast.h" -extern const char *tokennames[69]; +#define __T_MAX 69 +#define T_EXCEPTION (__T_MAX + 0) + +extern const char *tokennames[__T_MAX]; bool utf8enc(char **out, int *rem, int code); -- cgit v1.2.3