add more ffi types; add typedefs

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

diff --git a/idl/lexer.h b/idl/lexer.h
index e3f7c5f2d350d9cbbbd439338e744cf267ed2339..62ce14b371e8d62cf7b6059443e1f98898f2ac26 100644 (file)
--- a/idl/lexer.h
+++ b/idl/lexer.h
@@ -1,28 +1,26 @@
 #define BSIZE 256
 
 typedef int token_t;
-typedef unsigned char text;
+typedef char text;
 
 typedef struct PSI_Token {
        token_t type;
        unsigned line;
+       size_t size;
        text text[1];
 } PSI_Token;
 
-typedef struct impl impl;
-typedef struct decl decl;
+typedef struct impls impls;
+typedef struct decls decls;
+typedef struct decl_typedefs decl_typedefs;
 
 typedef struct PSI_Lexer {
        FILE *fp;
        char *fn;
-       struct {
-               size_t count;
-               decl **list;
-       } decl;
-       struct {
-               size_t count;
-               impl **list;
-       } impl;
+       char *lib;
+       decl_typedefs *defs;
+       decls *decls;
+       impls *impls;
        size_t line;
        text *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
 } PSI_Lexer;