"return",
"const"
};
-static size_t num_keywords_qc = sizeof(keywords_qc) / sizeof(keywords_qc[0]);
-
/* For fte/gmgqcc */
static const char *keywords_fg[] = {
"switch", "case", "default",
"__builtin_debug_printtype"
};
-static size_t num_keywords_fg = sizeof(keywords_fg) / sizeof(keywords_fg[0]);
/*
* Lexer code
*/
-
static char* *lex_filenames;
static void lexerror(lex_file *lex, const char *fmt, ...)
static bool lexwarn(lex_file *lex, int warntype, const char *fmt, ...)
{
- bool r;
- lex_ctx ctx;
- va_list ap;
+ bool r;
+ lex_ctx_t ctx;
+ va_list ap;
- ctx.file = lex->name;
- ctx.line = lex->sline;
+ ctx.file = lex->name;
+ ctx.line = lex->sline;
+ ctx.column = lex->column;
va_start(ap, fmt);
r = vcompile_warning(ctx, warntype, fmt, ap);
if (lex->peekpos) {
lex->peekpos--;
- if (!lex->push_line && lex->peek[lex->peekpos] == '\n')
+ if (!lex->push_line && lex->peek[lex->peekpos] == '\n') {
lex->line++;
+ lex->column = 0;
+ }
return lex->peek[lex->peekpos];
}
ch = lex_fgetc(lex);
- if (!lex->push_line && ch == '\n')
+ if (!lex->push_line && ch == '\n') {
lex->line++;
+ lex->column = 0;
+ }
else if (ch == '?')
return lex_try_trigraph(lex, ch);
else if (!lex->flags.nodigraphs && (ch == '<' || ch == ':' || ch == '%'))
}
if (ch == '+' || ch == '-' || /* ++, --, +=, -= and -> as well! */
- ch == '>' || ch == '<' || /* <<, >>, <=, >= */
+ ch == '>' || ch == '<' || /* <<, >>, <=, >= and >< as well! */
ch == '=' || ch == '!' || /* <=>, ==, != */
ch == '&' || ch == '|' || /* &&, ||, &=, |= */
ch == '~' || ch == '^' /* ~=, ~, ^ */
lex_tokench(lex, ch);
nextch = lex_getch(lex);
- if ((nextch == '=' && ch != '<') || (nextch == ch && ch != '!')) {
+ if ((nextch == '=' && ch != '<') ||
+ (nextch == ch && ch != '!') ||
+ (nextch == '<' && ch == '>')) {
lex_tokench(lex, nextch);
} else if (ch == '<' && nextch == '=') {
lex_tokench(lex, nextch);
lex->tok.constval.t = TYPE_VECTOR;
} else {
size_t kw;
- for (kw = 0; kw < num_keywords_qc; ++kw) {
+ for (kw = 0; kw < GMQCC_ARRAY_COUNT(keywords_qc); ++kw) {
if (!strcmp(v, keywords_qc[kw]))
return (lex->tok.ttype = TOKEN_KEYWORD);
}
if (OPTS_OPTION_U32(OPTION_STANDARD) != COMPILER_QCC) {
- for (kw = 0; kw < num_keywords_fg; ++kw) {
+ for (kw = 0; kw < GMQCC_ARRAY_COUNT(keywords_fg); ++kw) {
if (!strcmp(v, keywords_fg[kw]))
return (lex->tok.ttype = TOKEN_KEYWORD);
}
return (lex->tok.ttype = ch);
}
- lexerror(lex, "unknown token: `%s`", lex->tok.value);
+ lexerror(lex, "unknown token: `%c`", ch);
return (lex->tok.ttype = TOKEN_ERROR);
}