X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=lexer.h;h=df42fd597104ce68b33e0ddc8021935f27c79d88;hp=925610115bfce06bc21614f5366e5a3d8fa795f6;hb=74cb075665a8e389cd4a5492bef158bb2f59de85;hpb=f78ed233c0566aa786ab90ddc6fbf54abbcba97b

diff --git a/lexer.h b/lexer.h
index 9256101..df42fd5 100644
--- a/lexer.h
+++ b/lexer.h
@@ -17,17 +17,21 @@ struct token_s {
 		int    t; /* type */
 	} constval;
 
+#if 0
 	struct token_s *next;
 	struct token_s *prev;
+#endif
 
 	lex_ctx ctx;
 };
 
+#if 0
 token* token_new();
 void   token_delete(token*);
 token* token_copy(const token *cp);
 void   token_delete_all(token *t);
 token* token_copy_all(const token *cp);
+#endif
 
 /* Lexer
  *
@@ -45,6 +49,8 @@ enum {
 
     TOKEN_KEYWORD, /* loop */
 
+    TOKEN_DOTS, /* 3 dots, ... */
+
     TOKEN_STRINGCONST, /* not the typename but an actual "string" */
     TOKEN_CHARCONST,
     TOKEN_VECTORCONST,
@@ -66,6 +72,7 @@ static const char *_tokennames[] = {
     "TOKEN_TYPENAME",
     "TOKEN_OPERATOR",
     "TOKEN_KEYWORD",
+    "TOKEN_DOTS",
     "TOKEN_STRINGCONST",
     "TOKEN_CHARCONST",
     "TOKEN_VECTORCONST",
@@ -81,6 +88,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;
@@ -90,11 +102,17 @@ typedef struct {
 	char    peek[256];
 	size_t  peekpos;
 
-	token  *tok;
+	bool    eof;
+
+	token   tok; /* not a pointer anymore */
 
 	struct {
 	    bool noops;
 	} flags;
+
+    int framevalue;
+	MEM_VECTOR_MAKE(frame_macro, frames);
+	char *modelname;
 } lex_file;
 
 MEM_VECTOR_PROTO(lex_file, char, token);
@@ -102,6 +120,7 @@ MEM_VECTOR_PROTO(lex_file, char, token);
 lex_file* lex_open (const char *file);
 void      lex_close(lex_file   *lex);
 int       lex_do   (lex_file   *lex);
+void      lex_cleanup(void);
 
 /* Parser
  *
@@ -128,14 +147,17 @@ typedef struct {
 #define opid2(a,b) ((a<<8)|b)
 #define opid3(a,b,c) ((a<<16)|(b<<8)|c)
 
-static const oper_info operators[] = {
+static const oper_info c_operators[] = {
+    { "(",   0, opid1('('),         ASSOC_LEFT,  99, OP_PREFIX}, /* paren expression - non function call */
+
     { "++",  1, opid3('S','+','+'), ASSOC_LEFT,  16, OP_SUFFIX},
     { "--",  1, opid3('S','-','-'), ASSOC_LEFT,  16, OP_SUFFIX},
 
     { ".",   2, opid1('.'),         ASSOC_LEFT,  15, 0 },
+    { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0 }, /* function call */
 
-    { "!",   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,8 +205,54 @@ 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 c_operator_count = (sizeof(c_operators) / sizeof(c_operators[0]));
+
+static const oper_info qcc_operators[] = {
+    { "(",   0, opid1('('),         ASSOC_LEFT,  99, OP_PREFIX}, /* paren expression - non function call */
+
+    { ".",   2, opid1('.'),         ASSOC_LEFT,  15, 0 },
+    { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0 }, /* function call */
+
+    { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
+    { "+",   1, opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX },
+    { "-",   1, opid2('-','P'),     ASSOC_RIGHT, 14, OP_PREFIX },
+
+    { "*",   2, opid1('*'),         ASSOC_LEFT,  13, 0 },
+    { "/",   2, opid1('/'),         ASSOC_LEFT,  13, 0 },
+    { "&",   2, opid1('&'),         ASSOC_LEFT,  13, 0 },
+    { "|",   2, opid1('|'),         ASSOC_LEFT,  13, 0 },
+
+    { "+",   2, opid1('+'),         ASSOC_LEFT,  12, 0 },
+    { "-",   2, opid1('-'),         ASSOC_LEFT,  12, 0 },
+
+    { "<",   2, opid1('<'),         ASSOC_LEFT,  10, 0 },
+    { ">",   2, opid1('>'),         ASSOC_LEFT,  10, 0 },
+    { "<=",  2, opid2('<','='),     ASSOC_LEFT,  10, 0 },
+    { ">=",  2, opid2('>','='),     ASSOC_LEFT,  10, 0 },
+    { "==",  2, opid2('=','='),     ASSOC_LEFT,  10,  0 },
+    { "!=",  2, opid2('!','='),     ASSOC_LEFT,  10,  0 },
+
+    { "=",   2, opid1('='),         ASSOC_RIGHT, 8,  0 },
+    { "+=",  2, opid2('+','='),     ASSOC_RIGHT, 8,  0 },
+    { "-=",  2, opid2('-','='),     ASSOC_RIGHT, 8,  0 },
+    { "*=",  2, opid2('*','='),     ASSOC_RIGHT, 8,  0 },
+    { "/=",  2, opid2('/','='),     ASSOC_RIGHT, 8,  0 },
+    { "%=",  2, opid2('%','='),     ASSOC_RIGHT, 8,  0 },
+    { "&=",  2, opid2('&','='),     ASSOC_RIGHT, 8,  0 },
+    { "|=",  2, opid2('|','='),     ASSOC_RIGHT, 8,  0 },
+
+    { "&&",  2, opid2('&','&'),     ASSOC_LEFT,  5,  0 },
+    { "||",  2, opid2('|','|'),     ASSOC_LEFT,  5,  0 },
+
+    { ",",   2, opid1(','),         ASSOC_LEFT,  1,  0 }
+};
+static const size_t qcc_operator_count = (sizeof(qcc_operators) / sizeof(qcc_operators[0]));
+
+extern const oper_info *operators;
+extern size_t           operator_count;
 
 typedef struct
 {