X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=lexer.h;h=8ed85a97ab39607494378f048cd1ad4429d29d91;hp=9187dee089bce496322363f13a4d395e5f00214d;hb=163c4b99a4bef8746fc9d3caa8dc6c54c11d4955;hpb=ac8c7d730a7d0728facbdddea984a631037055aa

diff --git a/lexer.h b/lexer.h
index 9187dee..8ed85a9 100644
--- a/lexer.h
+++ b/lexer.h
@@ -1,59 +1,19 @@
-/*
- * Copyright (C) 2012, 2013, 2014
- *     Wolfgang Bumiller
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 #ifndef GMQCC_LEXER_HDR
 #define GMQCC_LEXER_HDR
 #include "gmqcc.h"
 
-typedef struct token_s token;
-
-struct token_s {
+struct token {
     int ttype;
-
     char *value;
-
     union {
-        vec3_t    v;
-        int       i;
+        vec3_t v;
+        int i;
         qcfloat_t f;
-        int       t; /* type */
+        qc_type t; /* type */
     } constval;
-
-#if 0
-    struct token_s *next;
-    struct token_s *prev;
-#endif
-
     lex_ctx_t 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
  *
  */
@@ -101,13 +61,13 @@ enum {
     TOKEN_FATAL /* internal error, eg out of memory */
 };
 
-typedef struct {
+struct frame_macro {
     char *name;
-    int   value;
-} frame_macro;
+    int value;
+};
 
-typedef struct lex_file_s {
-    fs_file_t  *file;
+struct lex_file {
+    FILE  *file;
     const char *open_string;
     size_t      open_string_length;
     size_t      open_string_pos;
@@ -136,7 +96,7 @@ typedef struct lex_file_s {
     char *modelname;
 
     size_t push_line;
-} lex_file;
+};
 
 lex_file* lex_open (const char *file);
 lex_file* lex_open_string(const char *str, size_t len, const char *name);
@@ -156,7 +116,7 @@ enum {
 #define OP_SUFFIX 1
 #define OP_PREFIX 2
 
-typedef struct {
+struct oper_info {
     const char   *op;
     unsigned int operands;
     unsigned int id;
@@ -164,7 +124,7 @@ typedef struct {
     signed int   prec;
     unsigned int flags;
     bool         folds;
-} oper_info;
+};
 
 /*
  * Explicit uint8_t casts since the left operand of shift operator cannot