start validator

[m6w6/ext-psi] / idl / lexer.h

diff --git a/idl/lexer.h b/idl/lexer.h
index 62ce14b371e8d62cf7b6059443e1f98898f2ac26..be1ee574be95de0c64442ba340c246cfc07fcefd 100644 (file)
--- a/idl/lexer.h
+++ b/idl/lexer.h
@@ -1,13 +1,12 @@
 #define BSIZE 256
 
 typedef int token_t;
-typedef char text;
 
 typedef struct PSI_Token {
        token_t type;
        unsigned line;
        size_t size;
-       text text[1];
+       char text[1];
 } PSI_Token;
 
 typedef struct impls impls;
@@ -15,14 +14,14 @@ typedef struct decls decls;
 typedef struct decl_typedefs decl_typedefs;
 
 typedef struct PSI_Lexer {
-       FILE *fp;
-       char *fn;
-       char *lib;
        decl_typedefs *defs;
        decls *decls;
        impls *impls;
+       char *lib;
+       char *fn;
+       FILE *fp;
        size_t line;
-       text *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
+       char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
 } PSI_Lexer;
 
 PSI_Lexer *PSI_LexerInit(PSI_Lexer *L, const char *filename);