summaryrefslogtreecommitdiff
path: root/apps/plugins/lua/lualib.h
diff options
context:
space:
mode:
authorRichard Quirk <richard.quirk@gmail.com>2014-03-19 19:31:31 +0100
committerMarcin Bukat <marcin.bukat@gmail.com>2014-04-02 20:31:54 +0200
commit36378988ad4059982742f05f5eb50580b456840a (patch)
treeee70be810d894566c5e351f21a1ebb79be742a85 /apps/plugins/lua/lualib.h
parent020f16a1c7d5bc9a302671cef03f56ac735e20c5 (diff)
downloadrockbox-36378988ad4059982742f05f5eb50580b456840a.tar.gz
rockbox-36378988ad4059982742f05f5eb50580b456840a.zip
Update lua plugin to 5.2.3
Prior to this patch the Lua plugin used version 5.1.4. This change reduces the number of modifications in the Lua source using some new defines and because the upstream source is now more flexible. Unless otherwise stated, l*.[ch] files are taken unmodified from the upstream lua-5.2.3. fscanf.c: file descriptors in rockbox are just ints, they are hidden behind a void* now so liolib requires less modifications. fscanf is updated to use void* too. getc.c: this is a new file required for getc implementation in lauxlib.c lauxlib.c: LoadF replaced FILE* with int, the rockbox file descriptor int are cast to FILE* (actually void* due to typedef). getc uses the PREFIX version. stdin is not used, as per 5.1.4. lbaselib.c: now uses strspn in the number parsing. print uses DEBUGF now rather than being commented out. lbitlib.c: use the built-in version from 5.2.3 rather than Reuben Thomas's external library. Backwards compatible and adds some new bit operations. ldo.c: the LUAI_THROW/TRY defines are now in the core lua code, so have been removed from rockconf.h liolib.c: here the implementation has changed to use the LStream from the original source, and cast the FILE* pointers to int. This has reduced the number of modifications from the upstream version. llex.c: the only change from upstream is to remove the locale include. lmathlib.c: updated from the 5.2.3 version and re-applied the changes that were made vs 5.1.4 for random numbers and to remove unsupported float functions. loadlib.c: upstream version, with the 5.1.4 changes for missing functions. lobject.c: upstream version, with ctype.h added and sprintf changed to snprintf. loslib.c: upstream version with locale.h removed and 5.1.4 changes for unsupportable functions. lstrlib.c: sprintf changed to snprintf. ltable.c: upstream with the hashnum function from 5.1.4 to avoid frexp in luai_hashnum. luaconf.h: updated to 5.2.3 version, restored relevant parts from the original 5.1.4 configuration. The COMPAT defines that are no longer available are not included. lundump.c: VERSION macro conflicts with the core Rockbox equivalent. rocklib.c: luaL_reg is no longer available, replaced by luaL_Reg equivalent. Moved checkboolean/optboolean functions to this file and out of core lua files. luaL_getn is no longer available, replaced by luaL_rawlen. luaL_register is deprecated, use the newlib/setfuncs replacements. rli_init has to be called before setting up the newlib to avoid overwriting the rb table. rocklib_aux.pl: use rli_checkboolean from rocklib.c. rocklua.c: new default bits library used, update the library loading code with idiomatic 5.2 code. strcspn.c: no longer needed, but strspn.c is required for strspn in lbaselib.c Change-Id: I0c7945c755f79083afe98ec117e1e8cf13de2651 Reviewed-on: http://gerrit.rockbox.org/774 Tested: Richard Quirk <richard.quirk@gmail.com> Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
Diffstat (limited to 'apps/plugins/lua/lualib.h')
-rw-r--r--apps/plugins/lua/lualib.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/apps/plugins/lua/lualib.h b/apps/plugins/lua/lualib.h
index d4f69fc4af..da82005c9d 100644
--- a/apps/plugins/lua/lualib.h
+++ b/apps/plugins/lua/lualib.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id$ 2** $Id: lualib.h,v 1.43.1.1 2013/04/12 18:48:47 roberto Exp $
3** Lua standard libraries 3** Lua standard libraries
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -11,43 +11,43 @@
11#include "lua.h" 11#include "lua.h"
12 12
13 13
14/* Key to file-handle type */
15#define LUA_FILEHANDLE "FILE*"
16 14
15LUAMOD_API int (luaopen_base) (lua_State *L);
17 16
18#define LUA_COLIBNAME "coroutine" 17#define LUA_COLIBNAME "coroutine"
19LUALIB_API int (luaopen_base) (lua_State *L); 18LUAMOD_API int (luaopen_coroutine) (lua_State *L);
20 19
21#define LUA_TABLIBNAME "table" 20#define LUA_TABLIBNAME "table"
22LUALIB_API int (luaopen_table) (lua_State *L); 21LUAMOD_API int (luaopen_table) (lua_State *L);
23 22
24#define LUA_IOLIBNAME "io" 23#define LUA_IOLIBNAME "io"
25LUALIB_API int (luaopen_io) (lua_State *L); 24LUAMOD_API int (luaopen_io) (lua_State *L);
26 25
27#define LUA_OSLIBNAME "os" 26#define LUA_OSLIBNAME "os"
28LUALIB_API int (luaopen_os) (lua_State *L); 27LUAMOD_API int (luaopen_os) (lua_State *L);
29 28
30#define LUA_STRLIBNAME "string" 29#define LUA_STRLIBNAME "string"
31LUALIB_API int (luaopen_string) (lua_State *L); 30LUAMOD_API int (luaopen_string) (lua_State *L);
31
32#define LUA_BITLIBNAME "bit32"
33LUAMOD_API int (luaopen_bit32) (lua_State *L);
32 34
33#define LUA_MATHLIBNAME "math" 35#define LUA_MATHLIBNAME "math"
34LUALIB_API int (luaopen_math) (lua_State *L); 36LUAMOD_API int (luaopen_math) (lua_State *L);
35 37
36#define LUA_DBLIBNAME "debug" 38#define LUA_DBLIBNAME "debug"
37LUALIB_API int (luaopen_debug) (lua_State *L); 39LUAMOD_API int (luaopen_debug) (lua_State *L);
38 40
39#define LUA_LOADLIBNAME "package" 41#define LUA_LOADLIBNAME "package"
40LUALIB_API int (luaopen_package) (lua_State *L); 42LUAMOD_API int (luaopen_package) (lua_State *L);
41 43
42#define LUA_BITLIBNAME "bit"
43LUALIB_API int (luaopen_bit) (lua_State *L);
44 44
45/* open all previous libraries */ 45/* open all previous libraries */
46LUALIB_API void (luaL_openlibs) (lua_State *L); 46LUALIB_API void (luaL_openlibs) (lua_State *L);
47 47
48 48
49 49
50#ifndef lua_assert 50#if !defined(lua_assert)
51#define lua_assert(x) ((void)0) 51#define lua_assert(x) ((void)0)
52#endif 52#endif
53 53