diff options
-rw-r--r-- | .gitignore | 4 | ||||
-rwxr-xr-x | src/LuaSL/build.lua | 4 | ||||
-rw-r--r-- | src/others/lemon/README (renamed from libraries/lemon/README) | 0 | ||||
-rw-r--r-- | src/others/lemon/lemon.c (renamed from libraries/lemon/lemon.c) | 0 | ||||
-rw-r--r-- | src/others/lemon/lempar.c (renamed from libraries/lemon/lempar.c) | 0 |
5 files changed, 5 insertions, 3 deletions
@@ -319,7 +319,6 @@ | |||
319 | *.diff | 319 | *.diff |
320 | *.lsl.lua | 320 | *.lsl.lua |
321 | *.lsl2 | 321 | *.lsl2 |
322 | /libraries/lemon/lemon | ||
323 | /lib/constants.lsl | 322 | /lib/constants.lsl |
324 | media/bad_scripts/ | 323 | media/bad_scripts/ |
325 | media/really_bad_scripts/ | 324 | media/really_bad_scripts/ |
@@ -334,4 +333,7 @@ media/Test%20sim/test/bulk_scripts_dump/ | |||
334 | /src/LuaSL/LuaSL_lexer.h | 333 | /src/LuaSL/LuaSL_lexer.h |
335 | /src/LuaSL/LuaSL_LSL_lexer.c | 334 | /src/LuaSL/LuaSL_LSL_lexer.c |
336 | /src/LuaSL/LuaSL_LSL_lexer.h | 335 | /src/LuaSL/LuaSL_LSL_lexer.h |
336 | /src/others/lemon/lemon | ||
337 | /src/others/netsurf/ | ||
338 | /src/others/polipo/ | ||
337 | valgrind_*.log | 339 | valgrind_*.log |
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua index dafcf5e..3a45e9b 100755 --- a/src/LuaSL/build.lua +++ b/src/LuaSL/build.lua | |||
@@ -16,7 +16,7 @@ end | |||
16 | removeFiles(dir, {'*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'}) | 16 | removeFiles(dir, {'*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'}) |
17 | 17 | ||
18 | -- Build and run lemon first, flex depends on it to define the symbol values. | 18 | -- Build and run lemon first, flex depends on it to define the symbol values. |
19 | compileFiles('lemon', dir .. '/../../libraries/lemon', {'lemon'}, '') | 19 | compileFiles('lemon', dir .. '/../others/lemon', {'lemon'}, '') |
20 | runCommand('lemon', dir, '../../libraries/lemon/lemon -qs -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') | 20 | runCommand('lemon', dir, '../others/lemon/lemon -qs -T../others/lemon/lempar.c LuaSL_lemon_yaccer.y') |
21 | runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') | 21 | runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') |
22 | compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') | 22 | compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') |
diff --git a/libraries/lemon/README b/src/others/lemon/README index aa84547..aa84547 100644 --- a/libraries/lemon/README +++ b/src/others/lemon/README | |||
diff --git a/libraries/lemon/lemon.c b/src/others/lemon/lemon.c index 85e94f7..85e94f7 100644 --- a/libraries/lemon/lemon.c +++ b/src/others/lemon/lemon.c | |||
diff --git a/libraries/lemon/lempar.c b/src/others/lemon/lempar.c index fe56d2d..fe56d2d 100644 --- a/libraries/lemon/lempar.c +++ b/src/others/lemon/lempar.c | |||