update bee

actboy168 · Apr 12, 2024 · bf5522d · bf5522d
1 parent 9b496d5
commit bf5522d
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 91 deletions.
diff --git a/bee.lua b/bee.lua
diff --git a/compile/ninja/android.ninja b/compile/ninja/android.ninja
@@ -80,20 +80,13 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
 build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
     bee.lua/binding/lua_time.cpp
 rule c_source_lua
-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-    -fvisibility=hidden -Ibee.lua -DNDEBUG -o $out -c $in
-  description = Compile C   $out
-  deps = gcc
-  depfile = $out.d
-build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
-rule c_source_lua_1
   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
     -DLUA_USE_LINUX -DNDEBUG -o $out -c $in
   description = Compile C   $out
   deps = gcc
   depfile = $out.d
-build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
+build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c
 rule cxx_source_bootstrap
   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
     -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
@@ -128,8 +121,7 @@ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
     $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
     $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
     $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
-    $obj/source_lua/utf8_crt.obj $obj/source_lua/linit.obj $
-    $obj/source_lua/onelua.obj
+    $obj/source_lua/linit.obj $obj/source_lua/onelua.obj
 build $bin/main.lua: copy | $bin/bootstrap
   input = bee.lua/bootstrap/main.lua
 build $obj/test.stamp: test bee.lua/test/glibc-version.lua $

diff --git a/compile/ninja/freebsd.ninja b/compile/ninja/freebsd.ninja
@@ -81,20 +81,13 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
 build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
     bee.lua/binding/lua_time.cpp
 rule c_source_lua
-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-    -fvisibility=hidden -Ibee.lua -DNDEBUG -o $out -c $in
-  description = Compile C   $out
-  deps = gcc
-  depfile = $out.d
-build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
-rule c_source_lua_1
   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
     -DLUA_USE_LINUX -DNDEBUG -o $out -c $in
   description = Compile C   $out
   deps = gcc
   depfile = $out.d
-build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
+build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c
 rule cxx_source_bootstrap
   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
     -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
@@ -130,8 +123,7 @@ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
     $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
     $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
     $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
-    $obj/source_lua/utf8_crt.obj $obj/source_lua/linit.obj $
-    $obj/source_lua/onelua.obj
+    $obj/source_lua/linit.obj $obj/source_lua/onelua.obj
 build $bin/main.lua: copy | $bin/bootstrap
   input = bee.lua/bootstrap/main.lua
 build $obj/test.stamp: test bee.lua/test/glibc-version.lua $

diff --git a/compile/ninja/linux.ninja b/compile/ninja/linux.ninja
@@ -80,20 +80,13 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
 build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
     bee.lua/binding/lua_time.cpp
 rule c_source_lua
-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-    -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in
-  description = Compile C   $out
-  deps = gcc
-  depfile = $out.d
-build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
-rule c_source_lua_1
   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
     -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
   description = Compile C   $out
   deps = gcc
   depfile = $out.d
-build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
+build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c
 rule cxx_source_bootstrap
   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
     -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
@@ -129,8 +122,7 @@ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
     $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
     $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
     $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
-    $obj/source_lua/utf8_crt.obj $obj/source_lua/linit.obj $
-    $obj/source_lua/onelua.obj
+    $obj/source_lua/linit.obj $obj/source_lua/onelua.obj
 build $bin/main.lua: copy | $bin/bootstrap
   input = bee.lua/bootstrap/main.lua
 build $obj/test.stamp: test bee.lua/test/glibc-version.lua $

diff --git a/compile/ninja/macos.ninja b/compile/ninja/macos.ninja
@@ -83,22 +83,14 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
 build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
     bee.lua/binding/lua_time.cpp
 rule c_source_lua
-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-    -fvisibility=hidden -mmacosx-version-min=10.15 -Ibee.lua -DNDEBUG $
-    -Wunguarded-availability -o $out -c $in
-  description = Compile C   $out
-  deps = gcc
-  depfile = $out.d
-build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
-rule c_source_lua_1
   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
     -mmacosx-version-min=10.15 -DMAKE_LIB -DLUA_USE_MACOSX -DNDEBUG $
     -Wunguarded-availability -o $out -c $in
   description = Compile C   $out
   deps = gcc
   depfile = $out.d
