Auios/BlockLua
1
0
Fork 0
forked from redo/BlockLua
Code Pull Requests Activity

Compare commits

base: Auios:4f42801da66a7d00c8c310040cae527292e46940
Branches Tags
Auios:master redo:master
..
compare: redo:master
Branches Tags
redo:master Auios:master

1 Commits
4f42801da6 ... master

Author SHA1 Message Date
Redo
8399b11322 fix table.empty, from auios 2025-12-08 11:49:23 -05:00
32 changed files with 2850 additions and 3401 deletions
Expand all files Collapse all files

42
.clang-format
View File

@@ -1,42 +0,0 @@
BasedOnStyle: LLVM
# Include sorting and grouping
SortIncludes: CaseSensitive
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '<Windows\.h>'
Priority: 1
- Regex: '<Psapi\.h>'
Priority: 2
- Regex: '"BlHooks\\.hpp"'
Priority: 3
- Regex: '"BlFuncs\\.hpp"'
Priority: 4
- Regex: ".*"
Priority: 5
# Indentation settings
IndentWidth: 2
UseTab: Never
IndentAccessModifiers: false
AccessModifierOffset: 0
NamespaceIndentation: All
# Line breaking and wrapping
ColumnLimit: 120
BreakBeforeTernaryOperators: false
BreakBeforeBinaryOperators: None
AlwaysBreakAfterReturnType: None
AlwaysBreakAfterDefinitionReturnType: None
# Alignment
AlignOperands: DontAlign
AlignAfterOpenBracket: AlwaysBreak
PointerAlignment: Left
# Parameter formatting
BinPackParameters: false
AllowAllParametersOfDeclarationOnNextLine: false
# Code organization
SeparateDefinitionBlocks: Always

9
.editorconfig
View File

@@ -1,9 +0,0 @@
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

4
.gitignore vendored
View File

@@ -1,2 +1,2 @@
build/ .*
.cache/ !.gitignore

11
.vscode/settings.json vendored
View File

@@ -1,11 +0,0 @@
{
"Lua.diagnostics.globals": [
"_bllua_ts",
"_bllua_requiresecure",
"_bllua_on_unload"
],
"Lua.runtime.version": "Lua 5.1",
"Lua.diagnostics.disable": ["lowercase-global", "undefined-global"],
"C_Cpp.default.compileCommands": "${workspaceFolder}/build/compile_commands.json",
"C_Cpp.default.compilerPath": "C:/msys64/mingw32/bin/g++.exe"
}

BIN
BlockLua.dll
View File

Binary file not shown.

56
CMakeLists.txt
View File

@@ -1,56 +0,0 @@
cmake_minimum_required(VERSION 3.10)
project(BlockLua CXX)
# Export compile_commands.json for VSCode IntelliSense
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Output directories to mirror compile.bat's build folder
set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/build)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})
# Global compile options to mirror compile.bat
add_compile_options(
-Wall
-Werror
-m32
-static-libgcc
-static-libstdc++
)
# Include paths
include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/inc/tsfuncs
${CMAKE_SOURCE_DIR}/inc/lua
)
# Link directories (for -L.) and libraries from compile.bat
link_directories(
${CMAKE_SOURCE_DIR}
)
# Safe DLL
add_library(BlockLua SHARED src/bllua4.cpp)
# Ensure output name matches compile.bat
set_target_properties(BlockLua PROPERTIES OUTPUT_NAME "BlockLua")
# Linker flags and libraries
if(MSVC)
# Not expected with mingw, but keep placeholder
else()
target_link_libraries(BlockLua PRIVATE psapi lua5.1)
endif()
# Unsafe DLL (with BLLUA_UNSAFE definition)
add_library(BlockLuaUnsafe SHARED src/bllua4.cpp)
set_target_properties(BlockLuaUnsafe PROPERTIES OUTPUT_NAME "BlockLua-Unsafe")
target_compile_definitions(BlockLuaUnsafe PRIVATE BLLUA_UNSAFE)
if(MSVC)
# Not expected with mingw, but keep placeholder
else()
target_link_libraries(BlockLuaUnsafe PRIVATE psapi lua5.1)
endif()

13
compile.bat
View File

@@ -1,13 +0,0 @@
@echo off
cd /d %~dp0
set "PATH=C:\msys64\mingw32\bin;%PATH%"
if not exist build mkdir build
set buildargs=-Wall -Werror -m32 -shared -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1 -static-libgcc -static-libstdc++
echo on
g++ src/bllua4.cpp %buildargs% -o build\BlockLua.dll
g++ -DBLLUA_UNSAFE src/bllua4.cpp %buildargs% -o build\BlockLua-Unsafe.dll
@echo off

52
compiling.md
View File

@@ -1,52 +0,0 @@
## Compiling on Windows with MSYS2 (32-bit)
Follow these steps to build `BlockLua.dll` for 32-bit Windows using MSYS2's MinGW-w64 i686 toolchain.
### 1) Install MSYS2
- Download and install MSYS2 from `https://www.msys2.org/`.
- After installing, open the "MSYS2 MSYS" terminal once and update the package database if prompted.
### 2) Install required packages (i686 / 32-bit)
Run this in the "MSYS2 MSYS" or "MSYS2 MinGW 32-bit" terminal:
```bash
pacman -Sy --needed mingw-w64-i686-toolchain mingw-w64-i686-binutils mingw-w64-i686-lua51
```
What these packages are for:
- mingw-w64-i686-toolchain: 32-bit C/C++ compiler suite (g++, libstdc++, runtime libs) to build Windows binaries.
- mingw-w64-i686-binutils: Linker and binary utilities (ld, as, objdump) used by the compiler and for optional inspection.
- mingw-w64-i686-lua51: Lua 5.1 development files for 32-bit (import library). We use its import library to link; at runtime you can use the provided `lua5.1.dll`.
### 3) Build (PowerShell, recommended)
- Open PowerShell in the repo root.
- Run the script:
```powershell
compile.bat
```
What the script does:
- Temporarily prepends `C:\\msys64\\mingw32\\bin` to PATH so the 32-bit toolchain is used.
- Compiles the project with `-m32` and links against `lua5.1`.
- Produces `build\BlockLua.dll` and `build\BlockLua-Unsafe.dll`.
### 4) Optional: Verify 32-bit output
If you installed binutils, you can check the architecture:
```powershell
objdump -f build\BlockLua.dll | Select-String i386
```
You should see `architecture: i386` in the output.
### Notes
- Ensure you installed the i686 (32-bit) variants of the packages; x86_64 packages won't work for a 32-bit build.
- If the linker cannot find `-llua5.1`, confirm `mingw-w64-i686-lua51` is installed and you are using the `mingw32` toolchain (not `x86_64`).

162
inc/lua/lauxlib.h
View File

@@ -4,75 +4,93 @@
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
#ifndef lauxlib_h #ifndef lauxlib_h
#define lauxlib_h #define lauxlib_h
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include "lua.h" #include "lua.h"
/* extra error code for `luaL_load' */ /* extra error code for `luaL_load' */
#define LUA_ERRFILE (LUA_ERRERR + 1) #define LUA_ERRFILE (LUA_ERRERR+1)
typedef struct luaL_Reg { typedef struct luaL_Reg {
const char* name; const char *name;
lua_CFunction func; lua_CFunction func;
} luaL_Reg; } luaL_Reg;
LUALIB_API void(luaL_openlib)(lua_State* L, const char* libname, const luaL_Reg* l, int nup); LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
LUALIB_API void(luaL_register)(lua_State* L, const char* libname, const luaL_Reg* l); const luaL_Reg *l, int nup);
LUALIB_API int(luaL_getmetafield)(lua_State* L, int obj, const char* e); LUALIB_API void (luaL_register) (lua_State *L, const char *libname,
LUALIB_API int(luaL_callmeta)(lua_State* L, int obj, const char* e); const luaL_Reg *l);
LUALIB_API int(luaL_typerror)(lua_State* L, int narg, const char* tname); LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
LUALIB_API int(luaL_argerror)(lua_State* L, int numarg, const char* extramsg); LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
LUALIB_API const char*(luaL_checklstring)(lua_State * L, int numArg, size_t* l); LUALIB_API int (luaL_typerror) (lua_State *L, int narg, const char *tname);
LUALIB_API const char*(luaL_optlstring)(lua_State * L, int numArg, const char* def, size_t* l); LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
LUALIB_API lua_Number(luaL_checknumber)(lua_State* L, int numArg); LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg,
LUALIB_API lua_Number(luaL_optnumber)(lua_State* L, int nArg, lua_Number def); size_t *l);
LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg,
const char *def, size_t *l);
LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg);
LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def);
LUALIB_API lua_Integer(luaL_checkinteger)(lua_State* L, int numArg); LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
LUALIB_API lua_Integer(luaL_optinteger)(lua_State* L, int nArg, lua_Integer def); LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
lua_Integer def);
LUALIB_API void(luaL_checkstack)(lua_State* L, int sz, const char* msg); LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
LUALIB_API void(luaL_checktype)(lua_State* L, int narg, int t); LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);
LUALIB_API void(luaL_checkany)(lua_State* L, int narg); LUALIB_API void (luaL_checkany) (lua_State *L, int narg);
LUALIB_API int(luaL_newmetatable)(lua_State* L, const char* tname); LUALIB_API int (luaL_newmetatable) (lua_State *L, const char *tname);
LUALIB_API void*(luaL_checkudata)(lua_State * L, int ud, const char* tname); LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
LUALIB_API void(luaL_where)(lua_State* L, int lvl); LUALIB_API void (luaL_where) (lua_State *L, int lvl);
LUALIB_API int(luaL_error)(lua_State* L, const char* fmt, ...); LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
LUALIB_API int(luaL_checkoption)(lua_State* L, int narg, const char* def, const char* const lst[]); LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
const char *const lst[]);
/* pre-defined references */ /* pre-defined references */
#define LUA_NOREF (-2) #define LUA_NOREF (-2)
#define LUA_REFNIL (-1) #define LUA_REFNIL (-1)
LUALIB_API int(luaL_ref)(lua_State* L, int t); LUALIB_API int (luaL_ref) (lua_State *L, int t);
LUALIB_API void(luaL_unref)(lua_State* L, int t, int ref); LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
LUALIB_API int(luaL_loadfile)(lua_State* L, const char* filename); LUALIB_API int (luaL_loadfile) (lua_State *L, const char *filename);
LUALIB_API int(luaL_loadbuffer)(lua_State* L, const char* buff, size_t sz, const char* name); LUALIB_API int (luaL_loadbuffer) (lua_State *L, const char *buff, size_t sz,
LUALIB_API int(luaL_loadstring)(lua_State* L, const char* s); const char *name);
LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
LUALIB_API lua_State*(luaL_newstate)(void); LUALIB_API lua_State *(luaL_newstate) (void);
LUALIB_API const char*(luaL_gsub)(lua_State * L, const char* s, const char* p, const char* r);
LUALIB_API const char*(luaL_findtable)(lua_State * L, int idx, const char* fname, int szhint); LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
const char *r);
LUALIB_API const char *(luaL_findtable) (lua_State *L, int idx,
const char *fname, int szhint);
/* From Lua 5.2. */ /* From Lua 5.2. */
LUALIB_API int luaL_fileresult(lua_State* L, int stat, const char* fname); LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname);
LUALIB_API int luaL_execresult(lua_State* L, int stat); LUALIB_API int luaL_execresult(lua_State *L, int stat);
LUALIB_API int(luaL_loadfilex)(lua_State* L, const char* filename, const char* mode); LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
LUALIB_API int(luaL_loadbufferx)(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode); const char *mode);
LUALIB_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level); LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
LUALIB_API void(luaL_setfuncs)(lua_State* L, const luaL_Reg* l, int nup); const char *name, const char *mode);
LUALIB_API void(luaL_pushmodule)(lua_State* L, const char* modname, int sizehint); LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1, const char *msg,
LUALIB_API void*(luaL_testudata)(lua_State * L, int ud, const char* tname); int level);
LUALIB_API void(luaL_setmetatable)(lua_State* L, const char* tname); LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
int sizehint);
LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname);
/* /*
** =============================================================== ** ===============================================================
@@ -80,27 +98,31 @@ LUALIB_API void(luaL_setmetatable)(lua_State* L, const char* tname);
** =============================================================== ** ===============================================================
*/ */
#define luaL_argcheck(L, cond, numarg, extramsg) ((void)((cond) || luaL_argerror(L, (numarg), (extramsg)))) #define luaL_argcheck(L, cond,numarg,extramsg) \
#define luaL_checkstring(L, n) (luaL_checklstring(L, (n), NULL)) ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
#define luaL_optstring(L, n, d) (luaL_optlstring(L, (n), (d), NULL)) #define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL))
#define luaL_checkint(L, n) ((int)luaL_checkinteger(L, (n))) #define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL))
#define luaL_optint(L, n, d) ((int)luaL_optinteger(L, (n), (d))) #define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n)))
#define luaL_checklong(L, n) ((long)luaL_checkinteger(L, (n))) #define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d)))
#define luaL_optlong(L, n, d) ((long)luaL_optinteger(L, (n), (d))) #define luaL_checklong(L,n) ((long)luaL_checkinteger(L, (n)))
#define luaL_optlong(L,n,d) ((long)luaL_optinteger(L, (n), (d)))
#define luaL_typename(L, i) lua_typename(L, lua_type(L, (i))) #define luaL_typename(L,i) lua_typename(L, lua_type(L,(i)))
#define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0)) #define luaL_dofile(L, fn) \
(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
#define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0)) #define luaL_dostring(L, s) \
(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
#define luaL_getmetatable(L, n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) #define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
#define luaL_opt(L, f, n, d) (lua_isnoneornil(L, (n)) ? (d) : f(L, (n))) #define luaL_opt(L,f,n,d) (lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
/* From Lua 5.2. */ /* From Lua 5.2. */
#define luaL_newlibtable(L, l) lua_createtable(L, 0, sizeof(l) / sizeof((l)[0]) - 1) #define luaL_newlibtable(L, l) \
#define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0)) lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
#define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0))
/* /*
** {====================================================== ** {======================================================
@@ -108,27 +130,31 @@ LUALIB_API void(luaL_setmetatable)(lua_State* L, const char* tname);
** ======================================================= ** =======================================================
*/ */
typedef struct luaL_Buffer { typedef struct luaL_Buffer {
char* p; /* current position in buffer */ char *p; /* current position in buffer */
int lvl; /* number of strings in the stack (level) */ int lvl; /* number of strings in the stack (level) */
lua_State* L; lua_State *L;
char buffer[LUAL_BUFFERSIZE]; char buffer[LUAL_BUFFERSIZE];
} luaL_Buffer; } luaL_Buffer;
#define luaL_addchar(B, c) \ #define luaL_addchar(B,c) \
((void)((B)->p < ((B)->buffer + LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), (*(B)->p++ = (char)(c))) ((void)((B)->p < ((B)->buffer+LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \
(*(B)->p++ = (char)(c)))
/* compatibility only */ /* compatibility only */
#define luaL_putchar(B, c) luaL_addchar(B, c) #define luaL_putchar(B,c) luaL_addchar(B,c)
#define luaL_addsize(B, n) ((B)->p += (n)) #define luaL_addsize(B,n) ((B)->p += (n))
LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
LUALIB_API char *(luaL_prepbuffer) (luaL_Buffer *B);
LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
LUALIB_API void(luaL_buffinit)(lua_State* L, luaL_Buffer* B);
LUALIB_API char*(luaL_prepbuffer)(luaL_Buffer * B);
LUALIB_API void(luaL_addlstring)(luaL_Buffer* B, const char* s, size_t l);
LUALIB_API void(luaL_addstring)(luaL_Buffer* B, const char* s);
LUALIB_API void(luaL_addvalue)(luaL_Buffer* B);
LUALIB_API void(luaL_pushresult)(luaL_Buffer* B);
/* }====================================================== */ /* }====================================================== */

424
inc/lua/lua.h
View File

@@ -5,75 +5,88 @@
** See Copyright Notice at the end of this file ** See Copyright Notice at the end of this file
*/ */
#ifndef lua_h #ifndef lua_h
#define lua_h #define lua_h
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include "luaconf.h" #include "luaconf.h"
#define LUA_VERSION "Lua 5.1"
#define LUA_RELEASE "Lua 5.1.4" #define LUA_VERSION "Lua 5.1"
#define LUA_VERSION_NUM 501 #define LUA_RELEASE "Lua 5.1.4"
#define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio" #define LUA_VERSION_NUM 501
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" #define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio"
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
/* mark for precompiled code (`<esc>Lua') */ /* mark for precompiled code (`<esc>Lua') */
#define LUA_SIGNATURE "\033Lua" #define LUA_SIGNATURE "\033Lua"
/* option for multiple returns in `lua_pcall' and `lua_call' */ /* option for multiple returns in `lua_pcall' and `lua_call' */
#define LUA_MULTRET (-1) #define LUA_MULTRET (-1)
/* /*
** pseudo-indices ** pseudo-indices
*/ */
#define LUA_REGISTRYINDEX (-10000) #define LUA_REGISTRYINDEX (-10000)
#define LUA_ENVIRONINDEX (-10001) #define LUA_ENVIRONINDEX (-10001)
#define LUA_GLOBALSINDEX (-10002) #define LUA_GLOBALSINDEX (-10002)
#define lua_upvalueindex(i) (LUA_GLOBALSINDEX - (i)) #define lua_upvalueindex(i) (LUA_GLOBALSINDEX-(i))
/* thread status */ /* thread status */
#define LUA_OK 0 #define LUA_OK 0
#define LUA_YIELD 1 #define LUA_YIELD 1
#define LUA_ERRRUN 2 #define LUA_ERRRUN 2
#define LUA_ERRSYNTAX 3 #define LUA_ERRSYNTAX 3
#define LUA_ERRMEM 4 #define LUA_ERRMEM 4
#define LUA_ERRERR 5 #define LUA_ERRERR 5
typedef struct lua_State lua_State; typedef struct lua_State lua_State;
typedef int (*lua_CFunction)(lua_State* L); typedef int (*lua_CFunction) (lua_State *L);
/* /*
** functions that read/write blocks when loading/dumping Lua chunks ** functions that read/write blocks when loading/dumping Lua chunks
*/ */
typedef const char* (*lua_Reader)(lua_State* L, void* ud, size_t* sz); typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud);
typedef int (*lua_Writer)(lua_State* L, const void* p, size_t sz, void* ud);
/* /*
** prototype for memory-allocation functions ** prototype for memory-allocation functions
*/ */
typedef void* (*lua_Alloc)(void* ud, void* ptr, size_t osize, size_t nsize); typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
/* /*
** basic types ** basic types
*/ */
#define LUA_TNONE (-1) #define LUA_TNONE (-1)
#define LUA_TNIL 0
#define LUA_TBOOLEAN 1
#define LUA_TLIGHTUSERDATA 2
#define LUA_TNUMBER 3
#define LUA_TSTRING 4
#define LUA_TTABLE 5
#define LUA_TFUNCTION 6
#define LUA_TUSERDATA 7
#define LUA_TTHREAD 8
#define LUA_TNIL 0
#define LUA_TBOOLEAN 1
#define LUA_TLIGHTUSERDATA 2
#define LUA_TNUMBER 3
#define LUA_TSTRING 4
#define LUA_TTABLE 5
#define LUA_TFUNCTION 6
#define LUA_TUSERDATA 7
#define LUA_TTHREAD 8
/* minimum Lua stack available to a C function */ /* minimum Lua stack available to a C function */
#define LUA_MINSTACK 20 #define LUA_MINSTACK 20
/* /*
** generic extra include file ** generic extra include file
@@ -82,141 +95,157 @@ typedef void* (*lua_Alloc)(void* ud, void* ptr, size_t osize, size_t nsize);
#include LUA_USER_H #include LUA_USER_H
#endif #endif
/* type of numbers in Lua */ /* type of numbers in Lua */
typedef LUA_NUMBER lua_Number; typedef LUA_NUMBER lua_Number;
/* type for integer functions */ /* type for integer functions */
typedef LUA_INTEGER lua_Integer; typedef LUA_INTEGER lua_Integer;
/* /*
** state manipulation ** state manipulation
*/ */
LUA_API lua_State*(lua_newstate)(lua_Alloc f, void* ud); LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
LUA_API void(lua_close)(lua_State* L); LUA_API void (lua_close) (lua_State *L);
LUA_API lua_State*(lua_newthread)(lua_State * L); LUA_API lua_State *(lua_newthread) (lua_State *L);
LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
LUA_API lua_CFunction(lua_atpanic)(lua_State* L, lua_CFunction panicf);
/* /*
** basic stack manipulation ** basic stack manipulation
*/ */
LUA_API int(lua_gettop)(lua_State* L); LUA_API int (lua_gettop) (lua_State *L);
LUA_API void(lua_settop)(lua_State* L, int idx); LUA_API void (lua_settop) (lua_State *L, int idx);
LUA_API void(lua_pushvalue)(lua_State* L, int idx); LUA_API void (lua_pushvalue) (lua_State *L, int idx);
LUA_API void(lua_remove)(lua_State* L, int idx); LUA_API void (lua_remove) (lua_State *L, int idx);
LUA_API void(lua_insert)(lua_State* L, int idx); LUA_API void (lua_insert) (lua_State *L, int idx);
LUA_API void(lua_replace)(lua_State* L, int idx); LUA_API void (lua_replace) (lua_State *L, int idx);
LUA_API int(lua_checkstack)(lua_State* L, int sz); LUA_API int (lua_checkstack) (lua_State *L, int sz);
LUA_API void (lua_xmove) (lua_State *from, lua_State *to, int n);
LUA_API void(lua_xmove)(lua_State* from, lua_State* to, int n);
/* /*
** access functions (stack -> C) ** access functions (stack -> C)
*/ */
LUA_API int(lua_isnumber)(lua_State* L, int idx); LUA_API int (lua_isnumber) (lua_State *L, int idx);
LUA_API int(lua_isstring)(lua_State* L, int idx); LUA_API int (lua_isstring) (lua_State *L, int idx);
LUA_API int(lua_iscfunction)(lua_State* L, int idx); LUA_API int (lua_iscfunction) (lua_State *L, int idx);
LUA_API int(lua_isuserdata)(lua_State* L, int idx); LUA_API int (lua_isuserdata) (lua_State *L, int idx);
LUA_API int(lua_type)(lua_State* L, int idx); LUA_API int (lua_type) (lua_State *L, int idx);
LUA_API const char*(lua_typename)(lua_State * L, int tp); LUA_API const char *(lua_typename) (lua_State *L, int tp);
LUA_API int(lua_equal)(lua_State* L, int idx1, int idx2); LUA_API int (lua_equal) (lua_State *L, int idx1, int idx2);
LUA_API int(lua_rawequal)(lua_State* L, int idx1, int idx2); LUA_API int (lua_rawequal) (lua_State *L, int idx1, int idx2);
LUA_API int(lua_lessthan)(lua_State* L, int idx1, int idx2); LUA_API int (lua_lessthan) (lua_State *L, int idx1, int idx2);
LUA_API lua_Number (lua_tonumber) (lua_State *L, int idx);
LUA_API lua_Integer (lua_tointeger) (lua_State *L, int idx);
LUA_API int (lua_toboolean) (lua_State *L, int idx);
LUA_API const char *(lua_tolstring) (lua_State *L, int idx, size_t *len);
LUA_API size_t (lua_objlen) (lua_State *L, int idx);
LUA_API lua_CFunction (lua_tocfunction) (lua_State *L, int idx);
LUA_API void *(lua_touserdata) (lua_State *L, int idx);
LUA_API lua_State *(lua_tothread) (lua_State *L, int idx);
LUA_API const void *(lua_topointer) (lua_State *L, int idx);
LUA_API lua_Number(lua_tonumber)(lua_State* L, int idx);
LUA_API lua_Integer(lua_tointeger)(lua_State* L, int idx);
LUA_API int(lua_toboolean)(lua_State* L, int idx);
LUA_API const char*(lua_tolstring)(lua_State * L, int idx, size_t* len);
LUA_API size_t(lua_objlen)(lua_State* L, int idx);
LUA_API lua_CFunction(lua_tocfunction)(lua_State* L, int idx);
LUA_API void*(lua_touserdata)(lua_State * L, int idx);
LUA_API lua_State*(lua_tothread)(lua_State * L, int idx);
LUA_API const void*(lua_topointer)(lua_State * L, int idx);
/* /*
** push functions (C -> stack) ** push functions (C -> stack)
*/ */
LUA_API void(lua_pushnil)(lua_State* L); LUA_API void (lua_pushnil) (lua_State *L);
LUA_API void(lua_pushnumber)(lua_State* L, lua_Number n); LUA_API void (lua_pushnumber) (lua_State *L, lua_Number n);
LUA_API void(lua_pushinteger)(lua_State* L, lua_Integer n); LUA_API void (lua_pushinteger) (lua_State *L, lua_Integer n);
LUA_API void(lua_pushlstring)(lua_State* L, const char* s, size_t l); LUA_API void (lua_pushlstring) (lua_State *L, const char *s, size_t l);
LUA_API void(lua_pushstring)(lua_State* L, const char* s); LUA_API void (lua_pushstring) (lua_State *L, const char *s);
LUA_API const char*(lua_pushvfstring)(lua_State * L, const char* fmt, va_list argp); LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
LUA_API const char*(lua_pushfstring)(lua_State * L, const char* fmt, ...); va_list argp);
LUA_API void(lua_pushcclosure)(lua_State* L, lua_CFunction fn, int n); LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
LUA_API void(lua_pushboolean)(lua_State* L, int b); LUA_API void (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
LUA_API void(lua_pushlightuserdata)(lua_State* L, void* p); LUA_API void (lua_pushboolean) (lua_State *L, int b);
LUA_API int(lua_pushthread)(lua_State* L); LUA_API void (lua_pushlightuserdata) (lua_State *L, void *p);
LUA_API int (lua_pushthread) (lua_State *L);
/* /*
** get functions (Lua -> stack) ** get functions (Lua -> stack)
*/ */
LUA_API void(lua_gettable)(lua_State* L, int idx); LUA_API void (lua_gettable) (lua_State *L, int idx);
LUA_API void(lua_getfield)(lua_State* L, int idx, const char* k); LUA_API void (lua_getfield) (lua_State *L, int idx, const char *k);
LUA_API void(lua_rawget)(lua_State* L, int idx); LUA_API void (lua_rawget) (lua_State *L, int idx);
LUA_API void(lua_rawgeti)(lua_State* L, int idx, int n); LUA_API void (lua_rawgeti) (lua_State *L, int idx, int n);
LUA_API void(lua_createtable)(lua_State* L, int narr, int nrec); LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec);
LUA_API void*(lua_newuserdata)(lua_State * L, size_t sz); LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
LUA_API int(lua_getmetatable)(lua_State* L, int objindex); LUA_API int (lua_getmetatable) (lua_State *L, int objindex);
LUA_API void(lua_getfenv)(lua_State* L, int idx); LUA_API void (lua_getfenv) (lua_State *L, int idx);
/* /*
** set functions (stack -> Lua) ** set functions (stack -> Lua)
*/ */
LUA_API void(lua_settable)(lua_State* L, int idx); LUA_API void (lua_settable) (lua_State *L, int idx);
LUA_API void(lua_setfield)(lua_State* L, int idx, const char* k); LUA_API void (lua_setfield) (lua_State *L, int idx, const char *k);
LUA_API void(lua_rawset)(lua_State* L, int idx); LUA_API void (lua_rawset) (lua_State *L, int idx);
LUA_API void(lua_rawseti)(lua_State* L, int idx, int n); LUA_API void (lua_rawseti) (lua_State *L, int idx, int n);
LUA_API int(lua_setmetatable)(lua_State* L, int objindex); LUA_API int (lua_setmetatable) (lua_State *L, int objindex);
LUA_API int(lua_setfenv)(lua_State* L, int idx); LUA_API int (lua_setfenv) (lua_State *L, int idx);
/* /*
** `load' and `call' functions (load and run Lua code) ** `load' and `call' functions (load and run Lua code)
*/ */
LUA_API void(lua_call)(lua_State* L, int nargs, int nresults); LUA_API void (lua_call) (lua_State *L, int nargs, int nresults);
LUA_API int(lua_pcall)(lua_State* L, int nargs, int nresults, int errfunc); LUA_API int (lua_pcall) (lua_State *L, int nargs, int nresults, int errfunc);
LUA_API int(lua_cpcall)(lua_State* L, lua_CFunction func, void* ud); LUA_API int (lua_cpcall) (lua_State *L, lua_CFunction func, void *ud);
LUA_API int(lua_load)(lua_State* L, lua_Reader reader, void* dt, const char* chunkname); LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt,
const char *chunkname);
LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);
LUA_API int(lua_dump)(lua_State* L, lua_Writer writer, void* data);
/* /*
** coroutine functions ** coroutine functions
*/ */
LUA_API int(lua_yield)(lua_State* L, int nresults); LUA_API int (lua_yield) (lua_State *L, int nresults);
LUA_API int(lua_resume)(lua_State* L, int narg); LUA_API int (lua_resume) (lua_State *L, int narg);
LUA_API int(lua_status)(lua_State* L); LUA_API int (lua_status) (lua_State *L);
/* /*
** garbage-collection function and options ** garbage-collection function and options
*/ */
#define LUA_GCSTOP 0 #define LUA_GCSTOP 0
#define LUA_GCRESTART 1 #define LUA_GCRESTART 1
#define LUA_GCCOLLECT 2 #define LUA_GCCOLLECT 2
#define LUA_GCCOUNT 3 #define LUA_GCCOUNT 3
#define LUA_GCCOUNTB 4 #define LUA_GCCOUNTB 4
#define LUA_GCSTEP 5 #define LUA_GCSTEP 5
#define LUA_GCSETPAUSE 6 #define LUA_GCSETPAUSE 6
#define LUA_GCSETSTEPMUL 7 #define LUA_GCSETSTEPMUL 7
#define LUA_GCISRUNNING 9 #define LUA_GCISRUNNING 9
LUA_API int (lua_gc) (lua_State *L, int what, int data);
LUA_API int(lua_gc)(lua_State* L, int what, int data);
/* /*
** miscellaneous functions ** miscellaneous functions
*/ */
LUA_API int(lua_error)(lua_State* L); LUA_API int (lua_error) (lua_State *L);
LUA_API int(lua_next)(lua_State* L, int idx); LUA_API int (lua_next) (lua_State *L, int idx);
LUA_API void (lua_concat) (lua_State *L, int n);
LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
LUA_API void(lua_concat)(lua_State* L, int n);
LUA_API lua_Alloc(lua_getallocf)(lua_State* L, void** ud);
LUA_API void lua_setallocf(lua_State* L, lua_Alloc f, void* ud);
/* /*
** =============================================================== ** ===============================================================
@@ -224,47 +253,52 @@ LUA_API void lua_setallocf(lua_State* L, lua_Alloc f, void* ud);
** =============================================================== ** ===============================================================
*/ */
#define lua_pop(L, n) lua_settop(L, -(n) - 1) #define lua_pop(L,n) lua_settop(L, -(n)-1)
#define lua_newtable(L) lua_createtable(L, 0, 0) #define lua_newtable(L) lua_createtable(L, 0, 0)
#define lua_register(L, n, f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n))) #define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
#define lua_pushcfunction(L, f) lua_pushcclosure(L, (f), 0) #define lua_pushcfunction(L,f) lua_pushcclosure(L, (f), 0)
#define lua_strlen(L, i) lua_objlen(L, (i)) #define lua_strlen(L,i) lua_objlen(L, (i))
#define lua_isfunction(L, n) (lua_type(L, (n)) == LUA_TFUNCTION) #define lua_isfunction(L,n) (lua_type(L, (n)) == LUA_TFUNCTION)
#define lua_istable(L, n) (lua_type(L, (n)) == LUA_TTABLE) #define lua_istable(L,n) (lua_type(L, (n)) == LUA_TTABLE)
#define lua_islightuserdata(L, n) (lua_type(L, (n)) == LUA_TLIGHTUSERDATA) #define lua_islightuserdata(L,n) (lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
#define lua_isnil(L, n) (lua_type(L, (n)) == LUA_TNIL) #define lua_isnil(L,n) (lua_type(L, (n)) == LUA_TNIL)
#define lua_isboolean(L, n) (lua_type(L, (n)) == LUA_TBOOLEAN) #define lua_isboolean(L,n) (lua_type(L, (n)) == LUA_TBOOLEAN)
#define lua_isthread(L, n) (lua_type(L, (n)) == LUA_TTHREAD) #define lua_isthread(L,n) (lua_type(L, (n)) == LUA_TTHREAD)
#define lua_isnone(L, n) (lua_type(L, (n)) == LUA_TNONE) #define lua_isnone(L,n) (lua_type(L, (n)) == LUA_TNONE)
#define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0) #define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0)
#define lua_pushliteral(L, s) lua_pushlstring(L, "" s, (sizeof(s) / sizeof(char)) - 1) #define lua_pushliteral(L, s) \
lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
#define lua_setglobal(L,s) lua_setfield(L, LUA_GLOBALSINDEX, (s))
#define lua_getglobal(L,s) lua_getfield(L, LUA_GLOBALSINDEX, (s))
#define lua_tostring(L,i) lua_tolstring(L, (i), NULL)
#define lua_setglobal(L, s) lua_setfield(L, LUA_GLOBALSINDEX, (s))
#define lua_getglobal(L, s) lua_getfield(L, LUA_GLOBALSINDEX, (s))
#define lua_tostring(L, i) lua_tolstring(L, (i), NULL)
/* /*
** compatibility macros and functions ** compatibility macros and functions
*/ */
#define lua_open() luaL_newstate() #define lua_open() luaL_newstate()
#define lua_getregistry(L) lua_pushvalue(L, LUA_REGISTRYINDEX) #define lua_getregistry(L) lua_pushvalue(L, LUA_REGISTRYINDEX)
#define lua_getgccount(L) lua_gc(L, LUA_GCCOUNT, 0) #define lua_getgccount(L) lua_gc(L, LUA_GCCOUNT, 0)
#define lua_Chunkreader lua_Reader
#define lua_Chunkwriter lua_Writer
#define lua_Chunkreader lua_Reader
#define lua_Chunkwriter lua_Writer
/* hack */ /* hack */
LUA_API void lua_setlevel(lua_State* from, lua_State* to); LUA_API void lua_setlevel (lua_State *from, lua_State *to);
/* /*
** {====================================================================== ** {======================================================================
@@ -272,89 +306,97 @@ LUA_API void lua_setlevel(lua_State* from, lua_State* to);
** ======================================================================= ** =======================================================================
*/ */
/* /*
** Event codes ** Event codes
*/ */
#define LUA_HOOKCALL 0 #define LUA_HOOKCALL 0
#define LUA_HOOKRET 1 #define LUA_HOOKRET 1
#define LUA_HOOKLINE 2 #define LUA_HOOKLINE 2
#define LUA_HOOKCOUNT 3 #define LUA_HOOKCOUNT 3
#define LUA_HOOKTAILRET 4 #define LUA_HOOKTAILRET 4
/* /*
** Event masks ** Event masks
*/ */
#define LUA_MASKCALL (1 << LUA_HOOKCALL) #define LUA_MASKCALL (1 << LUA_HOOKCALL)
#define LUA_MASKRET (1 << LUA_HOOKRET) #define LUA_MASKRET (1 << LUA_HOOKRET)
#define LUA_MASKLINE (1 << LUA_HOOKLINE) #define LUA_MASKLINE (1 << LUA_HOOKLINE)
#define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT) #define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT)
typedef struct lua_Debug lua_Debug; /* activation record */
typedef struct lua_Debug lua_Debug; /* activation record */
/* Functions to be called by the debuger in specific events */ /* Functions to be called by the debuger in specific events */
typedef void (*lua_Hook)(lua_State* L, lua_Debug* ar); typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
LUA_API int lua_getstack(lua_State* L, int level, lua_Debug* ar);
LUA_API int lua_getinfo(lua_State* L, const char* what, lua_Debug* ar); LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar);
LUA_API const char* lua_getlocal(lua_State* L, const lua_Debug* ar, int n); LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
LUA_API const char* lua_setlocal(lua_State* L, const lua_Debug* ar, int n); LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
LUA_API const char* lua_getupvalue(lua_State* L, int funcindex, int n); LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
LUA_API const char* lua_setupvalue(lua_State* L, int funcindex, int n); LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n);
LUA_API int lua_sethook(lua_State* L, lua_Hook func, int mask, int count); LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n);
LUA_API lua_Hook lua_gethook(lua_State* L); LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count);
LUA_API int lua_gethookmask(lua_State* L); LUA_API lua_Hook lua_gethook (lua_State *L);
LUA_API int lua_gethookcount(lua_State* L); LUA_API int lua_gethookmask (lua_State *L);
LUA_API int lua_gethookcount (lua_State *L);
/* From Lua 5.2. */ /* From Lua 5.2. */
LUA_API void* lua_upvalueid(lua_State* L, int idx, int n); LUA_API void *lua_upvalueid (lua_State *L, int idx, int n);
LUA_API void lua_upvaluejoin(lua_State* L, int idx1, int n1, int idx2, int n2); LUA_API void lua_upvaluejoin (lua_State *L, int idx1, int n1, int idx2, int n2);
LUA_API int lua_loadx(lua_State* L, lua_Reader reader, void* dt, const char* chunkname, const char* mode); LUA_API int lua_loadx (lua_State *L, lua_Reader reader, void *dt,
LUA_API const lua_Number* lua_version(lua_State* L); const char *chunkname, const char *mode);
LUA_API void lua_copy(lua_State* L, int fromidx, int toidx); LUA_API const lua_Number *lua_version (lua_State *L);
LUA_API lua_Number lua_tonumberx(lua_State* L, int idx, int* isnum); LUA_API void lua_copy (lua_State *L, int fromidx, int toidx);
LUA_API lua_Integer lua_tointegerx(lua_State* L, int idx, int* isnum); LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *isnum);
LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *isnum);
/* From Lua 5.3. */ /* From Lua 5.3. */
LUA_API int lua_isyieldable(lua_State* L); LUA_API int lua_isyieldable (lua_State *L);
struct lua_Debug { struct lua_Debug {
int event; int event;
const char* name; /* (n) */ const char *name; /* (n) */
const char* namewhat; /* (n) `global', `local', `field', `method' */ const char *namewhat; /* (n) `global', `local', `field', `method' */
const char* what; /* (S) `Lua', `C', `main', `tail' */ const char *what; /* (S) `Lua', `C', `main', `tail' */
const char* source; /* (S) */ const char *source; /* (S) */
int currentline; /* (l) */ int currentline; /* (l) */
int nups; /* (u) number of upvalues */ int nups; /* (u) number of upvalues */
int linedefined; /* (S) */ int linedefined; /* (S) */
int lastlinedefined; /* (S) */ int lastlinedefined; /* (S) */
char short_src[LUA_IDSIZE]; /* (S) */ char short_src[LUA_IDSIZE]; /* (S) */
/* private part */ /* private part */
int i_ci; /* active function */ int i_ci; /* active function */
}; };
/* }====================================================================== */ /* }====================================================================== */
/****************************************************************************** /******************************************************************************
* Copyright (C) 1994-2008 Lua.org, PUC-Rio. All rights reserved. * Copyright (C) 1994-2008 Lua.org, PUC-Rio. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including * "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish, * without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to * distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to * permit persons to whom the Software is furnished to do so, subject to
* the following conditions: * the following conditions:
* *
* The above copyright notice and this permission notice shall be * The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software. * included in all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************************/ ******************************************************************************/
#endif #endif

