va_start(ap, fmt);
if (lex)
- con_vprintmsg(LVL_ERROR, lex->ctx.file, lex->sline, lex->ctx.column, "parse error", fmt, ap);
+ con_vprintmsg(LVL_ERROR, lex->name, lex->sline, lex->column, "parse error", fmt, ap);
else
con_vprintmsg(LVL_ERROR, "", 0, 0, "parse error", fmt, ap);
va_end(ap);
static bool lexwarn(lex_file *lex, int warntype, const char *fmt, ...)
{
- bool r;
- va_list ap;
+ bool r;
+ lex_ctx_t ctx;
+ va_list ap;
+
+ ctx.file = lex->name;
+ ctx.line = lex->sline;
+ ctx.column = lex->column;
va_start(ap, fmt);
- r = vcompile_warning(lex->ctx, warntype, fmt, ap);
+ r = vcompile_warning(ctx, warntype, fmt, ap);
va_end(ap);
return r;
}
vec_shrinkto(lex->tok.value, 0);
lex->tok.constval.t = 0;
- lex->tok.ctx = &lex->ctx; /* this is 'shallow' */
+ lex->tok.ctx.line = lex->sline;
+ lex->tok.ctx.file = lex->name;
+ lex->tok.ctx.column = lex->column;
#endif
}
#endif
memset(lex, 0, sizeof(*lex));
- lex->file = in;
- lex->ctx.file = util_strdup(file);
- lex->ctx.line = 1; /* we start counting at 1 */
- lex->ctx.column = 0;
- lex->peekpos = 0;
- lex->eof = false;
+ lex->file = in;
+ lex->name = util_strdup(file);
+ lex->line = 1; /* we start counting at 1 */
+ lex->column = 0;
+ lex->peekpos = 0;
+ lex->eof = false;
- vec_push(lex_filenames, (char *)lex->ctx.file);
+ vec_push(lex_filenames, lex->name);
return lex;
}
lex->open_string_length = len;
lex->open_string_pos = 0;
- lex->ctx.file = util_strdup(name ? name : "<string-source>");
- lex->ctx.line = 1; /* we start counting at 1 */
- lex->ctx.column = 0;
- lex->peekpos = 0;
- lex->eof = false;
+ lex->name = util_strdup(name ? name : "<string-source>");
+ lex->line = 1; /* we start counting at 1 */
+ lex->peekpos = 0;
+ lex->eof = false;
+ lex->column = 0;
- vec_push(lex_filenames, (char*)lex->ctx.file);
+ vec_push(lex_filenames, lex->name);
return lex;
}
static int lex_fgetc(lex_file *lex)
{
if (lex->file) {
- lex->ctx.column++;
+ lex->column++;
return fs_file_getc(lex->file);
}
if (lex->open_string) {
if (lex->open_string_pos >= lex->open_string_length)
return EOF;
- lex->ctx.column++;
+ lex->column++;
return lex->open_string[lex->open_string_pos++];
}
return EOF;
int c2, c3;
c2 = lex_fgetc(lex);
if (!lex->push_line && c2 == '\n') {
- lex->ctx.line++;
- lex->ctx.column = 0;
+ lex->line++;
+ lex->column = 0;
}
if (c2 != '?') {
c3 = lex_fgetc(lex);
if (!lex->push_line && c3 == '\n') {
- lex->ctx.line++;
- lex->ctx.column = 0;
+ lex->line++;
+ lex->column = 0;
}
switch (c3) {
* need to offset a \n the ungetch would recognize
*/
if (!lex->push_line && c2 == '\n')
- lex->ctx.line++;
+ lex->line++;
if (ch == '<' && c2 == ':')
return '[';
else if (ch == ':' && c2 == '>')
if (lex->peekpos) {
lex->peekpos--;
if (!lex->push_line && lex->peek[lex->peekpos] == '\n')
- lex->ctx.line++;
+ lex->line++;
return lex->peek[lex->peekpos];
}
ch = lex_fgetc(lex);
if (!lex->push_line && ch == '\n')
- lex->ctx.line++;
+ lex->line++;
else if (ch == '?')
return lex_try_trigraph(lex, ch);
else if (!lex->flags.nodigraphs && (ch == '<' || ch == ':' || ch == '%'))
static void lex_ungetch(lex_file *lex, int ch)
{
lex->peek[lex->peekpos++] = ch;
- lex->ctx.column--;
+ lex->column--;
if (!lex->push_line && ch == '\n') {
- lex->ctx.line--;
- lex->ctx.column = 0;
+ lex->line--;
+ lex->column = 0;
}
}
if (lex->flags.preprocessing)
return false;
- line = lex->ctx.line;
+ line = lex->line;
ch = lex_getch(lex);
if (ch != '#') {
goto unroll;
}
else if (!strcmp(command, "file")) {
- lex->ctx.file = util_strdup(param);
- vec_push(lex_filenames, (char*)lex->ctx.file);
+ lex->name = util_strdup(param);
+ vec_push(lex_filenames, lex->name);
}
else if (!strcmp(command, "line")) {
line = strtol(param, NULL, 0)-1;
else
goto unroll;
- lex->ctx.line = line;
+ lex->line = line;
while (ch != '\n' && ch != EOF)
ch = lex_getch(lex);
vec_free(command);
}
lex_ungetch(lex, '#');
- lex->ctx.line = line;
+ lex->line = line;
return false;
}
ch = 0;
else {
--u8len;
- lex->ctx.column += u8len;
+ lex->column += u8len;
for (uc = 0; uc < u8len; ++uc)
lex_tokench(lex, u8buf[uc]);
/* the last character will be inserted with the tokench() call
return (lex->tok.ttype = ch);
}
- lex->sline = lex->ctx.line;
- lex->tok.ctx->line = lex->sline;
- lex->tok.ctx->file = lex->ctx.file;
+ lex->sline = lex->line;
+ lex->tok.ctx.line = lex->sline;
+ lex->tok.ctx.file = lex->name;
if (lex->eof)
return (lex->tok.ttype = TOKEN_FATAL);