X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=lexer.h;h=5d7b7f611bd0ef8166ed8e70ad432c7173ea6e3b;hb=51346734616d07f975ce187a77f278dd7500c0a3;hp=28bae8a30beafeb6bc06b279da0de4c95718e70b;hpb=12d87fba1b967a1443fbc1d9560b601792620b75;p=xonotic%2Fgmqcc.git

diff --git a/lexer.h b/lexer.h
index 28bae8a..5d7b7f6 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,8 +25,6 @@
 
 typedef struct token_s token;
 
-#include "ast.h"
-
 struct token_s {
     int ttype;
 
@@ -76,6 +74,8 @@ enum {
     TOKEN_ATTRIBUTE_OPEN,  /* [[ */
     TOKEN_ATTRIBUTE_CLOSE, /* ]] */
 
+    TOKEN_VA_ARGS, /* for the ftepp only */
+
     TOKEN_STRINGCONST, /* not the typename but an actual "string" */
     TOKEN_CHARCONST,
     TOKEN_VECTORCONST,
@@ -99,7 +99,7 @@ typedef struct {
     int   value;
 } frame_macro;
 
-typedef struct {
+typedef struct lex_file_s {
     FILE   *file;
     const char *open_string;
     size_t      open_string_length;
@@ -109,7 +109,7 @@ typedef struct {
     size_t  line;
     size_t  sline; /* line at the start of a token */
 
-    char    peek[256];
+    int     peek[256];
     size_t  peekpos;
 
     bool    eof;