struct token_s {
int ttype;
- MEM_VECTOR_MAKE(char, value);
+ char *value;
union {
vector v;
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 */
struct {
bool noops;
bool nodigraphs; /* used when lexing string constants */
+ bool preprocessing; /* whitespace and EOLs become actual tokens */
+ bool mergelines; /* backslash at the end of a line escapes the newline */
} flags;
int framevalue;
- MEM_VECTOR_MAKE(frame_macro, frames);
+ frame_macro *frames;
char *modelname;
-} lex_file;
-MEM_VECTOR_PROTO(lex_file, char, token);
+ 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);
void lex_close(lex_file *lex);
int lex_do (lex_file *lex);
void lex_cleanup(void);
{ ".", 2, opid1('.'), ASSOC_LEFT, 15, 0 },
{ "(", 0, opid1('('), ASSOC_LEFT, 15, 0 }, /* function call */
+ { "[", 2, opid1('['), ASSOC_LEFT, 15, 0 }, /* array subscript */
{ "!", 1, opid2('!', 'P'), ASSOC_RIGHT, 14, OP_PREFIX },
{ "~", 1, opid2('~', 'P'), ASSOC_RIGHT, 14, OP_PREFIX },
{ "||", 2, opid2('|','|'), ASSOC_LEFT, 4, 0 },
{ "?", 3, opid2('?',':'), ASSOC_RIGHT, 3, 0 },
+ { ":", 3, opid2(':','?'), ASSOC_RIGHT, 3, 0 },
{ "=", 2, opid1('='), ASSOC_RIGHT, 2, 0 },
{ "+=", 2, opid2('+','='), ASSOC_RIGHT, 2, 0 },
{ ".", 2, opid1('.'), ASSOC_LEFT, 15, 0 },
{ "(", 0, opid1('('), ASSOC_LEFT, 15, 0 }, /* function call */
+ { "[", 2, opid1('['), ASSOC_LEFT, 15, 0 }, /* array subscript */
{ "!", 1, opid2('!', 'P'), ASSOC_RIGHT, 14, OP_PREFIX },
{ "+", 1, opid2('+','P'), ASSOC_RIGHT, 14, OP_PREFIX },
{ "&&", 2, opid2('&','&'), ASSOC_LEFT, 5, 0 },
{ "||", 2, opid2('|','|'), ASSOC_LEFT, 5, 0 },
- { ",", 2, opid1(','), ASSOC_LEFT, 1, 0 }
+ { ",", 2, opid1(','), ASSOC_LEFT, 2, 0 },
+
+ { "?", 3, opid2('?',':'), ASSOC_RIGHT, 1, 0 },
+ { ":", 3, opid2(':','?'), ASSOC_RIGHT, 1, 0 }
};
static const size_t qcc_operator_count = (sizeof(qcc_operators) / sizeof(qcc_operators[0]));