Removing some debug output

[xonotic/gmqcc.git] / lexer.c

diff --git a/lexer.c b/lexer.c
index 867fb9430fe796ed227a59a13279415cd6d3fd63..1bea430edd36b1929505d8baf2fba3b7b9457cde 100644 (file)
--- a/lexer.c
+++ b/lexer.c
@@ -466,6 +466,8 @@ int lex_do(lex_file *lex)
 
                case ',':
 
+               case '#':
+
                        return (lex->tok->ttype = ch);
                default:
                        break;
@@ -559,22 +561,30 @@ int lex_do(lex_file *lex)
                lex->tok->ttype = TOKEN_IDENT;
 
                v = lex->tok->value;
-               if (!strcmp(v, "void") ||
-                   !strcmp(v, "int") ||
-                   !strcmp(v, "float") ||
-                   !strcmp(v, "vector") )
-               {
+               if (!strcmp(v, "void")) {
                        lex->tok->ttype = TOKEN_TYPENAME;
-                       switch (v[1]) {
-                               case 'o': lex->tok->constval.t = TYPE_VOID;    break;
-                               case 'n': lex->tok->constval.t = TYPE_INTEGER; break;
-                               case 'l': lex->tok->constval.t = TYPE_FLOAT;   break;
-                               case 'e': lex->tok->constval.t = TYPE_VECTOR;  break;
-                       }
-               }
-               else if (!strcmp(v, "for") ||
-                        !strcmp(v, "while") ||
-                        !strcmp(v, "do"))
+                   lex->tok->constval.t = TYPE_VOID;
+               } else if (!strcmp(v, "int")) {
+                       lex->tok->ttype = TOKEN_TYPENAME;
+                   lex->tok->constval.t = TYPE_INTEGER;
+               } else if (!strcmp(v, "float")) {
+                       lex->tok->ttype = TOKEN_TYPENAME;
+                   lex->tok->constval.t = TYPE_FLOAT;
+               } else if (!strcmp(v, "string")) {
+                       lex->tok->ttype = TOKEN_TYPENAME;
+                   lex->tok->constval.t = TYPE_STRING;
+               } else if (!strcmp(v, "entity")) {
+                       lex->tok->ttype = TOKEN_TYPENAME;
+                   lex->tok->constval.t = TYPE_ENTITY;
+               } else if (!strcmp(v, "vector")) {
+                       lex->tok->ttype = TOKEN_TYPENAME;
+                   lex->tok->constval.t = TYPE_VECTOR;
+               } else if (!strcmp(v, "for")  ||
+                        !strcmp(v, "while")  ||
+                        !strcmp(v, "do")     ||
+                        !strcmp(v, "var")    ||
+                        !strcmp(v, "return") ||
+                        !strcmp(v, "const"))
                        lex->tok->ttype = TOKEN_KEYWORD;
 
                return lex->tok->ttype;