From 3256a83e508bcde2cc1cd807d5fe84d140071c1d Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 6 Jan 2014 18:55:12 -0800
Subject: Fix flex/bison interaction properly

---
 src/map/magic-interpreter-lexer.lpp  | 3 ---
 src/map/magic-interpreter-parser.ypp | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3-60-g2f50