5
inc/lua/lua.hpp
View File

@@ -1,8 +1,9 @@
// C++ wrapper for LuaJIT header files. // C++ wrapper for LuaJIT header files.
extern "C" { extern "C" {
#include "lauxlib.h"
#include "lua.h" #include "lua.h"
#include "luajit.h" #include "lauxlib.h"
#include "lualib.h" #include "lualib.h"
#include "luajit.h"
} }

136
inc/lua/luaconf.h
View File

@@ -9,7 +9,6 @@
#ifndef WINVER #ifndef WINVER
#define WINVER 0x0501 #define WINVER 0x0501
#endif #endif
#include <limits.h> #include <limits.h>
#include <stddef.h> #include <stddef.h>
@@ -19,138 +18,135 @@
** In Windows, any exclamation mark ('!') in the path is replaced by the ** In Windows, any exclamation mark ('!') in the path is replaced by the
** path of the directory of the executable file of the current process. ** path of the directory of the executable file of the current process.
*/ */
#define LUA_LDIR "!\\lua\\" #define LUA_LDIR "!\\lua\\"
#define LUA_CDIR "!\\" #define LUA_CDIR "!\\"
#define LUA_PATH_DEFAULT ".\\?.lua;" LUA_LDIR "?.lua;" LUA_LDIR "?\\init.lua;" #define LUA_PATH_DEFAULT \
#define LUA_CPATH_DEFAULT ".\\?.dll;" LUA_CDIR "?.dll;" LUA_CDIR "loadall.dll" ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;"
#define LUA_CPATH_DEFAULT \
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
#else #else
/* /*
** Note to distribution maintainers: do NOT patch the following lines! ** Note to distribution maintainers: do NOT patch the following lines!
** Please read ../doc/install.html#distro and pass PREFIX=/usr instead. ** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
*/ */
#ifndef LUA_MULTILIB #ifndef LUA_MULTILIB
#define LUA_MULTILIB "lib" #define LUA_MULTILIB "lib"
#endif #endif
#ifndef LUA_LMULTILIB #ifndef LUA_LMULTILIB
#define LUA_LMULTILIB "lib" #define LUA_LMULTILIB "lib"
#endif #endif
#define LUA_LROOT "/usr/local" #define LUA_LROOT "/usr/local"
#define LUA_LUADIR "/lua/5.1/" #define LUA_LUADIR "/lua/5.1/"
#define LUA_LJDIR "/luajit-2.1.0-beta3/" #define LUA_LJDIR "/luajit-2.1.0-beta3/"
#ifdef LUA_ROOT #ifdef LUA_ROOT
#define LUA_JROOT LUA_ROOT #define LUA_JROOT LUA_ROOT
#define LUA_RLDIR LUA_ROOT "/share" LUA_LUADIR #define LUA_RLDIR LUA_ROOT "/share" LUA_LUADIR
#define LUA_RCDIR LUA_ROOT "/" LUA_MULTILIB LUA_LUADIR #define LUA_RCDIR LUA_ROOT "/" LUA_MULTILIB LUA_LUADIR
#define LUA_RLPATH ";" LUA_RLDIR "?.lua;" LUA_RLDIR "?/init.lua" #define LUA_RLPATH ";" LUA_RLDIR "?.lua;" LUA_RLDIR "?/init.lua"
#define LUA_RCPATH ";" LUA_RCDIR "?.so" #define LUA_RCPATH ";" LUA_RCDIR "?.so"
#else #else
#define LUA_JROOT LUA_LROOT #define LUA_JROOT LUA_LROOT
#define LUA_RLPATH #define LUA_RLPATH
#define LUA_RCPATH #define LUA_RCPATH
#endif #endif
#define LUA_JPATH ";" LUA_JROOT "/share" LUA_LJDIR "?.lua" #define LUA_JPATH ";" LUA_JROOT "/share" LUA_LJDIR "?.lua"
#define LUA_LLDIR LUA_LROOT "/share" LUA_LUADIR #define LUA_LLDIR LUA_LROOT "/share" LUA_LUADIR
#define LUA_LCDIR LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR #define LUA_LCDIR LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR
#define LUA_LLPATH ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua" #define LUA_LLPATH ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua"
#define LUA_LCPATH1 ";" LUA_LCDIR "?.so" #define LUA_LCPATH1 ";" LUA_LCDIR "?.so"
#define LUA_LCPATH2 ";" LUA_LCDIR "loadall.so" #define LUA_LCPATH2 ";" LUA_LCDIR "loadall.so"
#define LUA_PATH_DEFAULT "./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH #define LUA_PATH_DEFAULT "./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH
#define LUA_CPATH_DEFAULT "./?.so" LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2 #define LUA_CPATH_DEFAULT "./?.so" LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2
#endif #endif
/* Environment variable names for path overrides and initialization code. */ /* Environment variable names for path overrides and initialization code. */
#define LUA_PATH "LUA_PATH" #define LUA_PATH "LUA_PATH"
#define LUA_CPATH "LUA_CPATH" #define LUA_CPATH "LUA_CPATH"
#define LUA_INIT "LUA_INIT" #define LUA_INIT "LUA_INIT"
/* Special file system characters. */ /* Special file system characters. */
#if defined(_WIN32) #if defined(_WIN32)
#define LUA_DIRSEP "\\" #define LUA_DIRSEP "\\"
#else #else
#define LUA_DIRSEP "/" #define LUA_DIRSEP "/"
#endif #endif
#define LUA_PATHSEP ";" #define LUA_PATHSEP ";"
#define LUA_PATH_MARK "?" #define LUA_PATH_MARK "?"
#define LUA_EXECDIR "!" #define LUA_EXECDIR "!"
#define LUA_IGMARK "-" #define LUA_IGMARK "-"
#define LUA_PATH_CONFIG LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" LUA_EXECDIR "\n" LUA_IGMARK "\n" #define LUA_PATH_CONFIG \
LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" \
LUA_EXECDIR "\n" LUA_IGMARK "\n"
/* Quoting in error messages. */ /* Quoting in error messages. */
#define LUA_QL(x) "'" x "'" #define LUA_QL(x) "'" x "'"
#define LUA_QS LUA_QL("%s") #define LUA_QS LUA_QL("%s")
/* Various tunables. */ /* Various tunables. */
#define LUAI_MAXSTACK 65500 /* Max. # of stack slots for a thread (<64K). */ #define LUAI_MAXSTACK 65500 /* Max. # of stack slots for a thread (<64K). */
#define LUAI_MAXCSTACK 8000 /* Max. # of stack slots for a C func (<10K). */ #define LUAI_MAXCSTACK 8000 /* Max. # of stack slots for a C func (<10K). */
#define LUAI_GCPAUSE 200 /* Pause GC until memory is at 200%. */ #define LUAI_GCPAUSE 200 /* Pause GC until memory is at 200%. */
#define LUAI_GCMUL 200 /* Run GC at 200% of allocation speed. */ #define LUAI_GCMUL 200 /* Run GC at 200% of allocation speed. */
#define LUA_MAXCAPTURES 32 /* Max. pattern captures. */ #define LUA_MAXCAPTURES 32 /* Max. pattern captures. */
/* Configuration for the frontend (the luajit executable). */ /* Configuration for the frontend (the luajit executable). */
#if defined(luajit_c) #if defined(luajit_c)
#define LUA_PROGNAME "luajit" /* Fallback frontend name. */ #define LUA_PROGNAME "luajit" /* Fallback frontend name. */
#define LUA_PROMPT "> " /* Interactive prompt. */ #define LUA_PROMPT "> " /* Interactive prompt. */
#define LUA_PROMPT2 ">> " /* Continuation prompt. */ #define LUA_PROMPT2 ">> " /* Continuation prompt. */
#define LUA_MAXINPUT 512 /* Max. input line length. */ #define LUA_MAXINPUT 512 /* Max. input line length. */
#endif #endif
/* Note: changing the following defines breaks the Lua 5.1 ABI. */ /* Note: changing the following defines breaks the Lua 5.1 ABI. */
#define LUA_INTEGER ptrdiff_t #define LUA_INTEGER ptrdiff_t
#define LUA_IDSIZE 60 /* Size of lua_Debug.short_src. */ #define LUA_IDSIZE 60 /* Size of lua_Debug.short_src. */
/* /*
** Size of lauxlib and io.* on-stack buffers. Weird workaround to avoid using ** Size of lauxlib and io.* on-stack buffers. Weird workaround to avoid using
** unreasonable amounts of stack space, but still retain ABI compatibility. ** unreasonable amounts of stack space, but still retain ABI compatibility.
** Blame Lua for depending on BUFSIZ in the ABI, blame **** for wrecking it. ** Blame Lua for depending on BUFSIZ in the ABI, blame **** for wrecking it.
*/ */
#define LUAL_BUFFERSIZE (BUFSIZ > 16384 ? 8192 : BUFSIZ) #define LUAL_BUFFERSIZE (BUFSIZ > 16384 ? 8192 : BUFSIZ)
/* The following defines are here only for compatibility with luaconf.h /* The following defines are here only for compatibility with luaconf.h
** from the standard Lua distribution. They must not be changed for LuaJIT. ** from the standard Lua distribution. They must not be changed for LuaJIT.
*/ */
#define LUA_NUMBER_DOUBLE #define LUA_NUMBER_DOUBLE
#define LUA_NUMBER double #define LUA_NUMBER double
#define LUAI_UACNUMBER double #define LUAI_UACNUMBER double
#define LUA_NUMBER_SCAN "%lf" #define LUA_NUMBER_SCAN "%lf"
#define LUA_NUMBER_FMT "%.14g" #define LUA_NUMBER_FMT "%.14g"
#define lua_number2str(s, n) sprintf((s), LUA_NUMBER_FMT, (n)) #define lua_number2str(s, n) sprintf((s), LUA_NUMBER_FMT, (n))
#define LUAI_MAXNUMBER2STR 32 #define LUAI_MAXNUMBER2STR 32
#define LUA_INTFRMLEN "l" #define LUA_INTFRMLEN "l"
#define LUA_INTFRM_T long #define LUA_INTFRM_T long
/* Linkage of public API functions. */ /* Linkage of public API functions. */
#if defined(LUA_BUILD_AS_DLL) #if defined(LUA_BUILD_AS_DLL)
#if defined(LUA_CORE) || defined(LUA_LIB) #if defined(LUA_CORE) || defined(LUA_LIB)
#define LUA_API __declspec(dllexport) #define LUA_API __declspec(dllexport)
#else #else
#define LUA_API __declspec(dllimport) #define LUA_API __declspec(dllimport)
#endif #endif
#else #else
#define LUA_API extern #define LUA_API extern
#endif #endif
#define LUALIB_API LUA_API #define LUALIB_API LUA_API
/* Support for internal assertions. */ /* Support for internal assertions. */
#if defined(LUA_USE_ASSERT) || defined(LUA_USE_APICHECK) #if defined(LUA_USE_ASSERT) || defined(LUA_USE_APICHECK)
#include <assert.h> #include <assert.h>
#endif #endif
#ifdef LUA_USE_ASSERT #ifdef LUA_USE_ASSERT
#define lua_assert(x) assert(x) #define lua_assert(x) assert(x)
#endif #endif
#ifdef LUA_USE_APICHECK #ifdef LUA_USE_APICHECK
#define luai_apicheck(L, o) \ #define luai_apicheck(L, o) { (void)L; assert(o); }
{ \
(void)L; \
assert(o); \
}
#else #else
#define luai_apicheck(L, o) \ #define luai_apicheck(L, o) { (void)L; }
{ \
(void)L; \
}
#endif #endif
#endif #endif

