X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=lexer.h;h=8ccd2cf261d6a8dcb7d41d316cf0434fafc20a77;hb=0674cd2f0beda37727427ebd6cb2fd130db168a1;hp=f49b8ff2fe349a6407c5955affba02e86922303f;hpb=02b4c7b7c1639af8666f9a093d6dc4f6ac30e0f4;p=xonotic%2Fgmqcc.git

diff --git a/lexer.h b/lexer.h
index f49b8ff..8ccd2cf 100644
--- a/lexer.h
+++ b/lexer.h
@@ -117,66 +117,71 @@ enum {
 
 typedef struct {
     const char   *op;
+    unsigned int id;
     unsigned int assoc;
     unsigned int prec;
     unsigned int flags;
 } oper_info;
 
+#define opid1(a) (a)
+#define opid2(a,b) ((a<<8)|b)
+#define opid3(a,b,c) ((a<<16)|(b<<8)|c)
+
 static const oper_info operators[] = {
-    { "++",  ASSOC_LEFT,  16, OP_SUFFIX},
-    { "--",  ASSOC_LEFT,  16, OP_SUFFIX},
+    { "++",  opid3('S','+','+'), ASSOC_LEFT,  16, OP_SUFFIX},
+    { "--",  opid3('S','-','-'), ASSOC_LEFT,  16, OP_SUFFIX},
 
-    { ".",   ASSOC_LEFT,  15, 0 },
+    { ".",   opid1('.'),         ASSOC_LEFT,  15, 0 },
 
-    { "!",   ASSOC_RIGHT, 14, 0 },
-    { "~",   ASSOC_RIGHT, 14, 0 },
-    { "+",   ASSOC_RIGHT, 14, OP_PREFIX },
-    { "-",   ASSOC_RIGHT, 14, OP_PREFIX },
-    { "++",  ASSOC_RIGHT, 14, OP_PREFIX },
-    { "--",  ASSOC_RIGHT, 14, OP_PREFIX },
-/*  { "&",   ASSOC_RIGHT, 14, OP_PREFIX }, */
+    { "!",   opid2('!', 'P'),    ASSOC_RIGHT, 14, 0 },
+    { "~",   opid2('~', 'P'),    ASSOC_RIGHT, 14, 0 },
+    { "+",   opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX },
+    { "-",   opid2('-','P'),     ASSOC_RIGHT, 14, OP_PREFIX },
+    { "++",  opid3('+','+','P'), ASSOC_RIGHT, 14, OP_PREFIX },
+    { "--",  opid3('-','-','P'), ASSOC_RIGHT, 14, OP_PREFIX },
+/*  { "&",   opid2('&','P'),     ASSOC_RIGHT, 14, OP_PREFIX }, */
 
-    { "*",   ASSOC_LEFT,  13, 0 },
-    { "/",   ASSOC_LEFT,  13, 0 },
-    { "%",   ASSOC_LEFT,  13, 0 },
+    { "*",   opid1('*'),         ASSOC_LEFT,  13, 0 },
+    { "/",   opid1('/'),         ASSOC_LEFT,  13, 0 },
+    { "%",   opid1('%'),         ASSOC_LEFT,  13, 0 },
 
-    { "+",   ASSOC_LEFT,  12, 0 },
-    { "-",   ASSOC_LEFT,  12, 0 },
+    { "+",   opid1('+'),         ASSOC_LEFT,  12, 0 },
+    { "-",   opid1('-'),         ASSOC_LEFT,  12, 0 },
 
-    { "<<",  ASSOC_LEFT,  11, 0 },
-    { ">>",  ASSOC_LEFT,  11, 0 },
+    { "<<",  opid2('<','<'),     ASSOC_LEFT,  11, 0 },
+    { ">>",  opid2('>','>'),     ASSOC_LEFT,  11, 0 },
 
-    { "<",   ASSOC_LEFT,  10, 0 },
-    { ">",   ASSOC_LEFT,  10, 0 },
-    { "<=",  ASSOC_LEFT,  10, 0 },
-    { ">=",  ASSOC_LEFT,  10, 0 },
+    { "<",   opid1('<'),         ASSOC_LEFT,  10, 0 },
+    { ">",   opid1('>'),         ASSOC_LEFT,  10, 0 },
+    { "<=",  opid2('<','='),     ASSOC_LEFT,  10, 0 },
+    { ">=",  opid2('>','='),     ASSOC_LEFT,  10, 0 },
 
-    { "==",  ASSOC_LEFT,  9,  0 },
-    { "!=",  ASSOC_LEFT,  9,  0 },
+    { "==",  opid2('=','='),     ASSOC_LEFT,  9,  0 },
+    { "!=",  opid2('!','='),     ASSOC_LEFT,  9,  0 },
 
-    { "&",   ASSOC_LEFT,  8,  0 },
+    { "&",   opid1('&'),         ASSOC_LEFT,  8,  0 },
 
-    { "^",   ASSOC_LEFT,  7,  0 },
+    { "^",   opid1('^'),         ASSOC_LEFT,  7,  0 },
 
-    { "|",   ASSOC_LEFT,  6,  0 },
+    { "|",   opid1('|'),         ASSOC_LEFT,  6,  0 },
 
-    { "&&",  ASSOC_LEFT,  5,  0 },
+    { "&&",  opid2('&','&'),     ASSOC_LEFT,  5,  0 },
 
-    { "||",  ASSOC_LEFT,  4,  0 },
+    { "||",  opid2('|','|'),     ASSOC_LEFT,  4,  0 },
 
-    { "?",   ASSOC_RIGHT, 3,  0 },
+    { "?",   opid2('?',':'),     ASSOC_RIGHT, 3,  0 },
 
-    { "=",   ASSOC_RIGHT, 2,  0 },
-    { "+=",  ASSOC_RIGHT, 2,  0 },
-    { "-=",  ASSOC_RIGHT, 2,  0 },
-    { "*=",  ASSOC_RIGHT, 2,  0 },
-    { "/=",  ASSOC_RIGHT, 2,  0 },
-    { "%=",  ASSOC_RIGHT, 2,  0 },
-    { ">>=", ASSOC_RIGHT, 2,  0 },
-    { "<<=", ASSOC_RIGHT, 2,  0 },
-    { "&=",  ASSOC_RIGHT, 2,  0 },
-    { "^=",  ASSOC_RIGHT, 2,  0 },
-    { "|=",  ASSOC_RIGHT, 2,  0 },
+    { "=",   opid1('='),         ASSOC_RIGHT, 2,  0 },
+    { "+=",  opid2('+','='),     ASSOC_RIGHT, 2,  0 },
+    { "-=",  opid2('-','='),     ASSOC_RIGHT, 2,  0 },
+    { "*=",  opid2('*','='),     ASSOC_RIGHT, 2,  0 },
+    { "/=",  opid2('/','='),     ASSOC_RIGHT, 2,  0 },
+    { "%=",  opid2('%','='),     ASSOC_RIGHT, 2,  0 },
+    { ">>=", opid3('>','>','='), ASSOC_RIGHT, 2,  0 },
+    { "<<=", opid3('<','<','='), ASSOC_RIGHT, 2,  0 },
+    { "&=",  opid2('&','='),     ASSOC_RIGHT, 2,  0 },
+    { "^=",  opid2('^','='),     ASSOC_RIGHT, 2,  0 },
+    { "|=",  opid2('|','='),     ASSOC_RIGHT, 2,  0 },
 };
 
 typedef struct