-build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
+build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c
 rule cxx_source_bootstrap
   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
     -fvisibility=hidden -mmacosx-version-min=10.15 -Ibee.lua/3rd/lua $
@@ -135,8 +127,7 @@ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
     $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
     $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
     $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
-    $obj/source_lua/utf8_crt.obj $obj/source_lua/linit.obj $
-    $obj/source_lua/onelua.obj
+    $obj/source_lua/linit.obj $obj/source_lua/onelua.obj
 build $bin/main.lua: copy | $bin/bootstrap
   input = bee.lua/bootstrap/main.lua
 build $obj/test.stamp: test bee.lua/test/glibc-version.lua $

diff --git a/compile/ninja/mingw.ninja b/compile/ninja/mingw.ninja
@@ -88,21 +88,16 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
 build $obj/source_bee/lua_windows.obj: cxx_source_bee_2 $
     bee.lua/binding/port/lua_windows.cpp
 rule c_source_lua
-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Ibee.lua $
-    -D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in
-  description = Compile C   $out
-  deps = gcc
-  depfile = $out.d
-build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
-rule c_source_lua_1
   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
     -D_WIN32_WINNT=0x0602 -DMAKE_LIB -DLUA_BUILD_AS_DLL -DNDEBUG $
     -Wno-maybe-uninitialized -o $out -c $in
   description = Compile C   $out
   deps = gcc
   depfile = $out.d
-build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
+build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c
+build $obj/bee_utf8_crt/bee_utf8_crt.obj: cxx_source_bee_1 $
+    bee.lua/3rd/lua/bee_utf8_crt.cpp
 rule cxx_source_bootstrap
   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
     -Ibee.lua/3rd/lua -Ibee.lua -D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in
@@ -156,8 +151,8 @@ build $bin/bootstrap.exe: link_bootstrap $obj/source_bootstrap/main.obj $
     $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $
     $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $
     $obj/source_bee/lua_time.obj $obj/source_bee/lua_windows.obj $
-    $obj/source_lua/utf8_crt.obj $obj/source_lua/linit.obj $
-    $obj/source_lua/onelua.obj
+    $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $
+    $obj/bee_utf8_crt/bee_utf8_crt.obj
 build $bin/main.lua: copy | $bin/bootstrap.exe
   input = bee.lua/bootstrap/main.lua
 build $obj/test.stamp: test bee.lua/test/glibc-version.lua $

diff --git a/compile/ninja/msvc.ninja b/compile/ninja/msvc.ninja
@@ -87,26 +87,21 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
     bee.lua/binding/lua_time.cpp
 build $obj/source_bee/lua_windows.obj: cxx_source_bee_2 $
     bee.lua/binding/port/lua_windows.cpp
-rule c_source_lua
-  command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
-    /O2 /Zc:inline /W3 /permissive- /MD /GL /Ibee.lua /D_WIN32_WINNT=0x0602 $
-    /DNDEBUG /utf-8 /std:c11
-  description = Compile C   $out
-  deps = msvc
-build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
 rule asm_source_lua
   command = $ml /nologo /quiet /Fo $out /c $in
   description = Compile ASM $out
 build $obj/source_lua/fast_setjmp_x86_64.obj: asm_source_lua $
     bee.lua/3rd/lua/fast_setjmp_x86_64.s
-rule c_source_lua_1
+rule c_source_lua
   command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
     /O2 /Zc:inline /W3 /permissive- /MD /GL /D_WIN32_WINNT=0x0602 $
     /DMAKE_LIB /DLUA_BUILD_AS_DLL /DNDEBUG /utf-8 /wd4267 /wd4334 /std:c11
   description = Compile C   $out
   deps = msvc
-build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
+build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c
+build $obj/bee_utf8_crt/bee_utf8_crt.obj: cxx_source_bee_1 $
+    bee.lua/3rd/lua/bee_utf8_crt.cpp
 rule cxx_source_bootstrap
   command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
     /O2 /Zc:inline /W3 /permissive- /MD /GL /Ibee.lua/3rd/lua /Ibee.lua $
