ppcondition *conditions;
ppmacro **macros;
- bool output_string;
- char *output;
+ char *output_string;
} ftepp_t;
#define ftepp_tokval(f) ((f)->lex->tok.value)
va_end(ap);
}
+static bool GMQCC_WARN ftepp_warn(ftepp_t *ftepp, int warntype, const char *fmt, ...)
+{
+ va_list ap;
+ int lvl = LVL_WARNING;
+
+ if (!OPTS_WARN(warntype))
+ return false;
+
+ if (opts_werror) {
+ lvl = LVL_ERROR;
+ ftepp->errors++;
+ }
+
+ va_start(ap, fmt);
+ con_vprintmsg(lvl, ftepp->lex->tok.ctx.file, ftepp->lex->tok.ctx.line, "error", fmt, ap);
+ va_end(ap);
+ return opts_werror;
+}
+
static pptoken *pptoken_make(ftepp_t *ftepp)
{
pptoken *token = (pptoken*)mem_a(sizeof(pptoken));
token->token = ftepp->token;
+#if 0
if (token->token == TOKEN_WHITE)
token->value = util_strdup(" ");
else
+#else
token->value = util_strdup(ftepp_tokval(ftepp));
+#endif
memcpy(&token->constval, &ftepp->lex->tok.constval, sizeof(token->constval));
return token;
}
mem_d(self);
}
-static ftepp_t* ftepp_init()
+static ftepp_t* ftepp_new()
{
ftepp_t *ftepp;
ppmacro_delete(self->macros[i]);
vec_free(self->macros);
vec_free(self->conditions);
- lex_close(self->lex);
+ if (self->lex)
+ lex_close(self->lex);
mem_d(self);
}
{
size_t len;
char *data;
- if (!ftepp->output_string) {
- printf("%s", str);
- return;
- }
len = strlen(str);
- data = vec_add(ftepp->output, len);
+ data = vec_add(ftepp->output_string, len);
memcpy(data, str, len);
}
}
return NULL;
}
+static void ftepp_macro_delete(ftepp_t *ftepp, const char *name)
+{
+ size_t i;
+ for (i = 0; i < vec_size(ftepp->macros); ++i) {
+ if (!strcmp(name, ftepp->macros[i]->name)) {
+ vec_remove(ftepp->macros, i, 1);
+ return;
+ }
+ }
+}
+
static inline int ftepp_next(ftepp_t *ftepp)
{
return (ftepp->token = lex_do(ftepp->lex));
vec_push(macro->output, ptok);
ftepp_next(ftepp);
}
- if (ftepp->token != TOKEN_EOL) {
+ /* recursive expansion can cause EOFs here */
+ if (ftepp->token != TOKEN_EOL && ftepp->token != TOKEN_EOF) {
ftepp_error(ftepp, "unexpected junk after macro or unexpected end of file");
return false;
}
case TOKEN_IDENT:
case TOKEN_TYPENAME:
case TOKEN_KEYWORD:
+ macro = ftepp_macro_find(ftepp, ftepp_tokval(ftepp));
+ if (macro && ftepp->output_on) {
+ if (ftepp_warn(ftepp, WARN_PREPROCESSOR, "redefining `%s`", ftepp_tokval(ftepp)))
+ return false;
+ ftepp_macro_delete(ftepp, ftepp_tokval(ftepp));
+ }
macro = ppmacro_new(ftepp_ctx(ftepp), ftepp_tokval(ftepp));
break;
default:
if (!ftepp_define_body(ftepp, macro))
return false;
- vec_push(ftepp->macros, macro);
+ if (ftepp->output_on)
+ vec_push(ftepp->macros, macro);
+ else {
+ ppmacro_delete(macro);
+ }
return true;
}
vec_free(self->tokens);
}
+/* need to leave the last token up */
static bool ftepp_macro_call_params(ftepp_t *ftepp, macroparam **out_params)
{
macroparam *params = NULL;
goto on_error;
}
}
+ /* need to leave that up
if (ftepp_next(ftepp) >= TOKEN_EOF) {
ftepp_error(ftepp, "unexpected EOF in macro call");
goto on_error;
}
+ */
*out_params = params;
return true;
return false;
}
+static void ftepp_stringify_token(ftepp_t *ftepp, pptoken *token)
+{
+ char chs[2];
+ const char *ch;
+ chs[1] = 0;
+ switch (token->token) {
+ case TOKEN_STRINGCONST:
+ ch = token->value;
+ while (*ch) {
+ /* in preprocessor mode strings already are string,
+ * so we don't get actual newline bytes here.
+ * Still need to escape backslashes and quotes.
+ */
+ switch (*ch) {
+ case '\\': ftepp_out(ftepp, "\\\\", false); break;
+ case '"': ftepp_out(ftepp, "\\\"", false); break;
+ default:
+ chs[0] = *ch;
+ ftepp_out(ftepp, chs, false);
+ break;
+ }
+ ++ch;
+ }
+ break;
+ case TOKEN_WHITE:
+ ftepp_out(ftepp, " ", false);
+ break;
+ case TOKEN_EOL:
+ ftepp_out(ftepp, "\\n", false);
+ break;
+ default:
+ ftepp_out(ftepp, token->value, false);
+ break;
+ }
+}
+
+static void ftepp_stringify(ftepp_t *ftepp, macroparam *param)
+{
+ size_t i;
+ ftepp_out(ftepp, "\"", false);
+ for (i = 0; i < vec_size(param->tokens); ++i)
+ ftepp_stringify_token(ftepp, param->tokens[i]);
+ ftepp_out(ftepp, "\"", false);
+}
+
+static void ftepp_recursion_header(ftepp_t *ftepp)
+{
+ ftepp_out(ftepp, "\n#pragma push(line)\n", false);
+}
+
+static void ftepp_recursion_footer(ftepp_t *ftepp)
+{
+ ftepp_out(ftepp, "\n#pragma pop(line)\n", false);
+}
+
+static bool ftepp_preprocess(ftepp_t *ftepp);
static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *params)
{
- char *old_string = ftepp->output;
- bool old_string_flag = ftepp->output_string;
+ char *old_string = ftepp->output_string;
+ lex_file *old_lexer = ftepp->lex;
bool retval = true;
- size_t o, pi, pv;
+ size_t o, pi, pv;
+ lex_file *inlex;
+
+ int nextok;
/* really ... */
if (!vec_size(macro->output))
return true;
- ftepp->output = NULL;
- ftepp->output_string = true;
+ ftepp->output_string = NULL;
for (o = 0; o < vec_size(macro->output); ++o) {
pptoken *out = macro->output[o];
switch (out->token) {
}
}
break;
+ case '#':
+ if (o + 1 < vec_size(macro->output)) {
+ nextok = macro->output[o+1]->token;
+ if (nextok == '#') {
+ /* raw concatenation */
+ ++o;
+ break;
+ }
+ if ( (nextok == TOKEN_IDENT ||
+ nextok == TOKEN_KEYWORD ||
+ nextok == TOKEN_TYPENAME) &&
+ macro_params_find(macro, macro->output[o+1]->value, &pi))
+ {
+ ++o;
+ ftepp_stringify(ftepp, ¶ms[pi]);
+ break;
+ }
+ }
+ ftepp_out(ftepp, "#", false);
+ break;
case TOKEN_EOL:
ftepp_out(ftepp, "\n", false);
break;
break;
}
}
- vec_push(ftepp->output, 0);
- printf("_________________\n%s\n=================\n", ftepp->output);
- goto cleanup;
+ vec_push(ftepp->output_string, 0);
+ /* Now run the preprocessor recursively on this string buffer */
+ /*
+ printf("__________\n%s\n=========\n", ftepp->output_string);
+ */
+ inlex = lex_open_string(ftepp->output_string, vec_size(ftepp->output_string)-1, ftepp->lex->name);
+ if (!inlex) {
+ ftepp_error(ftepp, "internal error: failed to instantiate lexer");
+ retval = false;
+ goto cleanup;
+ }
+ ftepp->output_string = old_string;
+ ftepp->lex = inlex;
+ ftepp_recursion_header(ftepp);
+ if (!ftepp_preprocess(ftepp)) {
+ lex_close(ftepp->lex);
+ retval = false;
+ goto cleanup;
+ }
+ ftepp_recursion_footer(ftepp);
+ old_string = ftepp->output_string;
cleanup:
- ftepp->output = old_string;
- ftepp->output_string = old_string_flag;
+ ftepp->lex = old_lexer;
+ ftepp->output_string = old_string;
return retval;
}
macroparam *params = NULL;
bool retval = true;
- ftepp_next(ftepp);
-
if (!macro->has_params) {
- for (o = 0; o < vec_size(macro->output); ++o) {
- ftepp_out(ftepp, macro->output[o]->value, false);
- }
+ if (!ftepp_macro_expand(ftepp, macro, NULL))
+ return false;
+ ftepp_next(ftepp);
return true;
}
+ ftepp_next(ftepp);
if (!ftepp_skipallwhite(ftepp))
return false;
if (!ftepp_macro_expand(ftepp, macro, params))
retval = false;
+ ftepp_next(ftepp);
cleanup:
for (o = 0; o < vec_size(params); ++o)
(void)ftepp_next(ftepp);
if (!ftepp_skipspace(ftepp))
return false;
- if (ftepp->token != TOKEN_EOL) {
+ /* relaxing this condition
+ if (ftepp->token != TOKEN_EOL && ftepp->token != TOKEN_EOF) {
ftepp_error(ftepp, "stray tokens after #ifdef");
return false;
}
+ */
cond->on = !!macro;
return true;
}
+/**
+ * undef is also simple
+ */
+static bool ftepp_undef(ftepp_t *ftepp)
+{
+ (void)ftepp_next(ftepp);
+ if (!ftepp_skipspace(ftepp))
+ return false;
+
+ if (ftepp->output_on) {
+ switch (ftepp->token) {
+ case TOKEN_IDENT:
+ case TOKEN_TYPENAME:
+ case TOKEN_KEYWORD:
+ ftepp_macro_delete(ftepp, ftepp_tokval(ftepp));
+ break;
+ default:
+ ftepp_error(ftepp, "expected macro name");
+ return false;
+ }
+ }
+
+ (void)ftepp_next(ftepp);
+ if (!ftepp_skipspace(ftepp))
+ return false;
+ /* relaxing this condition
+ if (ftepp->token != TOKEN_EOL && ftepp->token != TOKEN_EOF) {
+ ftepp_error(ftepp, "stray tokens after #ifdef");
+ return false;
+ }
+ */
+ return true;
+}
+
/* Basic structure handlers */
static bool ftepp_else_allowed(ftepp_t *ftepp)
{
if (!strcmp(ftepp_tokval(ftepp), "define")) {
return ftepp_define(ftepp);
}
+ else if (!strcmp(ftepp_tokval(ftepp), "undef")) {
+ return ftepp_undef(ftepp);
+ }
else if (!strcmp(ftepp_tokval(ftepp), "ifdef")) {
if (!ftepp_ifdef(ftepp, &cond))
return false;
return newline;
}
+/* Like in parser.c - files keep the previous state so we have one global
+ * preprocessor. Except here we will want to warn about dangling #ifs.
+ */
+static ftepp_t *ftepp;
+
+static bool ftepp_preprocess_done()
+{
+ bool retval = true;
+ lex_close(ftepp->lex);
+ ftepp->lex = NULL;
+ if (vec_size(ftepp->conditions)) {
+ if (ftepp_warn(ftepp, WARN_MULTIFILE_IF, "#if spanning multiple files, is this intended?"))
+ retval = false;
+ }
+ return retval;
+}
+
bool ftepp_preprocess_file(const char *filename)
{
- ftepp_t *ftepp = ftepp_init();
ftepp->lex = lex_open(filename);
if (!ftepp->lex) {
con_out("failed to open file \"%s\"\n", filename);
ftepp_delete(ftepp);
return false;
}
- ftepp_delete(ftepp);
- return true;
+ return ftepp_preprocess_done();
}
bool ftepp_preprocess_string(const char *name, const char *str)
{
- ftepp_t *ftepp = ftepp_init();
+ ftepp_t *ftepp = ftepp_new();
ftepp->lex = lex_open_string(str, strlen(str), name);
if (!ftepp->lex) {
con_out("failed to create lexer for string \"%s\"\n", name);
ftepp_delete(ftepp);
return false;
}
+ return ftepp_preprocess_done();
+}
+
+bool ftepp_init()
+{
+ ftepp = ftepp_new();
+ return !!ftepp;
+}
+
+const char *ftepp_get()
+{
+ return ftepp->output_string;
+}
+
+void ftepp_flush()
+{
+ vec_free(ftepp->output_string);
+}
+
+void ftepp_finish()
+{
+ if (!ftepp)
+ return;
ftepp_delete(ftepp);
- return true;
+ ftepp = NULL;
}
projects / xonotic / gmqcc.git / blobdiff