Revert "Smaller memory footprint, 4/8 bytes vs 12/24 for individual token lex_ctx...

[xonotic/gmqcc.git] / lexer.h

diff --git a/lexer.h b/lexer.h
index b73fa5f1dbdcbc2c2850006edc57bf6224203667..f51d56e9073840d021e09f66e6ce03a68c16a54c 100644 (file)
--- a/lexer.h
+++ b/lexer.h
@@ -41,7 +41,7 @@ struct token_s {
     struct token_s *prev;
 #endif
 
-    lex_ctx *ctx;
+    lex_ctx ctx;
 };
 
 #if 0
@@ -110,15 +110,10 @@ typedef struct lex_file_s {
     size_t      open_string_length;
     size_t      open_string_pos;
 
+    char   *name;
+    size_t  line;
     size_t  sline; /* line at the start of a token */
-
-    /* 
-     * no more 'shallow' copies, instead all new instances
-     * of a lex_ctx will just point to this lex_file::ctx.
-     * i.e 4/8 byte pointer. Instead of every token getting
-     * a 'shallow' 12/24 byte structure.
-     */
-    lex_ctx ctx;
+    size_t  column;
 
     int     peek[256];
     size_t  peekpos;