walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Fixed up some post 5.1/jit Symbols (#1385) 

* Updated k functions to have appropriate method signatures for 5.3 and up.

* Fixed up some inconsistent signatures that I forgot.
This commit is contained in:
Adam 2023-02-09 11:55:47 -05:00 committed by GitHub
parent 195520ea12
commit 8bf47ec172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
resources/lite_xl_plugin_api.h
View File

@ -205,6 +205,7 @@ Go figure.
#define luai_numisnan(L,a) (!luai_numeq((a), (a))) #define luai_numisnan(L,a) (!luai_numeq((a), (a)))
#endif #endif
#define LUA_INTEGER ptrdiff_t #define LUA_INTEGER ptrdiff_t
#define LUA_KCONTEXT ptrdiff_t
#define LUA_UNSIGNED unsigned LUA_INT32 #define LUA_UNSIGNED unsigned LUA_INT32
#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) #if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI)
#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) #if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86)
@ -235,10 +236,12 @@ typedef int (*lua_CFunction) (lua_State *L);
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);
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);
typedef LUA_KCONTEXT lua_KContext;
typedef LUA_NUMBER lua_Number; typedef LUA_NUMBER lua_Number;
typedef LUA_INTEGER lua_Integer; typedef LUA_INTEGER lua_Integer;
typedef LUA_UNSIGNED lua_Unsigned; typedef LUA_UNSIGNED lua_Unsigned;
typedef struct lua_Debug lua_Debug; typedef struct lua_Debug lua_Debug;
typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar); typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
struct lua_Debug { struct lua_Debug {
int event; int event;
@ -321,12 +324,12 @@ SYMBOL_DECLARE(void, lua_rawsetp, lua_State *L, int idx,
SYMBOL_DECLARE(int, lua_setmetatable, lua_State *L, int objindex) SYMBOL_DECLARE(int, lua_setmetatable, lua_State *L, int objindex)
SYMBOL_DECLARE(void, lua_setuservalue, lua_State *L, int idx) SYMBOL_DECLARE(void, lua_setuservalue, lua_State *L, int idx)
SYMBOL_DECLARE(void, lua_setiuservalue, lua_State *L, int idx, int n) SYMBOL_DECLARE(void, lua_setiuservalue, lua_State *L, int idx, int n)
SYMBOL_DECLARE(void, lua_callk, lua_State *L, int nargs, int nresults, int ctx, lua_CFunction k) SYMBOL_DECLARE(void, lua_callk, lua_State *L, int nargs, int nresults, lua_KContext ctx, lua_KFunction k)
SYMBOL_DECLARE(int, lua_getctx, lua_State *L, int *ctx) SYMBOL_DECLARE(int, lua_getctx, lua_State *L, int *ctx)
SYMBOL_DECLARE(int, lua_pcallk, lua_State *L, int nargs, int nresults, int errfunc, int ctx, lua_CFunction k) SYMBOL_DECLARE(int, lua_pcallk, lua_State *L, int nargs, int nresults, int errfunc, lua_KContext ctx, lua_KFunction k)
SYMBOL_DECLARE(int, lua_load, lua_State *L, lua_Reader reader, void *dt, const char *chunkname, const char *mode) SYMBOL_DECLARE(int, lua_load, lua_State *L, lua_Reader reader, void *dt, const char *chunkname, const char *mode)
SYMBOL_DECLARE(int, lua_dump, lua_State *L, lua_Writer writer, void *data, int strip) SYMBOL_DECLARE(int, lua_dump, lua_State *L, lua_Writer writer, void *data, int strip)
SYMBOL_DECLARE(int, lua_yieldk, lua_State *L, int nresults, int ctx, lua_CFunction k) SYMBOL_DECLARE(int, lua_yieldk, lua_State *L, int nresults, lua_KContext ctx, lua_KFunction k)
SYMBOL_DECLARE(int, lua_resume, lua_State *L, lua_State *from, int narg) SYMBOL_DECLARE(int, lua_resume, lua_State *L, lua_State *from, int narg)
SYMBOL_DECLARE(int, lua_status, lua_State *L) SYMBOL_DECLARE(int, lua_status, lua_State *L)
SYMBOL_DECLARE(int, lua_gc, lua_State *L, int what, int data) SYMBOL_DECLARE(int, lua_gc, lua_State *L, int what, int data)
@ -740,13 +743,13 @@ SYMBOL_WRAP_DECL(void, lua_setuservalue, lua_State *L, int idx){
SYMBOL_WRAP_DECL(void, lua_setiuservalue, lua_State *L, int idx, int n){ SYMBOL_WRAP_DECL(void, lua_setiuservalue, lua_State *L, int idx, int n){
SYMBOL_WRAP_CALL(lua_setiuservalue, L, idx, n); SYMBOL_WRAP_CALL(lua_setiuservalue, L, idx, n);
} }
SYMBOL_WRAP_DECL(void, lua_callk, lua_State *L, int nargs, int nresults, int ctx, lua_CFunction k){ SYMBOL_WRAP_DECL(void, lua_callk, lua_State *L, int nargs, int nresults, lua_KContext ctx, lua_KFunction k){
SYMBOL_WRAP_CALL(lua_callk, L, nargs, nresults, ctx, k); SYMBOL_WRAP_CALL(lua_callk, L, nargs, nresults, ctx, k);
} }
SYMBOL_WRAP_DECL(int, lua_getctx, lua_State *L, int *ctx){ SYMBOL_WRAP_DECL(int, lua_getctx, lua_State *L, int *ctx){
SYMBOL_WRAP_CALL(lua_getctx, L, ctx); SYMBOL_WRAP_CALL(lua_getctx, L, ctx);
} }
SYMBOL_WRAP_DECL(int, lua_pcallk, lua_State *L, int nargs, int nresults, int errfunc, int ctx, lua_CFunction k){ SYMBOL_WRAP_DECL(int, lua_pcallk, lua_State *L, int nargs, int nresults, int errfunc, lua_KContext ctx, lua_KFunction k){
SYMBOL_WRAP_CALL(lua_pcallk, L, nargs, nresults, errfunc, ctx, k); SYMBOL_WRAP_CALL(lua_pcallk, L, nargs, nresults, errfunc, ctx, k);
} }
SYMBOL_WRAP_DECL(int, lua_load, lua_State *L, lua_Reader reader, void *dt, const char *chunkname, const char *mode){ SYMBOL_WRAP_DECL(int, lua_load, lua_State *L, lua_Reader reader, void *dt, const char *chunkname, const char *mode){
@ -755,7 +758,7 @@ SYMBOL_WRAP_DECL(int, lua_load, lua_State *L, lua_Reader reader, void *dt, const
SYMBOL_WRAP_DECL(int, lua_dump, lua_State *L, lua_Writer writer, void *data, int strip){ SYMBOL_WRAP_DECL(int, lua_dump, lua_State *L, lua_Writer writer, void *data, int strip){
SYMBOL_WRAP_CALL(lua_dump, L, writer, data, strip); SYMBOL_WRAP_CALL(lua_dump, L, writer, data, strip);
} }
SYMBOL_WRAP_DECL(int, lua_yieldk, lua_State *L, int nresults, int ctx, lua_CFunction k){ SYMBOL_WRAP_DECL(int, lua_yieldk, lua_State *L, int nresults, lua_KContext ctx, lua_KFunction k){
SYMBOL_WRAP_CALL(lua_yieldk, L, nresults, ctx, k); SYMBOL_WRAP_CALL(lua_yieldk, L, nresults, ctx, k);
} }
SYMBOL_WRAP_DECL(int, lua_resume, lua_State *L, lua_State *from, int narg){ SYMBOL_WRAP_DECL(int, lua_resume, lua_State *L, lua_State *from, int narg){
@ -1041,12 +1044,12 @@ static void lite_xl_plugin_init(void *XL) {
IMPORT_SYMBOL(lua_setmetatable, int , lua_State *L, int objindex); IMPORT_SYMBOL(lua_setmetatable, int , lua_State *L, int objindex);
IMPORT_SYMBOL_OPT(lua_setuservalue, void , lua_State *L, int idx); IMPORT_SYMBOL_OPT(lua_setuservalue, void , lua_State *L, int idx);
IMPORT_SYMBOL(lua_setiuservalue, void , lua_State *L, int idx, int n); IMPORT_SYMBOL(lua_setiuservalue, void , lua_State *L, int idx, int n);
IMPORT_SYMBOL(lua_callk, void , lua_State *L, int nargs, int nresults, int ctx, lua_CFunction k); IMPORT_SYMBOL(lua_callk, void , lua_State *L, int nargs, int nresults, lua_KContext ctx, lua_KFunction k);
IMPORT_SYMBOL(lua_getctx, int , lua_State *L, int *ctx); IMPORT_SYMBOL(lua_getctx, int , lua_State *L, int *ctx);
IMPORT_SYMBOL(lua_pcallk, int , lua_State *L, int nargs, int nresults, int errfunc, int ctx, lua_CFunction k); IMPORT_SYMBOL(lua_pcallk, int , lua_State *L, int nargs, int nresults, int errfunc, lua_KContext ctx, lua_KFunction k);
IMPORT_SYMBOL(lua_load, int , lua_State *L, lua_Reader reader, void *dt, const char *chunkname, const char *mode); IMPORT_SYMBOL(lua_load, int , lua_State *L, lua_Reader reader, void *dt, const char *chunkname, const char *mode);
IMPORT_SYMBOL(lua_dump, int , lua_State *L, lua_Writer writer, void *data, int strip); IMPORT_SYMBOL(lua_dump, int , lua_State *L, lua_Writer writer, void *data, int strip);
IMPORT_SYMBOL(lua_yieldk, int , lua_State *L, int nresults, int ctx, lua_CFunction k); IMPORT_SYMBOL(lua_yieldk, int , lua_State *L, int nresults, lua_KContext ctx, lua_KFunction k);
IMPORT_SYMBOL(lua_resume, int , lua_State *L, lua_State *from, int narg); IMPORT_SYMBOL(lua_resume, int , lua_State *L, lua_State *from, int narg);
IMPORT_SYMBOL(lua_status, int , lua_State *L); IMPORT_SYMBOL(lua_status, int , lua_State *L);
IMPORT_SYMBOL(lua_gc, int , lua_State *L, int what, int data); IMPORT_SYMBOL(lua_gc, int , lua_State *L, int what, int data);