diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-01-06 18:55:12 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-01-06 18:55:12 -0800 |
| commit | 3256a83e508bcde2cc1cd807d5fe84d140071c1d (patch) | |
| tree | ec9762d642f70a9b7f973a3a14c1953c8a10da1e | |
| parent | 4c053c131ee13400bf1057f37dae3d0b7750e676 (diff) | |
| download | tmwa-3256a83e508bcde2cc1cd807d5fe84d140071c1d.tar.gz tmwa-3256a83e508bcde2cc1cd807d5fe84d140071c1d.tar.bz2 tmwa-3256a83e508bcde2cc1cd807d5fe84d140071c1d.tar.xz tmwa-3256a83e508bcde2cc1cd807d5fe84d140071c1d.zip | |
Fix flex/bison interaction properly
| -rw-r--r-- | src/map/magic-interpreter-lexer.lpp | 3 | ||||
| -rw-r--r-- | src/map/magic-interpreter-parser.ypp | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/map/magic-interpreter-lexer.lpp b/src/map/magic-interpreter-lexer.lpp index 786088e..cef1121 100644 --- a/src/map/magic-interpreter-lexer.lpp +++ b/src/map/magic-interpreter-lexer.lpp @@ -13,8 +13,6 @@ #define HEADING(dir) { magic_frontend_lval.i = dir; FIXLOC; return DIR; } -// silence compiler warnings -#define YY_USER_INIT (void)yylval, (void)yylloc %} %option yylineno @@ -22,7 +20,6 @@ %option prefix="magic_frontend_" %option nounput %option noinput -%option bison-bridge bison-locations %% diff --git a/src/map/magic-interpreter-parser.ypp b/src/map/magic-interpreter-parser.ypp index 9b853e9..d59519a 100644 --- a/src/map/magic-interpreter-parser.ypp +++ b/src/map/magic-interpreter-parser.ypp @@ -20,9 +20,6 @@ #include "itemdb.hpp" #include "magic-expr.hpp" -// I still don't get why this is necessary. -#define YYLEX_PARAM 0, 0 - // can't use src/warnings.hpp in generated code #pragma GCC diagnostic warning "-Wall" #pragma GCC diagnostic warning "-Wextra" @@ -83,7 +80,7 @@ static dumb_ptr<effect_t> op_effect(FString name, const_array<dumb_ptr<expr_t>> argv, int line, int column); // in magic-interpreter-lexer.cpp -int magic_frontend_lex(YYSTYPE *, YYLTYPE *); +int magic_frontend_lex(void); static void install_proc(dumb_ptr<proc_t> proc); |