Happy new year!

[xonotic/gmqcc.git] / lexer.h

diff --git a/lexer.h b/lexer.h
index 24e29ddee4080659be406da5f073ef041ecdb115..41a135549f5cce35b22aeb20203ab6ecfd4e8a2e 100644 (file)
--- a/lexer.h
+++ b/lexer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013
+ * Copyright (C) 2012, 2013, 2014
  *     Wolfgang Bumiller
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -22,6 +22,8 @@
  */
 #ifndef GMQCC_LEXER_HDR
 #define GMQCC_LEXER_HDR
+#include "gmqcc.h"
+
 typedef struct token_s token;
 
 struct token_s {
@@ -30,10 +32,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 +107,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,8 +187,7 @@ 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, 14, 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, false},