"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, (opts_werror ? "error" : "warning"), fmt, ap);
+ r = vcompile_warning(ctx, warntype, fmt, ap);
va_end(ap);
-
- return opts_werror;
+ return r;
}
if (rc < 0)
return (lex->tok.ttype = TOKEN_FATAL);
- v = lex->tok.value;
if (lex->modelname) {
frame_macro m;
m.value = lex->framevalue;
switch (ch)
{
case '[':
+ nextch = lex_getch(lex);
+ if (nextch == '[') {
+ lex_tokench(lex, nextch);
+ lex_endtoken(lex);
+ return (lex->tok.ttype = TOKEN_ATTRIBUTE_OPEN);
+ }
+ lex_ungetch(lex, nextch);
+ /* FALL THROUGH */
case '(':
case ':':
case '?':
return (lex->tok.ttype = ch);
else
return (lex->tok.ttype = TOKEN_OPERATOR);
+
+ case ']':
+ nextch = lex_getch(lex);
+ if (nextch == ']') {
+ lex_tokench(lex, nextch);
+ lex_endtoken(lex);
+ return (lex->tok.ttype = TOKEN_ATTRIBUTE_CLOSE);
+ }
+ lex_ungetch(lex, nextch);
+ /* FALL THROUGH */
case ')':
case ';':
case '{':
case '}':
- case ']':
case '#':
lex_tokench(lex, ch);
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);
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