From 872c9ef5ec95b6800cfced063704e8f3c8f6dfa0 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 5 Jan 2012 10:17:03 +1000
Subject: Update the not yet used real parser includes to.

---
 LuaSL/src/LuaSL_LSL_lexer.l  |  3 ++-
 LuaSL/src/LuaSL_LSL_yaccer.y | 29 +++++++++++------------------
 2 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'LuaSL')

diff --git a/LuaSL/src/LuaSL_LSL_lexer.l b/LuaSL/src/LuaSL_LSL_lexer.l
index 24e88a3..473a427 100644
--- a/LuaSL/src/LuaSL_LSL_lexer.l
+++ b/LuaSL/src/LuaSL_LSL_lexer.l
@@ -10,7 +10,8 @@ FS			(f|F)
 
 %{
 
-#include "LuaSL_type_parser.h"
+#define excludeLexer
+#include "LuaSL_LSL_tree.h"
 #include "LuaSL_LSLS_yaccer.tab.h"
 
 
diff --git a/LuaSL/src/LuaSL_LSL_yaccer.y b/LuaSL/src/LuaSL_LSL_yaccer.y
index 1583b0b..8cc433d 100644
--- a/LuaSL/src/LuaSL_LSL_yaccer.y
+++ b/LuaSL/src/LuaSL_LSL_yaccer.y
@@ -1,28 +1,21 @@
 %{
-	#include "linden_common.h"
-	#include "lscript_tree.h"
 
-    #ifdef __cplusplus
-    extern "C" {
-    #endif
+#include "LuaSL_LSL_tree.h"
 
-	int yylex(void);
-	int yyparse( void );
-	int yyerror(const char *fmt, ...);
+//int yylex(void);
+//int yyparse( void );
+//int yyerror(const char *fmt, ...);
 
-    #if LL_LINUX
-    // broken yacc codegen...  --ryan.
+#if LL_LINUX
+// broken yacc codegen...  --ryan.
     #define getenv getenv_workaround
-    #endif
+#endif
 
-    #ifdef LL_WINDOWS
-	#pragma warning (disable : 4702) // warning C4702: unreachable code
-	#pragma warning( disable : 4065 )	// warning: switch statement contains 'default' but no 'case' labels
-	#endif
+#ifdef LL_WINDOWS
+    #pragma warning (disable : 4702) // warning C4702: unreachable code
+    #pragma warning( disable : 4065 )	// warning: switch statement contains 'default' but no 'case' labels
+#endif
 
-    #ifdef __cplusplus
-    }
-    #endif
 %}
 
 
-- 
cgit v1.1