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>

1 files changed, 20 insertions, 8 deletions

diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c
index 27c1177748..f214aca694 100644
--- a/apps/plugins/lua/rocklib.c
+++ b/apps/plugins/lua/rocklib.c
@@ -156,7 +156,19 @@ static int rli_tostring(lua_State *L)
     return 1;
 }
 
-static const struct luaL_reg rli_lib [] =
+int rli_checkboolean (lua_State *L, int narg) {
+    int b = lua_toboolean(L, narg);
+    if (b == 0)
+        luaL_checktype(L, narg, LUA_TBOOLEAN);
+    return b;
+}
+
+
+int rli_optboolean (lua_State *L, int narg, int def) {
+  return luaL_opt(L, rli_checkboolean, narg, def);
+}
+
+static const struct luaL_Reg rli_lib [] =
 {
     {"__tostring", rli_tostring},
     {"set", rli_set},
@@ -472,8 +484,8 @@ RB_WRAP(read_bmp_file)
 {
     struct bitmap bm;
     const char* filename = luaL_checkstring(L, 1);
-    bool dither = luaL_optboolean(L, 2, true);
-    bool transparent = luaL_optboolean(L, 3, false);
+    bool dither = rli_optboolean(L, 2, true);
+    bool transparent = rli_optboolean(L, 3, false);
     int format = FORMAT_NATIVE;
 
     if(dither)
@@ -516,7 +528,7 @@ static void fill_text_message(lua_State *L, struct text_message * message,
 {
     int i;
     luaL_checktype(L, pos, LUA_TTABLE);
-    int n = luaL_getn(L, pos);
+    int n = lua_rawlen(L, pos);
     const char **lines = (const char**) tlsf_malloc(n * sizeof(const char*));
     if(lines == NULL)
         luaL_error(L, "Can't allocate %d bytes!", n * sizeof(const char*));
@@ -565,7 +577,7 @@ RB_WRAP(do_menu)
     luaL_checktype(L, 2, LUA_TTABLE);
     start_selected = luaL_optint(L, 3, 0);
 
-    n = luaL_getn(L, 2);
+    n = lua_rawlen(L, 2);
     items = (const char**) tlsf_malloc(n * sizeof(const char*));
     if(items == NULL)
         luaL_error(L, "Can't allocate %d bytes!", n * sizeof(const char*));
@@ -758,8 +770,9 @@ extern const luaL_Reg rocklib_aux[];
  */
 LUALIB_API int luaopen_rock(lua_State *L)
 {
-    luaL_register(L, LUA_ROCKLIBNAME, rocklib);
-    luaL_register(L, LUA_ROCKLIBNAME, rocklib_aux);
+    rli_init(L);
+    luaL_newlib(L, rocklib);
+    luaL_setfuncs(L, rocklib_aux, 0);
 
     RB_CONSTANT(HZ);
 
@@ -797,7 +810,6 @@ LUALIB_API int luaopen_rock(lua_State *L)
     RB_STRING_CONSTANT(PLUGIN_DATA_DIR);
     RB_STRING_CONSTANT(VIEWERS_DATA_DIR);
 
-    rli_init(L);
 
     return 1;
 }