int t; /* type */
} constval;
+#if 0
struct token_s *next;
struct token_s *prev;
+#endif
lex_ctx 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
*
TOKEN_INTCONST,
TOKEN_FLOATCONST,
+ TOKEN_WHITE,
+ TOKEN_EOL,
+
TOKEN_EOF,
/* We use '< TOKEN_ERROR', so TOKEN_FATAL must come after it and any
"TOKEN_VECTORCONST",
"TOKEN_INTCONST",
"TOKEN_FLOATCONST",
+ "TOKEN_WHITE",
+ "TOKEN_EOL",
"TOKEN_EOF",
"TOKEN_ERROR",
"TOKEN_FATAL",
typedef struct {
FILE *file;
+ const char *open_string;
+ size_t open_string_length;
+ size_t open_string_pos;
+
char *name;
size_t line;
size_t sline; /* line at the start of a token */
bool eof;
- token *tok;
+ token tok; /* not a pointer anymore */
struct {
bool noops;
+ bool nodigraphs; /* used when lexing string constants */
+ bool preprocessing; /* whitespace and EOLs become actual tokens */
} flags;
int framevalue;
MEM_VECTOR_PROTO(lex_file, char, token);
lex_file* lex_open (const char *file);
+lex_file* lex_open_string(const char *str, size_t len, const char *name);
void lex_close(lex_file *lex);
int lex_do (lex_file *lex);
void lex_cleanup(void);
extern const oper_info *operators;
extern size_t operator_count;
-
-typedef struct
-{
- lex_file *lex;
- int error;
- lex_ctx ctx;
-
- token *tokens;
- token *lastok;
-
- token *tok; /* current token */
-
- MEM_VECTOR_MAKE(ast_value*, globals);
-} parse_file;
-
-MEM_VECTOR_PROTO(parse_file, ast_value*, globals);
-
-parse_file* parse_open(const char *file);
-void parse_file_close(parse_file*);
-
-bool parse(parse_file*);
-
-bool parse_iskey(parse_file *self, const char *ident);
-
void lexerror(lex_file*, const char *fmt, ...);
#endif