X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=lexer.h;h=e58a98d13e62ba854870b19bcc0e6a46d2c90e71;hp=b8e2e01f8449c1654ae298ffcff3181f6d58d5cb;hb=a87bc6a5759621ae7d7e018ade969337f239ccd2;hpb=79abe3fb6d9cf6c0d5f234d64fd77181b2c2317d

diff --git a/lexer.h b/lexer.h
index b8e2e01..e58a98d 100644
--- a/lexer.h
+++ b/lexer.h
@@ -69,30 +69,6 @@ enum {
     TOKEN_FATAL /* internal error, eg out of memory */
 };
 
-static const char *_tokennames[] = {
-    "TOKEN_START",
-    "TOKEN_IDENT",
-    "TOKEN_TYPENAME",
-    "TOKEN_OPERATOR",
-    "TOKEN_KEYWORD",
-    "TOKEN_DOTS",
-    "TOKEN_STRINGCONST",
-    "TOKEN_CHARCONST",
-    "TOKEN_VECTORCONST",
-    "TOKEN_INTCONST",
-    "TOKEN_FLOATCONST",
-    "TOKEN_WHITE",
-    "TOKEN_EOL",
-    "TOKEN_EOF",
-    "TOKEN_ERROR",
-    "TOKEN_FATAL",
-};
-typedef int
-_all_tokennames_added_[
-	((TOKEN_FATAL - TOKEN_START + 1) ==
-	 (sizeof(_tokennames)/sizeof(_tokennames[0])))
-	? 1 : -1];
-
 typedef struct {
     char *name;
     int   value;
@@ -125,6 +101,8 @@ typedef struct {
     int framevalue;
 	frame_macro *frames;
 	char *modelname;
+
+	size_t push_line;
 } lex_file;
 
 lex_file* lex_open (const char *file);
@@ -205,6 +183,7 @@ static const oper_info c_operators[] = {
     { "||",  2, opid2('|','|'),     ASSOC_LEFT,  4,  0 },
 
     { "?",   3, opid2('?',':'),     ASSOC_RIGHT, 3,  0 },
+    { ":",   3, opid2(':','?'),     ASSOC_RIGHT, 3,  0 },
 
     { "=",   2, opid1('='),         ASSOC_RIGHT, 2,  0 },
     { "+=",  2, opid2('+','='),     ASSOC_RIGHT, 2,  0 },
@@ -260,7 +239,10 @@ static const oper_info qcc_operators[] = {
     { "&&",  2, opid2('&','&'),     ASSOC_LEFT,  5,  0 },
     { "||",  2, opid2('|','|'),     ASSOC_LEFT,  5,  0 },
 
-    { ",",   2, opid1(','),         ASSOC_LEFT,  1,  0 }
+    { ",",   2, opid1(','),         ASSOC_LEFT,  2,  0 },
+
+    { "?",   3, opid2('?',':'),     ASSOC_RIGHT, 1,  0 },
+    { ":",   3, opid2(':','?'),     ASSOC_RIGHT, 1,  0 }
 };
 static const size_t qcc_operator_count = (sizeof(qcc_operators) / sizeof(qcc_operators[0]));