lexer now turns '(' into an operator if noops=false

[xonotic/gmqcc.git] / lexer.h

diff --git a/lexer.h b/lexer.h
index c23f944baf5fee23cf7da5ecdd5dee964956441d..5bd15f65a1e3fd0cddc64a8da394055fe960761d 100644 (file)
--- a/lexer.h
+++ b/lexer.h
@@ -81,6 +81,11 @@ _all_tokennames_added_[
         (sizeof(_tokennames)/sizeof(_tokennames[0])))
        ? 1 : -1];
 
+typedef struct {
+    char *name;
+    int   value;
+} frame_macro;
+
 typedef struct {
        FILE   *file;
        char   *name;
@@ -95,6 +100,10 @@ typedef struct {
        struct {
            bool noops;
        } flags;
+
+    int framevalue;
+       MEM_VECTOR_MAKE(frame_macro, frames);
+       char *modelname;
 } lex_file;
 
 MEM_VECTOR_PROTO(lex_file, char, token);
@@ -133,9 +142,10 @@ static const oper_info operators[] = {
     { "--",  1, opid3('S','-','-'), ASSOC_LEFT,  16, OP_SUFFIX},
 
     { ".",   2, opid1('.'),         ASSOC_LEFT,  15, 0 },
+    { "(",   0, opid1('('),         ASSOC_LEFT,  15, OP_SUFFIX },
 
-    { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, 0 },
-    { "~",   1, opid2('~', 'P'),    ASSOC_RIGHT, 14, 0 },
+    { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
+    { "~",   1, opid2('~', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
     { "+",   1, opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX },
     { "-",   1, opid2('-','P'),     ASSOC_RIGHT, 14, OP_PREFIX },
     { "++",  1, opid3('+','+','P'), ASSOC_RIGHT, 14, OP_PREFIX },
@@ -183,6 +193,8 @@ static const oper_info operators[] = {
     { "&=",  2, opid2('&','='),     ASSOC_RIGHT, 2,  0 },
     { "^=",  2, opid2('^','='),     ASSOC_RIGHT, 2,  0 },
     { "|=",  2, opid2('|','='),     ASSOC_RIGHT, 2,  0 },
+
+    { ",",   2, opid1(','),         ASSOC_LEFT,  1,  0 }
 };
 static const size_t operator_count = (sizeof(operators) / sizeof(operators[0]));