X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=lexer.h;h=75fb83e9320fc159d432819c408b3abf339270c7;hp=2d61f8bf2bc6364608a31362673d782fb002b9d4;hb=e7aa24bd28b34170e0825be10c61f5a1c41ecda6;hpb=b966cd4f4d10f1d9550401571e24a23e774ad6ce

diff --git a/lexer.h b/lexer.h
index 2d61f8b..75fb83e 100644
--- a/lexer.h
+++ b/lexer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
  *     Wolfgang Bumiller
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -25,26 +25,24 @@
 
 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 +71,12 @@ enum {
 
     TOKEN_DOTS, /* 3 dots, ... */
 
+    TOKEN_ATTRIBUTE_OPEN,  /* [[ */
+    TOKEN_ATTRIBUTE_CLOSE, /* ]] */
+
+    TOKEN_VA_ARGS, /* for the ftepp only */
+    TOKEN_VA_ARGS_ARRAY, /* for the ftepp only */
+
     TOKEN_STRINGCONST, /* not the typename but an actual "string" */
     TOKEN_CHARCONST,
     TOKEN_VECTORCONST,
@@ -96,35 +100,35 @@ typedef struct {
     int   value;
 } frame_macro;
 
-typedef struct {
-	FILE   *file;
-	const char *open_string;
-	size_t      open_string_length;
-	size_t      open_string_pos;
+typedef struct lex_file_s {
+    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;
+    int     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 +154,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 +208,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 +220,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]));
 
@@ -245,6 +251,9 @@ static const oper_info fte_operators[] = {
     { "+",   2, opid1('+'),         ASSOC_LEFT,  12, 0 },
     { "-",   2, opid1('-'),         ASSOC_LEFT,  12, 0 },
 
+    { "<<",  2, opid2('<','<'),     ASSOC_LEFT,  11, 0 },
+    { ">>",  2, opid2('>','>'),     ASSOC_LEFT,  11, 0 },
+
     { "<",   2, opid1('<'),         ASSOC_LEFT,  10, 0 },
     { ">",   2, opid1('>'),         ASSOC_LEFT,  10, 0 },
     { "<=",  2, opid2('<','='),     ASSOC_LEFT,  10, 0 },
@@ -267,9 +276,9 @@ static const oper_info fte_operators[] = {
     { "&&",  2, opid2('&','&'),     ASSOC_LEFT,  5,  0 },
     { "||",  2, opid2('|','|'),     ASSOC_LEFT,  5,  0 },
 
-    { ":",   0, opid2(':','?'),     ASSOC_RIGHT, 3,  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]));
 
@@ -312,9 +321,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]));