Fixes

[xonotic/gmqcc.git] / lexer.h

diff --git a/lexer.h b/lexer.h
index e5493734881d6240d3796b4b7a5f41332b46a79d..9f080dcb139fbd7ba3f6fbbf1e7d7e8031dd702e 100644 (file)
--- 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
@@ -76,6 +74,10 @@ enum {
     TOKEN_ATTRIBUTE_OPEN,  /* [[ */
     TOKEN_ATTRIBUTE_CLOSE, /* ]] */
 
+    TOKEN_VA_ARGS, /* for the ftepp only */
+    TOKEN_VA_ARGS_ARRAY, /* for the ftepp only */
+    TOKEN_VA_COUNT,     /* to get the count of vaargs */
+
     TOKEN_STRINGCONST, /* not the typename but an actual "string" */
     TOKEN_CHARCONST,
     TOKEN_VECTORCONST,
@@ -99,35 +101,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);
@@ -164,18 +166,21 @@ typedef struct {
 static const oper_info c_operators[] = {
     { "(",   0, opid1('('),         ASSOC_LEFT,  99, OP_PREFIX}, /* paren expression - non function call */
 
-    { "++",  1, opid3('S','+','+'), ASSOC_LEFT,  15, OP_SUFFIX},
-    { "--",  1, opid3('S','-','-'), ASSOC_LEFT,  15, OP_SUFFIX},
-    { ".",   2, opid1('.'),         ASSOC_LEFT,  15, 0 },
-    { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0 }, /* function call */
-    { "[",   2, opid1('['),         ASSOC_LEFT,  15, 0 }, /* array subscript */
+    { "++",  1, opid3('S','+','+'), ASSOC_LEFT,  17, OP_SUFFIX},
+    { "--",  1, opid3('S','-','-'), ASSOC_LEFT,  17, OP_SUFFIX},
+    { ".",   2, opid1('.'),         ASSOC_LEFT,  17, 0 },
+    { "(",   0, opid1('('),         ASSOC_LEFT,  17, 0 }, /* function call */
+    { "[",   2, opid1('['),         ASSOC_LEFT,  17, 0 }, /* array subscript */
+
+    { "++",  1, opid3('+','+','P'), ASSOC_RIGHT, 16, OP_PREFIX },
+    { "--",  1, opid3('-','-','P'), ASSOC_RIGHT, 16, OP_PREFIX },
+
+    { "**",  2, opid2('*', '*'),    ASSOC_RIGHT, 15, 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 },
-    { "--",  1, opid3('-','-','P'), ASSOC_RIGHT, 14, OP_PREFIX },
 /*  { "&",   1, opid2('&','P'),     ASSOC_RIGHT, 14, OP_PREFIX }, */
 
     { "*",   2, opid1('*'),         ASSOC_LEFT,  13, 0 },
@@ -190,6 +195,7 @@ static const oper_info c_operators[] = {
 
     { "<",   2, opid1('<'),         ASSOC_LEFT,  10, 0 },
     { ">",   2, opid1('>'),         ASSOC_LEFT,  10, 0 },
+    { "<=>", 2, opid3('<','=','>'), ASSOC_LEFT,  10, 0 },
     { "<=",  2, opid2('<','='),     ASSOC_LEFT,  10, 0 },
     { ">=",  2, opid2('>','='),     ASSOC_LEFT,  10, 0 },
 
@@ -219,6 +225,7 @@ 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 },
 
@@ -249,6 +256,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 },