45
inc/lua/luajit.h
View File

@@ -30,45 +30,48 @@
#include "lua.h" #include "lua.h"
#define LUAJIT_VERSION "LuaJIT 2.1.0-beta3" #define LUAJIT_VERSION "LuaJIT 2.1.0-beta3"
#define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */ #define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_beta3 #define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_beta3
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2017 Mike Pall" #define LUAJIT_COPYRIGHT "Copyright (C) 2005-2017 Mike Pall"
#define LUAJIT_URL "http://luajit.org/" #define LUAJIT_URL "http://luajit.org/"
/* Modes for luaJIT_setmode. */ /* Modes for luaJIT_setmode. */
#define LUAJIT_MODE_MASK 0x00ff #define LUAJIT_MODE_MASK 0x00ff
enum { enum {
LUAJIT_MODE_ENGINE, /* Set mode for whole JIT engine. */ LUAJIT_MODE_ENGINE, /* Set mode for whole JIT engine. */
LUAJIT_MODE_DEBUG, /* Set debug mode (idx = level). */ LUAJIT_MODE_DEBUG, /* Set debug mode (idx = level). */
LUAJIT_MODE_FUNC, /* Change mode for a function. */ LUAJIT_MODE_FUNC, /* Change mode for a function. */
LUAJIT_MODE_ALLFUNC, /* Recurse into subroutine protos. */ LUAJIT_MODE_ALLFUNC, /* Recurse into subroutine protos. */
LUAJIT_MODE_ALLSUBFUNC, /* Change only the subroutines. */ LUAJIT_MODE_ALLSUBFUNC, /* Change only the subroutines. */
LUAJIT_MODE_TRACE, /* Flush a compiled trace. */ LUAJIT_MODE_TRACE, /* Flush a compiled trace. */
LUAJIT_MODE_WRAPCFUNC = 0x10, /* Set wrapper mode for C function calls. */ LUAJIT_MODE_WRAPCFUNC = 0x10, /* Set wrapper mode for C function calls. */
LUAJIT_MODE_MAX LUAJIT_MODE_MAX
}; };
/* Flags or'ed in to the mode. */ /* Flags or'ed in to the mode. */
#define LUAJIT_MODE_OFF 0x0000 /* Turn feature off. */ #define LUAJIT_MODE_OFF 0x0000 /* Turn feature off. */
#define LUAJIT_MODE_ON 0x0100 /* Turn feature on. */ #define LUAJIT_MODE_ON 0x0100 /* Turn feature on. */
#define LUAJIT_MODE_FLUSH 0x0200 /* Flush JIT-compiled code. */ #define LUAJIT_MODE_FLUSH 0x0200 /* Flush JIT-compiled code. */
/* LuaJIT public C API. */ /* LuaJIT public C API. */
/* Control the JIT engine. */ /* Control the JIT engine. */
LUA_API int luaJIT_setmode(lua_State* L, int idx, int mode); LUA_API int luaJIT_setmode(lua_State *L, int idx, int mode);
/* Low-overhead profiling API. */ /* Low-overhead profiling API. */
typedef void (*luaJIT_profile_callback)(void* data, lua_State* L, int samples, int vmstate); typedef void (*luaJIT_profile_callback)(void *data, lua_State *L,
LUA_API void luaJIT_profile_start(lua_State* L, const char* mode, luaJIT_profile_callback cb, void* data); int samples, int vmstate);
LUA_API void luaJIT_profile_stop(lua_State* L); LUA_API void luaJIT_profile_start(lua_State *L, const char *mode,
LUA_API const char* luaJIT_profile_dumpstack(lua_State* L, const char* fmt, int depth, size_t* len); luaJIT_profile_callback cb, void *data);
LUA_API void luaJIT_profile_stop(lua_State *L);
LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt,
int depth, size_t *len);
/* Enforce (dynamic) linker error for version mismatches. Call from main. */ /* Enforce (dynamic) linker error for version mismatches. Call from main. */
LUA_API void LUAJIT_VERSION_SYM(void); LUA_API void LUAJIT_VERSION_SYM(void);

50
inc/lua/lualib.h
View File

@@ -8,36 +8,36 @@
#include "lua.h" #include "lua.h"
#define LUA_FILEHANDLE "FILE*" #define LUA_FILEHANDLE "FILE*"
#define LUA_COLIBNAME "coroutine" #define LUA_COLIBNAME "coroutine"
#define LUA_MATHLIBNAME "math" #define LUA_MATHLIBNAME "math"
#define LUA_STRLIBNAME "string" #define LUA_STRLIBNAME "string"
#define LUA_TABLIBNAME "table" #define LUA_TABLIBNAME "table"
#define LUA_IOLIBNAME "io" #define LUA_IOLIBNAME "io"
#define LUA_OSLIBNAME "os" #define LUA_OSLIBNAME "os"
#define LUA_LOADLIBNAME "package" #define LUA_LOADLIBNAME "package"
#define LUA_DBLIBNAME "debug" #define LUA_DBLIBNAME "debug"
#define LUA_BITLIBNAME "bit" #define LUA_BITLIBNAME "bit"
#define LUA_JITLIBNAME "jit" #define LUA_JITLIBNAME "jit"
#define LUA_FFILIBNAME "ffi" #define LUA_FFILIBNAME "ffi"
LUALIB_API int luaopen_base(lua_State* L); LUALIB_API int luaopen_base(lua_State *L);
LUALIB_API int luaopen_math(lua_State* L); LUALIB_API int luaopen_math(lua_State *L);
LUALIB_API int luaopen_string(lua_State* L); LUALIB_API int luaopen_string(lua_State *L);
LUALIB_API int luaopen_table(lua_State* L); LUALIB_API int luaopen_table(lua_State *L);
LUALIB_API int luaopen_io(lua_State* L); LUALIB_API int luaopen_io(lua_State *L);
LUALIB_API int luaopen_os(lua_State* L); LUALIB_API int luaopen_os(lua_State *L);
LUALIB_API int luaopen_package(lua_State* L); LUALIB_API int luaopen_package(lua_State *L);
LUALIB_API int luaopen_debug(lua_State* L); LUALIB_API int luaopen_debug(lua_State *L);
LUALIB_API int luaopen_bit(lua_State* L); LUALIB_API int luaopen_bit(lua_State *L);
LUALIB_API int luaopen_jit(lua_State* L); LUALIB_API int luaopen_jit(lua_State *L);
LUALIB_API int luaopen_ffi(lua_State* L); LUALIB_API int luaopen_ffi(lua_State *L);
LUALIB_API void luaL_openlibs(lua_State* L); LUALIB_API void luaL_openlibs(lua_State *L);
#ifndef lua_assert #ifndef lua_assert
#define lua_assert(x) ((void)0) #define lua_assert(x) ((void)0)
#endif #endif
#endif #endif

380
inc/tsfuncs/BlFuncs.cpp
View File

@@ -2,18 +2,15 @@
////////////////////////////////////////////////// //////////////////////////////////////////////////
// BlFuncs Version 1.0 // BlFuncs Version 1.0
// Includes
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include "BlFuncs.hpp"
#include <Windows.h>
#include "BlHooks.hpp"
#include <cstdarg> // Includes
#include <cstring>
#include "BlHooks.hpp"
#include "BlFuncs.hpp"
#include <stdio.h> #include <stdio.h>
// Scanned structures // Scanned structures
ADDR tsf_mCacheSequence; ADDR tsf_mCacheSequence;
@@ -21,284 +18,221 @@ ADDR tsf_mCacheAllocator;
ADDR tsf_gIdDictionary; ADDR tsf_gIdDictionary;
ADDR tsf_gEvalState_globalVars; ADDR tsf_gEvalState_globalVars;
BlFunctionDefIntern(tsf_BlStringTable__insert); BlFunctionDefIntern(tsf_BlStringTable__insert );
BlFunctionDefIntern(tsf_BlNamespace__find); BlFunctionDefIntern(tsf_BlNamespace__find );
BlFunctionDefIntern(tsf_BlNamespace__createLocalEntry); BlFunctionDefIntern(tsf_BlNamespace__createLocalEntry);
BlFunctionDefIntern(tsf_BlDataChunker__freeBlocks); BlFunctionDefIntern(tsf_BlDataChunker__freeBlocks );
BlFunctionDefIntern(tsf_BlCon__evaluate); BlFunctionDefIntern(tsf_BlCon__evaluate );
BlFunctionDefIntern(tsf_BlCon__executef); BlFunctionDefIntern(tsf_BlCon__executef );
BlFunctionDefIntern(tsf_BlCon__executefSimObj); BlFunctionDefIntern(tsf_BlCon__executefSimObj );
BlFunctionDefIntern(tsf_BlCon__getVariable); BlFunctionDefIntern(tsf_BlCon__getVariable );
BlFunctionDefIntern(tsf_BlDictionary__addVariable); BlFunctionDefIntern(tsf_BlDictionary__addVariable );
BlFunctionDefIntern(tsf_BlSim__findObject_name); BlFunctionDefIntern(tsf_BlSim__findObject_name );
BlFunctionDefIntern(tsf_BlStringStack__getArgBuffer); BlFunctionDefIntern(tsf_BlStringStack__getArgBuffer );
BlFunctionDefIntern(tsf_BlSimObject__getDataField); BlFunctionDefIntern(tsf_BlSimObject__getDataField );
BlFunctionDefIntern(tsf_BlSimObject__setDataField); BlFunctionDefIntern(tsf_BlSimObject__setDataField );
BlFunctionDefIntern(tsf_BlCon__getReturnBuffer); BlFunctionDefIntern(tsf_BlCon__getReturnBuffer );
// C->TS Args // C->TS Args
char* tsf_GetIntArg(signed int value) { char* tsf_GetIntArg(signed int value) {
char* ret = tsf_BlStringStack__getArgBuffer(16); char* ret = tsf_BlStringStack__getArgBuffer(16);
snprintf(ret, 16, "%d", value); snprintf(ret, 16, "%d", value);
return ret; return ret;
} }
char* tsf_GetFloatArg(float value) { char* tsf_GetFloatArg(float value) {
char* ret = tsf_BlStringStack__getArgBuffer(32); char* ret = tsf_BlStringStack__getArgBuffer(32);
snprintf(ret, 32, "%g", value); snprintf(ret, 32, "%g", value);
return ret; return ret;
} }
char* tsf_GetStringArg(char* value) { char* tsf_GetStringArg(char* value) {
int len = strlen(value) + 1; int len = strlen(value)+1;
char* ret = tsf_BlStringStack__getArgBuffer(len); char* ret = tsf_BlStringStack__getArgBuffer(len);
memcpy(ret, value, len); memcpy(ret, value, len);
return ret; return ret;
}
char* tsf_GetThisArg(ADDR obj) {
return tsf_GetIntArg(*(signed int *)(obj + 32));
} }
char* tsf_GetThisArg(ADDR obj) { return tsf_GetIntArg(*(signed int*)(obj + 32)); }
// Eval // Eval
const char* tsf_Eval(const char* code) { const char* tsf_Eval(const char *code) {
const char* argv[] = {nullptr, code}; const char *argv[] = {nullptr, code};
return tsf_BlCon__evaluate(0, 2, argv); return tsf_BlCon__evaluate(0, 2, argv);
} }
const char* tsf_Evalf(const char* fmt, ...) { const char* tsf_Evalf(const char *fmt, ...) {
va_list args; va_list args;
char code[4096]; char code[4096];
va_start(args, fmt); va_start(args, fmt);
vsnprintf(code, 4096, fmt, args); vsnprintf(code, 4096, fmt, args);
va_end(args); va_end(args);
return tsf_Eval((const char*)code); return tsf_Eval((const char*)code);
} }
// Objects // Objects
ADDR tsf_FindObject(unsigned int id) { ADDR tsf_FindObject(unsigned int id) {
ADDR obj = *(ADDR*)(*(ADDR*)(tsf_gIdDictionary) + 4 * (id & 0xFFF)); ADDR obj = *(ADDR*)(*(ADDR*)(tsf_gIdDictionary) + 4*(id & 0xFFF));
if (!obj) if(!obj) return 0;
return 0;
while (obj && *(unsigned int*)(obj + 32) != id) { while(obj && *(unsigned int *)(obj + 32) != id) {
obj = *(ADDR*)(obj + 16); obj = *(ADDR*)(obj + 16);
if (!obj) if(!obj) return 0;
return 0; }
}
return obj; return obj;
} }
ADDR tsf_FindObject(const char* name) { return (ADDR)tsf_BlSim__findObject_name(name); } ADDR tsf_FindObject(const char* name) {
return (ADDR)tsf_BlSim__findObject_name(name);
}
ADDR tsf_LookupNamespace(const char* ns, const char* package) { ADDR tsf_LookupNamespace(const char* ns, const char* package) {
const char* ste_package; const char* ste_package;
if (package) { if(package) {
ste_package = tsf_BlStringTable__insert(package, 0); ste_package = tsf_BlStringTable__insert(package, 0);
} else { } else {
ste_package = nullptr; ste_package = nullptr;
} }
if (ns) { if(ns) {
const char* ste_namespace = tsf_BlStringTable__insert(ns, 0); const char* ste_namespace = tsf_BlStringTable__insert(ns, 0);
return tsf_BlNamespace__find(ste_namespace, ste_package); return tsf_BlNamespace__find(ste_namespace, ste_package);
} else { } else {
return tsf_BlNamespace__find(nullptr, ste_package); return tsf_BlNamespace__find(nullptr, ste_package);
} }
}
ADDR tsf_LookupNamespace(const char* ns) {
return tsf_LookupNamespace(ns, nullptr);
} }
ADDR tsf_LookupNamespace(const char* ns) { return tsf_LookupNamespace(ns, nullptr); }
// Object Fields // Object Fields
const char* tsf_GetDataField(ADDR simObject, const char* slotName, const char* array) { const char* tsf_GetDataField(ADDR simObject, const char* slotName, const char* array) {
const char* ste_slotName; const char *ste_slotName;
if (slotName) { if(slotName) {
ste_slotName = tsf_BlStringTable__insert(slotName, 0); ste_slotName = tsf_BlStringTable__insert(slotName, 0);
} else { } else {
ste_slotName = nullptr; ste_slotName = nullptr;
} }
return tsf_BlSimObject__getDataField(simObject, ste_slotName, array); return tsf_BlSimObject__getDataField(simObject, ste_slotName, array);
} }
void tsf_SetDataField(ADDR simObject, const char* slotName, const char* array, const char* value) { void tsf_SetDataField(ADDR simObject, const char* slotName, const char* array, const char* value) {
const char* ste_slotName; const char* ste_slotName;
if (slotName) { if(slotName) {
ste_slotName = tsf_BlStringTable__insert(slotName, 0); ste_slotName = tsf_BlStringTable__insert(slotName, 0);
} else { } else {
ste_slotName = nullptr; ste_slotName = nullptr;
} }
tsf_BlSimObject__setDataField(simObject, ste_slotName, array, value); tsf_BlSimObject__setDataField(simObject, ste_slotName, array, value);
} }
// TS Global Variables // TS Global Variables
const char* tsf_GetVar(const char* name) { return tsf_BlCon__getVariable(name); } const char *tsf_GetVar(const char* name) {
return tsf_BlCon__getVariable(name);
void tsf_AddVarInternal(const char* name, signed int varType, void* data) {
tsf_BlDictionary__addVariable((ADDR*)tsf_gEvalState_globalVars, name, varType, data);
} }
void tsf_AddVar(const char* name, const char** data) { tsf_AddVarInternal(name, 10, data); } void tsf_AddVarInternal(const char* name, signed int varType, void* data) {
tsf_BlDictionary__addVariable((ADDR *)tsf_gEvalState_globalVars, name, varType, data);
}
void tsf_AddVar(const char* name, signed int* data) { tsf_AddVarInternal(name, 4, data); } void tsf_AddVar(const char* name, const char** data) {
tsf_AddVarInternal(name, 10, data);
}
void tsf_AddVar(const char* name, signed int* data) {
tsf_AddVarInternal(name, 4, data);
}
void tsf_AddVar(const char* name, float* data) {
tsf_AddVarInternal(name, 8, data);
}
void tsf_AddVar(const char* name, bool* data) {
tsf_AddVarInternal(name, 6, data);
}
void tsf_AddVar(const char* name, float* data) { tsf_AddVarInternal(name, 8, data); }
void tsf_AddVar(const char* name, bool* data) { tsf_AddVarInternal(name, 6, data); }
// TS->C Functions // TS->C Functions
ADDR tsf_AddConsoleFuncInternal( ADDR tsf_AddConsoleFuncInternal(const char* pname, const char* cname, const char* fname, signed int cbtype, const char* usage, signed int mina, signed int maxa) {
const char* pname, const char *ste_fname = tsf_BlStringTable__insert(fname, 0);
const char* cname, ADDR ns = tsf_LookupNamespace(cname, pname);
const char* fname, ADDR ent = tsf_BlNamespace__createLocalEntry(ns, ste_fname);
signed int cbtype,
const char* usage,
signed int mina,
signed int maxa) {
const char* ste_fname = tsf_BlStringTable__insert(fname, 0);
ADDR ns = tsf_LookupNamespace(cname, pname);
ADDR ent = tsf_BlNamespace__createLocalEntry(ns, ste_fname);
*(signed int*)tsf_mCacheSequence += 1; *(signed int *)tsf_mCacheSequence += 1;
tsf_BlDataChunker__freeBlocks(*(ADDR*)tsf_mCacheAllocator); tsf_BlDataChunker__freeBlocks(*(ADDR *)tsf_mCacheAllocator);
*(const char**)(ent + 24) = usage; *(const char**)(ent + 24) = usage ;
*(signed int*)(ent + 16) = mina; *(signed int* )(ent + 16) = mina ;
*(signed int*)(ent + 20) = maxa; *(signed int* )(ent + 20) = maxa ;
*(signed int*)(ent + 12) = cbtype; *(signed int* )(ent + 12) = cbtype;
return ent; return ent;
} }
void tsf_AddConsoleFunc( void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_StringCallback sc, const char* usage, signed int mina, signed int maxa) {
const char* pname, ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa);
const char* cname, *(tsf_StringCallback *)(ent + 40) = sc;
const char* fname, }
tsf_StringCallback sc, void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_IntCallback ic, const char* usage, signed int mina, signed int maxa) {
const char* usage, ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa);
signed int mina, *(tsf_IntCallback *)(ent + 40) = ic;
signed int maxa) { }
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa); void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_FloatCallback fc, const char* usage, signed int mina, signed int maxa) {
*(tsf_StringCallback*)(ent + 40) = sc; ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa);
*(tsf_FloatCallback *)(ent + 40) = fc;
}
void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_VoidCallback vc, const char* usage, signed int mina, signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa);
*(tsf_VoidCallback *)(ent + 40) = vc;
}
void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_BoolCallback bc, const char* usage, signed int mina, signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
*(tsf_BoolCallback *)(ent + 40) = bc;
} }
void tsf_AddConsoleFunc(
const char* pname,
const char* cname,
const char* fname,
tsf_IntCallback ic,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa);
*(tsf_IntCallback*)(ent + 40) = ic;
}
void tsf_AddConsoleFunc(
const char* pname,
const char* cname,
const char* fname,
tsf_FloatCallback fc,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa);
*(tsf_FloatCallback*)(ent + 40) = fc;
}
void tsf_AddConsoleFunc(
const char* pname,
const char* cname,
const char* fname,
tsf_VoidCallback vc,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa);
*(tsf_VoidCallback*)(ent + 40) = vc;
}
void tsf_AddConsoleFunc(
const char* pname,
const char* cname,
const char* fname,
tsf_BoolCallback bc,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
*(tsf_BoolCallback*)(ent + 40) = bc;
}
// Initialization // Initialization
bool tsf_InitInternal() { bool tsf_InitInternal() {
BlScanFunctionText(tsf_BlStringTable__insert, "83 EC 0C 80 3D ? ? ? ? ?"); BlScanFunctionText(tsf_BlStringTable__insert , "83 EC 0C 80 3D ? ? ? ? ?" );
BlScanFunctionText( BlScanFunctionText(tsf_BlNamespace__find , "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 0C 53 56 57 A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B DA 8B D1" );
tsf_BlNamespace__find, BlScanFunctionText(tsf_BlNamespace__createLocalEntry, "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 08 53 56 57 A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 89 4D F0" );
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 0C 53 56 57 A1 ? ? ? ? " BlScanFunctionText(tsf_BlDataChunker__freeBlocks , "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33" );
"33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B DA 8B D1"); BlScanFunctionText(tsf_BlCon__evaluate , "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 56 57 A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B 75 10" );
BlScanFunctionText( BlScanFunctionText(tsf_BlCon__executef , "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 55 56 8B B4 24 ? ? ? ? 33 C9" );
tsf_BlNamespace__createLocalEntry, BlScanFunctionText(tsf_BlCon__executefSimObj , "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 56 8B B4 24 ? ? ? ? 33 C9" );
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 08 53 56 57 A1 ? ? ? ? " BlScanFunctionText(tsf_BlCon__getVariable , "53 56 8B F1 57 85 F6 0F 84 ? ? ? ?" );
"33 C5 50 8D 45 F4 64 A3 ? ? ? ? 89 4D F0"); BlScanFunctionText(tsf_BlDictionary__addVariable , "8B 44 24 04 56 57 8B F9" );
BlScanFunctionText( BlScanFunctionText(tsf_BlSim__findObject_name , "57 8B F9 8A 17" );
tsf_BlDataChunker__freeBlocks, BlScanFunctionText(tsf_BlStringStack__getArgBuffer , "55 8B EC 83 E4 F8 8B 0D ? ? ? ? A1 ? ? ? ? 56 57 8B 7D 08 8D 14 01 03 D7 3B 15 ? ? ? ? 72 2C 8B 0D" );
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 " BlScanFunctionText(tsf_BlSimObject__getDataField , "51 53 8B D9 55 56 8B 74 24 14" );
"A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33"); BlScanFunctionText(tsf_BlSimObject__setDataField , "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 8B 84 24 ? ? ? ? 53 8B D9 89 44 24 04" );
BlScanFunctionText( BlScanFunctionText(tsf_BlCon__getReturnBuffer , "81 F9 ? ? ? ? 76 2B" );
tsf_BlCon__evaluate,
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 56 57 A1 ? ? "
"? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B 75 10");
BlScanFunctionText(
tsf_BlCon__executef,
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 55 56 "
"8B B4 24 ? ? ? ? 33 C9");
BlScanFunctionText(
tsf_BlCon__executefSimObj,
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 56 8B "
"B4 24 ? ? ? ? 33 C9");
BlScanFunctionText(tsf_BlCon__getVariable, "53 56 8B F1 57 85 F6 0F 84 ? ? ? ?");
BlScanFunctionText(tsf_BlDictionary__addVariable, "8B 44 24 04 56 57 8B F9");
BlScanFunctionText(tsf_BlSim__findObject_name, "57 8B F9 8A 17");
BlScanFunctionText(
tsf_BlStringStack__getArgBuffer,
"55 8B EC 83 E4 F8 8B 0D ? ? ? ? A1 ? ? ? ? 56 57 8B 7D "
"08 8D 14 01 03 D7 3B 15 ? ? ? ? 72 2C 8B 0D");
BlScanFunctionText(tsf_BlSimObject__getDataField, "51 53 8B D9 55 56 8B 74 24 14");
BlScanFunctionText(
tsf_BlSimObject__setDataField,
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 8B 84 24 "
"? ? ? ? 53 8B D9 89 44 24 04");
BlScanFunctionText(tsf_BlCon__getReturnBuffer, "81 F9 ? ? ? ? 76 2B");
ADDR BlScanText( ADDR BlScanText (tsf_mCacheSequenceLoc , "FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 18 8B 44 24 14" );
tsf_mCacheSequenceLoc, ADDR BlScanText (tsf_mCacheAllocatorLoc , "89 35 ? ? ? ? C7 06 ? ? ? ? A1 ? ? ? ? 68 ? ? ? ? C7 40 ? ? ? ? ? E8 ? ? ? ? 83 C4 04 8B 4D F4 64 89 0D ? ? ? ? 59 5E 8B E5 5D C3");
"FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 " ADDR BlScanText (tsf_gIdDictionaryLoc , "89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0" );
"18 8B 44 24 14"); ADDR BlScanText (tsf_gEvalState_globalVarsLoc , "B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ?" );
ADDR BlScanText(
tsf_mCacheAllocatorLoc,
"89 35 ? ? ? ? C7 06 ? ? ? ? A1 ? ? ? ? 68 ? ? ? ? C7 40 ? ? ? ? ? E8 ? "
"? ? ? 83 C4 04 8B 4D F4 64 89 0D ? ? ? ? 59 5E 8B E5 5D C3");
ADDR BlScanText(tsf_gIdDictionaryLoc, "89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0");
ADDR BlScanText(
tsf_gEvalState_globalVarsLoc,
"B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? "
"? E8 ? ? ? ? E8 ? ? ? ?");
tsf_mCacheSequence = *(ADDR*)(tsf_mCacheSequenceLoc + 2); tsf_mCacheSequence = *(ADDR*)(tsf_mCacheSequenceLoc + 2);
tsf_mCacheAllocator = *(ADDR*)(tsf_mCacheAllocatorLoc + 2); tsf_mCacheAllocator = *(ADDR*)(tsf_mCacheAllocatorLoc + 2);
tsf_gIdDictionary = *(ADDR*)(tsf_gIdDictionaryLoc + 2); tsf_gIdDictionary = *(ADDR*)(tsf_gIdDictionaryLoc + 2);
tsf_gEvalState_globalVars = *(ADDR*)(tsf_gEvalState_globalVarsLoc + 1); tsf_gEvalState_globalVars = *(ADDR*)(tsf_gEvalState_globalVarsLoc + 1);
return true; return true;
} }
bool tsf_DeinitInternal() { return true; } bool tsf_DeinitInternal() {
return true;
}

