char *includename;
} ftepp_t;
-typedef struct {
- const char *name;
- char *(*func)(lex_file *);
-} predef_t;
-
/*
* Implement the predef subsystem now. We can do this safely with the
* help of lexer contexts.
return value;
}
-static const predef_t ftepp_predefs[] = {
+const ftepp_predef_t ftepp_predefs[FTEPP_PREDEF_COUNT] = {
{ "__LINE__", &ftepp_predef_line },
{ "__FILE__", &ftepp_predef_file },
{ "__COUNTER__", &ftepp_predef_counter },
}
static bool ftepp_preprocess(ftepp_t *ftepp);
-static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *params)
+static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *params, bool resetline)
{
char *old_string = ftepp->output_string;
lex_file *old_lexer = ftepp->lex;
size_t vararg_start = vec_size(macro->params);
bool retval = true;
+ bool has_newlines;
size_t varargs;
size_t o, pi;
}
}
vec_push(ftepp->output_string, 0);
+ has_newlines = (strchr(ftepp->output_string, '\n') != NULL);
/* Now run the preprocessor recursively on this string buffer */
/*
printf("__________\n%s\n=========\n", ftepp->output_string);
inlex->line = ftepp->lex->line;
inlex->sline = ftepp->lex->sline;
ftepp->lex = inlex;
- ftepp_recursion_header(ftepp);
+ if (has_newlines)
+ ftepp_recursion_header(ftepp);
if (!ftepp_preprocess(ftepp)) {
vec_free(ftepp->lex->open_string);
old_string = ftepp->output_string;
goto cleanup;
}
vec_free(ftepp->lex->open_string);
- ftepp_recursion_footer(ftepp);
+ if (has_newlines)
+ ftepp_recursion_footer(ftepp);
+ if (resetline) {
+ char lineno[128];
+ sprintf(lineno, "\n#pragma line(%lu)\n", old_lexer->sline);
+ ftepp_out(ftepp, lineno, false);
+ }
old_string = ftepp->output_string;
cleanup:
size_t o;
macroparam *params = NULL;
bool retval = true;
+ size_t paramline;
if (!macro->has_params) {
- if (!ftepp_macro_expand(ftepp, macro, NULL))
+ if (!ftepp_macro_expand(ftepp, macro, NULL, false))
return false;
ftepp_next(ftepp);
return true;
}
ftepp_next(ftepp);
+ paramline = ftepp->lex->sline;
if (!ftepp_macro_call_params(ftepp, ¶ms))
return false;
goto cleanup;
}
- if (!ftepp_macro_expand(ftepp, macro, params))
+ if (!ftepp_macro_expand(ftepp, macro, params, (paramline != ftepp->lex->sline)))
retval = false;
ftepp_next(ftepp);
{
ppmacro *macro;
bool wasnot = false;
+ bool wasneg = false;
if (!ftepp_skipspace(ftepp))
return false;
return false;
}
+ if (ftepp->token == TOKEN_OPERATOR && !strcmp(ftepp_tokval(ftepp), "-"))
+ {
+ wasneg = true;
+ ftepp_next(ftepp);
+ if (!ftepp_skipspace(ftepp))
+ return false;
+ }
+
switch (ftepp->token) {
case TOKEN_IDENT:
case TOKEN_TYPENAME:
}
break;
case TOKEN_STRINGCONST:
+ *value_out = 0;
*out = false;
break;
case TOKEN_INTCONST:
default:
ftepp_error(ftepp, "junk in #if: `%s` ...", ftepp_tokval(ftepp));
+ if (opts.debug)
+ ftepp_error(ftepp, "internal: token %i\n", ftepp->token);
return false;
}
+ if (wasneg)
+ *value_out = -*value_out;
if (wasnot) {
*out = !*out;
*value_out = (*out ? 1 : 0);
ftepp_add_define(NULL, "__STD_GMQCC__");
sprintf(major, "\"%d\"", GMQCC_VERSION_MAJOR);
sprintf(minor, "\"%d\"", GMQCC_VERSION_MINOR);
+ } else if (opts.standard == COMPILER_QCCX) {
+ ftepp_add_define(NULL, "__STD_QCCX__");
+ sprintf(major, "\"%d\"", GMQCC_VERSION_MAJOR);
+ sprintf(minor, "\"%d\"", GMQCC_VERSION_MINOR);
} else if (opts.standard == COMPILER_QCC) {
ftepp_add_define(NULL, "__STD_QCC__");
/* 1.0 */