Merge pull request #5 from YoRyan/fix-lua50-loadbuffer

lolleko · web-flow · commit 21ae5c027d1c · 2022-09-01T10:34:29.000+02:00
Fix Unicode strings for luaL_loadbuffer in Lua 5.0
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -20,7 +20,7 @@ cd ../..
 if [[ "$1" == "lua-5.0.3" ]]; then
     emcc -Ithirdparty/$1 thirdparty/$1/lib/liblua.a thirdparty/$1/lib/liblualib.a \
         -s WASM=1 -O3 -o dist/glue/glue-$1.js \
-        -s EXPORTED_RUNTIME_METHODS="['cwrap']" \
+        -s EXPORTED_RUNTIME_METHODS="['cwrap', 'lengthBytesUTF8']" \
         -s MODULARIZE=1 \
         -s ALLOW_TABLE_GROWTH \
         -s EXPORT_NAME="glue" \
diff --git a/src/binding-factory.ts b/src/binding-factory.ts
@@ -165,7 +165,7 @@ const lauxBindings: Record<string, lauxBindingFactoryFunc> = {
                 return (this as LauxLib).luaL_loadstring(L, s) || lua.lua_pcall(L, 0, LUA_MULTRET, 0);
             },
             luaL_loadstring: function(L: LuaState, s: string) {
-                return (this as LauxLib).luaL_loadbuffer(L, s, s.length, s);
+                return (this as LauxLib).luaL_loadbuffer(L, s, luaGlue.lengthBytesUTF8(s), s);
             },
             luaL_newstate: luaGlue.cwrap("lua_open", "number", []),
         }
diff --git a/src/glue/glue.ts b/src/glue/glue.ts
@@ -1,5 +1,6 @@
 export interface LuaEmscriptenModule extends EmscriptenModule {
     cwrap: typeof cwrap;
+    lengthBytesUTF8: typeof lengthBytesUTF8;
 }
 
 export type EmscriptenModuleFactorySync<T extends EmscriptenModule = EmscriptenModule> = (

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ const lauxBindings: Record<string, lauxBindingFactoryFunc> = {`
`165`	`165`	`return (this as LauxLib).luaL_loadstring(L, s) \|\| lua.lua_pcall(L, 0, LUA_MULTRET, 0);`
`166`	`166`	`},`
`167`	`167`	`luaL_loadstring: function(L: LuaState, s: string) {`
`168`		`- return (this as LauxLib).luaL_loadbuffer(L, s, s.length, s);`
	`168`	`+ return (this as LauxLib).luaL_loadbuffer(L, s, luaGlue.lengthBytesUTF8(s), s);`
`169`	`169`	`},`
`170`	`170`	`luaL_newstate: luaGlue.cwrap("lua_open", "number", []),`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`export interface LuaEmscriptenModule extends EmscriptenModule {`
`2`	`2`	`cwrap: typeof cwrap;`
	`3`	`+ lengthBytesUTF8: typeof lengthBytesUTF8;`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`export type EmscriptenModuleFactorySync<T extends EmscriptenModule = EmscriptenModule> = (`