110
inc/tsfuncs/BlFuncs.hpp
View File

@@ -5,49 +5,49 @@
#ifndef _H_BLFUNCS #ifndef _H_BLFUNCS
#define _H_BLFUNCS #define _H_BLFUNCS
// Ensure BlHooks is available (include it if not already included) // Require BlHooks to be included before this header
#ifndef _H_BLHOOKS #ifndef _H_BLHOOKS
#include "BlHooks.hpp" #error "BlFuncs.hpp: You must include BlHooks.hpp first"
#endif #else
typedef const char* (*tsf_StringCallback)(ADDR, signed int, const char*[]); typedef const char * (*tsf_StringCallback)(ADDR, signed int, const char *[]);
typedef signed int (*tsf_IntCallback)(ADDR, signed int, const char*[]); typedef signed int (*tsf_IntCallback )(ADDR, signed int, const char *[]);
typedef float (*tsf_FloatCallback)(ADDR, signed int, const char*[]); typedef float (*tsf_FloatCallback )(ADDR, signed int, const char *[]);
typedef void (*tsf_VoidCallback)(ADDR, signed int, const char*[]); typedef void (*tsf_VoidCallback )(ADDR, signed int, const char *[]);
typedef bool (*tsf_BoolCallback)(ADDR, signed int, const char*[]); typedef bool (*tsf_BoolCallback )(ADDR, signed int, const char *[]);
/* These functions are used for tsf_BlCon__executefSimObj. /* These functions are used for tsf_BlCon__executefSimObj.
They refer to a special buffer for the argument stack. They refer to a special buffer for the argument stack.
For tsf_BlCon__executef, you need to use your own buffers. */ For tsf_BlCon__executef, you need to use your own buffers. */
char* tsf_GetIntArg(int); char *tsf_GetIntArg(int);
char* tsf_GetFloatArg(float); char *tsf_GetFloatArg(float);
char* tsf_ScriptThis(ADDR); char *tsf_ScriptThis(ADDR);
const char* tsf_Eval(const char*); const char *tsf_Eval(const char *);
const char* tsf_Evalf(const char*, ...); const char *tsf_Evalf(const char *, ...);
ADDR tsf_FindObject(unsigned int); ADDR tsf_FindObject(unsigned int);
ADDR tsf_FindObject(const char*); ADDR tsf_FindObject(const char *);
ADDR tsf_LookupNamespace(const char*, const char*); ADDR tsf_LookupNamespace(const char *, const char *);
const char* tsf_GetDataField(ADDR, const char*, const char*); const char *tsf_GetDataField(ADDR, const char *, const char *);
void tsf_SetDataField(ADDR, const char*, const char*, const char*); void tsf_SetDataField(ADDR, const char *, const char *, const char *);
const char* tsf_GetVar(const char*); const char *tsf_GetVar(const char *);
void tsf_AddVarInternal(const char*, signed int, void*); void tsf_AddVarInternal(const char *, signed int, void *);
void tsf_AddVar(const char*, const char**); void tsf_AddVar(const char *, const char **);
void tsf_AddVar(const char*, signed int*); void tsf_AddVar(const char *, signed int *);
void tsf_AddVar(const char*, float*); void tsf_AddVar(const char *, float *);
void tsf_AddVar(const char*, bool*); void tsf_AddVar(const char *, bool *);
ADDR tsf_AddConsoleFuncInternal(const char*, const char*, const char*, signed int, const char*, signed int, signed int); ADDR tsf_AddConsoleFuncInternal(const char *, const char *, const char *, signed int, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_StringCallback, const char*, signed int, signed int); void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_StringCallback, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_IntCallback, const char*, signed int, signed int); void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_IntCallback, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_FloatCallback, const char*, signed int, signed int); void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_FloatCallback, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_VoidCallback, const char*, signed int, signed int); void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_VoidCallback, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_BoolCallback, const char*, signed int, signed int); void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_BoolCallback, const char *, signed int, signed int);
bool tsf_InitInternal(); bool tsf_InitInternal();
@@ -56,20 +56,21 @@ extern ADDR tsf_mCacheAllocator;
extern ADDR tsf_gIdDictionary; extern ADDR tsf_gIdDictionary;
extern ADDR tsf_gEvalState_globalVars; extern ADDR tsf_gEvalState_globalVars;
BlFunctionDefExtern(const char*, __stdcall, tsf_BlStringTable__insert, const char*, bool); BlFunctionDefExtern(const char *, __stdcall, tsf_BlStringTable__insert, const char *, bool);
BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char*, const char*); BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char *, const char *);
BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR, const char*); BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR, const char *);
BlFunctionDefExtern(void, __thiscall, tsf_BlDataChunker__freeBlocks, ADDR); BlFunctionDefExtern(void, __thiscall, tsf_BlDataChunker__freeBlocks, ADDR);
BlFunctionDefExtern(const char*, , tsf_BlCon__evaluate, ADDR, signed int, const char**); BlFunctionDefExtern(const char *, , tsf_BlCon__evaluate, ADDR, signed int, const char **);
BlFunctionDefExtern(const char*, , tsf_BlCon__executef, signed int, ...); BlFunctionDefExtern(const char *, , tsf_BlCon__executef, signed int, ...);
BlFunctionDefExtern(const char*, , tsf_BlCon__executefSimObj, ADDR*, signed int, ...); BlFunctionDefExtern(const char *, , tsf_BlCon__executefSimObj, ADDR *, signed int, ...);
BlFunctionDefExtern(const char*, __thiscall, tsf_BlCon__getVariable, const char*); BlFunctionDefExtern(const char *, __thiscall, tsf_BlCon__getVariable, const char *);
BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR*, const char*, signed int, void*); BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR *, const char *, signed int, void *);
BlFunctionDefExtern(ADDR*, __thiscall, tsf_BlSim__findObject_name, const char*); BlFunctionDefExtern(ADDR *, __thiscall, tsf_BlSim__findObject_name, const char *);
BlFunctionDefExtern(char*, __stdcall, tsf_BlStringStack__getArgBuffer, unsigned int); BlFunctionDefExtern(char *, __stdcall, tsf_BlStringStack__getArgBuffer, unsigned int);
BlFunctionDefExtern(const char*, __thiscall, tsf_BlSimObject__getDataField, ADDR, const char*, const char*); BlFunctionDefExtern(const char *, __thiscall, tsf_BlSimObject__getDataField, ADDR, const char *, const char *);
BlFunctionDefExtern(void, __thiscall, tsf_BlSimObject__setDataField, ADDR, const char*, const char*, const char*); BlFunctionDefExtern(void, __thiscall, tsf_BlSimObject__setDataField, ADDR, const char *, const char *, const char *);
BlFunctionDefExtern(char*, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int); BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int);
// Function short names // Function short names
@@ -93,21 +94,16 @@ BlFunctionDefExtern(char*, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int)
#define BlAddFunction tsf_AddConsoleFunc #define BlAddFunction tsf_AddConsoleFunc
#define __22ND_ARGUMENT( \ #define __22ND_ARGUMENT(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) a22
a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) \ #define __NUM_LIST(...) __22ND_ARGUMENT(dummy, ##__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
a22 #define BlCall(...) \
#define __NUM_LIST(...) \ tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__)
__22ND_ARGUMENT(dummy, ##__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) #define BlCallObj(obj, ...) \
#define BlCall(...) tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__) tsf_BlCon__executefSimObj((ADDR*)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
#define BlCallObj(obj, ...) tsf_BlCon__executefSimObj((ADDR*)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
#define BlFuncsInit() if(!tsf_InitInternal()) { return false; }
#define BlFuncsDeinit() if(!tsf_DeinitInternal()) { return false; }
#define BlFuncsInit() \
if (!tsf_InitInternal()) { \
return false; \
}
#define BlFuncsDeinit() \
if (!tsf_DeinitInternal()) { \
return false; \
}
#endif #endif
#endif

232
inc/tsfuncs/BlHooks.cpp
View File

@@ -2,194 +2,206 @@
////////////////////////////////////////////////// //////////////////////////////////////////////////
// RedoBlHooks Version 3.0 // RedoBlHooks Version 3.0
// Includes // Includes
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#include <cstdlib>
#endif
#include <Windows.h> #include <Windows.h>
#include <Psapi.h> #include <Psapi.h>
// #include <map> //#include <map>
#include "BlHooks.hpp" #include "BlHooks.hpp"
// Scanned structures // Scanned structures
BlFunctionDefIntern(tsh_BlPrintf); BlFunctionDefIntern(tsh_BlPrintf);
// Sig Scanning // Sig Scanning
ADDR ImageBase; ADDR ImageBase;
ADDR ImageSize; ADDR ImageSize;
void tsh_i_InitScanner() { void tsh_i_InitScanner(){
HMODULE module = GetModuleHandle(NULL); HMODULE module = GetModuleHandle(NULL);
if (module) { if(module) {
MODULEINFO info; MODULEINFO info;
GetModuleInformation(GetCurrentProcess(), module, &info, sizeof(MODULEINFO)); GetModuleInformation(GetCurrentProcess(), module, &info, sizeof(MODULEINFO));
ImageBase = (ADDR)info.lpBaseOfDll; ImageBase = (ADDR)info.lpBaseOfDll;
ImageSize = info.SizeOfImage; ImageSize = info.SizeOfImage;
} }
} }
bool tsh_i_CompareData(BYTE* data, BYTE* pattern, char* mask) { bool tsh_i_CompareData(BYTE *data, BYTE *pattern, char* mask){
for (; *mask; ++data, ++pattern, ++mask) { for (; *mask; ++data, ++pattern, ++mask){
if (*mask == 'x' && *data != *pattern) if (*mask=='x' && *data!=*pattern)
return false; return false;
} }
return (*mask) == 0; return (*mask)==0;
} }
ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE* pattern, char* mask) { ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE *pattern, char *mask){
for (ADDR i = imageBase; i < imageBase + imageSize; i++) { for (ADDR i=imageBase; i < imageBase+imageSize; i++){
if (tsh_i_CompareData((PBYTE)i, pattern, mask)) { if(tsh_i_CompareData((PBYTE)i, pattern, mask)){
return i; return i;
} }
} }
return 0; return 0;
} }
// Convert a text-style pattern into code-style // Convert a text-style pattern into code-style
void tsh_i_PatternTextToCode(char* text, char** opatt, char** omask) { void tsh_i_PatternTextToCode(char* text, char** opatt, char** omask) {
unsigned int len = strlen(text); unsigned int len = strlen(text);
char* patt = (char*)malloc(len); char* patt = (char*)malloc(len);
char* mask = (char*)malloc(len); char* mask = (char*)malloc(len);
int outidx = 0; int outidx = 0;
int val = 0; int val = 0;
bool uk = false; bool uk = false;
for (unsigned int i = 0; i < len; i++) { for(unsigned int i=0; i<len; i++){
char c = text[i]; char c = text[i];
if (c == '?') { if(c=='?'){
uk = true; uk = true;
} else if (c >= '0' && c <= '9') { }else if(c>='0' && c<='9'){
val = (val << 4) + (c - '0'); val = (val<<4) + (c-'0');
} else if (c >= 'A' && c <= 'F') { }else if(c>='A' && c<='F'){
val = (val << 4) + (c - 'A' + 10); val = (val<<4) + (c-'A'+10);
} else if (c >= 'a' && c <= 'f') { }else if(c>='a' && c<='f'){
val = (val << 4) + (c - 'a' + 10); val = (val<<4) + (c-'a'+10);
} else if (c == ' ') { }else if(c==' '){
patt[outidx] = uk ? 0 : val; patt[outidx] = uk ? 0 : val;
mask[outidx] = uk ? '?' : 'x'; mask[outidx] = uk ? '?' : 'x';
val = 0; val = 0;
uk = false; uk = false;
outidx++; outidx++;
} }
} }
patt[outidx] = uk ? 0 : val; patt[outidx] = uk ? 0 : val;
mask[outidx] = uk ? '?' : 'x'; mask[outidx] = uk ? '?' : 'x';
outidx++; outidx++;
patt[outidx] = 0; patt[outidx] = 0;
mask[outidx] = 0; mask[outidx] = 0;
*opatt = patt; *opatt = patt;
*omask = mask; *omask = mask;
} }
// Public functions for sig scanning // Public functions for sig scanning
// Scan using code-style pattern // Scan using code-style pattern
ADDR tsh_ScanCode(char* pattern, char* mask) { ADDR tsh_ScanCode(char* pattern, char* mask) {
return tsh_i_FindPattern(ImageBase, ImageSize - strlen(mask), (BYTE*)pattern, mask); return tsh_i_FindPattern(ImageBase, ImageSize-strlen(mask), (BYTE*)pattern, mask);
} }
// Scan using a text-style pattern // Scan using a text-style pattern
ADDR tsh_ScanText(char* text) { ADDR tsh_ScanText(char* text) {
char* patt; char* patt;
char* mask; char* mask;
tsh_i_PatternTextToCode(text, &patt, &mask); tsh_i_PatternTextToCode(text, &patt, &mask);
ADDR res = tsh_ScanCode(patt, mask); ADDR res = tsh_ScanCode(patt, mask);
free(patt); free(patt);
free(mask); free(mask);
return res; return res;
} }
// Call Patching and Hooking // Call Patching and Hooking
// Remove protection from address // Remove protection from address
// std::map<ADDR, std::pair<ADDR, ADDR>> tsh_DeprotectedAddresses; //std::map<ADDR, std::pair<ADDR, ADDR>> tsh_DeprotectedAddresses;
void tsh_DeprotectAddress(ADDR length, ADDR location) { void tsh_DeprotectAddress(ADDR length, ADDR location) {
DWORD oldProtection; DWORD oldProtection;
VirtualProtect((void*)location, length, PAGE_EXECUTE_READWRITE, &oldProtection); VirtualProtect((void*)location, length, PAGE_EXECUTE_READWRITE, &oldProtection);
// tsh_DeprotectedAddresses[location] = {length, oldProtection}; //tsh_DeprotectedAddresses[location] = {length, oldProtection};
} }
// Patch a string of bytes by deprotecting and then overwriting // Patch a string of bytes by deprotecting and then overwriting
void tsh_PatchBytes(ADDR length, ADDR location, BYTE* repl) { void tsh_PatchBytes(ADDR length, ADDR location, BYTE* repl) {
tsh_DeprotectAddress(length, location); tsh_DeprotectAddress(length, location);
memcpy((void*)location, (void*)repl, (size_t)length); memcpy((void*)location, (void*)repl, (size_t)length);
} }
void tsh_PatchByte(ADDR location, BYTE value) { tsh_PatchBytes(location, 1, &value); } void tsh_PatchByte(ADDR location, BYTE value) {
tsh_PatchBytes(location, 1, &value);
}
void tsh_ReplaceInt(ADDR addr, int rval) { tsh_PatchBytes(4, addr, (BYTE*)(&rval)); } void tsh_ReplaceInt(ADDR addr, int rval) {
tsh_PatchBytes(4, addr, (BYTE*)(&rval));
}
int tsh_i_CallOffset(ADDR instr, ADDR func) { return func - (instr + 4); } int tsh_i_CallOffset(ADDR instr, ADDR func) {
return func - (instr+4);
}
void tsh_i_ReplaceCall(ADDR instr, ADDR target) { tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target)); } void tsh_i_ReplaceCall(ADDR instr, ADDR target) {
tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target));
}
void tsh_i_PatchCopy(ADDR dest, ADDR src, unsigned int len) { void tsh_i_PatchCopy(ADDR dest, ADDR src, unsigned int len) {
for (unsigned int i = 0; i < len; i++) { for(unsigned int i=0; i<len; i++){
tsh_PatchByte(dest + i, *((BYTE*)(src + i))); tsh_PatchByte(dest+i, *((BYTE*)(src+i)));
} }
} }
void tsh_HookFunction(ADDR victim, ADDR detour, BYTE* origbytes) { void tsh_HookFunction(ADDR victim, ADDR detour, BYTE* origbytes) {
memcpy(origbytes, (BYTE*)victim, 6); // save old data memcpy(origbytes, (BYTE*)victim, 6); //save old data
*(BYTE*)victim = 0xE9; // jmp rel32 *(BYTE*)victim = 0xE9; //jmp rel32
*(ADDR*)(victim + 1) = (detour - (victim + 5)); // jump offset *(ADDR*)(victim+1) = (detour - (victim+5)); // jump offset
*(BYTE*)(victim + 5) = 0xC3; // retn *(BYTE*)(victim+5) = 0xC3; //retn
} }
void tsh_UnhookFunction(ADDR victim, BYTE* origbytes) { void tsh_UnhookFunction(ADDR victim, BYTE* origbytes){
tsh_i_PatchCopy(victim, (ADDR)origbytes, 6); // restore old data tsh_i_PatchCopy(victim, (ADDR)origbytes, 6); //restore old data
} }
int tsh_PatchAllMatchesCode(ADDR len, char* patt, char* mask, char* replace, bool debugprint) { int tsh_PatchAllMatchesCode(ADDR len, char* patt, char* mask, char* replace, bool debugprint){
int numpatched = 0; int numpatched = 0;
for (ADDR i = ImageBase; i < ImageBase + ImageSize - len; i++) { for(ADDR i=ImageBase; i<ImageBase+ImageSize-len; i++){
if (tsh_i_CompareData((BYTE*)i, (BYTE*)patt, mask)) { if(tsh_i_CompareData((BYTE*)i, (BYTE*)patt, mask)){
if (debugprint) if(debugprint) BlPrintf("RedoBlHooks: Patching call at %08x", i);
BlPrintf("RedoBlHooks: Patching call at %08x", i);
numpatched++; numpatched++;
tsh_DeprotectAddress(i, len); tsh_DeprotectAddress(i, len);
for (ADDR c = 0; c < len; c++) { for(ADDR c=0; c<len; c++){
tsh_PatchByte(i + c, replace[c]); tsh_PatchByte(i+c, replace[c]);
} }
} }
} }
return numpatched; return numpatched;
} }
int tsh_PatchAllMatchesHex(ADDR len, char* text, char* replace, bool debugprint) { int tsh_PatchAllMatchesHex(ADDR len, char* text, char* replace, bool debugprint) {
char* patt; char* patt;
char* mask; char* mask;
tsh_i_PatternTextToCode(text, &patt, &mask); tsh_i_PatternTextToCode(text, &patt, &mask);
int res = tsh_PatchAllMatchesCode(len, patt, mask, replace, debugprint); int res = tsh_PatchAllMatchesCode(len, patt, mask, replace, debugprint);
free(patt); free(patt);
free(mask); free(mask);
return res; return res;
} }
// Initialization // Initialization
bool tsh_InitInternal() { bool tsh_InitInternal(){
tsh_i_InitScanner(); tsh_i_InitScanner();
BlScanFunctionText(tsh_BlPrintf, "8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3"); BlScanFunctionText(tsh_BlPrintf, "8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3");
return true; return true;
}
bool tsh_DeinitInternal() {
return true;
} }
bool tsh_DeinitInternal() { return true; }

151
inc/tsfuncs/BlHooks.hpp
View File

