Adding '&~=' to the -std=gmqcc operator list

[xonotic/gmqcc.git] / lexer.h

diff --git a/lexer.h b/lexer.h
index 49c7762081454933216aac4e3d902dfa956f6e59..28bae8a30beafeb6bc06b279da0de4c95718e70b 100644 (file)
--- a/lexer.h
+++ b/lexer.h
@@ -28,23 +28,23 @@ typedef struct token_s token;
 #include "ast.h"
 
 struct token_s {
-       int ttype;
+    int ttype;
 
-       char *value;
+    char *value;
 
-       union {
-               vector v;
-               int    i;
-               double f;
-               int    t; /* type */
-       } constval;
+    union {
+        vector v;
+        int    i;
+        double f;
+        int    t; /* type */
+    } constval;
 
 #if 0
-       struct token_s *next;
-       struct token_s *prev;
+    struct token_s *next;
+    struct token_s *prev;
 #endif
 
-       lex_ctx ctx;
+    lex_ctx ctx;
 };
 
 #if 0
@@ -73,6 +73,9 @@ enum {
 
     TOKEN_DOTS, /* 3 dots, ... */
 
+    TOKEN_ATTRIBUTE_OPEN,  /* [[ */
+    TOKEN_ATTRIBUTE_CLOSE, /* ]] */
+
     TOKEN_STRINGCONST, /* not the typename but an actual "string" */
     TOKEN_CHARCONST,
     TOKEN_VECTORCONST,
@@ -97,34 +100,34 @@ typedef struct {
 } frame_macro;
 
 typedef struct {
-       FILE   *file;
-       const char *open_string;
-       size_t      open_string_length;
-       size_t      open_string_pos;
+    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 */
+    char   *name;
+    size_t  line;
+    size_t  sline; /* line at the start of a token */
 
-       char    peek[256];
-       size_t  peekpos;
+    char    peek[256];
+    size_t  peekpos;
 
-       bool    eof;
+    bool    eof;
 
-       token   tok; /* not a pointer anymore */
+    token   tok; /* not a pointer anymore */
 
-       struct {
-           bool noops;
-           bool nodigraphs; /* used when lexing string constants */
-           bool preprocessing; /* whitespace and EOLs become actual tokens */
-           bool mergelines; /* backslash at the end of a line escapes the newline */
-       } flags;
+    struct {
+        bool noops;
+        bool nodigraphs; /* used when lexing string constants */
+        bool preprocessing; /* whitespace and EOLs become actual tokens */
+        bool mergelines; /* backslash at the end of a line escapes the newline */
+    } flags;
 
     int framevalue;
-       frame_macro *frames;
-       char *modelname;
+    frame_macro *frames;
+    char *modelname;
 
-       size_t push_line;
+    size_t push_line;
 } lex_file;
 
 lex_file* lex_open (const char *file);
@@ -150,7 +153,7 @@ typedef struct {
     unsigned int operands;
     unsigned int id;
     unsigned int assoc;
-    unsigned int prec;
+    signed int   prec;
     unsigned int flags;
 } oper_info;
 
@@ -204,7 +207,6 @@ 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 },
@@ -217,8 +219,11 @@ static const oper_info c_operators[] = {
     { "&=",  2, opid2('&','='),     ASSOC_RIGHT, 2,  0 },
     { "^=",  2, opid2('^','='),     ASSOC_RIGHT, 2,  0 },
     { "|=",  2, opid2('|','='),     ASSOC_RIGHT, 2,  0 },
+    { "&~=", 2, opid3('&','~','='), ASSOC_RIGHT, 2,  0 },
+
+    { ":",   0, opid2(':','?'),     ASSOC_RIGHT, 1,  0 },
 
-    { ",",   2, opid1(','),         ASSOC_LEFT,  1,  0 }
+    { ",",   2, opid1(','),         ASSOC_LEFT,  0,  0 }
 };
 static const size_t c_operator_count = (sizeof(c_operators) / sizeof(c_operators[0]));
 
@@ -253,7 +258,6 @@ static const oper_info fte_operators[] = {
     { "!=",  2, opid2('!','='),     ASSOC_LEFT,  10,  0 },
 
     { "?",   3, opid2('?',':'),     ASSOC_RIGHT, 9,  0 },
-    { ":",   3, opid2(':','?'),     ASSOC_RIGHT, 9,  0 },
 
     { "=",   2, opid1('='),         ASSOC_RIGHT, 8,  0 },
     { "+=",  2, opid2('+','='),     ASSOC_RIGHT, 8,  0 },
@@ -268,7 +272,9 @@ static const oper_info fte_operators[] = {
     { "&&",  2, opid2('&','&'),     ASSOC_LEFT,  5,  0 },
     { "||",  2, opid2('|','|'),     ASSOC_LEFT,  5,  0 },
 
-    { ",",   2, opid1(','),         ASSOC_LEFT,  2,  0 }
+    /* Leave precedence 3 for : with -fcorrect-ternary */
+    { ",",   2, opid1(','),         ASSOC_LEFT,  2,  0 },
+    { ":",   0, opid2(':','?'),     ASSOC_RIGHT, 1,  0 }
 };
 static const size_t fte_operator_count = (sizeof(fte_operators) / sizeof(fte_operators[0]));
 
@@ -311,9 +317,6 @@ static const oper_info qcc_operators[] = {
     { "||",  2, opid2('|','|'),     ASSOC_LEFT,  5,  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]));