X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=lexer.h;h=44f6491725c17a5dc458cdf789a0e2b8cf248450;hb=669a0555947b3aac4bab2b5c94b2ebcec5c08a47;hp=f490d2a1b538618bb3ed307d78d0aa94316ecd17;hpb=920dbaf1e09f6dce8cc8dd703ed2bfdec62fae38;p=xonotic%2Fgmqcc.git

diff --git a/lexer.h b/lexer.h
index f490d2a..44f6491 100644
--- a/lexer.h
+++ b/lexer.h
@@ -30,10 +30,10 @@ struct token_s {
     char *value;
 
     union {
-        vec3_t v;
-        int    i;
-        double f;
-        int    t; /* type */
+        vec3_t    v;
+        int       i;
+        qcfloat_t f;
+        int       t; /* type */
     } constval;
 
 #if 0
@@ -105,7 +105,7 @@ typedef struct {
 } frame_macro;
 
 typedef struct lex_file_s {
-    FILE   *file;
+    fs_file_t  *file;
     const char *open_string;
     size_t      open_string_length;
     size_t      open_string_pos;
@@ -185,10 +185,10 @@ static const oper_info c_operators[] = {
     { "++",  1, opid3('+','+','P'), ASSOC_RIGHT, 16, OP_PREFIX, false},
     { "--",  1, opid3('-','-','P'), ASSOC_RIGHT, 16, OP_PREFIX, false},
 
-    { "**",  2, opid2('*', '*'),    ASSOC_RIGHT, 15, 0,         true},
+    { "**",  2, opid2('*','*'),     ASSOC_RIGHT, 15, 0,         true},
 
-    { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX, true},
-    { "~",   1, opid2('~', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX, true},
+    { "!",   1, opid2('!','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
+    { "~",   1, opid2('~','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
     { "+",   1, opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX, false},
     { "-",   1, opid2('-','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
 /*  { "&",   1, opid2('&','P'),     ASSOC_RIGHT, 14, OP_PREFIX, false}, */
@@ -196,6 +196,7 @@ static const oper_info c_operators[] = {
     { "*",   2, opid1('*'),         ASSOC_LEFT,  13, 0,         true},
     { "/",   2, opid1('/'),         ASSOC_LEFT,  13, 0,         true},
     { "%",   2, opid1('%'),         ASSOC_LEFT,  13, 0,         true},
+    { "><",  2, opid2('>','<'),     ASSOC_LEFT,  13, 0,         true},
 
     { "+",   2, opid1('+'),         ASSOC_LEFT,  12, 0,         true},
     { "-",   2, opid1('-'),         ASSOC_LEFT,  12, 0,         true},
@@ -209,8 +210,8 @@ static const oper_info c_operators[] = {
     { "<=",  2, opid2('<','='),     ASSOC_LEFT,  10, 0,         false},
     { ">=",  2, opid2('>','='),     ASSOC_LEFT,  10, 0,         false},
 
-    { "==",  2, opid2('=','='),     ASSOC_LEFT,  9,  0,         false},
-    { "!=",  2, opid2('!','='),     ASSOC_LEFT,  9,  0,         false},
+    { "==",  2, opid2('=','='),     ASSOC_LEFT,  9,  0,         true},
+    { "!=",  2, opid2('!','='),     ASSOC_LEFT,  9,  0,         true},
 
     { "&",   2, opid1('&'),         ASSOC_LEFT,  8,  0,         true},
 
@@ -228,20 +229,18 @@ static const oper_info c_operators[] = {
     { "+=",  2, opid2('+','='),     ASSOC_RIGHT, 2,  0,         false},
     { "-=",  2, opid2('-','='),     ASSOC_RIGHT, 2,  0,         false},
     { "*=",  2, opid2('*','='),     ASSOC_RIGHT, 2,  0,         false},
-    { "/=",  2, opid2('/','='),     ASSOC_RIGHT, 2,  0,         true},
+    { "/=",  2, opid2('/','='),     ASSOC_RIGHT, 2,  0,         false},
     { "%=",  2, opid2('%','='),     ASSOC_RIGHT, 2,  0,         false},
     { ">>=", 2, opid3('>','>','='), ASSOC_RIGHT, 2,  0,         false},
     { "<<=", 2, opid3('<','<','='), ASSOC_RIGHT, 2,  0,         false},
     { "&=",  2, opid2('&','='),     ASSOC_RIGHT, 2,  0,         false},
     { "^=",  2, opid2('^','='),     ASSOC_RIGHT, 2,  0,         false},
     { "|=",  2, opid2('|','='),     ASSOC_RIGHT, 2,  0,         false},
-    { "&~=", 2, opid3('&','~','='), ASSOC_RIGHT, 2,  0,         false},
 
     { ":",   0, opid2(':','?'),     ASSOC_RIGHT, 1,  0,         false},
 
     { ",",   2, opid1(','),         ASSOC_LEFT,  0,  0,         false}
 };
-static const size_t c_operator_count = (sizeof(c_operators) / sizeof(c_operators[0]));
 
 static const oper_info fte_operators[] = {
     { "(",   0, opid1('('),         ASSOC_LEFT,  99, OP_PREFIX, false}, /* paren expression - non function call */
@@ -252,7 +251,7 @@ static const oper_info fte_operators[] = {
     { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0,         false}, /* function call */
     { "[",   2, opid1('['),         ASSOC_LEFT,  15, 0,         false}, /* array subscript */
 
-    { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX, true},
+    { "!",   1, opid2('!','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
     { "+",   1, opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX, false},
     { "-",   1, opid2('-','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
     { "++",  1, opid3('+','+','P'), ASSOC_RIGHT, 14, OP_PREFIX, false},
@@ -273,8 +272,8 @@ static const oper_info fte_operators[] = {
     { ">",   2, opid1('>'),         ASSOC_LEFT,  10, 0,         false},
     { "<=",  2, opid2('<','='),     ASSOC_LEFT,  10, 0,         false},
     { ">=",  2, opid2('>','='),     ASSOC_LEFT,  10, 0,         false},
-    { "==",  2, opid2('=','='),     ASSOC_LEFT,  10, 0,         false},
-    { "!=",  2, opid2('!','='),     ASSOC_LEFT,  10, 0,         false},
+    { "==",  2, opid2('=','='),     ASSOC_LEFT,  10, 0,         true},
+    { "!=",  2, opid2('!','='),     ASSOC_LEFT,  10, 0,         true},
 
     { "?",   3, opid2('?',':'),     ASSOC_RIGHT, 9,  0,         true},
 
@@ -282,7 +281,7 @@ static const oper_info fte_operators[] = {
     { "+=",  2, opid2('+','='),     ASSOC_RIGHT, 8,  0,         false},
     { "-=",  2, opid2('-','='),     ASSOC_RIGHT, 8,  0,         false},
     { "*=",  2, opid2('*','='),     ASSOC_RIGHT, 8,  0,         false},
-    { "/=",  2, opid2('/','='),     ASSOC_RIGHT, 8,  0,         true},
+    { "/=",  2, opid2('/','='),     ASSOC_RIGHT, 8,  0,         false},
     { "%=",  2, opid2('%','='),     ASSOC_RIGHT, 8,  0,         false},
     { "&=",  2, opid2('&','='),     ASSOC_RIGHT, 8,  0,         false},
     { "|=",  2, opid2('|','='),     ASSOC_RIGHT, 8,  0,         false},
@@ -295,7 +294,6 @@ static const oper_info fte_operators[] = {
     { ",",   2, opid1(','),         ASSOC_LEFT,  2,  0,         false},
     { ":",   0, opid2(':','?'),     ASSOC_RIGHT, 1,  0,         false}
 };
-static const size_t fte_operator_count = (sizeof(fte_operators) / sizeof(fte_operators[0]));
 
 static const oper_info qcc_operators[] = {
     { "(",   0, opid1('('),         ASSOC_LEFT,  99, OP_PREFIX, false}, /* paren expression - non function call */
@@ -304,7 +302,7 @@ static const oper_info qcc_operators[] = {
     { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0,         false}, /* function call */
     { "[",   2, opid1('['),         ASSOC_LEFT,  15, 0,         false}, /* array subscript */
 
-    { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX, true},
+    { "!",   1, opid2('!','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
     { "+",   1, opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX, false},
     { "-",   1, opid2('-','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
 
@@ -320,14 +318,14 @@ static const oper_info qcc_operators[] = {
     { ">",   2, opid1('>'),         ASSOC_LEFT,  10, 0,         false},
     { "<=",  2, opid2('<','='),     ASSOC_LEFT,  10, 0,         false},
     { ">=",  2, opid2('>','='),     ASSOC_LEFT,  10, 0,         false},
-    { "==",  2, opid2('=','='),     ASSOC_LEFT,  10, 0,         false},
-    { "!=",  2, opid2('!','='),     ASSOC_LEFT,  10, 0,         false},
+    { "==",  2, opid2('=','='),     ASSOC_LEFT,  10, 0,         true},
+    { "!=",  2, opid2('!','='),     ASSOC_LEFT,  10, 0,         true},
 
     { "=",   2, opid1('='),         ASSOC_RIGHT, 8,  0,         false},
     { "+=",  2, opid2('+','='),     ASSOC_RIGHT, 8,  0,         false},
     { "-=",  2, opid2('-','='),     ASSOC_RIGHT, 8,  0,         false},
     { "*=",  2, opid2('*','='),     ASSOC_RIGHT, 8,  0,         false},
-    { "/=",  2, opid2('/','='),     ASSOC_RIGHT, 8,  0,         true},
+    { "/=",  2, opid2('/','='),     ASSOC_RIGHT, 8,  0,         false},
     { "%=",  2, opid2('%','='),     ASSOC_RIGHT, 8,  0,         false},
     { "&=",  2, opid2('&','='),     ASSOC_RIGHT, 8,  0,         false},
     { "|=",  2, opid2('|','='),     ASSOC_RIGHT, 8,  0,         false},
@@ -337,10 +335,7 @@ static const oper_info qcc_operators[] = {
 
     { ",",   2, opid1(','),         ASSOC_LEFT,  2,  0,         false},
 };
-static const size_t qcc_operator_count = (sizeof(qcc_operators) / sizeof(qcc_operators[0]));
-
 extern const oper_info *operators;
 extern size_t           operator_count;
-/*void lexerror(lex_file*, const char *fmt, ...);*/
 
 #endif