@@ -5,10 +5,12 @@
#ifndef _H_BLHOOKS #ifndef _H_BLHOOKS
#define _H_BLHOOKS #define _H_BLHOOKS
// Typedefs // Typedefs
typedef unsigned char BYTE; typedef unsigned char BYTE;
typedef unsigned int ADDR; typedef unsigned int ADDR;
// Prototypes // Prototypes
@@ -18,114 +20,103 @@ ADDR tsh_ScanCode(char*, char*);
ADDR tsh_ScanText(char*); ADDR tsh_ScanText(char*);
void tsh_HookFunction(ADDR, ADDR, BYTE*); void tsh_HookFunction(ADDR, ADDR, BYTE*);
void tsh_UnhookFunction(ADDR, BYTE*); void tsh_UnhookFunction(ADDR, BYTE*);
int tsh_PatchAllMatches(unsigned int, char*, char*, char*, bool); int tsh_PatchAllMatches(unsigned int, char*, char*, char*, bool);
void tsh_PatchByte(ADDR, BYTE); void tsh_PatchByte(ADDR, BYTE);
void tsh_PatchBytes(unsigned int, ADDR, BYTE*); void tsh_PatchBytes(unsigned int, ADDR, BYTE*);
void tsh_PatchInt(ADDR, int); void tsh_PatchInt(ADDR, int);
// Debug print settings // Debug print settings
#ifndef TSH_NO_DEBUG_PRINT #ifndef TSH_NO_DEBUG_PRINT
#define tsh_DEBUGPRINT false #define tsh_DEBUGPRINT false
#else #else
#define tsh_DEBUGPRINT true #define tsh_DEBUGPRINT true
#endif #endif
// Function short names // Function short names
// Use in code when the def is not shared in a header // Use in code when the def is not shared in a header
#define BlFunctionDef(returnType, convention, name, ...) \ #define BlFunctionDef(returnType, convention, name, ...) \
typedef returnType(convention* tsh_##name##FnT)(__VA_ARGS__); \ typedef returnType (convention *tsh_##name##FnT)(__VA_ARGS__); \
tsh_##name##FnT name; tsh_##name##FnT name;
// Use in header for shared function defs when a BlFunctionDefIntern exists in // Use in header for shared function defs when a BlFunctionDefIntern exists in code
// code #define BlFunctionDefExtern(returnType, convention, name, ...) \
#define BlFunctionDefExtern(returnType, convention, name, ...) \ typedef returnType (convention *tsh_##name##FnT)(__VA_ARGS__); \
typedef returnType(convention* tsh_##name##FnT)(__VA_ARGS__); \ extern tsh_##name##FnT name;
extern tsh_##name##FnT name; // Use in code for shared function defs when a BlFunctionDefExtern exists in header
// Use in code for shared function defs when a BlFunctionDefExtern exists in #define BlFunctionDefIntern(name) \
// header tsh_##name##FnT name;
#define BlFunctionDefIntern(name) tsh_##name##FnT name;
// Scan for and assign the pattern to the variable, or err and return if not // Scan for and assign the pattern to the variable, or err and return if not found
// found #define BlScanFunctionCode(target, patt, mask) \
#define BlScanFunctionCode(target, patt, mask) \ target = (tsh_##target##FnT)tsh_ScanCode((char*)patt, (char*)mask); \
target = (tsh_##target##FnT)tsh_ScanCode((char*)patt, (char*)mask); \ if(!target){ \
if (!target) { \ BlPrintf("RedoBlHooks | Cannot find function "#target"!"); \
BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \ return false; \
return false; \ }else{ \
} else { \ if(tsh_DEBUGPRINT) BlPrintf("RedoBlHooks | Found function "#target" at %08x", (int)target); \
if (tsh_DEBUGPRINT) \ }
BlPrintf("RedoBlHooks | Found function " #target " at %08x", (int)target); \ #define BlScanFunctionText(target, text) \
} target = (tsh_##target##FnT)tsh_ScanText((char*)text); \
#define BlScanFunctionText(target, text) \ if(!target){ \
target = (tsh_##target##FnT)tsh_ScanText((char*)text); \ BlPrintf("RedoBlHooks | Cannot find function "#target"!"); \
if (!target) { \ return false; \
BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \ }else{ \
return false; \ if(tsh_DEBUGPRINT) BlPrintf("RedoBlHooks | Found function "#target" at %08x", (int)target); \
} else { \ }
if (tsh_DEBUGPRINT) \ #define BlScanCode(target, patt, mask) \
BlPrintf("RedoBlHooks | Found function " #target " at %08x", (int)target); \ target = tsh_ScanCode((char*)patt, (char*)mask); \
} if(!target){ \
#define BlScanCode(target, patt, mask) \ BlPrintf("RedoBlHooks | Cannot find pattern "#target"!"); \
target = tsh_ScanCode((char*)patt, (char*)mask); \ return false; \
if (!target) { \ }else{ \
BlPrintf("RedoBlHooks | Cannot find pattern " #target "!"); \ if(tsh_DEBUGPRINT) BlPrintf("RedoBlHooks | Found "#target" at %08x", (int)target); \
return false; \ }
} else { \ #define BlScanText(target, text) \
if (tsh_DEBUGPRINT) \ target = tsh_ScanText((char*)text); \
BlPrintf("RedoBlHooks | Found " #target " at %08x", (int)target); \ if(!target){ \
} BlPrintf("RedoBlHooks | Cannot find "#target"!"); \
#define BlScanText(target, text) \ return false; \
target = tsh_ScanText((char*)text); \ }else{ \
if (!target) { \ if(tsh_DEBUGPRINT) BlPrintf("RedoBlHooks | Found "#target" at %08x", (int)target); \
BlPrintf("RedoBlHooks | Cannot find " #target "!"); \ }
return false; \
} else { \
if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found " #target " at %08x", (int)target); \
}
// Use in code to define the data and functions for hooking a function // Use in code to define the data and functions for hooking a function
#define BlFunctionHookDef(func) \ #define BlFunctionHookDef(func) \
BYTE tsh_BlFunctionHook##func##Data[6]; \ BYTE tsh_BlFunctionHook##func##Data[6]; \
void func##HookOn() { tsh_HookFunction((ADDR)func, (ADDR)func##Hook, tsh_BlFunctionHook##func##Data); } \ void func##HookOn(){ tsh_HookFunction((ADDR)func, (ADDR)func##Hook, tsh_BlFunctionHook##func##Data); } \
void func##HookOff() { tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); } void func##HookOff(){ tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); }
// Use in code to initialize the hook once // Use in code to initialize the hook once
#define BlFunctionHookInit(func) \ #define BlFunctionHookInit(func) \
tsh_DeprotectAddress(6, (ADDR)func); \ tsh_DeprotectAddress(6, (ADDR)func); \
func##HookOn(); func##HookOn();
// Replace all matches of the pattern with the given byte string // Replace all matches of the pattern with the given byte string
#define BlPatchAllMatchesCode(len, patt, mask, repl) \ #define BlPatchAllMatchesCode(len, patt, mask, repl) \
tsh_PatchAllMatchesCode((ADDR)len, (char*)patt, (char*)mask, (char*)repl, tsh_DEBUGPRINT); tsh_PatchAllMatchesCode((ADDR)len, (char*)patt, (char*)mask, (char*)repl, tsh_DEBUGPRINT);
#define BlPatchAllMatchesText(len, text, repl) \ #define BlPatchAllMatchesText(len, text, repl) \
tsh_PatchAllMatchesCode((ADDR)len, (char*)text, (char*)repl, tsh_DEBUGPRINT); tsh_PatchAllMatchesCode((ADDR)len, (char*)text, (char*)repl, tsh_DEBUGPRINT);
// Deprotect and replace one byte // Deprotect and replace one byte
#define BlPatchByte(addr, byte) tsh_PatchByte((ADDR)addr, (BYTE)byte); #define BlPatchByte(addr, byte) \
tsh_PatchByte((ADDR)addr, (BYTE)byte);
// Deprotect and replace a byte string // Deprotect and replace a byte string
#define BlPatchBytes(len, addr, repl) tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE*)repl); #define BlPatchBytes(len, addr, repl) \
tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE*)repl);
// BlPrintf(char* format, ...) // BlPrintf(char* format, ...)
#define BlPrintf(...) \ #define BlPrintf(...) if(tsh_BlPrintf) { tsh_BlPrintf(__VA_ARGS__); }
if (tsh_BlPrintf) { \
tsh_BlPrintf(__VA_ARGS__); \
}
// BlHooksInit() -> bool: success // BlHooksInit() -> bool: success
#define BlHooksInit() \ #define BlHooksInit() if(!tsh_InitInternal()) { BlPrintf("BlHooksInit failed"); return false; }
if (!tsh_InitInternal()) { \
BlPrintf("BlHooksInit failed"); \
return false; \
}
// BlHooksDeinit() -> bool: success // BlHooksDeinit() -> bool: success
#define BlHooksDeinit() \ #define BlHooksDeinit() if(!tsh_DeinitInternal()) { BlPrintf("BlHooksDeinit failed"); return false; }
if (!tsh_DeinitInternal()) { \
BlPrintf("BlHooksDeinit failed"); \
return false; \
}
// Scanned structures // Scanned structures
BlFunctionDefExtern(void, , tsh_BlPrintf, const char*, ...); BlFunctionDefExtern(void, , tsh_BlPrintf, const char*, ...);
#endif #endif

27
make.bat
View File

@@ -1,27 +0,0 @@
@echo off
cd /d %~dp0
REM Ensure MinGW32 toolchain is first in PATH (matches compile.bat)
set "PATH=C:\msys64\mingw32\bin;%PATH%"
REM Configure CMake (generate into build/)
cmake -S . -B build -G "MinGW Makefiles"
if errorlevel 1 goto :error
REM Build (Release by default)
cmake --build build --config Release -j
if errorlevel 1 goto :error
echo.
echo Build completed.
echo Outputs in .\build :
echo - BlockLua.dll
echo - BlockLua-Unsafe.dll
exit /b 0
:error
echo.
echo Build failed. See errors above.
exit /b 1

141
src/bllua4.cpp
View File

@@ -2,15 +2,12 @@
// Includes // Includes
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <Windows.h> #include <Windows.h>
#include <Psapi.h> #include <Psapi.h>
#include "BlFuncs.cpp"
#include "BlHooks.cpp"
#include "lua.hpp" #include "lua.hpp"
#include "BlHooks.cpp"
#include "BlFuncs.cpp"
#include "luainterp.cpp" #include "luainterp.cpp"
#include "lualibts.cpp" #include "lualibts.cpp"
@@ -22,96 +19,92 @@ lua_State* gL;
// Setup // Setup
// Hack to encode the contents of text files as static strings // Hack to encode the contents of text files as static strings
#define INCLUDE_BIN(varname, filename) \ #define INCLUDE_BIN(varname, filename) \
asm("_" #varname ": .incbin \"" filename "\""); \ asm("_" #varname ": .incbin \"" filename "\""); \
asm(".byte 0"); \ asm(".byte 0"); \
extern char varname[]; extern char varname[];
INCLUDE_BIN(bll_fileLuaEnvSafe, "lua-env-safe.lua"); INCLUDE_BIN(bll_fileLuaEnvSafe, "lua-env-safe.lua");
INCLUDE_BIN(bll_fileLuaEnv, "lua-env.lua"); INCLUDE_BIN(bll_fileLuaEnv , "lua-env.lua");
INCLUDE_BIN(bll_fileTsEnv, "ts-env.cs"); INCLUDE_BIN(bll_fileTsEnv , "ts-env.cs" );
INCLUDE_BIN(bll_fileLuaStd, "util/std.lua"); INCLUDE_BIN(bll_fileLuaStd , "util/std.lua");
INCLUDE_BIN(bll_fileLuaVector, "util/vector.lua"); INCLUDE_BIN(bll_fileLuaVector , "util/vector.lua");
INCLUDE_BIN(bll_fileLuaMatrix, "util/matrix.lua"); INCLUDE_BIN(bll_fileLuaMatrix , "util/matrix.lua");
INCLUDE_BIN(bll_fileLuaLibts, "util/libts-lua.lua"); INCLUDE_BIN(bll_fileLuaLibts , "util/libts-lua.lua");
INCLUDE_BIN(bll_fileTsLibts, "util/libts-ts.cs"); INCLUDE_BIN(bll_fileTsLibts , "util/libts-ts.cs");
INCLUDE_BIN(bll_fileLuaLibbl, "util/libbl.lua"); INCLUDE_BIN(bll_fileLuaLibbl , "util/libbl.lua" );
INCLUDE_BIN(bll_fileLuaLibblTypes, "util/libbl-types.lua"); INCLUDE_BIN(bll_fileLuaLibblTypes , "util/libbl-types.lua");
INCLUDE_BIN(bll_fileTsLibblSupport, "util/libbl-support.cs"); INCLUDE_BIN(bll_fileTsLibblSupport, "util/libbl-support.cs");
INCLUDE_BIN(bll_fileLoadaddons, "util/loadaddons.cs"); INCLUDE_BIN(bll_fileLoadaddons , "util/loadaddons.cs");
#define BLL_LOAD_LUA(lstate, vname) \ #define BLL_LOAD_LUA(lstate, vname) \
if (!bll_LuaEval(lstate, vname)) { \ if(!bll_LuaEval(lstate, vname)) { \
BlPrintf(" Error executing " #vname); \ BlPrintf(" Error executing " #vname); \
return false; \ return false; \
} }
bool init() { bool init() {
BlHooksInit(); BlHooksInit();
BlPrintf("BlockLua: Loading"); BlPrintf("BlockLua: Loading");
BlFuncsInit(); BlFuncsInit();
// Initialize Lua environment // Initialize Lua environment
gL = lua_open(); gL = lua_open();
luaL_openlibs(gL); luaL_openlibs(gL);
// Expose TS API to Lua // Expose TS API to Lua
llibbl_init(gL); llibbl_init(gL);
// Set up Lua environment // Set up Lua environment
BLL_LOAD_LUA(gL, bll_fileLuaEnv); BLL_LOAD_LUA(gL, bll_fileLuaEnv);
#ifdef BLLUA_ALLOWFFI #ifdef BLLUA_ALLOWFFI
lua_pushboolean(gL, true); lua_pushboolean(gL, true);
lua_setglobal(gL, "_bllua_allowffi"); lua_setglobal(gL, "_bllua_allowffi");
#endif #endif
#ifndef BLLUA_UNSAFE #ifndef BLLUA_UNSAFE
BLL_LOAD_LUA(gL, bll_fileLuaEnvSafe); BLL_LOAD_LUA(gL, bll_fileLuaEnvSafe);
#endif #endif
// Load utilities in Lua // Load utilities in Lua
BLL_LOAD_LUA(gL, bll_fileLuaStd); BLL_LOAD_LUA(gL, bll_fileLuaStd);
BLL_LOAD_LUA(gL, bll_fileLuaVector); BLL_LOAD_LUA(gL, bll_fileLuaVector);
BLL_LOAD_LUA(gL, bll_fileLuaMatrix); BLL_LOAD_LUA(gL, bll_fileLuaMatrix);
BLL_LOAD_LUA(gL, bll_fileLuaLibts); BLL_LOAD_LUA(gL, bll_fileLuaLibts);
BLL_LOAD_LUA(gL, bll_fileLuaLibbl); BLL_LOAD_LUA(gL, bll_fileLuaLibbl);
BLL_LOAD_LUA(gL, bll_fileLuaLibblTypes); BLL_LOAD_LUA(gL, bll_fileLuaLibblTypes);
// Expose Lua API to TS // Expose Lua API to TS
BlAddFunction( BlAddFunction(NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20);
NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20); BlEval(bll_fileTsEnv);
BlEval(bll_fileTsEnv); BlEval(bll_fileTsLibts);
BlEval(bll_fileTsLibts); BlEval(bll_fileTsLibblSupport);
BlEval(bll_fileTsLibblSupport); BlEval(bll_fileLoadaddons);
BlEval(bll_fileLoadaddons);
BlEval("$_bllua_active = 1;"); BlEval("$_bllua_active = 1;");
BlPrintf(" BlockLua: Done Loading"); BlPrintf(" BlockLua: Done Loading");
return true; return true;
} }
bool deinit() { bool deinit() {
BlPrintf("BlockLua: Unloading"); BlPrintf("BlockLua: Unloading");
BlEval("$_bllua_active=0;deactivatePackage(_bllua_main);"); BlEval("$_bllua_active=0;deactivatePackage(_bllua_main);");
bll_LuaEval(gL, "for _,f in pairs(_bllua_on_unload) do f() end"); bll_LuaEval(gL, "for _,f in pairs(_bllua_on_unload) do f() end");
lua_close(gL); lua_close(gL);
BlHooksDeinit(); BlHooksDeinit();
BlFuncsDeinit(); BlFuncsDeinit();
BlPrintf(" BlockLua: Done Unloading"); BlPrintf(" BlockLua: Done Unloading");
return true; return true;
} }
bool __stdcall DllMain(HINSTANCE hinstance, DWORD reason, void* reserved) { bool __stdcall DllMain(HINSTANCE hinstance, DWORD reason, void* reserved) {
switch (reason) { switch(reason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH: return init();
return init(); case DLL_PROCESS_DETACH: return deinit();
case DLL_PROCESS_DETACH: default : return true;
return deinit(); }
default:
return true;
}
} }

158
src/lua-env-safe.lua
View File

@@ -4,9 +4,7 @@
-- Utility: Convert a list of strings into a map of string->true -- Utility: Convert a list of strings into a map of string->true
local function tmap(t) local function tmap(t) local u = {}; for _, n in ipairs(t) do u[n] = true end; return u; end
local u = {}; for _, n in ipairs(t) do u[n] = true end; return u;
end
-- Save banned global variables for wrapping with safe functions -- Save banned global variables for wrapping with safe functions
local old_io = io local old_io = io
@@ -18,97 +16,96 @@ local old_allowffi = _bllua_allowffi
-- Remove all global variables except a whitelist -- Remove all global variables except a whitelist
local ok_names = tmap { local ok_names = tmap {
'_G', '_bllua_ts', '_bllua_on_unload', '_bllua_on_error', '_G', '_bllua_ts', '_bllua_on_unload', '_bllua_on_error',
'string', 'table', 'math', 'coroutine', 'bit', 'string', 'table', 'math', 'coroutine', 'bit',
'pairs', 'ipairs', 'next', 'unpack', 'select', 'pairs', 'ipairs', 'next', 'unpack', 'select',
'error', 'assert', 'pcall', 'xpcall', 'error', 'assert', 'pcall', 'xpcall',
'type', 'tostring', 'tonumber', 'type', 'tostring', 'tonumber',
'loadstring', 'loadstring',
'getmetatable', 'setmetatable', 'getmetatable', 'setmetatable',
'rawget', 'rawset', 'rawequal', 'rawlen', 'rawget', 'rawset', 'rawequal', 'rawlen',
'module', '_VERSION', 'module', '_VERSION',
} }
local not_ok_names = {} local not_ok_names = {}
for n, _ in pairs(_G) do for n, _ in pairs(_G) do
if not ok_names[n] then if not ok_names[n] then
table.insert(not_ok_names, n) table.insert(not_ok_names, n)
end end
end end
for _, n in ipairs(not_ok_names) do for _, n in ipairs(not_ok_names) do
_G[n] = nil _G[n] = nil
end end
-- Sanitize file paths to point only to allowed files within the game directory -- Sanitize file paths to point only to allowed files within the game directory
-- List of allowed directories for reading/writing -- List of allowed directories for reading/writing
-- modules/lualib is also allowed as read-only -- modules/lualib is also allowed as read-only
local allowed_dirs = tmap { local allowed_dirs = tmap {
'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders' 'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
} }
-- List of disallowed file extensions - basically executable file extensions -- List of disallowed file extensions - basically executable file extensions
-- Note that even without this protection, exploiting would still require somehow -- Note that even without this protection, exploiting would still require somehow
-- getting a file within the allowed directories to autorun, -- getting a file within the allowed directories to autorun,
-- so this is just a precaution. -- so this is just a precaution.
local disallowed_exts = tmap { local disallowed_exts = tmap {
-- windows -- windows
'bat', 'bin', 'cab', 'cmd', 'com', 'cpl', 'ex_', 'exe', 'gadget', 'inf', 'ins', 'inx', 'isu', 'bat','bin','cab','cmd','com','cpl','ex_','exe','gadget','inf','ins','inx','isu',
'job', 'jse', 'lnk', 'msc', 'msi', 'msp', 'mst', 'paf', 'pif', 'ps1', 'reg', 'rgs', 'scr', 'job','jse','lnk','msc','msi','msp','mst','paf','pif','ps1','reg','rgs','scr',
'sct', 'shb', 'shs', 'u3p', 'vb', 'vbe', 'vbs', 'vbscript', 'ws', 'wsf', 'wsh', 'sct','shb','shs','u3p','vb','vbe','vbs','vbscript','ws','wsf','wsh',
-- linux -- linux
'csh', 'ksh', 'out', 'run', 'sh', 'csh','ksh','out','run','sh',
-- mac/other -- mac/other
'action', 'apk', 'app', 'command', 'ipa', 'osx', 'prg', 'workflow', 'action','apk','app','command','ipa','osx','prg','workflow',
} }
-- Arguments: file name (relative to game directory), boolean true if only reading -- Arguments: file name (relative to game directory), boolean true if only reading
-- Return: clean file path if allowed (or nil if disallowed), -- Return: clean file path if allowed (or nil if disallowed),
-- error string (or nil if allowed) -- error string (or nil if allowed)
local function safe_path(fn, readonly) local function safe_path(fn, readonly)
fn = fn:gsub('\\', '/') fn = fn:gsub('\\', '/')
fn = fn:gsub('^ +', '') fn = fn:gsub('^ +', '')
fn = fn:gsub(' +$', '') fn = fn:gsub(' +$', '')
-- whitelist characters -- whitelist characters
local ic = fn:find('[^a-zA-Z0-9_%-/ %.]') local ic = fn:find('[^a-zA-Z0-9_%-/ %.]')
if ic then if ic then
return nil, 'Filename \'' .. fn .. '\' contains invalid character \'' .. return nil, 'Filename \''..fn..'\' contains invalid character \''..
fn:sub(ic, ic) .. '\' at position ' .. ic fn:sub(ic, ic)..'\' at position '..ic
end end
-- disallow up-dirs, absolute paths, and relative paths -- disallow up-dirs, absolute paths, and relative paths
-- './' and '../' are possible in scripts, because they're processed into -- './' and '../' are possible in scripts, because they're processed into
-- absolute paths in util.lua before reaching here -- absolute paths in util.lua before reaching here
if fn:find('^%.') or fn:find('%.%.') or fn:find(':') or fn:find('^/') then if fn:find('^%.') or fn:find('%.%.') or fn:find(':') or fn:find('^/') then
return nil, 'Filename \'' .. fn .. '\' contains invalid sequence' return nil, 'Filename \''..fn..'\' contains invalid sequence'
end end
-- allow only whitelisted dirs -- allow only whitelisted dirs
local dir = fn:match('^([^/]+)/') local dir = fn:match('^([^/]+)/')
if not (dir and ( if not (dir and (
allowed_dirs[dir:lower()] or allowed_dirs[dir:lower()] or
(readonly and fn:find('^modules/lualib/')))) ( readonly and fn:find('^modules/lualib/') ) ))
then then
return nil, 'File is in disallowed directory ' .. (dir or 'nil') return nil, 'File is in disallowed directory '..(dir or 'nil')
end end
-- disallow blacklisted extensions -- disallow blacklisted extensions
local ext = fn:match('%.([^/%.]+)$') local ext = fn:match('%.([^/%.]+)$')
if ext and disallowed_exts[ext:lower()] then if ext and disallowed_exts[ext:lower()] then
return nil, 'Filename \'' .. fn .. '\' has disallowed extension \'' .. return nil, 'Filename \''..fn..'\' has disallowed extension \''..
(ext or '') .. '\'' (ext or '')..'\''
end end
return fn, nil return fn, nil
end end
-- Wrap io.open with path sanitization -- Wrap io.open with path sanitization
function _bllua_io_open(fn, md) function _bllua_io_open(fn, md)
md = md or 'r' md = md or 'r'
local readonly = md == 'r' or md == 'rb' local readonly = md=='r' or md=='rb'
local fns, err = safe_path(fn, readonly) local fns, err = safe_path(fn, readonly)
if fns then if fns then
return old_io.open(fns, md) return old_io.open(fns, md)
else else
return nil, err return nil, err
end end
end end
-- Allow io.type (works on file handles returned by io.open) -- Allow io.type (works on file handles returned by io.open)
function _bllua_io_type(f) function _bllua_io_type(f)
return old_io.type(f) return old_io.type(f)
end end
-- Wrap require with a blacklist for unsafe built-in modules -- Wrap require with a blacklist for unsafe built-in modules
@@ -116,31 +113,30 @@ end
-- Note that util.lua wraps this and provides 'require', -- Note that util.lua wraps this and provides 'require',
-- only falling back here if the package is not found in user files -- only falling back here if the package is not found in user files
local disallowed_packages = tmap { local disallowed_packages = tmap {
'ffi', 'debug', 'package', 'io', 'os', 'ffi', 'debug', 'package', 'io', 'os',
'_bllua_ts', '_bllua_ts',
} }
if old_allowffi then disallowed_packages['ffi'] = nil end if old_allowffi then disallowed_packages['ffi'] = nil end
function _bllua_requiresecure(name) function _bllua_requiresecure(name)
if name:find('[^a-zA-Z0-9_%-%.]') or name:find('%.%.') or if name:find('[^a-zA-Z0-9_%-%.]') or name:find('%.%.') or
name:find('^%.') or name:find('%.$') then name:find('^%.') or name:find('%.$') then
error('require: package name contains invalid character', 3) error('require: package name contains invalid character', 3)
elseif disallowed_packages[name] then elseif disallowed_packages[name] then
error('require: attempt to require disallowed module \'' .. name .. '\'', 3) error('require: attempt to require disallowed module \''..name..'\'', 3)
else else
-- todo: reimplement require to not use package.* stuff? -- todo: reimplement require to not use package.* stuff?
return old_require(name) return old_require(name)
end end
end end
package = { package = {
seeall = old_package.seeall, seeall = old_package.seeall,
} }
-- Provide limited debug -- Provide limited debug
debug = { debug = {
traceback = old_debug.traceback, traceback = old_debug.traceback,
getinfo = old_debug.getinfo, getinfo = old_debug.getinfo,
getfilename = old_debug.getfilename, -- defined in lua.env.lua getfilename = old_debug.getfilename, -- defined in lua.env.lua
} }
print = _bllua_ts.echo print = _bllua_ts.echo

44
src/lua-env.lua
View File

@@ -9,32 +9,32 @@ _bllua_on_unload = {}
-- Utility for getting the current filename -- Utility for getting the current filename
function debug.getfilename(level) function debug.getfilename(level)
if type(level) == 'number' then level = level + 1 end if type(level) == 'number' then level = level+1 end
local info = debug.getinfo(level) local info = debug.getinfo(level)
if not info then return nil end if not info then return nil end
local filename = info.source:match('^%-%-%[%[([^%]]+)%]%]') local filename = info.source:match('^%-%-%[%[([^%]]+)%]%]')
return filename return filename
end end
-- Called when pcall fails on a ts->lua call, used to print detailed error info -- Called when pcall fails on a ts->lua call, used to print detailed error info
function _bllua_on_error(err) function _bllua_on_error(err)
err = err:match(': (.+)$') or err err = err:match(': (.+)$') or err
local tracelines = { err } local tracelines = {err}
local level = 2 local level = 2
while true do while true do
local info = debug.getinfo(level) local info = debug.getinfo(level)
if not info then break end if not info then break end
local filename = debug.getfilename(level) or info.short_src local filename = debug.getfilename(level) or info.short_src
local funcname = info.name local funcname = info.name
if funcname == 'dofile' then break end if funcname=='dofile' then break end
table.insert(tracelines, string.format('%s:%s in function \'%s\'', table.insert(tracelines, string.format('%s:%s in function \'%s\'',
filename, filename,
info.currentline == -1 and '' or info.currentline .. ':', info.currentline==-1 and '' or info.currentline..':',
funcname funcname
)) ))
level = level + 1 level = level+1
end end
return table.concat(tracelines, '\n') return table.concat(tracelines, '\n')
end end
-- overridden in lua-env-safe.lua (executed if not BLLUA_UNSAFE) -- overridden in lua-env-safe.lua (executed if not BLLUA_UNSAFE)

107
src/luainterp.cpp
View File

@@ -1,81 +1,68 @@
// Handle errors with a Lua function, defined in lua-env.lua // Handle errors with a Lua function, defined in lua-env.lua
#include "luainterp.hpp" int bll_error_handler(lua_State *L) {
#include "BlHooks.hpp" lua_getfield(L, LUA_GLOBALSINDEX, "_bllua_on_error");
#include "lauxlib.h" if (!lua_isfunction(L, -1)) {
#include "lua.h" BlPrintf(" Lua error handler: _bllua_on_error not defined.");
#include <cstring> lua_pop(L, 1);
return 1;
}
int bll_error_handler(lua_State* L) { // move function to before arg
lua_getfield(L, LUA_GLOBALSINDEX, "_bllua_on_error"); int hpos = lua_gettop(L) - 1;
if (!lua_isfunction(L, -1)) { lua_insert(L, hpos);
BlPrintf(" Lua error handler: _bllua_on_error not defined.");
lua_pop(L, 1);
return 1;
}
// move function to before arg lua_pcall(L, 1, 1, 0);
int hpos = lua_gettop(L) - 1; return 1;
lua_insert(L, hpos);
lua_pcall(L, 1, 1, 0);
return 1;
} }
int bll_pcall(lua_State* L, int nargs, int nret) { int bll_pcall(lua_State* L, int nargs, int nret) {
// calculate stack position for message handler // calculate stack position for message handler
int hpos = lua_gettop(L) - nargs; int hpos = lua_gettop(L) - nargs;
// push custom error message handler // push custom error message handler
lua_pushcfunction(L, bll_error_handler); lua_pushcfunction(L, bll_error_handler);
// move it before function and arguments // move it before function and arguments
lua_insert(L, hpos); lua_insert(L, hpos);
// call lua_pcall function with custom handler // call lua_pcall function with custom handler
int ret = lua_pcall(L, nargs, nret, hpos); int ret = lua_pcall(L, nargs, nret, hpos);
// remove custom error message handler from stack // remove custom error message handler from stack
lua_remove(L, hpos); lua_remove(L, hpos);
return ret; return ret;
} }
// Display the last Lua error in the BL console // Display the last Lua error in the BL console
void bll_printError(lua_State* L, const char* operation, const char* item) { void bll_printError(lua_State* L, const char* operation, const char* item) {
// error_handler(L); //error_handler(L);
BlPrintf("\x03Lua error: %s", lua_tostring(L, -1)); BlPrintf("\x03Lua error: %s", lua_tostring(L, -1));
BlPrintf("\x03 (%s: %s)", operation, item); BlPrintf("\x03 (%s: %s)", operation, item);
lua_pop(L, 1); lua_pop(L, 1);
} }
// Eval a string of Lua code // Eval a string of Lua code
bool bll_LuaEval(lua_State* L, const char* str) { bool bll_LuaEval(lua_State* L, const char* str) {
if (luaL_loadbuffer(L, str, strlen(str), "input") || bll_pcall(L, 0, 1)) { if(luaL_loadbuffer(L, str, strlen(str), "input") || bll_pcall(L, 0, 1)) {
bll_printError(L, "eval", str); bll_printError(L, "eval", str);
return false; return false;
} }
return true; return true;
} }
// Convert a Lua stack entry into a string for providing to TS // Convert a Lua stack entry into a string for providing to TS
// Use static buffer to avoid excessive malloc // Use static buffer to avoid excessive malloc
#define BLL_ARG_COUNT 20
#define BLL_ARG_MAX 8192
char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX]; char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX];
bool bll_toarg(lua_State* L, char* buf, int i, bool err) { bool bll_toarg(lua_State* L, char* buf, int i, bool err) {
if (lua_isstring(L, i)) { if(lua_isstring(L, i)) {
const char* str = lua_tostring(L, i); const char* str = lua_tostring(L, i);
if (strlen(str) >= BLL_ARG_MAX) { if(strlen(str) >= BLL_ARG_MAX) {
if (err) if(err) luaL_error(L, "argument to TS is too long - max length is 8192");
luaL_error(L, "argument to TS is too long - max length is 8192"); return true;
return true; } else {
} else { strcpy(buf, str);
#ifdef _MSC_VER return false;
strncpy_s(buf, BLL_ARG_MAX, str, _TRUNCATE); }
#else } else {
strncpy(buf, str, BLL_ARG_MAX - 1); if(err) luaL_error(L, "argument to TS must be a string");
buf[BLL_ARG_MAX - 1] = '\0'; return true;
#endif }
return false;
}
} else {
if (err)
luaL_error(L, "argument to TS must be a string");
return true;
}
} }

17
src/luainterp.hpp
View File

@@ -1,17 +0,0 @@
// Shared declarations for Lua <-> TS argument handling
#ifndef _H_LUAINTERP_SHARED
#define _H_LUAINTERP_SHARED
#include "lua.h"
#define BLL_ARG_COUNT 20
#define BLL_ARG_MAX 8192
extern char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX];
bool bll_toarg(lua_State* L, char* buf, int i, bool err);
int bll_pcall(lua_State* L, int nargs, int nret);
void bll_printError(lua_State* L, const char* operation, const char* item);
extern lua_State* gL;
#endif

360
src/lualibts.cpp
View File

@@ -1,295 +1,159 @@
// run ../compile //run ../compile
// TS -> Lua API // TS -> Lua API
// Call a TS function from Lua, push the result to Lua stack // Call a TS function from Lua, push the result to Lua stack
#include "BlFuncs.hpp"
#include "BlHooks.hpp"
#include "lauxlib.h"
#include "lua.h"
#include "luainterp.hpp"
int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int ofs) { int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int ofs) {
ADDR obj = (ADDR)NULL; ADDR obj = (ADDR)NULL;
if (oname) { if(oname) {
obj = BlObject(oname); obj = BlObject(oname);
if (!obj) { if(!obj) { return luaL_error(L, "Lua->TS call: Object not found"); }
return luaL_error(L, "Lua->TS call: Object not found"); }
}
}
if (argc > BLL_ARG_COUNT) { if(argc > BLL_ARG_COUNT) { return luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)"); }
return luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)");
}
char* argv[BLL_ARG_COUNT]; char* argv[BLL_ARG_COUNT];
for (int i = 0; i < argc; i++) { for(int i=0; i<argc; i++) {
char* argbuf = bll_arg_buffer[i]; char* argbuf = bll_arg_buffer[i];
argv[i] = argbuf; argv[i] = argbuf;
bll_toarg(L, argbuf, i + ofs + 1, true); bll_toarg(L, argbuf, i+ofs+1, true);
} }
// /:^| / // /:^| /
const char* res; const char* res;
if (obj) { if(obj) {
switch (argc) { switch(argc) {
case 0: case 0: res = BlCallObj(obj, fname); break; // no idea why this happens sometimes, it shouldnt be possible
res = BlCallObj(obj, fname); case 1: res = BlCallObj(obj, fname); break;
break; // no idea why this happens sometimes, it shouldnt be possible case 2: res = BlCallObj(obj, fname, argv[0]); break;
case 1: case 3: res = BlCallObj(obj, fname, argv[0], argv[1]); break;
res = BlCallObj(obj, fname); case 4: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2]); break;
break; case 5: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3]); break;
case 2: case 6: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4]); break;
res = BlCallObj(obj, fname, argv[0]); case 7: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]); break;
break; case 8: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]); break;
case 3: case 9: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]); break;
res = BlCallObj(obj, fname, argv[0], argv[1]); case 10: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]); break;
break; case 11: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]); break;
case 4: case 12: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]); break;
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2]); case 13: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]); break;
break; case 14: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12]); break;
case 5: case 15: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13]); break;
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3]); case 16: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14]); break;
break; case 17: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15]); break;
case 6: case 18: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]); break;
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4]); case 19: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]); break;
break; case 20: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]); break;
case 7: default: res = ""; luaL_error(L, "Lua->TS object call: Too many arguments (Max is 19)");
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]); }
break; } else {
case 8: switch(argc) {
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]); case 0: res = BlCall(fname); break;
break; case 1: res = BlCall(fname, argv[0]); break;
case 9: case 2: res = BlCall(fname, argv[0], argv[1]); break;
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]); case 3: res = BlCall(fname, argv[0], argv[1], argv[2]); break;
break; case 4: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3]); break;
case 10: case 5: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4]); break;
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]); case 6: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]); break;
break; case 7: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]); break;
case 11: case 8: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]); break;
res = BlCallObj( case 9: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]); break;
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]); case 10: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]); break;
break; case 11: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]); break;
case 12: case 12: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]); break;
res = BlCallObj( case 13: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12]); break;
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], case 14: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13]); break;
argv[10]); case 15: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14]); break;
break; case 16: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15]); break;
case 13: case 17: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]); break;
res = BlCallObj( case 18: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]); break;
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], case 19: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]); break;
argv[10], argv[11]); default: res = ""; luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)");
break; }
case 14: }
res = BlCallObj(
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[10], argv[11], argv[12]);
break;
case 15:
res = BlCallObj(
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[10], argv[11], argv[12], argv[13]);
break;
case 16:
res = BlCallObj(
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[10], argv[11], argv[12], argv[13], argv[14]);
break;
case 17:
res = BlCallObj(
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[10], argv[11], argv[12], argv[13], argv[14], argv[15]);
break;
case 18:
res = BlCallObj(
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
break;
case 19:
res = BlCallObj(
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
break;
case 20:
res = BlCallObj(
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]);
break;
default:
res = "";
luaL_error(L, "Lua->TS object call: Too many arguments (Max is 19)");
}
} else {
switch (argc) {
case 0:
res = BlCall(fname);
break;
case 1:
res = BlCall(fname, argv[0]);
break;
case 2:
res = BlCall(fname, argv[0], argv[1]);
break;
case 3:
res = BlCall(fname, argv[0], argv[1], argv[2]);
break;
case 4:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3]);
break;
case 5:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4]);
break;
case 6:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
break;
case 7:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
break;
case 8:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
break;
case 9:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]);
break;
case 10:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]);
break;
case 11:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
break;
case 12:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11]);
break;
case 13:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12]);
break;
case 14:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13]);
break;
case 15:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14]);
break;
case 16:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14], argv[15]);
break;
case 17:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
break;
case 18:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
break;
case 19:
res = BlCall(
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]);
break;
default:
res = "";
luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)");
}
}
lua_pushstring(L, res); lua_pushstring(L, res);
return 1; return 1;
} }
// Lua lib function: ts.call // Lua lib function: ts.call
int bll_lua_tscall(lua_State* L) { int bll_lua_tscall(lua_State* L) {
int argc = lua_gettop(L) - 1; // number of arguments after function name int argc = lua_gettop(L)-1; // number of arguments after function name
if (argc < 0) if(argc < 0) return luaL_error(L, "_bllua_ts.call: Must provide a function name");
return luaL_error(L, "_bllua_ts.call: Must provide a function name");
const char* fname = luaL_checkstring(L, 1); const char* fname = luaL_checkstring(L, 1);
return bll_TsCall(L, NULL, fname, argc, 1); return bll_TsCall(L, NULL, fname, argc, 1);
} }
// Lua lib function: ts.callobj // Lua lib function: ts.callobj
int bll_lua_tscallobj(lua_State* L) { int bll_lua_tscallobj(lua_State* L) {
int argc = lua_gettop(L) - 2; // number of arguments after function name and object? int argc = lua_gettop(L)-2; // number of arguments after function name and object?
if (argc < 0) if(argc < 0) return luaL_error(L, "_bllua_ts.callobj: Must provide an object and function name");
return luaL_error(L, "_bllua_ts.callobj: Must provide an object and function name");
const char* oname = luaL_checkstring(L, 1); const char* oname = luaL_checkstring(L, 1);
const char* fname = luaL_checkstring(L, 2); const char* fname = luaL_checkstring(L, 2);
return bll_TsCall(L, oname, fname, argc, 2); return bll_TsCall(L, oname, fname, argc, 2);
} }
// Lua lib function: ts.getvar // Lua lib function: ts.getvar
int bll_lua_tsgetvar(lua_State* L) { int bll_lua_tsgetvar(lua_State* L) {
const char* vname = luaL_checkstring(L, 1); const char* vname = luaL_checkstring(L, 1);
const char* var = BlGetVar(vname); const char* var = BlGetVar(vname);
lua_pushstring(L, var); lua_pushstring(L, var);
return 1; return 1;
} }
// Lua lib function: ts.getfield // Lua lib function: ts.getfield
int bll_lua_tsgetfield(lua_State* L) { int bll_lua_tsgetfield(lua_State* L) {
const char* oname = luaL_checkstring(L, 1); const char* oname = luaL_checkstring(L, 1);
const char* vname = luaL_checkstring(L, 2); const char* vname = luaL_checkstring(L, 2);
ADDR obj = BlObject(oname); ADDR obj = BlObject(oname);
if (!obj) { if(!obj) { return luaL_error(L, "_bllua_ts.getfield: Object not found"); }
return luaL_error(L, "_bllua_ts.getfield: Object not found");
}
const char* val = BlGetField(obj, vname, NULL); const char* val = BlGetField(obj, vname, NULL);
lua_pushstring(L, val); lua_pushstring(L, val);
return 1; return 1;
} }
// Lua lib function: ts.setfield // Lua lib function: ts.setfield
int bll_lua_tssetfield(lua_State* L) { int bll_lua_tssetfield(lua_State* L) {
const char* oname = luaL_checkstring(L, 1); const char* oname = luaL_checkstring(L, 1);
const char* vname = luaL_checkstring(L, 2); const char* vname = luaL_checkstring(L, 2);
const char* val = luaL_checkstring(L, 3); const char* val = luaL_checkstring(L, 3);
ADDR obj = BlObject(oname); ADDR obj = BlObject(oname);
if (!obj) { if(!obj) { return luaL_error(L, "_bllua_ts.setfield: Object not found"); }
return luaL_error(L, "_bllua_ts.setfield: Object not found");
}
BlSetField(obj, vname, NULL, val); BlSetField(obj, vname, NULL, val);
return 0; return 0;
} }
// Lua lib function: ts.eval // Lua lib function: ts.eval
int bll_lua_tseval(lua_State* L) { int bll_lua_tseval(lua_State* L) {
const char* str = luaL_checkstring(L, 1); const char* str = luaL_checkstring(L, 1);
const char* res = BlEval(str); const char* res = BlEval(str);
lua_pushstring(L, res); lua_pushstring(L, res);
return 1; return 1;
} }
// Lua lib function: ts.echo // Lua lib function: ts.echo
// Print to BL console - used in Lua print implementation // Print to BL console - used in Lua print implementation
int bll_lua_tsecho(lua_State* L) { int bll_lua_tsecho(lua_State* L) {
const char* str = luaL_checkstring(L, 1); const char* str = luaL_checkstring(L, 1);
BlPrintf("%s", str); BlPrintf("%s", str);
return 0; return 0;
} }
const luaL_Reg bll_lua_reg[] = { const luaL_Reg bll_lua_reg[] = {
{"call", bll_lua_tscall}, {"callobj", bll_lua_tscallobj}, {"call" , bll_lua_tscall },
{"getvar", bll_lua_tsgetvar}, {"getfield", bll_lua_tsgetfield}, {"callobj" , bll_lua_tscallobj },
{"setfield", bll_lua_tssetfield}, {"eval", bll_lua_tseval}, {"getvar" , bll_lua_tsgetvar },
{"echo", bll_lua_tsecho}, {NULL, NULL}, {"getfield", bll_lua_tsgetfield},
{"setfield", bll_lua_tssetfield},
{"eval" , bll_lua_tseval },
{"echo" , bll_lua_tsecho },
{NULL, NULL},
}; };
void llibbl_init(lua_State* L) {
void llibbl_init(lua_State* L) { luaL_register(L, "_bllua_ts", bll_lua_reg); } luaL_register(L, "_bllua_ts", bll_lua_reg);
}

