diff options
author | David Walter Seikel | 2012-01-05 10:17:03 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-05 10:17:03 +1000 |
commit | 872c9ef5ec95b6800cfced063704e8f3c8f6dfa0 (patch) | |
tree | d9cfb0becaf533f0b8734628e55cb3537f10eda9 | |
parent | Consolidate the parser includes. (diff) | |
download | SledjHamr-872c9ef5ec95b6800cfced063704e8f3c8f6dfa0.zip SledjHamr-872c9ef5ec95b6800cfced063704e8f3c8f6dfa0.tar.gz SledjHamr-872c9ef5ec95b6800cfced063704e8f3c8f6dfa0.tar.bz2 SledjHamr-872c9ef5ec95b6800cfced063704e8f3c8f6dfa0.tar.xz |
Update the not yet used real parser includes to.
-rw-r--r-- | LuaSL/src/LuaSL_LSL_lexer.l | 3 | ||||
-rw-r--r-- | LuaSL/src/LuaSL_LSL_yaccer.y | 29 |
2 files changed, 13 insertions, 19 deletions
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) | |||
10 | 10 | ||
11 | %{ | 11 | %{ |
12 | 12 | ||
13 | #include "LuaSL_type_parser.h" | 13 | #define excludeLexer |
14 | #include "LuaSL_LSL_tree.h" | ||
14 | #include "LuaSL_LSLS_yaccer.tab.h" | 15 | #include "LuaSL_LSLS_yaccer.tab.h" |
15 | 16 | ||
16 | 17 | ||
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 @@ | |||
1 | %{ | 1 | %{ |
2 | #include "linden_common.h" | ||
3 | #include "lscript_tree.h" | ||
4 | 2 | ||
5 | #ifdef __cplusplus | 3 | #include "LuaSL_LSL_tree.h" |
6 | extern "C" { | ||
7 | #endif | ||
8 | 4 | ||
9 | int yylex(void); | 5 | //int yylex(void); |
10 | int yyparse( void ); | 6 | //int yyparse( void ); |
11 | int yyerror(const char *fmt, ...); | 7 | //int yyerror(const char *fmt, ...); |
12 | 8 | ||
13 | #if LL_LINUX | 9 | #if LL_LINUX |
14 | // broken yacc codegen... --ryan. | 10 | // broken yacc codegen... --ryan. |
15 | #define getenv getenv_workaround | 11 | #define getenv getenv_workaround |
16 | #endif | 12 | #endif |
17 | 13 | ||
18 | #ifdef LL_WINDOWS | 14 | #ifdef LL_WINDOWS |
19 | #pragma warning (disable : 4702) // warning C4702: unreachable code | 15 | #pragma warning (disable : 4702) // warning C4702: unreachable code |
20 | #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels | 16 | #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels |
21 | #endif | 17 | #endif |
22 | 18 | ||
23 | #ifdef __cplusplus | ||
24 | } | ||
25 | #endif | ||
26 | %} | 19 | %} |
27 | 20 | ||
28 | 21 | ||