X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=lexer.h;h=76d2b7a711c9ce8f5a2e8ddf704778328c92bb70;hb=b1c27e3bf2ed785d693ab3332528bde058a067d0;hp=c84b2084ee57c0e854696b886b79f0132ce42d42;hpb=19391bb1907c1727b50a32c2766fb9ee6b215b61;p=xonotic%2Fgmqcc.git

diff --git a/lexer.h b/lexer.h
index c84b208..76d2b7a 100644
--- a/lexer.h
+++ b/lexer.h
@@ -8,7 +8,7 @@ typedef struct token_s token;
 struct token_s {
 	int ttype;
 
-	MEM_VECTOR_MAKE(char, value);
+	char *value;
 
 	union {
 		vector v;
@@ -17,17 +17,21 @@ struct token_s {
 		int    t; /* type */
 	} constval;
 
+#if 0
 	struct token_s *next;
 	struct token_s *prev;
+#endif
 
 	lex_ctx ctx;
 };
 
+#if 0
 token* token_new();
 void   token_delete(token*);
 token* token_copy(const token *cp);
 void   token_delete_all(token *t);
 token* token_copy_all(const token *cp);
+#endif
 
 /* Lexer
  *
@@ -53,6 +57,9 @@ enum {
     TOKEN_INTCONST,
     TOKEN_FLOATCONST,
 
+    TOKEN_WHITE,
+    TOKEN_EOL,
+
     TOKEN_EOF,
 
     /* We use '< TOKEN_ERROR', so TOKEN_FATAL must come after it and any
@@ -74,6 +81,8 @@ static const char *_tokennames[] = {
     "TOKEN_VECTORCONST",
     "TOKEN_INTCONST",
     "TOKEN_FLOATCONST",
+    "TOKEN_WHITE",
+    "TOKEN_EOL",
     "TOKEN_EOF",
     "TOKEN_ERROR",
     "TOKEN_FATAL",
@@ -91,6 +100,10 @@ typedef struct {
 
 typedef struct {
 	FILE   *file;
+	const char *open_string;
+	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 */
@@ -100,20 +113,21 @@ typedef struct {
 
 	bool    eof;
 
-	token  *tok;
+	token   tok; /* not a pointer anymore */
 
 	struct {
 	    bool noops;
+	    bool nodigraphs; /* used when lexing string constants */
+	    bool preprocessing; /* whitespace and EOLs become actual tokens */
 	} flags;
 
     int framevalue;
-	MEM_VECTOR_MAKE(frame_macro, frames);
+	frame_macro *frames;
 	char *modelname;
 } lex_file;
 
-MEM_VECTOR_PROTO(lex_file, char, token);
-
 lex_file* lex_open (const char *file);
+lex_file* lex_open_string(const char *str, size_t len, const char *name);
 void      lex_close(lex_file   *lex);
 int       lex_do   (lex_file   *lex);
 void      lex_cleanup(void);
@@ -151,6 +165,7 @@ static const oper_info c_operators[] = {
 
     { ".",   2, opid1('.'),         ASSOC_LEFT,  15, 0 },
     { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0 }, /* function call */
+    { "[",   2, opid1('['),         ASSOC_LEFT,  15, 0 }, /* array subscript */
 
     { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
     { "~",   1, opid2('~', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
@@ -211,6 +226,7 @@ static const oper_info qcc_operators[] = {
 
     { ".",   2, opid1('.'),         ASSOC_LEFT,  15, 0 },
     { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0 }, /* function call */
+    { "[",   2, opid1('['),         ASSOC_LEFT,  15, 0 }, /* array subscript */
 
     { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
     { "+",   1, opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX },
@@ -249,30 +265,6 @@ static const size_t qcc_operator_count = (sizeof(qcc_operators) / sizeof(qcc_ope
 
 extern const oper_info *operators;
 extern size_t           operator_count;
-
-typedef struct
-{
-	lex_file *lex;
-	int      error;
-	lex_ctx  ctx;
-
-	token    *tokens;
-	token    *lastok;
-
-	token    *tok; /* current token */
-
-	MEM_VECTOR_MAKE(ast_value*, globals);
-} parse_file;
-
-MEM_VECTOR_PROTO(parse_file, ast_value*, globals);
-
-parse_file* parse_open(const char *file);
-void        parse_file_close(parse_file*);
-
-bool        parse(parse_file*);
-
-bool        parse_iskey(parse_file *self, const char *ident);
-
 void lexerror(lex_file*, const char *fmt, ...);
 
 #endif