"typedef",
"goto",
+ "noreturn",
+
"__builtin_debug_printtype"
};
static size_t num_keywords_fg = sizeof(keywords_fg) / sizeof(keywords_fg[0]);
bool lexwarn(lex_file *lex, int warntype, const char *fmt, ...)
{
+ bool r;
+ lex_ctx ctx;
va_list ap;
- int lvl = LVL_WARNING;
-
- if (!OPTS_WARN(warntype))
- return false;
- if (opts_werror)
- lvl = LVL_ERROR;
+ ctx.file = lex->name;
+ ctx.line = lex->sline;
va_start(ap, fmt);
- con_vprintmsg(lvl, lex->name, lex->sline, "warning", fmt, ap);
+ r = vcompile_warning(ctx, warntype, fmt, ap);
va_end(ap);
-
- return opts_werror;
+ return r;
}
goto unroll;
}
- for (ch = lex_getch(lex); vec_size(param) < 32 && ch != ')' && ch != '\n'; ch = lex_getch(lex))
+ for (ch = lex_getch(lex); vec_size(param) < 1024 && ch != ')' && ch != '\n'; ch = lex_getch(lex))
vec_push(param, ch);
vec_push(param, 0);
vec_pop(command);
}
vec_free(command);
+ lex_ungetch(lex, ' ');
}
if (command) {
vec_pop(command);
vec_pop(command);
}
vec_free(command);
+ lex_ungetch(lex, ' ');
}
if (pragma) {
vec_pop(pragma);
* here is to store the line of the first character after skipping
* the initial whitespace in lex->sline, this happens in lex_do.
*/
-static int lex_skipwhite(lex_file *lex)
+static int lex_skipwhite(lex_file *lex, bool hadwhite)
{
int ch = 0;
- bool haswhite = false;
+ bool haswhite = hadwhite;
do
{
int lex_do(lex_file *lex)
{
int ch, nextch, thirdch;
+ bool hadwhite = false;
lex_token_new(lex);
#if 0
#endif
while (true) {
- ch = lex_skipwhite(lex);
+ ch = lex_skipwhite(lex, hadwhite);
+ hadwhite = true;
if (!lex->flags.mergelines || ch != '\\')
break;
ch = lex_getch(lex);
if (rc < 0)
return (lex->tok.ttype = TOKEN_FATAL);
- v = lex->tok.value;
if (lex->modelname) {
frame_macro m;
m.value = lex->framevalue;
if (!strcmp(v, keywords_qc[kw]))
return (lex->tok.ttype = TOKEN_KEYWORD);
}
- if (opts_standard != COMPILER_QCC) {
+ if (opts.standard != COMPILER_QCC) {
for (kw = 0; kw < num_keywords_fg; ++kw) {
if (!strcmp(v, keywords_fg[kw]))
return (lex->tok.ttype = TOKEN_KEYWORD);
while (!lex->flags.preprocessing && lex->tok.ttype == TOKEN_STRINGCONST)
{
/* Allow c style "string" "continuation" */
- ch = lex_skipwhite(lex);
+ ch = lex_skipwhite(lex, false);
if (ch != '"') {
lex_ungetch(lex, ch);
break;
lex->tok.ttype = TOKEN_CHARCONST;
/* It's a vector if we can successfully scan 3 floats */
-#ifdef WIN32
+#ifdef _MSC_VER
if (sscanf_s(lex->tok.value, " %f %f %f ",
&lex->tok.constval.v.x, &lex->tok.constval.v.y, &lex->tok.constval.v.z) == 3)
#else