Merging master and adopting its main.c

[xonotic/gmqcc.git] / lexer.h

diff --git a/lexer.h b/lexer.h
index 925610115bfce06bc21614f5366e5a3d8fa795f6..ae8812b261c5be6e68252a78704e2e32438b59c7 100644 (file)
--- a/lexer.h
+++ b/lexer.h
@@ -183,8 +183,10 @@ 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 }
 };
-const size_t operator_count = (sizeof(operators) / sizeof(operators[0]));
+static const size_t operator_count = (sizeof(operators) / sizeof(operators[0]));
 
 typedef struct
 {