40
src/tsliblua.cpp
View File

@@ -1,33 +1,25 @@
// Call a Lua function from TS, return true if success - result will be on Lua // Call a Lua function from TS, return true if success - result will be on Lua stack
// stack
#include "BlFuncs.hpp"
#include "BlHooks.hpp"
#include "luainterp.hpp"
bool bll_LuaCall(const char* fname, int argc, const char* argv[]) { bool bll_LuaCall(const char* fname, int argc, const char* argv[]) {
lua_getglobal(gL, fname); lua_getglobal(gL, fname);
for (int i = 0; i < argc; i++) { for(int i=0; i<argc; i++) {
lua_pushstring(gL, argv[i]); lua_pushstring(gL, argv[i]);
} }
if (bll_pcall(gL, argc, 1)) { if(bll_pcall(gL, argc, 1)) {
bll_printError(gL, "call", fname); bll_printError(gL, "call", fname);
return false; return false;
} }
return true; return true;
} }
// TS lib function: luacall // TS lib function: luacall
const char* bll_ts_luacall(ADDR obj, int argc, const char* argv[]) { const char* bll_ts_luacall(ADDR obj, int argc, const char* argv[]) {
if (argc < 2) if(argc<2) return "";
return "";
if (!bll_LuaCall(argv[1], argc - 2, &argv[2])) { if(!bll_LuaCall(argv[1], argc-2, &argv[2])) { return ""; }
return "";
}
char* retbuf = BlReturnBuffer(BLL_ARG_MAX); char* retbuf = BlReturnBuffer(BLL_ARG_MAX);
bll_toarg(gL, retbuf, -1, false); // provide returned value to ts bll_toarg(gL, retbuf, -1, false); // provide returned value to ts
lua_pop(gL, 1); // pop returned value lua_pop(gL, 1); // pop returned value
return retbuf; return retbuf;
} }

246
src/util/libbl-types.lua
View File

@@ -4,129 +4,129 @@
-- Class hierarchy, adapted from https://notabug.org/Queuenard/blockland-DLL-tools/src/master/class_hierarchy -- Class hierarchy, adapted from https://notabug.org/Queuenard/blockland-DLL-tools/src/master/class_hierarchy
bl.class('SimObject') bl.class('SimObject')
bl.class('ScriptObject', 'SimObject') bl.class('ScriptObject', 'SimObject')
bl.class('SimSet', 'SimObject') bl.class('SimSet', 'SimObject')
bl.class('SimGroup', 'SimSet') bl.class('SimGroup', 'SimSet')
bl.class('GuiControl', 'SimGroup') bl.class('GuiControl', 'SimGroup')
bl.class('GuiTextCtrl', 'GuiControl') bl.class('GuiTextCtrl' , 'GuiControl')
bl.class('GuiSwatchCtrl', 'GuiControl') bl.class('GuiSwatchCtrl' , 'GuiControl')
bl.class('GuiButtonBaseCtrl', 'GuiControl') bl.class('GuiButtonBaseCtrl' , 'GuiControl')
bl.class('GuiArrayCtrl', 'GuiControl') bl.class('GuiArrayCtrl' , 'GuiControl')
bl.class('GuiScrollCtrl', 'GuiControl') bl.class('GuiScrollCtrl' , 'GuiControl')
bl.class('GuiMouseEventCtrl', 'GuiControl') bl.class('GuiMouseEventCtrl' , 'GuiControl')
bl.class('GuiProgressCtrl', 'GuiControl') bl.class('GuiProgressCtrl' , 'GuiControl')
bl.class('GuiSliderCtrl', 'GuiControl') bl.class('GuiSliderCtrl' , 'GuiControl')
bl.class('GuiConsoleTextCtrl', 'GuiControl') bl.class('GuiConsoleTextCtrl' , 'GuiControl')
bl.class('GuiTSCtrl', 'GuiControl') bl.class('GuiTSCtrl' , 'GuiControl')
bl.class('GuiObjectView', 'GuiTSCtrl') bl.class('GuiObjectView', 'GuiTSCtrl')
bl.class('GameTSCtrl', 'GuiTSCtrl') bl.class('GameTSCtrl' , 'GuiTSCtrl')
bl.class('EditTSCtrl', 'GuiTSCtrl') bl.class('EditTSCtrl' , 'GuiTSCtrl')
bl.class('GuiPlayerView', 'GuiTSCtrl') bl.class('GuiPlayerView', 'GuiTSCtrl')
bl.class('GuiShapeNameHud', 'GuiControl') bl.class('GuiShapeNameHud' , 'GuiControl')
bl.class('GuiHealthBarHud', 'GuiControl') bl.class('GuiHealthBarHud' , 'GuiControl')
bl.class('GuiGraphCtrl', 'GuiControl') bl.class('GuiGraphCtrl' , 'GuiControl')
bl.class('GuiInspector', 'GuiControl') bl.class('GuiInspector' , 'GuiControl')
bl.class('GuiChunkedBitmapCtrl', 'GuiControl') bl.class('GuiChunkedBitmapCtrl', 'GuiControl')
bl.class('GuiInputCtrl', 'GuiControl') bl.class('GuiInputCtrl' , 'GuiControl')
bl.class('GuiNoMouseCtrl', 'GuiControl') bl.class('GuiNoMouseCtrl' , 'GuiControl')
bl.class('GuiBitmapBorderCtrl', 'GuiControl') bl.class('GuiBitmapBorderCtrl' , 'GuiControl')
bl.class('GuiBackgroundCtrl', 'GuiControl') bl.class('GuiBackgroundCtrl' , 'GuiControl')
bl.class('GuiEditorRuler', 'GuiControl') bl.class('GuiEditorRuler' , 'GuiControl')
bl.class('GuiClockHud', 'GuiControl') bl.class('GuiClockHud' , 'GuiControl')
bl.class('GuiEditCtrl', 'GuiControl') bl.class('GuiEditCtrl' , 'GuiControl')
bl.class('GuiFilterCtrl', 'GuiControl') bl.class('GuiFilterCtrl' , 'GuiControl')
bl.class('GuiFrameSetCtrl', 'GuiControl') bl.class('GuiFrameSetCtrl' , 'GuiControl')
bl.class('GuiMenuBar', 'GuiControl') bl.class('GuiMenuBar' , 'GuiControl')
bl.class('GuiMessageVectorCtrl', 'GuiControl') bl.class('GuiMessageVectorCtrl', 'GuiControl')
bl.class('GuiBitmapCtrl', 'GuiControl') bl.class('GuiBitmapCtrl' , 'GuiControl')
bl.class('GuiCrossHairHud', 'GuiBitmapCtrl') bl.class('GuiCrossHairHud', 'GuiBitmapCtrl')
bl.class('ScriptGroup', 'SimGroup') bl.class('ScriptGroup', 'SimGroup')
bl.class('NetConnection', 'SimGroup') bl.class('NetConnection', 'SimGroup')
bl.class('GameConnection', 'NetConnection') bl.class('GameConnection', 'NetConnection')
bl.class('Path', 'SimGroup') bl.class('Path', 'SimGroup')
bl.class('TCPObject', 'SimObject') bl.class('TCPObject', 'SimObject')
bl.class('SOCKObject', 'TCPObject') bl.class('SOCKObject', 'TCPObject')
bl.class('HTTPObject', 'TCPObject') bl.class('HTTPObject', 'TCPObject')
bl.class('SimDataBlock', 'SimObject') bl.class('SimDataBlock', 'SimObject')
bl.class('AudioEnvironment', 'SimDataBlock') bl.class('AudioEnvironment' , 'SimDataBlock')
bl.class('AudioSampleEnvironment', 'SimDataBlock') bl.class('AudioSampleEnvironment', 'SimDataBlock')
bl.class('AudioDescription', 'SimDataBlock') bl.class('AudioDescription' , 'SimDataBlock')
bl.class('GameBaseData', 'SimDataBlock') bl.class('GameBaseData' , 'SimDataBlock')
bl.class('ShapeBaseData', 'GameBaseData') bl.class('ShapeBaseData' , 'GameBaseData')
bl.class('CameraData', 'ShapeBaseData') bl.class('CameraData' , 'ShapeBaseData')
bl.class('ItemData', 'ShapeBaseData') bl.class('ItemData' , 'ShapeBaseData')
bl.class('MissionMarkerData', 'ShapeBaseData') bl.class('MissionMarkerData', 'ShapeBaseData')
bl.class('PathCameraData', 'ShapeBaseData') bl.class('PathCameraData' , 'ShapeBaseData')
bl.class('PlayerData', 'ShapeBaseData') bl.class('PlayerData' , 'ShapeBaseData')
bl.class('StaticShapeData', 'ShapeBaseData') bl.class('StaticShapeData' , 'ShapeBaseData')
bl.class('VehicleData', 'ShapeBaseData') bl.class('VehicleData' , 'ShapeBaseData')
bl.class('FlyingVehicleData', 'VehicleData') bl.class('FlyingVehicleData' , 'VehicleData')
bl.class('WheeledVehicleData', 'VehicleData') bl.class('WheeledVehicleData', 'VehicleData')
bl.class('DebrisData', 'GameBaseData') bl.class('DebrisData' , 'GameBaseData')
bl.class('ProjectileData', 'GameBaseData') bl.class('ProjectileData' , 'GameBaseData')
bl.class('ShapeBaseImageData', 'GameBaseData') bl.class('ShapeBaseImageData' , 'GameBaseData')
bl.class('TriggerData', 'GameBaseData') bl.class('TriggerData' , 'GameBaseData')
bl.class('ExplosionData', 'GameBaseData') bl.class('ExplosionData' , 'GameBaseData')
bl.class('fxLightData', 'GameBaseData') bl.class('fxLightData' , 'GameBaseData')
bl.class('LightningData', 'GameBaseData') bl.class('LightningData' , 'GameBaseData')
bl.class('ParticleEmitterNodeData', 'GameBaseData') bl.class('ParticleEmitterNodeData', 'GameBaseData')
bl.class('SplashData', 'GameBaseData') bl.class('SplashData' , 'GameBaseData')
bl.class('fxDTSBrickData', 'GameBaseData') bl.class('fxDTSBrickData' , 'GameBaseData')
bl.class('ParticleEmitterData', 'GameBaseData') bl.class('ParticleEmitterData' , 'GameBaseData')
bl.class('WheeledVehicleTire', 'SimDataBlock') bl.class('WheeledVehicleTire' , 'SimDataBlock')
bl.class('WheeledVehicleSpring', 'SimDataBlock') bl.class('WheeledVehicleSpring' , 'SimDataBlock')
bl.class('TSShapeConstructor', 'SimDataBlock') bl.class('TSShapeConstructor' , 'SimDataBlock')
bl.class('AudioProfile', 'SimDataBlock') bl.class('AudioProfile' , 'SimDataBlock')
bl.class('ParticleData', 'SimDataBlock') bl.class('ParticleData' , 'SimDataBlock')
bl.class('MaterialPropertyMap', 'SimObject') bl.class('MaterialPropertyMap', 'SimObject')
bl.class('NetObject', 'SimObject') bl.class('NetObject', 'SimObject')
bl.class('SceneObject', 'NetObject') bl.class('SceneObject', 'NetObject')
bl.class('GameBase', 'SceneObject') bl.class('GameBase', 'SceneObject')
bl.class('ShapeBase', 'GameBase') bl.class('ShapeBase', 'GameBase')
bl.class('MissionMarker', 'ShapeBase') bl.class('MissionMarker', 'ShapeBase')
bl.class('SpawnSphere', 'MissionMarker') bl.class('SpawnSphere' , 'MissionMarker')
bl.class('VehicleSpawnMarker', 'MissionMarker') bl.class('VehicleSpawnMarker', 'MissionMarker')
bl.class('Waypoint', 'MissionMarker') bl.class('Waypoint' , 'MissionMarker')
bl.class('StaticShape', 'ShapeBase') bl.class('StaticShape' , 'ShapeBase')
bl.class('ScopeAlwaysShape', 'StaticShape') bl.class('ScopeAlwaysShape', 'StaticShape')
bl.class('Player', 'ShapeBase') bl.class('Player' , 'ShapeBase')
bl.class('AIPlayer', 'Player') bl.class('AIPlayer', 'Player')
bl.class('Camera', 'ShapeBase') bl.class('Camera' , 'ShapeBase')
bl.class('Item', 'ShapeBase') bl.class('Item' , 'ShapeBase')
bl.class('PathCamera', 'ShapeBase') bl.class('PathCamera' , 'ShapeBase')
bl.class('Vehicle', 'ShapeBase') bl.class('Vehicle' , 'ShapeBase')
bl.class('FlyingVehicle', 'Vehicle') bl.class('FlyingVehicle' , 'Vehicle')
bl.class('WheeledVehicle', 'Vehicle') bl.class('WheeledVehicle', 'Vehicle')
bl.class('Explosion', 'GameBase') bl.class('Explosion' , 'GameBase')
bl.class('Splash', 'GameBase') bl.class('Splash' , 'GameBase')
bl.class('Debris', 'GameBase') bl.class('Debris' , 'GameBase')
bl.class('Projectile', 'GameBase') bl.class('Projectile' , 'GameBase')
bl.class('Trigger', 'GameBase') bl.class('Trigger' , 'GameBase')
bl.class('fxLight', 'GameBase') bl.class('fxLight' , 'GameBase')
bl.class('Lightning', 'GameBase') bl.class('Lightning' , 'GameBase')
bl.class('ParticleEmitterNode', 'GameBase') bl.class('ParticleEmitterNode', 'GameBase')
bl.class('ParticleEmitter', 'GameBase') bl.class('ParticleEmitter' , 'GameBase')
bl.class('Precipitation', 'GameBase') bl.class('Precipitation' , 'GameBase')
bl.class('TSStatic', 'SceneObject') bl.class('TSStatic' , 'SceneObject')
bl.class('VehicleBlocker', 'SceneObject') bl.class('VehicleBlocker', 'SceneObject')
bl.class('Marker', 'SceneObject') bl.class('Marker' , 'SceneObject')
bl.class('AudioEmitter', 'SceneObject') bl.class('AudioEmitter' , 'SceneObject')
bl.class('PhysicalZone', 'SceneObject') bl.class('PhysicalZone' , 'SceneObject')
bl.class('fxDayCycle', 'SceneObject') bl.class('fxDayCycle' , 'SceneObject')
bl.class('fxDTSBrick', 'SceneObject') bl.class('fxDTSBrick' , 'SceneObject')
bl.class('fxPlane', 'SceneObject') bl.class('fxPlane' , 'SceneObject')
bl.class('fxSunLight', 'SceneObject') bl.class('fxSunLight' , 'SceneObject')
bl.class('Sky', 'SceneObject') bl.class('Sky' , 'SceneObject')
bl.class('SceneRoot', 'SceneObject') bl.class('SceneRoot' , 'SceneObject')
bl.class('Sun', 'NetObject') bl.class('Sun', 'NetObject')
bl.class('GuiCursor', 'SimObject') bl.class('GuiCursor', 'SimObject')
bl.class('ConsoleLogger', 'SimObject') bl.class('ConsoleLogger' , 'SimObject')
bl.class('QuotaObject', 'SimObject') bl.class('QuotaObject' , 'SimObject')
bl.class('FileObject', 'SimObject') bl.class('FileObject' , 'SimObject')
bl.class('BanList', 'SimObject') bl.class('BanList' , 'SimObject')
bl.class('GuiControlProfile', 'SimObject') bl.class('GuiControlProfile', 'SimObject')
bl.class('MessageVector', 'SimObject') bl.class('MessageVector' , 'SimObject')
bl.class('ActionMap', 'SimObject') bl.class('ActionMap' , 'SimObject')
-- Auto-generated from game scripts -- Auto-generated from game scripts
bl.type('ActionMap::blockBind:1', 'object') bl.type('ActionMap::blockBind:1', 'object')

