/*
* Copyright (C) 2012
* Wolfgang Bumiller
+ * Dale Weiler
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
typedef struct {
lex_file *lex;
int token;
- bool newline;
unsigned int errors;
bool output_on;
static bool GMQCC_WARN ftepp_warn(ftepp_t *ftepp, int warntype, const char *fmt, ...)
{
+ bool r;
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_cvprintmsg((void*)&ftepp->lex->tok.ctx, lvl, "error", fmt, ap);
+ r = vcompile_warning(ftepp->lex->tok.ctx, warntype, fmt, ap);
va_end(ap);
- return opts_werror;
+ return r;
}
static pptoken *pptoken_make(ftepp_t *ftepp)
static ppmacro *ppmacro_new(lex_ctx ctx, const char *name)
{
ppmacro *macro = (ppmacro*)mem_a(sizeof(ppmacro));
-
+
(void)ctx;
memset(macro, 0, sizeof(*macro));
macro->name = util_strdup(name);
static bool ftepp_define(ftepp_t *ftepp)
{
ppmacro *macro;
+ size_t l = ftepp_ctx(ftepp).line;
+
(void)ftepp_next(ftepp);
if (!ftepp_skipspace(ftepp))
return false;
else {
ppmacro_delete(macro);
}
+
+ for (; l < ftepp_ctx(ftepp).line; ++l)
+ ftepp_out(ftepp, "\n", true);
return true;
}
memcpy(vec_add(filename, len), pathfile, len);
vec_push(filename, '/');
}
- else {
- len = strlen(pathfile);
- memcpy(vec_add(filename, len), pathfile, len);
- if (vec_last(filename) != '/')
- vec_push(filename, '/');
- }
len = strlen(file);
memcpy(vec_add(filename, len+1), file, len);
}
inlex = lex_open(filename);
if (!inlex) {
- ftepp_error(ftepp, "failed to open include file `%s`", filename);
+ ftepp_error(ftepp, "open failed on include file `%s`", filename);
vec_free(filename);
return false;
}
break;
}
else {
- ftepp_error(ftepp, "unrecognized preprocessor directive: `%s`", ftepp_tokval(ftepp));
- return false;
+ if (ftepp->output_on) {
+ ftepp_error(ftepp, "unrecognized preprocessor directive: `%s`", ftepp_tokval(ftepp));
+ return false;
+ } else {
+ ftepp_next(ftepp);
+ break;
+ }
}
/* break; never reached */
default:
if (ftepp->token >= TOKEN_EOF)
break;
#if 0
- ftepp->newline = newline;
- newline = false;
-#else
- /* For the sake of FTE compatibility... FU, really */
- ftepp->newline = newline = true;
+ newline = true;
#endif
switch (ftepp->token) {
case TOKEN_KEYWORD:
case TOKEN_IDENT:
case TOKEN_TYPENAME:
- macro = ftepp_macro_find(ftepp, ftepp_tokval(ftepp));
+ if (ftepp->output_on)
+ macro = ftepp_macro_find(ftepp, ftepp_tokval(ftepp));
+ else
+ macro = NULL;
if (!macro) {
ftepp_out(ftepp, ftepp_tokval(ftepp), false);
ftepp_next(ftepp);
ftepp->token = TOKEN_ERROR;
break;
case '#':
- if (!ftepp->newline) {
+ if (!newline) {
ftepp_out(ftepp, ftepp_tokval(ftepp), false);
ftepp_next(ftepp);
break;
ftepp_out(ftepp, "\n", true);
ftepp_next(ftepp);
break;
+ case TOKEN_WHITE:
+ /* same as default but don't set newline=false */
+ ftepp_out(ftepp, ftepp_tokval(ftepp), false);
+ ftepp_next(ftepp);
+ break;
default:
+ newline = false;
ftepp_out(ftepp, ftepp_tokval(ftepp), false);
ftepp_next(ftepp);
break;
vec_push(ftepp->output_string, 0);
vec_shrinkby(ftepp->output_string, 1);
- newline = ftepp->token == TOKEN_EOF;
- return newline;
+ return (ftepp->token == TOKEN_EOF);
}
/* Like in parser.c - files keep the previous state so we have one global
return ftepp_preprocess_done();
}
+
+void ftepp_add_macro(const char *name, const char *value) {
+ char *create = NULL;
+
+ /* use saner path for empty macros */
+ if (!value) {
+ ftepp_add_define("__builtin__", name);
+ return;
+ }
+
+ vec_upload(create, "#define ", 8);
+ vec_upload(create, name, strlen(name));
+ vec_push (create, ' ');
+ vec_upload(create, value, strlen(value));
+ vec_push (create, 0);
+
+ ftepp_preprocess_string("__builtin__", create);
+ vec_free (create);
+}
+
bool ftepp_init()
{
+ char minor[32];
+ char major[32];
+
ftepp = ftepp_new();
if (!ftepp)
return false;
+ memset(minor, 0, sizeof(minor));
+ memset(major, 0, sizeof(major));
+
/* set the right macro based on the selected standard */
ftepp_add_define(NULL, "GMQCC");
- if (opts_standard == COMPILER_FTEQCC)
+ if (opts.standard == COMPILER_FTEQCC) {
ftepp_add_define(NULL, "__STD_FTEQCC__");
- else if (opts_standard == COMPILER_GMQCC)
+ /* 1.00 */
+ major[0] = '"';
+ major[1] = '1';
+ major[2] = '"';
+
+ minor[0] = '"';
+ minor[1] = '0';
+ minor[2] = '"';
+ } else if (opts.standard == COMPILER_GMQCC) {
ftepp_add_define(NULL, "__STD_GMQCC__");
- else if (opts_standard == COMPILER_QCC)
+ 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 */
+ major[0] = '"';
+ major[1] = '1';
+ major[2] = '"';
+
+ minor[0] = '"';
+ minor[1] = '0';
+ minor[2] = '"';
+ }
+
+ ftepp_add_macro("__STD_VERSION_MINOR__", minor);
+ ftepp_add_macro("__STD_VERSION_MAJOR__", major);
return true;
}