@@ -164,8 +159,8 @@ build $bin/bootstrap.exe: link_bootstrap $obj/source_bootstrap/main.obj $
     $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $
     $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $
     $obj/source_bee/lua_time.obj $obj/source_bee/lua_windows.obj $
-    $obj/source_lua/utf8_crt.obj $obj/source_lua/fast_setjmp_x86_64.obj $
-    $obj/source_lua/linit.obj $obj/source_lua/onelua.obj
+    $obj/source_lua/fast_setjmp_x86_64.obj $obj/source_lua/linit.obj $
+    $obj/source_lua/onelua.obj $obj/bee_utf8_crt/bee_utf8_crt.obj
 build $bin/main.lua: copy | $bin/bootstrap.exe
   input = bee.lua/bootstrap/main.lua
 build $obj/test.stamp: test bee.lua/test/glibc-version.lua $

diff --git a/compile/ninja/netbsd.ninja b/compile/ninja/netbsd.ninja
@@ -81,20 +81,13 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
 build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
     bee.lua/binding/lua_time.cpp
 rule c_source_lua
-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-    -fvisibility=hidden -Ibee.lua -DNDEBUG -o $out -c $in
-  description = Compile C   $out
-  deps = gcc
-  depfile = $out.d
-build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
-rule c_source_lua_1
   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
     -DLUA_USE_LINUX -DNDEBUG -o $out -c $in
   description = Compile C   $out
   deps = gcc
   depfile = $out.d
-build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
+build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c
 rule cxx_source_bootstrap
   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
     -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
@@ -130,8 +123,7 @@ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
     $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
     $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
     $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
-    $obj/source_lua/utf8_crt.obj $obj/source_lua/linit.obj $
-    $obj/source_lua/onelua.obj
+    $obj/source_lua/linit.obj $obj/source_lua/onelua.obj
 build $bin/main.lua: copy | $bin/bootstrap
   input = bee.lua/bootstrap/main.lua
 build $obj/test.stamp: test bee.lua/test/glibc-version.lua $

diff --git a/compile/ninja/openbsd.ninja b/compile/ninja/openbsd.ninja
@@ -81,20 +81,13 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
 build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
     bee.lua/binding/lua_time.cpp
 rule c_source_lua
-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-    -fvisibility=hidden -Ibee.lua -DNDEBUG -o $out -c $in
-  description = Compile C   $out
-  deps = gcc
-  depfile = $out.d
-build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
-rule c_source_lua_1
   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
     -DLUA_USE_LINUX -DNDEBUG -o $out -c $in
   description = Compile C   $out
   deps = gcc
   depfile = $out.d
-build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
+build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c
 rule cxx_source_bootstrap
   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
     -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
@@ -131,8 +124,7 @@ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
     $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
     $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
     $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
-    $obj/source_lua/utf8_crt.obj $obj/source_lua/linit.obj $
-    $obj/source_lua/onelua.obj
+    $obj/source_lua/linit.obj $obj/source_lua/onelua.obj
 build $bin/main.lua: copy | $bin/bootstrap
   input = bee.lua/bootstrap/main.lua
 build $obj/test.stamp: test bee.lua/test/glibc-version.lua $
+7 −0		3rd/lua/bee_lua.c
+236 −0		3rd/lua/bee_utf8_crt.cpp
+2 −8		3rd/lua/bee_utf8_crt.h
+79 −0		3rd/lua/bee_utf8_main.c
+1 −1		3rd/lua/bee_utf8_prefix.h
+1 −1		3rd/lua/lprefix.h
+14 −2		3rd/lua/onelua.c
+0 −277		3rd/lua/utf8_crt.c
+0 −59		3rd/lua/utf8_lua.c
+0 −40		3rd/lua/utf8_luac.c
+17 −4		bee/platform/win/cwtf8.h
+1 −4		bee/platform/win/wtf8_win.cpp
+2 −2		bee/utility/assume.h
+1 −1		binding/file.h
+8 −7		binding/lua_filesystem.cpp
+5 −46		bootstrap/main.cpp
+9 −1		compile/bootstrap.lua
+7 −5		compile/common.lua
+9 −8		compile/lua.lua