1783
src/util/libbl.lua
View File

File diff suppressed because it is too large Load Diff

324
src/util/libts-lua.lua
View File

@@ -1,3 +1,4 @@
-- This Lua code provides some built-in utilities for writing Lua add-ons -- This Lua code provides some built-in utilities for writing Lua add-ons
-- It is eval'd automatically once BLLua3 has loaded the TS API and environment -- It is eval'd automatically once BLLua3 has loaded the TS API and environment
-- It only has access to the sandboxed lua environment, just like user code. -- It only has access to the sandboxed lua environment, just like user code.
@@ -6,11 +7,8 @@ ts = _bllua_ts
-- Provide limited OS functions -- Provide limited OS functions
os = os or {} os = os or {}
---@diagnostic disable-next-line: duplicate-set-field function os.time() return math.floor(tonumber(_bllua_ts.call('getSimTime'))/1000) end
function os.time() return math.floor(tonumber(_bllua_ts.call('getSimTime')) / 1000) end function os.clock() return tonumber(_bllua_ts.call('getSimTime'))/1000 end
---@diagnostic disable-next-line: duplicate-set-field
function os.clock() return tonumber(_bllua_ts.call('getSimTime')) / 1000 end
-- Virtual file class, emulating a file object as returned by io.open -- Virtual file class, emulating a file object as returned by io.open
-- Used to wrap io.open to allow reading from zips (using TS) -- Used to wrap io.open to allow reading from zips (using TS)
@@ -18,154 +16,141 @@ function os.clock() return tonumber(_bllua_ts.call('getSimTime')) / 1000 end
-- Can't read nulls, can't distinguish between CRLF and LF. -- Can't read nulls, can't distinguish between CRLF and LF.
-- Todo someday: actually read the zip in lua? -- Todo someday: actually read the zip in lua?
local file_meta = { local file_meta = {
read = function(file, mode) read = function(file, mode)
file:_init() file:_init()
if not file or type(file) ~= 'table' or not file._is_file then error('File:read: Not a file', 2) end if not file or type(file)~='table' or not file._is_file then error('File:read: Not a file', 2) end
if file._is_open ~= true then error('File:read: File is closed', 2) end if file._is_open ~= true then error('File:read: File is closed', 2) end
if mode == '*n' then if mode=='*n' then
local ws, n = file.data:match('^([ \t\r\n]*)([0-9%.%-e]+)', file.pos) local ws, n = file.data:match('^([ \t\r\n]*)([0-9%.%-e]+)', file.pos)
if n then if n then
file.pos = file.pos + #ws + #n file.pos = file.pos + #ws + #n
return n return n
else else
return nil return nil
end end
elseif mode == '*a' then elseif mode=='*a' then
local d = file.data:sub(file.pos, #file.data) local d = file.data:sub(file.pos, #file.data)
file.pos = #file.data + 1 file.pos = #file.data + 1
return d return d
elseif mode == '*l' then elseif mode=='*l' then
local l, ws = file.data:match('^([^\r\n]*)(\r?\n)', file.pos) local l, ws = file.data:match('^([^\r\n]*)(\r?\n)', file.pos)
if not l then if not l then
l = file.data:match('^([^\r\n]*)$', file.pos); ws = ''; l = file.data:match('^([^\r\n]*)$', file.pos); ws = '';
if l == '' then return nil end if l=='' then return nil end
end end
if l then if l then
file.pos = file.pos + #l + #ws file.pos = file.pos + #l + #ws
return l return l
else else
return nil return nil
end end
elseif type(mode) == 'number' then elseif type(mode)=='number' then
local d = file.data:sub(file.pos, file.pos + mode) local d = file.data:sub(file.pos, file.pos+mode)
file.pos = file.pos + #d file.pos = file.pos + #d
return d return d
else else
error('File:read: Invalid mode \'' .. mode .. '\'', 2) error('File:read: Invalid mode \''..mode..'\'', 2)
end end
end, end,
lines = function(file) lines = function(file)
file:_init() file:_init()
return function() return function()
return file:read('*l') return file:read('*l')
end end
end, end,
close = function(file) close = function(file)
if not file._is_open then error('File:close: File is not open', 2) end if not file._is_open then error('File:close: File is not open', 2) end
file._is_open = false file._is_open = false
end, end,
__index = function(f, k) return rawget(f, k) or getmetatable(f)[k] end, __index = function(f, k) return rawget(f, k) or getmetatable(f)[k] end,
_init = function(f) _init = function(f)
if not f.data then if not f.data then
f.data = _bllua_ts.call('_bllua_ReadEntireFile', f.filename) f.data = _bllua_ts.call('_bllua_ReadEntireFile', f.filename)
end end
end, end,
} }
local function new_file_obj(fn) local function new_file_obj(fn)
local file = { local file = {
_is_file = true, _is_file = true,
_is_open = true, _is_open = true,
pos = 1, pos = 1,
__index = file_meta.__index, __index = file_meta.__index,
filename = fn, filename = fn,
data = nil, data = nil,
} }
setmetatable(file, file_meta) setmetatable(file, file_meta)
return file return file
end end
local function tflip(t) local function tflip(t) local u = {}; for _, n in ipairs(t) do u[n] = true end; return u; end
local u = {}; for _, n in ipairs(t) do u[n] = true end; return u; local allowed_zip_dirs = tflip{
end 'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
local allowed_zip_dirs = tflip {
'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
} }
local function io_open_absolute(fn, mode) local function io_open_absolute(fn, mode)
-- if file exists, use original mode -- if file exists, use original mode
local res, err = _bllua_io_open(fn, mode) local res, err = _bllua_io_open(fn, mode)
if res then if res then return res
return res elseif err and not err:find('No such file or directory$') then return nil, err end
elseif err and not err:find('No such file or directory$') then
return nil, err
end
-- otherwise, if TS sees file but Lua doesn't, it must be in a zip, so use TS reader -- otherwise, if TS sees file but Lua doesn't, it must be in a zip, so use TS reader
local dir = fn:match('^[^/]+') local dir = fn:match('^[^/]+')
if not allowed_zip_dirs[dir:lower()] then return nil, 'Zip is not in one of the allowed directories' end if not allowed_zip_dirs[dir:lower()] then return nil, 'Zip is not in one of the allowed directories' end
local exist = _bllua_ts.call('isFile', fn) == '1' local exist = _bllua_ts.call('isFile', fn) == '1'
if not exist then return nil, err end if not exist then return nil, err end
if mode ~= nil and mode ~= 'r' and mode ~= 'rb' then if mode~=nil and mode~='r' and mode~='rb' then
return nil, 'Files in zips can only be opened in read mode' return nil, 'Files in zips can only be opened in read mode' end
end
-- return a temp lua file object with the data -- return a temp lua file object with the data
local fi = new_file_obj(fn) local fi = new_file_obj(fn)
return fi return fi
end end
io = io or {} io = io or {}
---@diagnostic disable-next-line: duplicate-set-field
function io.open(fn, mode, errn) function io.open(fn, mode, errn)
errn = errn or 1 errn = errn or 1
-- try to open the file with relative path, otherwise use absolute path -- try to open the file with relative path, otherwise use absolute path
local curfn = debug.getfilename(errn + 1) or _bllua_ts.getvar('Con::File') local curfn = debug.getfilename(errn + 1) or _bllua_ts.getvar('Con::File')
if curfn == '' then curfn = nil end if curfn == '' then curfn = nil end
if fn:find('^%.') then if fn:find('^%.') then
local relfn = curfn and fn:find('^%./') and local relfn = curfn and fn:find('^%./') and
curfn:gsub('[^/]+$', '') .. fn:gsub('^%./', '') curfn:gsub('[^/]+$', '')..fn:gsub('^%./', '')
if relfn then if relfn then
local fi, err = io_open_absolute(relfn, mode) local fi, err = io_open_absolute(relfn, mode)
return fi, err, relfn return fi, err, relfn
else else
return nil, 'Invalid path', fn return nil, 'Invalid path', fn
end end
else else
local fi, err = io_open_absolute(fn, mode) local fi, err = io_open_absolute(fn, mode)
return fi, err, fn return fi, err, fn
end end
end end
---@diagnostic disable-next-line: duplicate-set-field
function io.lines(fn) function io.lines(fn)
local fi, err, fn2 = io.open(fn, nil, 2) local fi, err, fn2 = io.open(fn, nil, 2)
if not fi then error('Error opening file \'' .. fn2 .. '\': ' .. err, 2) end if not fi then error('Error opening file \''..fn2..'\': '..err, 2) end
return fi:lines() return fi:lines()
end end
---@diagnostic disable-next-line: duplicate-set-field
function io.type(f) function io.type(f)
---@diagnostic disable-next-line: undefined-field if type(f)=='table' and f._is_file then
if type(f) == 'table' and f._is_file then return f._is_open and 'file' or 'closed file'
---@diagnostic disable-next-line: undefined-field else
return f._is_open and 'file' or 'closed file' return _bllua_io_type(f)
else end
return _bllua_io_type(f)
end
end end
-- provide dofile -- provide dofile
function dofile(fn, errn) function dofile(fn, errn)
errn = errn or 1 errn = errn or 1
local fi, err, fn2 = io.open(fn, 'r', errn + 1) local fi, err, fn2 = io.open(fn, 'r', errn+1)
if not fi then error('Error executing file \'' .. fn2 .. '\': ' .. err, errn + 1) end if not fi then error('Error executing file \''..fn2..'\': '..err, errn+1) end
print('Executing ' .. fn2) print('Executing '..fn2)
local text = fi:read('*a') local text = fi:read('*a')
fi:close() fi:close()
return assert(loadstring('--[[' .. fn2 .. ']]' .. text))() return assert(loadstring('--[['..fn2..']]'..text))()
end end
-- provide require (just a wrapper for dofile) -- provide require (just a wrapper for dofile)
@@ -174,58 +159,57 @@ end
-- blockland directory -- blockland directory
-- current add-on -- current add-on
local function file_exists(fn, errn) local function file_exists(fn, errn)
local fi, err, fn2 = io.open(fn, 'r', errn + 1) local fi, err, fn2 = io.open(fn, 'r', errn+1)
if fi then if fi then
fi:close() fi:close()
return fn2 return fn2
else else
return nil return nil
end end
end end
local require_memo = {} local require_memo = {}
function require(mod) function require(mod)
if require_memo[mod] then return unpack(require_memo[mod]) end if require_memo[mod] then return unpack(require_memo[mod]) end
local fp = mod:gsub('%.', '/') local fp = mod:gsub('%.', '/')
local fns = { local fns = {
'./' .. fp .. '.lua', -- local file './'..fp..'.lua', -- local file
'./' .. fp .. '/init.lua', -- local library './'..fp..'/init.lua', -- local library
fp .. '.lua', -- global file fp..'.lua', -- global file
fp .. '/init.lua', -- global library fp..'/init.lua', -- global library
} }
if fp:lower():find('^add-ons/') then if fp:lower():find('^add-ons/') then
local addonpath = fp:lower():match('^add-ons/[^/]+') .. '/' local addonpath = fp:lower():match('^add-ons/[^/]+')..'/'
table.insert(fns, addonpath .. fp .. '.lua') -- add-on file table.insert(fns, addonpath..fp..'.lua') -- add-on file
table.insert(fns, addonpath .. fp .. '/init.lua') -- add-on library table.insert(fns, addonpath..fp..'/init.lua') -- add-on library
end end
for _, fn in ipairs(fns) do for _,fn in ipairs(fns) do
local fne = file_exists(fn, 2) local fne = file_exists(fn, 2)
if fne then if fne then
local res = { dofile(fne, 2) } local res = {dofile(fne, 2)}
require_memo[mod] = res require_memo[mod] = res
return unpack(res) return unpack(res)
end end
end end
return _bllua_requiresecure(mod) return _bllua_requiresecure(mod)
end end
local function isValidCode(code) local function isValidCode(code)
local f, e = loadstring(code) local f,e = loadstring(code)
return f ~= nil return f~=nil
end end
function _bllua_smarteval(code) function _bllua_smarteval(code)
if (not code:find('^print%(')) and isValidCode('print(' .. code .. ')') then if (not code:find('^print%(')) and isValidCode('print('..code..')') then
code = 'print(' .. code .. ')' code = 'print('..code..')' end
end local f,e = loadstring(code)
local f, e = loadstring(code) if f then
if f then return f()
return f() else
else print(e)
print(e) end
end
end end
function ts.setvar(name, val) function ts.setvar(name, val)
_bllua_ts.call('_bllua_set_var', name, val) _bllua_ts.call('_bllua_set_var', name, val)
end end
_bllua_ts.call('echo', ' Executed libts-lua.lua') _bllua_ts.call('echo', ' Executed libts-lua.lua')

1
src/util/matrix.lua
View File

@@ -1,3 +1,4 @@
-- todo -- todo
-- Matrix class with math operators -- Matrix class with math operators

544
src/util/std.lua
View File

@@ -1,398 +1,370 @@
-- Basic functionality that should be standard in Lua -- Basic functionality that should be standard in Lua
-- Table / List -- Table / List
-- Whether a table contains no keys -- Whether a table contains no keys
function table.empty(t) function table.empty(t)
return next(t) ~= nil return next(t)==nil
end end
-- Apply a function to each key in a table -- Apply a function to each key in a table
function table.map(f, ...) function table.map(f, ...)
local ts = { ... } local ts = {...}
local u = {} local u = {}
for k, _ in pairs(ts[1]) do for k,_ in pairs(ts[1]) do
local args = {} local args = {}
for j = 1, #ts do args[j] = ts[j][k] end for j=1,#ts do args[j] = ts[j][k] end
u[k] = f(unpack(args)) u[k] = f(unpack(args))
end end
return u return u
end end
function table.mapk(f, ...) function table.mapk(f, ...)
local ts = { ... } local ts = {...}
local u = {} local u = {}
for k, _ in pairs(ts[1]) do for k,_ in pairs(ts[1]) do
local args = {} local args = {}
for j = 1, #ts do args[j] = ts[j][k] end for j=1,#ts do args[j] = ts[j][k] end
u[k] = f(k, unpack(args)) u[k] = f(k, unpack(args))
end end
return u return u
end end
function table.map_list(f, ...) function table.map_list(f, ...)
local ts = { ... } local ts = {...}
local u = {} local u = {}
for i = 1, #ts[1] do for i=1,#ts[1] do
local args = {} local args = {}
for j = 1, #ts do args[j] = ts[j][i] end for j=1,#ts do args[j] = ts[j][i] end
u[i] = f(unpack(args)) u[i] = f(unpack(args))
end end
return u return u
end end
function table.mapi_list(f, ...) function table.mapi_list(f, ...)
local ts = { ... } local ts = {...}
local u = {} local u = {}
for i = 1, #ts[1] do for i=1,#ts[1] do
local args = {} local args = {}
for j = 1, #ts do args[j] = ts[j][i] end for j=1,#ts do args[j] = ts[j][i] end
u[i] = f(i, unpack(args)) u[i] = f(i, unpack(args))
end end
return u return u
end end
-- Swap keys/values -- Swap keys/values
function table.swap(t) function table.swap(t)
local u = {} local u = {}
for k, v in pairs(t) do u[v] = k end for k,v in pairs(t) do u[v] = k end
return u return u
end end
-- Reverse a list -- Reverse a list
function table.reverse(l) function table.reverse(l)
local m = {} local m = {}
for i = 1, #l do m[#l - i + 1] = l[i] end for i=1,#l do m[#l-i+1] = l[i] end
return m return m
end end
-- Whether a table is a list/array (has only monotonic integer keys) -- Whether a table is a list/array (has only monotonic integer keys)
function table.islist(t) function table.islist(t)
local n = 0 local n = 0
for i, _ in pairs(t) do for i,_ in pairs(t) do
if type(i) ~= 'number' or i % 1 ~= 0 then return false end if type(i)~='number' or i%1~=0 then return false end
n = n + 1 n = n+1
end end
return n == #t return n==#t
end end
-- Append contents of other tables to first table -- Append contents of other tables to first table
function table.append(t, ...) function table.append(t, ...)
local a = { ... } local a = {...}
for _, u in ipairs(a) do for _,u in ipairs(a) do
for _, v in ipairs(u) do table.insert(t, v) end for _,v in ipairs(u) do table.insert(t,v) end
end end
return t return t
end end
-- Create a new table containing all keys from any number of tables -- Create a new table containing all keys from any number of tables
-- latter tables in the arg list override prior ones -- latter tables in the arg list override prior ones
-- overlaps, NOT appends, integer keys -- overlaps, NOT appends, integer keys
function table.join(...) function table.join(...)
local ts = { ... } local ts = {...}
local w = {} local w = {}
for _, t in ipairs(ts) do for _,t in ipairs(ts) do
for k, v in pairs(t) do w[k] = v end for k,v in pairs(t) do w[k] = v end
end end
return w return w
end end
-- Whether a table contains a certain value in any key -- Whether a table contains a certain value in any key
function table.contains(t, s) function table.contains(t,s)
for _, v in pairs(t) do for _,v in pairs(t) do
if v == s then return true end if v==s then return true end
end end
return false return false
end end
function table.contains_list(t,s)
function table.contains_list(t, s) for _,v in ipairs(t) do
for _, v in ipairs(t) do if v==s then return true end
if v == s then return true end end
end return false
return false
end end
-- Copy a table to another table -- Copy a table to another table
function table.copy(t) function table.copy(t)
local u = {} local u = {}
for k, v in pairs(t) do u[k] = v end for k,v in pairs(t) do u[k] = v end
return u return u
end end
function table.copy_list(l) function table.copy_list(l)
local m = {} local m = {}
for i, v in ipairs(l) do m[i] = v end for i,v in ipairs(l) do m[i] = v end
return m return m
end end
-- Sort a table in a new copy -- Sort a table in a new copy
function table.sortcopy(t, f) function table.sortcopy(t, f)
local u = table.copy_list(t) local u = table.copy_list(t)
table.sort(u, f) table.sort(u, f)
return u return u
end end
-- Remove a value from a table -- Remove a value from a table
function table.removevalue(t, r) function table.removevalue(t, r)
local rem = {} local rem = {}
for k, v in pairs(t) do for k,v in pairs(t) do
if v == r then table.insert(rem, k) end if v==r then table.insert(rem, k) end
end end
for _, k in ipairs(rem) do t[k] = nil end for _,k in ipairs(rem) do t[k] = nil end
end end
function table.removevalue_list(t, r) function table.removevalue_list(t, r)
for i = #t, 1, -1 do for i = #t, 1, -1 do
if t[i] == r then if t[i]==r then
table.remove(t, i) table.remove(t, i)
end end
end end
end end
-- Export tables into formatted executable strings -- Export tables into formatted executable strings
local function tabs(tabLevel) local function tabs(tabLevel)
return (' '):rep(tabLevel) return (' '):rep(tabLevel)
end end
local valueToString local valueToString
local function tableToString(t, tabLevel, seen) local function tableToString(t, tabLevel, seen)
if type(t) ~= 'table' or (getmetatable(t) and getmetatable(t).__tostring) then if type(t)~='table' or (getmetatable(t) and getmetatable(t).__tostring) then
return tostring(t) return tostring(t)
elseif table.islist(t) then elseif table.islist(t) then
if #t == 0 then if #t==0 then
return '{}' return '{}'
else else
local strs = {} local strs = {}
local containsTables = false local containsTables = false
for _, v in ipairs(t) do for _,v in ipairs(t) do
if type(v) == 'table' then containsTables = true end if type(v)=='table' then containsTables = true end
table.insert(strs, valueToString(v, tabLevel + 1, seen) .. ',') table.insert(strs, valueToString(v, tabLevel+1, seen)..',')
end end
if containsTables or #t > 3 then if containsTables or #t>3 then
return '{\n' .. tabs(tabLevel + 1) return '{\n'..tabs(tabLevel+1)
.. table.concat(strs, '\n' .. tabs(tabLevel + 1)) ..table.concat(strs, '\n'..tabs(tabLevel+1))
.. '\n' .. tabs(tabLevel) .. '}' ..'\n'..tabs(tabLevel)..'}'
else else
return '{ ' .. table.concat(strs, ' ') .. ' }' return '{ '..table.concat(strs, ' ')..' }'
end end
end end
else else
local containsNonStringKeys = false local containsNonStringKeys = false
for k, v in pairs(t) do for k,v in pairs(t) do
if type(k) ~= 'string' or k:find('[^a-zA-Z0-9_]') then if type(k)~='string' or k:find('[^a-zA-Z0-9_]') then
containsNonStringKeys = true containsNonStringKeys = true
elseif type(k) == 'table' then elseif type(k)=='table' then
error('table.tostring: table contains a table as key, cannot serialize') error('table.tostring: table contains a table as key, cannot serialize')
end end
end end
local strs = {} local strs = {}
if containsNonStringKeys then if containsNonStringKeys then
for k, v in pairs(t) do for k,v in pairs(t) do
table.insert(strs, '\n' .. tabs(tabLevel + 1) table.insert(strs, '\n'..tabs(tabLevel+1)
.. '[' .. valueToString(k, tabLevel + 1, seen) .. '] = ' ..'['..valueToString(k, tabLevel+1, seen)..'] = '
.. valueToString(v, tabLevel + 1, seen) .. ',') ..valueToString(v, tabLevel+1, seen)..',')
end end
else else
for k, v in pairs(t) do for k,v in pairs(t) do
table.insert(strs, '\n' .. tabs(tabLevel + 1) table.insert(strs, '\n'..tabs(tabLevel+1)
.. k .. ' = ' .. valueToString(v, tabLevel + 1, seen) .. ',') ..k..' = '..valueToString(v, tabLevel+1, seen)..',')
end end
end end
return '{' .. table.concat(strs) .. '\n' .. tabs(tabLevel) .. '}' return '{'..table.concat(strs)..'\n'..tabs(tabLevel)..'}'
end end
end end
valueToString = function(v, tabLevel, seen) valueToString = function(v, tabLevel, seen)
local t = type(v) local t = type(v)
if t == 'table' then if t=='table' then
if seen[v] then if seen[v] then
return 'nil --[[ already seen: ' .. tostring(v) .. ' ]]' return 'nil --[[ already seen: '..tostring(v)..' ]]'
else else
seen[v] = true seen[v] = true
return tableToString(v, tabLevel, seen) return tableToString(v, tabLevel, seen)
end end
elseif t == 'string' then elseif t=='string' then
return '\'' .. string.escape(v) .. '\'' return '\''..string.escape(v)..'\''
elseif t == 'number' or t == 'boolean' then elseif t=='number' or t=='boolean' then
return tostring(v) return tostring(v)
else else
--error('table.tostring: table contains a '..t..' value, cannot serialize') --error('table.tostring: table contains a '..t..' value, cannot serialize')
return 'nil --[[ ' .. tostring(v) .. ' ]]' return 'nil --[[ '..tostring(v)..' ]]'
end end
end end
function table.tostring(t) function table.tostring(t)
return tableToString(t, 0, {}) return tableToString(t, 0, {})
end end
-- String -- String
-- Split string into table by separator -- Split string into table by separator
-- or by chars if no separator given -- or by chars if no separator given
-- if regex is not true, sep is treated as a regex pattern -- if regex is not true, sep is treated as a regex pattern
function string.split(str, sep, noregex) function string.split(str, sep, noregex)
if type(str) ~= 'string' then if type(str)~='string' then
error('string.split: argument #1: expected string, got ' .. type(str), 2) error('string.split: argument #1: expected string, got '..type(str), 2) end
end if sep==nil or sep=='' then
if sep == nil or sep == '' then local t = {}
local t = {} local ns = #str
local ns = #str for x = 1, ns do
for x = 1, ns do table.insert(t, str:sub(x, x))
table.insert(t, str:sub(x, x)) end
end return t
return t elseif type(sep)=='string' then
elseif type(sep) == 'string' then local t = {}
local t = {} if #str>0 then
if #str > 0 then local first = 1
local first = 1 while true do
while true do local last, newfirst = str:find(sep, first, noregex)
local last, newfirst = str:find(sep, first, noregex) if not last then break end
if not last then break end table.insert(t, str:sub(first, last-1))
table.insert(t, str:sub(first, last - 1)) first = newfirst+1
first = newfirst + 1 end
end table.insert(t, str:sub(first, #str))
table.insert(t, str:sub(first, #str)) end
end return t
return t else
else error(
error( 'string.split: argument #2: expected string or nil, got '..type(sep), 2)
'string.split: argument #2: expected string or nil, got ' .. type(sep), 2) end
end
end end
-- Split string to a list of char bytes -- Split string to a list of char bytes
function string.bytes(s) function string.bytes(s)
local b = {} local b = {}
for i = 1, #s do for i=1,#s do
local c = s:sub(i, i) local c = s:sub(i,i)
table.insert(b, c:byte()) table.insert(b, c:byte())
end end
return b return b
end end
-- Trim leading and trailing whitespace -- Trim leading and trailing whitespace
function string.trim(s, ws) function string.trim(s, ws)
ws = ws or ' \t\r\n' ws = ws or ' \t\r\n'
return s:gsub('^[' .. ws .. ']+', ''):gsub('[' .. ws .. ']+$', '') .. '' return s:gsub('^['..ws..']+', ''):gsub('['..ws..']+$', '')..''
end end
-- String slicing and searching using [] operator -- String slicing and searching using [] operator
local str_meta = getmetatable('') local str_meta = getmetatable('')
local str_meta_index_old = str_meta.__index local str_meta_index_old= str_meta.__index
function str_meta.__index(s, k) function str_meta.__index(s,k)
if type(k) == 'string' then if type(k)=='string' then
return str_meta_index_old[k] return str_meta_index_old[k]
elseif type(k) == 'number' then elseif type(k)=='number' then
if k < 0 then k = #s + k + 1 end if k<0 then k = #s+k+1 end
return string.sub(s, k, k) return string.sub(s,k,k)
elseif type(k) == 'table' then elseif type(k)=='table' then
local a = k[1] < 0 and (#s + k[1] + 1) or k[1] local a = k[1]<0 and (#s+k[1]+1) or k[1]
local b = k[2] < 0 and (#s + k[2] + 1) or k[2] local b = k[2]<0 and (#s+k[2]+1) or k[2]
return string.sub(s, a, b) return string.sub(s,a,b)
end end
end end
-- String iterator -- String iterator
function string.chars(s) function string.chars(s)
local i = 0 local i = 0
return function() return function()
i = i + 1 i = i+1
if i <= #s then if i<=#s then return s:sub(i,i)
return s:sub(i, i) else return nil end
else end
return nil
end
end
end end
-- Escape sequences -- Escape sequences
local defaultEscapes = { local defaultEscapes = {
['\\'] = '\\\\', ['\\'] = '\\\\',
['\''] = '\\\'', ['\''] = '\\\'',
['\"'] = '\\\"', ['\"'] = '\\\"',
['\t'] = '\\t', ['\t'] = '\\t',
['\r'] = '\\r', ['\r'] = '\\r',
['\n'] = '\\n', ['\n'] = '\\n',
['\0'] = '\\0', ['\0'] = '\\0',
} }
function string.escape(s, escapes) function string.escape(s, escapes)
escapes = escapes or defaultEscapes escapes = escapes or defaultEscapes
local t = {} local t = {}
for i = 1, #s do for i=1,#s do
local c = s:sub(i, i) local c = s:sub(i,i)
table.insert(t, escapes[c] or c) table.insert(t, escapes[c] or c)
end end
return table.concat(t) return table.concat(t)
end end
local defaultEscapeChar = '\\' local defaultEscapeChar = '\\'
local defaultUnescapes = { local defaultUnescapes = {
['\\'] = '\\', ['\\'] = '\\',
['\''] = '\'', ['\''] = '\'',
['\"'] = '\"', ['\"'] = '\"',
['t'] = '\t', ['t'] = '\t',
['r'] = '\r', ['r'] = '\r',
['n'] = '\n', ['n'] = '\n',
['0'] = '\0', ['0'] = '\0',
} }
function string.unescape(s, escapeChar, unescapes) function string.unescape(s, escapeChar, unescapes)
escapeChar = escapeChar or defaultEscapeChar escapeChar = escapeChar or defaultEscapeChar
unescapes = unescapes or defaultUnescapes unescapes = unescapes or defaultUnescapes
local t = {} local t = {}
local inEscape = false local inEscape = false
for i = 1, #s do for i=1,#s do
local c = s:sub(i, i) local c = s:sub(i,i)
if inEscape then if inEscape then
table.insert(t, unescapes[c] table.insert(t, unescapes[c]
or error('string.unescape: invalid escape sequence: \'' or error('string.unescape: invalid escape sequence: \''
.. escapeChar .. c .. '\'')) ..escapeChar..c..'\''))
elseif c == escapeChar then elseif c==escapeChar then
inEscape = true inEscape = true
else else
table.insert(t, c) table.insert(t, c)
end end
end end
return table.concat(t) return table.concat(t)
end end
-- IO -- IO
io = io or {} io = io or {}
-- Read entire file at once, return nil,err if access failed -- Read entire file at once, return nil,err if access failed
function io.readall(filename) function io.readall(filename)
local fi, err = io.open(filename, 'rb') local fi,err = io.open(filename, 'rb')
if not fi then return nil, err end if not fi then return nil,err end
local s = fi:read("*a") local s = fi:read("*a")
fi:close() fi:close()
return s return s
end end
-- Write data to file all at once, return true if success / false,err if failure -- Write data to file all at once, return true if success / false,err if failure
function io.writeall(filename, data) function io.writeall(filename, data)
local fi, err = io.open(filename, 'wb') local fi,err = io.open(filename, 'wb')
if not fi then return false, err end if not fi then return false,err end
fi:write(data) fi:write(data)
fi:close() fi:close()
return true, nil return true,nil
end end
-- Math -- Math
-- Round -- Round
function math.round(x) function math.round(x)
return math.floor(x + 0.5) return math.floor(x+0.5)
end end
-- Mod that accounts for floating point inaccuracy -- Mod that accounts for floating point inaccuracy
function math.mod(a, b) function math.mod(a,b)
local m = a % b local m = a%b
if m == 0 or math.abs(m) < 1e-15 or math.abs(m - b) < 1e-15 then if m==0 or math.abs(m)<1e-15 or math.abs(m-b)<1e-15 then return 0
return 0 else return m end
else
return m
end
end end
-- Clamp value between min and max -- Clamp value between min and max
function math.clamp(v, n, x) function math.clamp(v, n, x)
return math.min(x, math.max(v, n)) return math.min(x, math.max(v, n))
end end
print(' Executed std.lua') print(' Executed std.lua')

413
src/util/vector.lua
View File

@@ -1,237 +1,218 @@
-- Vector math class with operators -- Vector math class with operators
local vector_meta local vector_meta
local vector_new local vector_new
local function vector_check(v, n, name, argn) local function vector_check(v, n, name, argn)
if not v.__is_vector then if not v.__is_vector then
error('vector ' .. name .. ': argument #' .. (argn or 1) error('vector '..name..': argument #'..(argn or 1)
.. ': expected vector, got ' .. type(v), n + 1) ..': expected vector, got '..type(v), n+1) end
end
end end
local function vector_checksamelen(v1, v2, name) local function vector_checksamelen(v1, v2, name)
vector_check(v1, 3, name, 1) vector_check(v1, 3, name, 1)
vector_check(v2, 3, name, 2) vector_check(v2, 3, name, 2)
if #v1 ~= #v2 then if #v1~=#v2 then
error('vector ' .. name .. ': vector lengths do not match (lengths are ' error('vector '..name..': vector lengths do not match (lengths are '
.. #v1 .. ' and ' .. #v2 .. ')', 3) ..#v1..' and '..#v2..')', 3) end
end return #v1
return #v1
end end
local function vector_checklen(v1, v2, name, len) local function vector_checklen(v1, v2, name, len)
vector_check(v1, 3, name, 1) vector_check(v1, 3, name, 1)
vector_check(v2, 3, name, 2) vector_check(v2, 3, name, 2)
if #v1 ~= len or #v2 ~= len then if #v1~=len or #v2~=len then
error('vector ' .. name .. ': vector lengths are not ' .. len .. ' (lengths are ' error('vector '..name..': vector lengths are not '..len..' (lengths are '
.. #v1 .. ' and ' .. #v2 .. ')', 3) ..#v1..' and '..#v2..')', 3) end
end
end end
local function vector_opnnn(name, op) local function vector_opnnn(name, op)
return function(v1, v2) return function(v1, v2)
local len = vector_checksamelen(v1, v2, name) local len = vector_checksamelen(v1, v2, name)
local v3 = {} local v3 = {}
for i = 1, len do for i = 1, len do
v3[i] = op(v1[i], v2[i]) v3[i] = op(v1[i], v2[i])
end end
return vector_new(v3) return vector_new(v3)
end end
end end
local function vector_opnxn(name, op) local function vector_opnxn(name, op)
return function(v1, v2) return function(v1, v2)
local v1v = type(v1) == 'table' and v1.__is_vector local v1v = type(v1)=='table' and v1.__is_vector
local v2v = type(v2) == 'table' and v2.__is_vector local v2v = type(v2)=='table' and v2.__is_vector
if v1v and v2v then if v1v and v2v then
local len = vector_checksamelen(v1, v2, name) local len = vector_checksamelen(v1, v2, name)
local v3 = {} local v3 = {}
for i = 1, len do for i = 1, len do
v3[i] = op(v1[i], v2[i]) v3[i] = op(v1[i], v2[i])
end end
return vector_new(v3) return vector_new(v3)
else else
if v2v then v1, v2 = v2, v1 end if v2v then v1,v2 = v2,v1 end
local len = #v1 local len = #v1
local v3 = {} local v3 = {}
for i = 1, len do for i = 1, len do
v3[i] = op(v1[i], v2) v3[i] = op(v1[i], v2)
end end
return vector_new(v3) return vector_new(v3)
end end
end end
end end
local function vector_opn0n(name, op) local function vector_opn0n(name, op)
return function(v1) return function(v1)
--vector_check(v1, 1, name) --vector_check(v1, 1, name)
local len = #v1 local len = #v1
local v2 = {} local v2 = {}
for i = 1, len do for i = 1, len do
v2[i] = op(v1[i]) v2[i] = op(v1[i])
end end
return vector_new(v2) return vector_new(v2)
end end
end end
local vector_indices = { x = 1, y = 2, z = 3, w = 4, r = 1, g = 2, b = 3, a = 4 } local vector_indices = {x = 1, y = 2, z = 3, w = 4, r = 1, g = 2, b = 3, a = 4}
local vector_meta = { local vector_meta = {
__is_vector = true, __is_vector = true,
__index = function(t, k) __index = function(t, k)
if tonumber(k) then if tonumber(k) then return rawget(t, k)
return rawget(t, k) elseif vector_indices[k] then return rawget(t, vector_indices[k])
elseif vector_indices[k] then else return getmetatable(t)[k]
return rawget(t, vector_indices[k]) end
else end,
return getmetatable(t)[k] __newindex = function(t, k, v)
end if tonumber(k) then rawset(t, k, v)
end, elseif vector_indices[k] then rawset(t, vector_indices[k], v)
__newindex = function(t, k, v) else return
if tonumber(k) then end
rawset(t, k, v) end,
elseif vector_indices[k] then __add = vector_opnnn('add', function(x1, x2) return x1+x2 end),
rawset(t, vector_indices[k], v) __sub = vector_opnnn('sub', function(x1, x2) return x1-x2 end),
else __mul = vector_opnxn('mul', function(x1, x2) return x1*x2 end),
return __div = vector_opnxn('div', function(x1, x2) return x1/x2 end),
end __pow = vector_opnxn('pow', function(x1, x2) return x1^x2 end),
end, __unm = vector_opn0n('inv', function(x1) return -x1 end),
__add = vector_opnnn('add', function(x1, x2) return x1 + x2 end), __concat = nil,
__sub = vector_opnnn('sub', function(x1, x2) return x1 - x2 end), --__len = function(v1) return #v1 end,
__mul = vector_opnxn('mul', function(x1, x2) return x1 * x2 end), __len = nil,
__div = vector_opnxn('div', function(x1, x2) return x1 / x2 end), __eq = function(v1, v2)
__pow = vector_opnxn('pow', function(x1, x2) return x1 ^ x2 end), local len = vector_checksamelen(v1, v2, 'equals')
__unm = vector_opn0n('inv', function(x1) return -x1 end), for i = 1, len do
__concat = nil, if v1[i]~=v2[i] then return false end
--__len = function(v1) return #v1 end, end
__len = nil, return true
__eq = function(v1, v2) end,
local len = vector_checksamelen(v1, v2, 'equals') __lt = nil,
for i = 1, len do __le = nil,
if v1[i] ~= v2[i] then return false end __call = nil,
end abs = vector_opn0n('abs', math.abs),
return true length = function(v1)
end, --vector_check(v1, 2, 'length')
__lt = nil, local len = #v1
__le = nil, local l = 0
__call = nil, for i = 1, len do
abs = vector_opn0n('abs', math.abs), l = l + v1[i]^2
length = function(v1) end
--vector_check(v1, 2, 'length') return math.sqrt(l)
local len = #v1 end,
local l = 0 normalize = function(v1)
for i = 1, len do --vector_check(v1, 2, 'normal')
l = l + v1[i] ^ 2 local length = v1:length()
end local len = #v1
return math.sqrt(l) local v3 = {}
end, for i = 1, len do
normalize = function(v1) if length==0 then v3[i] = 0
--vector_check(v1, 2, 'normal') else v3[i] = v1[i]/length end
local length = v1:length() end
local len = #v1 return vector_new(v3)
local v3 = {} end,
for i = 1, len do __tostring = function(v1)
if length == 0 then --vector_check(v1, 2, 'tostring')
v3[i] = 0 local st = {}
else local len = #v1
v3[i] = v1[i] / length for i = 1, len do
end table.insert(st, tostring(v1[i]))
end end
return vector_new(v3) return 'vector{ '..table.concat(st, ', ')..' }'
end, end,
__tostring = function(v1) unpack = function(v1) return unpack(v1) end,
--vector_check(v1, 2, 'tostring') floor = vector_opn0n('floor', function(x1) return math.floor(x1) end),
local st = {} ceil = vector_opn0n('ceil' , function(x1) return math.ceil (x1) end),
local len = #v1 round = vector_opn0n('round', function(x1) return math.floor(x1+0.5) end),
for i = 1, len do dot = function(v1, v2)
table.insert(st, tostring(v1[i])) local len = vector_checksamelen(v1, v2, 'dot')
end local x = 0
return 'vector{ ' .. table.concat(st, ', ') .. ' }' for i = 1, len do
end, x = x + v1[i]*v2[i]
unpack = function(v1) return unpack(v1) end, end
floor = vector_opn0n('floor', function(x1) return math.floor(x1) end), return x
ceil = vector_opn0n('ceil', function(x1) return math.ceil(x1) end), end,
round = vector_opn0n('round', function(x1) return math.floor(x1 + 0.5) end), cross = function(v1, v2)
dot = function(v1, v2) vector_checklen(v1, v2, 'cross', 3)
local len = vector_checksamelen(v1, v2, 'dot') return vector_new{
local x = 0 v1[2]*v2[3] - v1[3]*v2[2],
for i = 1, len do v1[3]*v2[1] - v1[1]*v2[3],
x = x + v1[i] * v2[i] v1[1]*v2[2] - v1[2]*v2[1],
end }
return x end,
end, rotateByAngleId = function(v1, r)
cross = function(v1, v2) --vector_check(v1, 2, 'rotate')
vector_checklen(v1, v2, 'cross', 3) if type(r)~='number' or r%1~=0 then
return vector_new { error('vector rotateByAngleId: invalid rotation '..tostring(r), 2) end
v1[2] * v2[3] - v1[3] * v2[2], r = r%4
v1[3] * v2[1] - v1[1] * v2[3], local v2
v1[1] * v2[2] - v1[2] * v2[1], if r==0 then v2 = vector_new{ v1[1], v1[2], v1[3] }
} elseif r==1 then v2 = vector_new{ v1[2], -v1[1], v1[3] }
end, elseif r==2 then v2 = vector_new{ -v1[1], -v1[2], v1[3] }
rotateByAngleId = function(v1, r) elseif r==3 then v2 = vector_new{ -v1[2], v1[1], v1[3] }
--vector_check(v1, 2, 'rotate') else error('vector rotateByAngleId: invalid rotation '..r, 2) end
if type(r) ~= 'number' or r % 1 ~= 0 then return v2
error('vector rotateByAngleId: invalid rotation ' .. tostring(r), 2) end,
end rotateZ = function(v, r)
r = r % 4 --vector_check(v, 2, 'rotate2d')
local v2 if type(r)~='number' then
if r == 0 then error('vector rotateZ: invalid rotation '..tostring(r), 2) end
v2 = vector_new { v1[1], v1[2], v1[3] } local len = math.sqrt(v[1]^2 + v[2]^2)
elseif r == 1 then local ang = math.atan2(v[2], v[1]) + r
v2 = vector_new { v1[2], -v1[1], v1[3] } local v2 = vector_new{ math.cos(ang)*len, math.sin(ang)*len }
elseif r == 2 then return v2
v2 = vector_new { -v1[1], -v1[2], v1[3] } end,
elseif r == 3 then tsString = function(v)
v2 = vector_new { -v1[2], v1[1], v1[3] } --vector_check(v, 2, 'tsString')
else return table.concat(v, ' ')
error('vector rotateByAngleId: invalid rotation ' .. r, 2) end,
end distance = function(v1, v2)
return v2 local len = vector_checksamelen(v1, v2, 'distance')
end, local sum = 0
rotateZ = function(v, r) for i=1,len do
--vector_check(v, 2, 'rotate2d') sum = sum + (v1[i] - v2[i])^2
if type(r) ~= 'number' then end
error('vector rotateZ: invalid rotation ' .. tostring(r), 2) return math.sqrt(sum)
end end,
local len = math.sqrt(v[1] ^ 2 + v[2] ^ 2) copy = function(v)
local ang = math.atan2(v[2], v[1]) + r --vector_check(v, 2, 'copy')
local v2 = vector_new { math.cos(ang) * len, math.sin(ang) * len } return vector_new(v)
return v2 end,
end,
tsString = function(v)
--vector_check(v, 2, 'tsString')
return table.concat(v, ' ')
end,
distance = function(v1, v2)
local len = vector_checksamelen(v1, v2, 'distance')
local sum = 0
for i = 1, len do
sum = sum + (v1[i] - v2[i]) ^ 2
end
return math.sqrt(sum)
end,
copy = function(v)
--vector_check(v, 2, 'copy')
return vector_new(v)
end,
} }
vector_new = function(vi) vector_new = function(vi)
if vi then if vi then
if type(vi) == 'string' then if type(vi)=='string' then
local vi2 = {} local vi2 = {}
for val in vi:gmatch('[0-9%.%-e]+') do for val in vi:gmatch('[0-9%.%-e]+') do
table.insert(vi2, tonumber(val)) table.insert(vi2, tonumber(val))
end end
vi = vi2 vi = vi2
elseif type(vi) ~= 'table' then elseif type(vi)~='table' then
error('vector: argument #1: expected input table, got ' .. type(vi), 2) error('vector: argument #1: expected input table, got '..type(vi), 2)
end end
local v = {} local v = {}
if #vi > 0 then if #vi>0 then
for i = 1, #vi do v[i] = vi[i] end for i = 1, #vi do v[i] = vi[i] end
else else
for n, i in pairs(vector_indices) do v[i] = vi[n] end for n, i in pairs(vector_indices) do v[i] = vi[n] end
if #v == 0 then if #v==0 then
error('vector: argument #1: table contains no values', 2) error('vector: argument #1: table contains no values', 2)
end end
end end
setmetatable(v, vector_meta) setmetatable(v, vector_meta)
return v return v
else else
error('vector: argument #1: expected input table, got nil', 2) error('vector: argument #1: expected input table, got nil', 2)
end end
end end
vector = vector_new vector = vector_new