diff options
-rw-r--r-- | .gitattributes | 1 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rwxr-xr-x | doc/.gitignore | 2 | ||||
-rwxr-xr-x | doc/docs/.vuepress/components/YueCompiler.vue | 180 | ||||
-rwxr-xr-x | doc/docs/doc/README.md | 2 | ||||
-rw-r--r-- | makefile | 24 | ||||
-rw-r--r-- | src/3rdParty/LuaMinify.h (renamed from src/LuaMinify.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/ghc/filesystem.hpp (renamed from src/ghc/filesystem.hpp) | 0 | ||||
-rw-r--r-- | src/3rdParty/ghc/fs_std.hpp (renamed from src/ghc/fs_std.hpp) | 0 | ||||
-rw-r--r-- | src/3rdParty/linenoise.hpp (renamed from src/linenoise.hpp) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/.gitignore | 5 | ||||
-rw-r--r-- | src/3rdParty/lua/Makefile (renamed from src/lua/makefile) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lapi.c (renamed from src/lua/lapi.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lapi.h (renamed from src/lua/lapi.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lauxlib.c (renamed from src/lua/lauxlib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lauxlib.h (renamed from src/lua/lauxlib.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lbaselib.c (renamed from src/lua/lbaselib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lcode.c (renamed from src/lua/lcode.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lcode.h (renamed from src/lua/lcode.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lcorolib.c (renamed from src/lua/lcorolib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lctype.c (renamed from src/lua/lctype.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lctype.h (renamed from src/lua/lctype.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ldblib.c (renamed from src/lua/ldblib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ldebug.c (renamed from src/lua/ldebug.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ldebug.h (renamed from src/lua/ldebug.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ldo.c (renamed from src/lua/ldo.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ldo.h (renamed from src/lua/ldo.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ldump.c (renamed from src/lua/ldump.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lfunc.c (renamed from src/lua/lfunc.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lfunc.h (renamed from src/lua/lfunc.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lgc.c (renamed from src/lua/lgc.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lgc.h (renamed from src/lua/lgc.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/linit.c (renamed from src/lua/linit.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/liolib.c (renamed from src/lua/liolib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ljumptab.h (renamed from src/lua/ljumptab.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/llex.c (renamed from src/lua/llex.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/llex.h (renamed from src/lua/llex.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/llimits.h (renamed from src/lua/llimits.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lmathlib.c (renamed from src/lua/lmathlib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lmem.c (renamed from src/lua/lmem.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lmem.h (renamed from src/lua/lmem.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/loadlib.c (renamed from src/lua/loadlib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lobject.c (renamed from src/lua/lobject.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lobject.h (renamed from src/lua/lobject.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lopcodes.c (renamed from src/lua/lopcodes.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lopcodes.h (renamed from src/lua/lopcodes.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lopnames.h (renamed from src/lua/lopnames.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/loslib.c (renamed from src/lua/loslib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lparser.c (renamed from src/lua/lparser.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lparser.h (renamed from src/lua/lparser.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lprefix.h (renamed from src/lua/lprefix.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lstate.c (renamed from src/lua/lstate.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lstate.h (renamed from src/lua/lstate.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lstring.c (renamed from src/lua/lstring.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lstring.h (renamed from src/lua/lstring.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lstrlib.c (renamed from src/lua/lstrlib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ltable.c (renamed from src/lua/ltable.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ltable.h (renamed from src/lua/ltable.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ltablib.c (renamed from src/lua/ltablib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ltm.c (renamed from src/lua/ltm.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/ltm.h (renamed from src/lua/ltm.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lua.c (renamed from src/lua/lua.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lua.h (renamed from src/lua/lua.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lua.hpp (renamed from src/lua/lua.hpp) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/luac.c (renamed from src/lua/luac.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/luaconf.h (renamed from src/lua/luaconf.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lualib.h (renamed from src/lua/lualib.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lundump.c (renamed from src/lua/lundump.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lundump.h (renamed from src/lua/lundump.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lutf8lib.c (renamed from src/lua/lutf8lib.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lvm.c (renamed from src/lua/lvm.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lvm.h (renamed from src/lua/lvm.h) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lzio.c (renamed from src/lua/lzio.c) | 0 | ||||
-rw-r--r-- | src/3rdParty/lua/lzio.h (renamed from src/lua/lzio.h) | 0 |
74 files changed, 25 insertions, 191 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..79eebd7 --- /dev/null +++ b/.gitattributes | |||
@@ -0,0 +1 @@ | |||
src/3rdParty/* linguist-vendored | |||
diff --git a/CMakeLists.txt b/CMakeLists.txt index d3ca6fd..995378f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -28,7 +28,7 @@ MESSAGE(STATUS "Lua include: " ${LUA_INCLUDE_DIR}) | |||
28 | MESSAGE(STATUS "Lua library: ${LUA_LIBRARIES}") | 28 | MESSAGE(STATUS "Lua library: ${LUA_LIBRARIES}") |
29 | 29 | ||
30 | enable_language(CXX) | 30 | enable_language(CXX) |
31 | include_directories(src ${LUA_INCLUDE_DIR}) | 31 | include_directories(src src/3rdParty ${LUA_INCLUDE_DIR}) |
32 | add_definitions(-std=c++17 -O3 -fPIC) | 32 | add_definitions(-std=c++17 -O3 -fPIC) |
33 | 33 | ||
34 | add_library(libyue MODULE src/yuescript/ast.cpp src/yuescript/parser.cpp src/yuescript/yue_parser.cpp src/yuescript/yue_compiler.cpp src/yuescript/yuescript.cpp) | 34 | add_library(libyue MODULE src/yuescript/ast.cpp src/yuescript/parser.cpp src/yuescript/yue_parser.cpp src/yuescript/yue_compiler.cpp src/yuescript/yuescript.cpp) |
diff --git a/doc/.gitignore b/doc/.gitignore index ac4a32c..0cef669 100755 --- a/doc/.gitignore +++ b/doc/.gitignore | |||
@@ -11,3 +11,5 @@ dist | |||
11 | config.local.js | 11 | config.local.js |
12 | basement_dist | 12 | basement_dist |
13 | yarn.lock | 13 | yarn.lock |
14 | docs/.vuepress/public/js/yuescript.js | ||
15 | docs/.vuepress/public/js/yuescript.wasm | ||
diff --git a/doc/docs/.vuepress/components/YueCompiler.vue b/doc/docs/.vuepress/components/YueCompiler.vue index 9c09297..ea8ea11 100755 --- a/doc/docs/.vuepress/components/YueCompiler.vue +++ b/doc/docs/.vuepress/components/YueCompiler.vue | |||
@@ -74,6 +74,9 @@ | |||
74 | setTimeout(check, 100); | 74 | setTimeout(check, 100); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | if (this.$data.code !== '') { | ||
78 | this.codeChanged(this.$data.code); | ||
79 | } | ||
77 | const textArea = editor.children[0].children[1].children[0]; | 80 | const textArea = editor.children[0].children[1].children[0]; |
78 | textArea.focus(); | 81 | textArea.focus(); |
79 | } else { | 82 | } else { |
@@ -201,182 +204,5 @@ | |||
201 | .my-editor >>> .prism-editor__textarea:focus { | 204 | .my-editor >>> .prism-editor__textarea:focus { |
202 | outline: none; | 205 | outline: none; |
203 | } | 206 | } |
204 | |||
205 | /* | ||
206 | Name: Base16 Atelier Sulphurpool Light | ||
207 | Author: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/sulphurpool) | ||
208 | |||
209 | Prism template by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/prism/) | ||
210 | Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) | ||
211 | |||
212 | */ | ||
213 | code[class*="language-"], | ||
214 | pre[class*="language-"] { | ||
215 | font-family: Consolas, Menlo, Monaco, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", "Courier New", Courier, monospace; | ||
216 | font-size: 1em; | ||
217 | line-height: 1.375; | ||
218 | direction: ltr; | ||
219 | text-align: left; | ||
220 | white-space: pre; | ||
221 | word-spacing: normal; | ||
222 | word-break: normal; | ||
223 | -moz-tab-size: 4; | ||
224 | -o-tab-size: 4; | ||
225 | tab-size: 4; | ||
226 | -webkit-hyphens: none; | ||
227 | -moz-hyphens: none; | ||
228 | -ms-hyphens: none; | ||
229 | hyphens: none; | ||
230 | background: #f5f7ff; | ||
231 | color: #5e6687; | ||
232 | } | ||
233 | |||
234 | pre > code[class*="language-"] { | ||
235 | font-size: 1em; | ||
236 | } | ||
237 | |||
238 | pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection, | ||
239 | code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection { | ||
240 | text-shadow: none; | ||
241 | background: #dfe2f1; | ||
242 | } | ||
243 | |||
244 | pre[class*="language-"]::selection, pre[class*="language-"] ::selection, | ||
245 | code[class*="language-"]::selection, code[class*="language-"] ::selection { | ||
246 | text-shadow: none; | ||
247 | background: #dfe2f1; | ||
248 | } | ||
249 | |||
250 | /* Code blocks */ | ||
251 | pre[class*="language-"] { | ||
252 | padding: 1em; | ||
253 | margin: .5em 0; | ||
254 | overflow: auto; | ||
255 | } | ||
256 | |||
257 | /* Inline code */ | ||
258 | :not(pre) > code[class*="language-"] { | ||
259 | padding: .1em; | ||
260 | border-radius: .3em; | ||
261 | } | ||
262 | |||
263 | .token.comment, | ||
264 | .token.prolog, | ||
265 | .token.doctype, | ||
266 | .token.cdata { | ||
267 | color: #898ea4; | ||
268 | } | ||
269 | |||
270 | .token.punctuation { | ||
271 | color: #5e6687; | ||
272 | } | ||
273 | |||
274 | .token.namespace { | ||
275 | opacity: .7; | ||
276 | } | ||
277 | |||
278 | .token.operator, | ||
279 | .token.boolean, | ||
280 | .token.number { | ||
281 | color: #c76b29; | ||
282 | } | ||
283 | |||
284 | .token.property { | ||
285 | color: #c08b30; | ||
286 | } | ||
287 | |||
288 | .token.tag { | ||
289 | color: #3d8fd1; | ||
290 | } | ||
291 | |||
292 | .token.string { | ||
293 | color: #22a2c9; | ||
294 | } | ||
295 | |||
296 | .token.selector { | ||
297 | color: #6679cc; | ||
298 | } | ||
299 | |||
300 | .token.attr-name { | ||
301 | color: #c76b29; | ||
302 | } | ||
303 | |||
304 | .token.entity, | ||
305 | .token.url, | ||
306 | .language-css .token.string, | ||
307 | .style .token.string { | ||
308 | color: #22a2c9; | ||
309 | } | ||
310 | |||
311 | .token.attr-value, | ||
312 | .token.keyword, | ||
313 | .token.control, | ||
314 | .token.directive, | ||
315 | .token.unit { | ||
316 | color: #ac9739; | ||
317 | } | ||
318 | |||
319 | .token.statement, | ||
320 | .token.regex, | ||
321 | .token.atrule { | ||
322 | color: #22a2c9; | ||
323 | } | ||
324 | |||
325 | .token.placeholder, | ||
326 | .token.variable { | ||
327 | color: #3d8fd1; | ||
328 | } | ||
329 | |||
330 | .token.deleted { | ||
331 | text-decoration: line-through; | ||
332 | } | ||
333 | |||
334 | .token.inserted { | ||
335 | border-bottom: 1px dotted #202746; | ||
336 | text-decoration: none; | ||
337 | } | ||
338 | |||
339 | .token.italic { | ||
340 | font-style: italic; | ||
341 | } | ||
342 | |||
343 | .token.important, | ||
344 | .token.bold { | ||
345 | font-weight: bold; | ||
346 | } | ||
347 | |||
348 | .token.important { | ||
349 | color: #c94922; | ||
350 | } | ||
351 | |||
352 | .token.entity { | ||
353 | cursor: help; | ||
354 | } | ||
355 | |||
356 | pre > code.highlight { | ||
357 | outline: 0.4em solid #c94922; | ||
358 | outline-offset: .4em; | ||
359 | } | ||
360 | |||
361 | /* overrides color-values for the Line Numbers plugin | ||
362 | * http://prismjs.com/plugins/line-numbers/ | ||
363 | */ | ||
364 | .line-numbers .line-numbers-rows { | ||
365 | border-right-color: #dfe2f1; | ||
366 | } | ||
367 | |||
368 | .line-numbers-rows > span:before { | ||
369 | color: #979db4; | ||
370 | } | ||
371 | |||
372 | /* overrides color-values for the Line Highlight plugin | ||
373 | * http://prismjs.com/plugins/line-highlight/ | ||
374 | */ | ||
375 | .line-highlight { | ||
376 | background: rgba(107, 115, 148, 0.2); | ||
377 | background: -webkit-linear-gradient(left, rgba(107, 115, 148, 0.2) 70%, rgba(107, 115, 148, 0)); | ||
378 | background: linear-gradient(to right, rgba(107, 115, 148, 0.2) 70%, rgba(107, 115, 148, 0)); | ||
379 | } | ||
380 | |||
381 | </style> | 207 | </style> |
382 | 208 | ||
diff --git a/doc/docs/doc/README.md b/doc/docs/doc/README.md index ec76612..76ae3c1 100755 --- a/doc/docs/doc/README.md +++ b/doc/docs/doc/README.md | |||
@@ -27,7 +27,7 @@ inventory = | |||
27 | * name: "bread" | 27 | * name: "bread" |
28 | count: 3 | 28 | count: 3 |
29 | 29 | ||
30 | -- backcall | 30 | -- pipe operator |
31 | {1, 2, 3} | 31 | {1, 2, 3} |
32 | |> map (x)-> x * 2 | 32 | |> map (x)-> x * 2 |
33 | |> filter (x)-> x > 4 | 33 | |> filter (x)-> x > 4 |
@@ -16,7 +16,7 @@ RCOMPILE_FLAGS = -D NDEBUG -O3 | |||
16 | # Additional debug-specific flags | 16 | # Additional debug-specific flags |
17 | DCOMPILE_FLAGS = -D DEBUG | 17 | DCOMPILE_FLAGS = -D DEBUG |
18 | # Add additional include paths | 18 | # Add additional include paths |
19 | INCLUDES = -I $(SRC_PATH) | 19 | INCLUDES = -I $(SRC_PATH) -I $(SRC_PATH)/3rdParty |
20 | # General linker settings | 20 | # General linker settings |
21 | LINK_FLAGS = -lpthread | 21 | LINK_FLAGS = -lpthread |
22 | # Additional release-specific linker settings | 22 | # Additional release-specific linker settings |
@@ -47,8 +47,8 @@ else | |||
47 | ifeq ($(NO_MACRO),true) | 47 | ifeq ($(NO_MACRO),true) |
48 | COMPILE_FLAGS += -DYUE_NO_MACRO | 48 | COMPILE_FLAGS += -DYUE_NO_MACRO |
49 | endif | 49 | endif |
50 | INCLUDES += -I ./src/lua | 50 | INCLUDES += -I $(SRC_PATH)/3rdParty/lua |
51 | LINK_FLAGS += -L ./src/lua -llua -ldl | 51 | LINK_FLAGS += -L $(SRC_PATH)/3rdParty/lua -llua -ldl |
52 | endif | 52 | endif |
53 | 53 | ||
54 | # Add platform related linker flag | 54 | # Add platform related linker flag |
@@ -117,10 +117,10 @@ ifeq ($(SOURCES),) | |||
117 | SOURCES := $(call rwildcard, $(SRC_PATH), *.$(SRC_EXT)) | 117 | SOURCES := $(call rwildcard, $(SRC_PATH), *.$(SRC_EXT)) |
118 | endif | 118 | endif |
119 | 119 | ||
120 | SOURCES := $(filter-out ./src/yue_wasm.cpp, $(SOURCES)) | 120 | SOURCES := $(filter-out $(SRC_PATH)/yue_wasm.cpp, $(SOURCES)) |
121 | 121 | ||
122 | ifeq ($(NO_LUA),true) | 122 | ifeq ($(NO_LUA),true) |
123 | SOURCES := $(filter-out ./src/yuescript/yuescript.cpp, $(SOURCES)) | 123 | SOURCES := $(filter-out $(SRC_PATH)/yuescript/yuescript.cpp, $(SOURCES)) |
124 | endif | 124 | endif |
125 | 125 | ||
126 | # Set the object file names, with the source directory stripped | 126 | # Set the object file names, with the source directory stripped |
@@ -179,7 +179,7 @@ else | |||
179 | @echo "Beginning release build" | 179 | @echo "Beginning release build" |
180 | endif | 180 | endif |
181 | ifneq ($(NO_LUA),true) | 181 | ifneq ($(NO_LUA),true) |
182 | @$(MAKE) generic -C ./src/lua | 182 | @$(MAKE) generic -C $(SRC_PATH)/3rdParty/lua |
183 | endif | 183 | endif |
184 | @$(START_TIME) | 184 | @$(START_TIME) |
185 | @$(MAKE) all --no-print-directory | 185 | @$(MAKE) all --no-print-directory |
@@ -188,9 +188,9 @@ endif | |||
188 | 188 | ||
189 | .PHONY: wasm | 189 | .PHONY: wasm |
190 | wasm: | 190 | wasm: |
191 | @$(MAKE) generic CC='emcc -s WASM=1' AR='emar rcu' RANLIB='emranlib' -C ./src/lua | 191 | @$(MAKE) generic CC='emcc -s WASM=1' AR='emar rcu' RANLIB='emranlib' -C $(SRC_PATH)/3rdParty/lua |
192 | @mkdir -p doc/docs/.vuepress/public/js | 192 | @mkdir -p doc/docs/.vuepress/public/js |
193 | @emcc src/yue_wasm.cpp src/yuescript/ast.cpp src/yuescript/parser.cpp src/yuescript/yue_compiler.cpp src/yuescript/yue_parser.cpp src/yuescript/yuescript.cpp src/lua/liblua.a -s WASM=1 -O2 -o doc/docs/.vuepress/public/js/yuescript.js -Isrc -Isrc/lua -std=c++17 --bind -fexceptions | 193 | @emcc $(SRC_PATH)/yue_wasm.cpp $(SRC_PATH)/yuescript/ast.cpp $(SRC_PATH)/yuescript/parser.cpp $(SRC_PATH)/yuescript/yue_compiler.cpp $(SRC_PATH)/yuescript/yue_parser.cpp $(SRC_PATH)/yuescript/yuescript.cpp $(SRC_PATH)/3rdParty/lua/liblua.a -s WASM=1 -O2 -o doc/docs/.vuepress/public/js/yuescript.js -I $(SRC_PATH) -I $(SRC_PATH)/3rdParty/lua -std=c++17 --bind -fexceptions |
194 | 194 | ||
195 | # Debug build for gdb debugging | 195 | # Debug build for gdb debugging |
196 | .PHONY: debug | 196 | .PHONY: debug |
@@ -201,15 +201,15 @@ else | |||
201 | @echo "Beginning debug build" | 201 | @echo "Beginning debug build" |
202 | endif | 202 | endif |
203 | ifneq ($(NO_LUA),true) | 203 | ifneq ($(NO_LUA),true) |
204 | @$(MAKE) generic -C ./src/lua | 204 | @$(MAKE) generic -C $(SRC_PATH)/3rdParty/lua |
205 | endif | 205 | endif |
206 | @$(START_TIME) | 206 | @$(START_TIME) |
207 | @$(MAKE) all --no-print-directory | 207 | @$(MAKE) all --no-print-directory |
208 | @echo -n "Total build time: " | 208 | @echo -n "Total build time: " |
209 | @$(END_TIME) | 209 | @$(END_TIME) |
210 | 210 | ||
211 | $(BUILD_PATH)/yue.so: src/yuescript/ast.cpp src/yuescript/yue_compiler.cpp src/yuescript/yue_parser.cpp src/yuescript/yuescript.cpp src/yuescript/parser.cpp | 211 | $(BUILD_PATH)/yue.so: $(SRC_PATH)/yuescript/ast.cpp $(SRC_PATH)/yuescript/yue_compiler.cpp $(SRC_PATH)/yuescript/yue_parser.cpp $(SRC_PATH)/yuescript/yuescript.cpp $(SRC_PATH)/yuescript/parser.cpp |
212 | $(CMD_PREFIX)$(CXX) $(CXXFLAGS) -I $(SRC_PATH) -I $(LUAI) -L $(LUAL) -llua -o $@ -fPIC -shared $? | 212 | $(CMD_PREFIX)$(CXX) $(CXXFLAGS) -I $(SRC_PATH) -I $(SRC_PATH)/3rdParty -I $(LUAI) -L $(LUAL) -llua -o $@ -fPIC -shared $? |
213 | 213 | ||
214 | # Standard, non-optimized release build | 214 | # Standard, non-optimized release build |
215 | .PHONY: shared | 215 | .PHONY: shared |
@@ -248,7 +248,7 @@ uninstall: | |||
248 | # Removes all build files | 248 | # Removes all build files |
249 | .PHONY: clean | 249 | .PHONY: clean |
250 | clean: | 250 | clean: |
251 | @$(MAKE) clean -C ./src/lua | 251 | @$(MAKE) clean -C $(SRC_PATH)/3rdParty/lua |
252 | @echo "Deleting $(BIN_NAME) symlink" | 252 | @echo "Deleting $(BIN_NAME) symlink" |
253 | @$(RM) $(BIN_NAME) | 253 | @$(RM) $(BIN_NAME) |
254 | @echo "Deleting directories" | 254 | @echo "Deleting directories" |
diff --git a/src/LuaMinify.h b/src/3rdParty/LuaMinify.h index 76d7759..76d7759 100644 --- a/src/LuaMinify.h +++ b/src/3rdParty/LuaMinify.h | |||
diff --git a/src/ghc/filesystem.hpp b/src/3rdParty/ghc/filesystem.hpp index 7951369..7951369 100644 --- a/src/ghc/filesystem.hpp +++ b/src/3rdParty/ghc/filesystem.hpp | |||
diff --git a/src/ghc/fs_std.hpp b/src/3rdParty/ghc/fs_std.hpp index d8e03b8..d8e03b8 100644 --- a/src/ghc/fs_std.hpp +++ b/src/3rdParty/ghc/fs_std.hpp | |||
diff --git a/src/linenoise.hpp b/src/3rdParty/linenoise.hpp index 06add16..06add16 100644 --- a/src/linenoise.hpp +++ b/src/3rdParty/linenoise.hpp | |||
diff --git a/src/3rdParty/lua/.gitignore b/src/3rdParty/lua/.gitignore new file mode 100644 index 0000000..2aaf5bd --- /dev/null +++ b/src/3rdParty/lua/.gitignore | |||
@@ -0,0 +1,5 @@ | |||
1 | *.o | ||
2 | *.a | ||
3 | *.wasm | ||
4 | lua | ||
5 | luac | ||
diff --git a/src/lua/makefile b/src/3rdParty/lua/Makefile index f78c0b8..f78c0b8 100644 --- a/src/lua/makefile +++ b/src/3rdParty/lua/Makefile | |||
diff --git a/src/lua/lapi.c b/src/3rdParty/lua/lapi.c index f8f70cd..f8f70cd 100644 --- a/src/lua/lapi.c +++ b/src/3rdParty/lua/lapi.c | |||
diff --git a/src/lua/lapi.h b/src/3rdParty/lua/lapi.h index 9e99cc4..9e99cc4 100644 --- a/src/lua/lapi.h +++ b/src/3rdParty/lua/lapi.h | |||
diff --git a/src/lua/lauxlib.c b/src/3rdParty/lua/lauxlib.c index 94835ef..94835ef 100644 --- a/src/lua/lauxlib.c +++ b/src/3rdParty/lua/lauxlib.c | |||
diff --git a/src/lua/lauxlib.h b/src/3rdParty/lua/lauxlib.h index 72f70e7..72f70e7 100644 --- a/src/lua/lauxlib.h +++ b/src/3rdParty/lua/lauxlib.h | |||
diff --git a/src/lua/lbaselib.c b/src/3rdParty/lua/lbaselib.c index 83ad306..83ad306 100644 --- a/src/lua/lbaselib.c +++ b/src/3rdParty/lua/lbaselib.c | |||
diff --git a/src/lua/lcode.c b/src/3rdParty/lua/lcode.c index 80d975c..80d975c 100644 --- a/src/lua/lcode.c +++ b/src/3rdParty/lua/lcode.c | |||
diff --git a/src/lua/lcode.h b/src/3rdParty/lua/lcode.h index 3265824..3265824 100644 --- a/src/lua/lcode.h +++ b/src/3rdParty/lua/lcode.h | |||
diff --git a/src/lua/lcorolib.c b/src/3rdParty/lua/lcorolib.c index fedbebe..fedbebe 100644 --- a/src/lua/lcorolib.c +++ b/src/3rdParty/lua/lcorolib.c | |||
diff --git a/src/lua/lctype.c b/src/3rdParty/lua/lctype.c index 9542280..9542280 100644 --- a/src/lua/lctype.c +++ b/src/3rdParty/lua/lctype.c | |||
diff --git a/src/lua/lctype.h b/src/3rdParty/lua/lctype.h index 864e190..864e190 100644 --- a/src/lua/lctype.h +++ b/src/3rdParty/lua/lctype.h | |||
diff --git a/src/lua/ldblib.c b/src/3rdParty/lua/ldblib.c index 6dcbaa9..6dcbaa9 100644 --- a/src/lua/ldblib.c +++ b/src/3rdParty/lua/ldblib.c | |||
diff --git a/src/lua/ldebug.c b/src/3rdParty/lua/ldebug.c index 1feaab2..1feaab2 100644 --- a/src/lua/ldebug.c +++ b/src/3rdParty/lua/ldebug.c | |||
diff --git a/src/lua/ldebug.h b/src/3rdParty/lua/ldebug.h index 974960e..974960e 100644 --- a/src/lua/ldebug.h +++ b/src/3rdParty/lua/ldebug.h | |||
diff --git a/src/lua/ldo.c b/src/3rdParty/lua/ldo.c index 7135079..7135079 100644 --- a/src/lua/ldo.c +++ b/src/3rdParty/lua/ldo.c | |||
diff --git a/src/lua/ldo.h b/src/3rdParty/lua/ldo.h index 6bf0ed8..6bf0ed8 100644 --- a/src/lua/ldo.h +++ b/src/3rdParty/lua/ldo.h | |||
diff --git a/src/lua/ldump.c b/src/3rdParty/lua/ldump.c index f848b66..f848b66 100644 --- a/src/lua/ldump.c +++ b/src/3rdParty/lua/ldump.c | |||
diff --git a/src/lua/lfunc.c b/src/3rdParty/lua/lfunc.c index f5889a2..f5889a2 100644 --- a/src/lua/lfunc.c +++ b/src/3rdParty/lua/lfunc.c | |||
diff --git a/src/lua/lfunc.h b/src/3rdParty/lua/lfunc.h index dc1cebc..dc1cebc 100644 --- a/src/lua/lfunc.h +++ b/src/3rdParty/lua/lfunc.h | |||
diff --git a/src/lua/lgc.c b/src/3rdParty/lua/lgc.c index b360eed..b360eed 100644 --- a/src/lua/lgc.c +++ b/src/3rdParty/lua/lgc.c | |||
diff --git a/src/lua/lgc.h b/src/3rdParty/lua/lgc.h index 073e2a4..073e2a4 100644 --- a/src/lua/lgc.h +++ b/src/3rdParty/lua/lgc.h | |||
diff --git a/src/lua/linit.c b/src/3rdParty/lua/linit.c index 69808f8..69808f8 100644 --- a/src/lua/linit.c +++ b/src/3rdParty/lua/linit.c | |||
diff --git a/src/lua/liolib.c b/src/3rdParty/lua/liolib.c index b08397d..b08397d 100644 --- a/src/lua/liolib.c +++ b/src/3rdParty/lua/liolib.c | |||
diff --git a/src/lua/ljumptab.h b/src/3rdParty/lua/ljumptab.h index 8306f25..8306f25 100644 --- a/src/lua/ljumptab.h +++ b/src/3rdParty/lua/ljumptab.h | |||
diff --git a/src/lua/llex.c b/src/3rdParty/lua/llex.c index e991517..e991517 100644 --- a/src/lua/llex.c +++ b/src/3rdParty/lua/llex.c | |||
diff --git a/src/lua/llex.h b/src/3rdParty/lua/llex.h index 389d2f8..389d2f8 100644 --- a/src/lua/llex.h +++ b/src/3rdParty/lua/llex.h | |||
diff --git a/src/lua/llimits.h b/src/3rdParty/lua/llimits.h index 025f1c8..025f1c8 100644 --- a/src/lua/llimits.h +++ b/src/3rdParty/lua/llimits.h | |||
diff --git a/src/lua/lmathlib.c b/src/3rdParty/lua/lmathlib.c index 5f5983a..5f5983a 100644 --- a/src/lua/lmathlib.c +++ b/src/3rdParty/lua/lmathlib.c | |||
diff --git a/src/lua/lmem.c b/src/3rdParty/lua/lmem.c index 9029d58..9029d58 100644 --- a/src/lua/lmem.c +++ b/src/3rdParty/lua/lmem.c | |||
diff --git a/src/lua/lmem.h b/src/3rdParty/lua/lmem.h index 8c75a44..8c75a44 100644 --- a/src/lua/lmem.h +++ b/src/3rdParty/lua/lmem.h | |||
diff --git a/src/lua/loadlib.c b/src/3rdParty/lua/loadlib.c index 6f9fa37..6f9fa37 100644 --- a/src/lua/loadlib.c +++ b/src/3rdParty/lua/loadlib.c | |||
diff --git a/src/lua/lobject.c b/src/3rdParty/lua/lobject.c index 0e504be..0e504be 100644 --- a/src/lua/lobject.c +++ b/src/3rdParty/lua/lobject.c | |||
diff --git a/src/lua/lobject.h b/src/3rdParty/lua/lobject.h index 950bebb..950bebb 100644 --- a/src/lua/lobject.h +++ b/src/3rdParty/lua/lobject.h | |||
diff --git a/src/lua/lopcodes.c b/src/3rdParty/lua/lopcodes.c index c67aa22..c67aa22 100644 --- a/src/lua/lopcodes.c +++ b/src/3rdParty/lua/lopcodes.c | |||
diff --git a/src/lua/lopcodes.h b/src/3rdParty/lua/lopcodes.h index d6a47e5..d6a47e5 100644 --- a/src/lua/lopcodes.h +++ b/src/3rdParty/lua/lopcodes.h | |||
diff --git a/src/lua/lopnames.h b/src/3rdParty/lua/lopnames.h index 965cec9..965cec9 100644 --- a/src/lua/lopnames.h +++ b/src/3rdParty/lua/lopnames.h | |||
diff --git a/src/lua/loslib.c b/src/3rdParty/lua/loslib.c index 3e20d62..3e20d62 100644 --- a/src/lua/loslib.c +++ b/src/3rdParty/lua/loslib.c | |||
diff --git a/src/lua/lparser.c b/src/3rdParty/lua/lparser.c index 284ef1f..284ef1f 100644 --- a/src/lua/lparser.c +++ b/src/3rdParty/lua/lparser.c | |||
diff --git a/src/lua/lparser.h b/src/3rdParty/lua/lparser.h index 5e4500f..5e4500f 100644 --- a/src/lua/lparser.h +++ b/src/3rdParty/lua/lparser.h | |||
diff --git a/src/lua/lprefix.h b/src/3rdParty/lua/lprefix.h index 484f2ad..484f2ad 100644 --- a/src/lua/lprefix.h +++ b/src/3rdParty/lua/lprefix.h | |||
diff --git a/src/lua/lstate.c b/src/3rdParty/lua/lstate.c index c5e3b43..c5e3b43 100644 --- a/src/lua/lstate.c +++ b/src/3rdParty/lua/lstate.c | |||
diff --git a/src/lua/lstate.h b/src/3rdParty/lua/lstate.h index c1283bb..c1283bb 100644 --- a/src/lua/lstate.h +++ b/src/3rdParty/lua/lstate.h | |||
diff --git a/src/lua/lstring.c b/src/3rdParty/lua/lstring.c index 13dcaf4..13dcaf4 100644 --- a/src/lua/lstring.c +++ b/src/3rdParty/lua/lstring.c | |||
diff --git a/src/lua/lstring.h b/src/3rdParty/lua/lstring.h index 450c239..450c239 100644 --- a/src/lua/lstring.h +++ b/src/3rdParty/lua/lstring.h | |||
diff --git a/src/lua/lstrlib.c b/src/3rdParty/lua/lstrlib.c index 47e5b27..47e5b27 100644 --- a/src/lua/lstrlib.c +++ b/src/3rdParty/lua/lstrlib.c | |||
diff --git a/src/lua/ltable.c b/src/3rdParty/lua/ltable.c index 33c1ab3..33c1ab3 100644 --- a/src/lua/ltable.c +++ b/src/3rdParty/lua/ltable.c | |||
diff --git a/src/lua/ltable.h b/src/3rdParty/lua/ltable.h index 7bbbcb2..7bbbcb2 100644 --- a/src/lua/ltable.h +++ b/src/3rdParty/lua/ltable.h | |||
diff --git a/src/lua/ltablib.c b/src/3rdParty/lua/ltablib.c index d80eb80..d80eb80 100644 --- a/src/lua/ltablib.c +++ b/src/3rdParty/lua/ltablib.c | |||
diff --git a/src/lua/ltm.c b/src/3rdParty/lua/ltm.c index b657b78..b657b78 100644 --- a/src/lua/ltm.c +++ b/src/3rdParty/lua/ltm.c | |||
diff --git a/src/lua/ltm.h b/src/3rdParty/lua/ltm.h index 73b833c..73b833c 100644 --- a/src/lua/ltm.h +++ b/src/3rdParty/lua/ltm.h | |||
diff --git a/src/lua/lua.c b/src/3rdParty/lua/lua.c index 46b48db..46b48db 100644 --- a/src/lua/lua.c +++ b/src/3rdParty/lua/lua.c | |||
diff --git a/src/lua/lua.h b/src/3rdParty/lua/lua.h index 820535b..820535b 100644 --- a/src/lua/lua.h +++ b/src/3rdParty/lua/lua.h | |||
diff --git a/src/lua/lua.hpp b/src/3rdParty/lua/lua.hpp index ec417f5..ec417f5 100644 --- a/src/lua/lua.hpp +++ b/src/3rdParty/lua/lua.hpp | |||
diff --git a/src/lua/luac.c b/src/3rdParty/lua/luac.c index 56ddc41..56ddc41 100644 --- a/src/lua/luac.c +++ b/src/3rdParty/lua/luac.c | |||
diff --git a/src/lua/luaconf.h b/src/3rdParty/lua/luaconf.h index e64d2ee..e64d2ee 100644 --- a/src/lua/luaconf.h +++ b/src/3rdParty/lua/luaconf.h | |||
diff --git a/src/lua/lualib.h b/src/3rdParty/lua/lualib.h index 2625529..2625529 100644 --- a/src/lua/lualib.h +++ b/src/3rdParty/lua/lualib.h | |||
diff --git a/src/lua/lundump.c b/src/3rdParty/lua/lundump.c index 5aa55c4..5aa55c4 100644 --- a/src/lua/lundump.c +++ b/src/3rdParty/lua/lundump.c | |||
diff --git a/src/lua/lundump.h b/src/3rdParty/lua/lundump.h index f3748a9..f3748a9 100644 --- a/src/lua/lundump.h +++ b/src/3rdParty/lua/lundump.h | |||
diff --git a/src/lua/lutf8lib.c b/src/3rdParty/lua/lutf8lib.c index 901d985..901d985 100644 --- a/src/lua/lutf8lib.c +++ b/src/3rdParty/lua/lutf8lib.c | |||
diff --git a/src/lua/lvm.c b/src/3rdParty/lua/lvm.c index c9729bc..c9729bc 100644 --- a/src/lua/lvm.c +++ b/src/3rdParty/lua/lvm.c | |||
diff --git a/src/lua/lvm.h b/src/3rdParty/lua/lvm.h index 1bc16f3..1bc16f3 100644 --- a/src/lua/lvm.h +++ b/src/3rdParty/lua/lvm.h | |||
diff --git a/src/lua/lzio.c b/src/3rdParty/lua/lzio.c index cd0a02d..cd0a02d 100644 --- a/src/lua/lzio.c +++ b/src/3rdParty/lua/lzio.c | |||
diff --git a/src/lua/lzio.h b/src/3rdParty/lua/lzio.h index 38f397f..38f397f 100644 --- a/src/lua/lzio.h +++ b/src/3rdParty/lua/lzio.h | |||