Merge branch 'eris' into zepto8

Additional changes:
 - lua.h: do not try to persist loadlib and liolib
 - eris.c: fix read and write functions for lua_Number
 - .gitignore: add z8lua

Author: samhocevar

.gitignore

@@ -1,3 +1,3 @@
 *.o
 *.a
-lua
+z8lua

eris.c

@@ -0,0 +1,153 @@
+/*
+Eris - Heavy-duty persistence for Lua 5.2.4 - Based on Pluto
+Copyright (c) 2013-2015 by Florian Nuecke.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+/* lua.h must be included before this file */
+
+#ifndef ERIS_H
+#define ERIS_H
+
+#define ERIS_VERSION_MAJOR  "1"
+#define ERIS_VERSION_MINOR  "1"
+#define ERIS_VERSION_NUM    101
+#define ERIS_VERSION_RELEASE  "1"
+
+/*
+** ==================================================================
+** API
+** ==================================================================
+*/
+
+/**
+ * This provides an interface to Eris' persist functionality for writing in
+ * an arbitrary way, using a writer.
+ *
+ * When called, the stack in 'L' must look like this:
+ * 1: perms:table
+ * 2: value:any
+ *
+ * 'writer' is the writer function used to store all data, 'ud' is passed to
+ * the writer function whenever it is called.
+ *
+ * [-0, +0, e]
+ */
+LUA_API void eris_dump(lua_State* L, lua_Writer writer, void* ud);
+
+/**
+ * This provides an interface to Eris' unpersist functionality for reading
+ * in an arbitrary way, using a reader.
+ *
+ * When called, the stack in 'L' must look like this:
+ * 1: perms:table
+ *
+ * 'reader' is the reader function used to read all data, 'ud' is passed to
+ * the reader function whenever it is called.
+ *
+ * The result of the operation will be pushed onto the stack.
+ *
+ * [-0, +1, e]
+ */
+LUA_API void eris_undump(lua_State* L, lua_Reader reader, void* ud);
+
+/**
+ * This is a stack-based alternative to eris_dump.
+ *
+ * It expects the perms table at the specified index 'perms' and the value to
+ * persist at the specified index 'value'. It will push the resulting string
+ * onto the stack on success.
+ *
+ * [-0, +1, e]
+ */
+LUA_API void eris_persist(lua_State* L, int perms, int value);
+
+/**
+ * This is a stack-based alternative to eris_undump.
+ *
+ * It expects the perms table at the specified index 'perms' and the string
+ * containing persisted data at the specified index 'value'. It will push the
+ * resulting value onto the stack on success.
+ *
+ * [-0, +1, e]
+ */
+LUA_API void eris_unpersist(lua_State* L, int perms, int value);
+
+/**
+ * Pushes the current value of a setting onto the stack.
+ *
+ * The name is the name of the setting to get the value for:
+ * - 'debug'  whether to write debug information when persisting function
+ *            prototypes (line numbers, local variable names, upvalue names).
+ * - 'maxrec' the maximum complexity of objects we support (the nesting level
+ *            of tables, for example). This can be useful to avoid segmentation
+ *            faults due to too deep recursion when working with user-provided
+ *            data.
+ * - 'path'   whether to generate a "path" used to indicate where in an object
+ *            an error occurred. This adds considerable overhead and should
+ *            only be used to debug errors as they appear.
+ * - 'spio'   whether to pass IO objects along as light userdata to special
+ *            persistence functions. When persisting this will pass along the
+ *            lua_Writer and its void* in addition to the original object, when
+ *            unpersisting it will pass along a ZIO*.
+ * - 'spkey'  the name of the field in the metatable of tables and userdata
+ *            used to control persistence (on/off or special persistence).
+ *
+ * If an unknown name is specified this will throw an error.
+ *
+ * [-0, +1, e]
+ */
+LUA_API void eris_get_setting(lua_State *L, const char *name);
+
+/**
+ * Changes the value of a setting to a value on the stack.
+ *
+ * For the available settings see eris_set_setting(). This will get the new
+ * value from the specified stack index 'value'. If the type does not match
+ * this will throw an error. Specify a nil value to reset the setting to its
+ * default value.
+ *
+ * [-0, +0, e]
+ */
+LUA_API void eris_set_setting(lua_State *L, const char *name, int value);
+
+/*
+** ==================================================================
+** Library installer
+** ==================================================================
+*/
+
+/**
+ * This pushes a table with the two functions 'persist' and 'unpersist':
+ *   persist([perms,] value)
+ *     Where 'perms' is a table with "permanent" objects and 'value' is the
+ *     value that should be persisted. Returns the string with persisted data.
+ *     If only one value is given, the perms table is assumed to be empty.
+ *
+ *   unpersist([perms,] value)
+ *     Where 'perms' is a table with the inverse mapping as used when
+ *     persisting the data via persist() and 'value' is the string with the
+ *     persisted data returned by persist(). Returns the unpersisted value.
+ *     If only one value is given, the perms table is assumed to be empty.
+ */
+LUA_API int luaopen_eris(lua_State* L);
+
+#endif
+

eris.h

@@ -276,7 +276,12 @@ static void hookf (lua_State *L, lua_Debug *ar) {
       lua_pushinteger(L, ar->currentline);
     else lua_pushnil(L);
     lua_assert(lua_getinfo(L, "lS", ar));
-    lua_call(L, 2, 0);
+    int yield =
+      (ar->event == LUA_HOOKLINE || ar->event == LUA_HOOKCOUNT)
+      && (lua_gethookmask(L) & LUA_MASKYIELD) ? 1 : 0;
+    lua_call(L, 2, yield);  /* call hook function */
+    if (yield && lua_toboolean(L, -1))
+      lua_yield(L, 0);
   }
 }
 
@@ -286,6 +291,7 @@ static int makemask (const char *smask, int count) {
   if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
   if (strchr(smask, 'r')) mask |= LUA_MASKRET;
   if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+  if (strchr(smask, 'y')) mask |= LUA_MASKYIELD;
   if (count > 0) mask |= LUA_MASKCOUNT;
   return mask;
 }
@@ -296,6 +302,7 @@ static char *unmakemask (int mask, char *smask) {
   if (mask & LUA_MASKCALL) smask[i++] = 'c';
   if (mask & LUA_MASKRET) smask[i++] = 'r';
   if (mask & LUA_MASKLINE) smask[i++] = 'l';
+  if (mask & LUA_MASKYIELD) smask[i++] = 'y';
   smask[i] = '\0';
   return smask;
 }

ldblib.c

@@ -629,8 +629,9 @@ static void clearkeys (global_State *g, GCObject *l, GCObject *f) {
     for (n = gnode(h, 0); n < limit; n++) {
       if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) {
         setnilvalue(gval(n));  /* remove value ... */
-        removeentry(n);  /* and remove entry from table */
       }
+      if (ttisnil(gval(n)))  /* is entry empty? */
+        removeentry(n);  /* remove entry from table */
     }
   }
 }

lgc.c

@@ -33,6 +33,7 @@ static const luaL_Reg loadedlibs[] = {
   {LUA_TABLIBNAME, luaopen_table},
   {LUA_STRLIBNAME, luaopen_string},
   {LUA_DBLIBNAME, luaopen_debug},
+  {LUA_ERISLIBNAME, luaopen_eris},
   {NULL, NULL}
 };
 

linit.c

@@ -324,6 +324,8 @@ static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
       luaK_nil(fs, reg, extra);
     }
   }
+  if (nexps > nvars)
+    ls->fs->freereg -= nexps - nvars;  /* remove extra values */
 }
 
 
@@ -1151,11 +1153,8 @@ static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) {
     int nexps;
     checknext(ls, '=');
     nexps = explist(ls, &e);
-    if (nexps != nvars) {
+    if (nexps != nvars)
       adjust_assign(ls, nvars, nexps, &e);
-      if (nexps > nvars)
-        ls->fs->freereg -= nexps - nvars;  /* remove extra values */
-    }
     else {
       luaK_setoneret(ls->fs, &e);  /* close last expression */
       luaK_storevar(ls->fs, &lh->v, &e);
@@ -1252,7 +1251,7 @@ static void labelstat (LexState *ls, TString *label, int line) {
   checkrepeated(fs, ll, label);  /* check for repeated labels */
   checknext(ls, TK_DBCOLON);  /* skip double colon */
   /* create new entry for this label */
-  l = newlabelentry(ls, ll, label, line, fs->pc);
+  l = newlabelentry(ls, ll, label, line, luaK_getlabel(fs));
   skipnoopstat(ls);  /* skip other no-op statements */
   if (block_follow(ls, 0)) {  /* label is last no-op statement in the block? */
     /* assume that locals are already out of scope */
@@ -1424,7 +1423,7 @@ static int test_then_block (LexState *ls, int *escapelist) {
     luaK_goiffalse(ls->fs, &v);  /* will jump to label if condition is true */
     enterblock(fs, &bl, 0);  /* must enter block before 'goto' */
     gotostat(ls, v.t);  /* handle goto/break */
-    skipnoopstat(ls);  /* skip other no-op statements */
+    while (testnext(ls, ';')) {}  /* skip semicolons */
     if (block_follow(ls, 0)) {  /* 'goto' is the entire block? */
       leaveblock(fs);
       return short_if;  /* and that is it */

lparser.c

@@ -21,7 +21,7 @@
 #define LUA_VERSION_NUM		502
 #define LUA_VERSION_RELEASE	"4"
 
-#define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#define LUA_VERSION	"Lua+Eris " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
 #define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
 #define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2015 Lua.org, PUC-Rio"
 #define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
@@ -347,6 +347,66 @@ LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
 
 
 
+/*
+** =======================================================================
+** Eris persistence
+** =======================================================================
+*/
+
+#if defined(eris_c)
+/* Utility macro for populating the perms table with internal C functions. */
+# define eris_persist(lib, fn)\
+    extern lua_CFunction __perm_##lib##_##fn;\
+    if (forUnpersist) {\
+      lua_pushstring(L, "__eris." #lib "_" #fn);\
+      lua_pushcfunction(L, *__perm_##lib##_##fn);\
+    }\
+    else {\
+      lua_pushcfunction(L, *__perm_##lib##_##fn);\
+      lua_pushstring(L, "__eris." #lib "_" #fn);\
+    }\
+    lua_rawset(L, -3);
+#else
+/* Utility macro to export internal C functions to eris. */
+# define eris_persist(lib, fn)\
+    static int fn (lua_State *L);\
+    lua_CFunction __perm_##lib##_##fn = fn;
+#endif
+
+#if defined(eris_c)
+/* Functions in Lua libraries used to access C functions we need to add to the
+ * permanents table to fully support yielded coroutines. */
+static void populateperms(lua_State *L, bool forUnpersist)
+{
+#endif
+#if defined(eris_c) || defined(lstrlib_c)
+  eris_persist(strlib, gmatch_aux)
+#endif
+/*#if defined(eris_c) || defined(loadlib_c)
+  eris_persist(loadlib, searcher_preload)
+  eris_persist(loadlib, searcher_Lua)
+  eris_persist(loadlib, searcher_C)
+  eris_persist(loadlib, searcher_Croot)
+#endif
+#if defined(eris_c) || defined(liolib_c)
+  eris_persist(iolib, io_readline)
+#endif*/
+#if defined(eris_c) || defined(lbaselib_c)
+  eris_persist(baselib, pcallcont)
+  eris_persist(baselib, luaB_next)
+  eris_persist(baselib, ipairsaux)
+#endif
+#if defined(eris_c) || defined(lcorolib_c)
+  eris_persist(corolib, luaB_auxwrap)
+#endif
+#if defined(eris_c)
+}
+#endif
+
+#undef eris_persist
+
+
+
 /*
 ** {======================================================================
 ** Debug API
@@ -371,6 +431,7 @@ LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
 #define LUA_MASKRET	(1 << LUA_HOOKRET)
 #define LUA_MASKLINE	(1 << LUA_HOOKLINE)
 #define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
+#define LUA_MASKYIELD	(1 << LUA_HOOKTAILCALL)
 
 typedef struct lua_Debug lua_Debug;  /* activation record */
 

lua.h

@@ -43,6 +43,9 @@ LUAMOD_API int (luaopen_debug) (lua_State *L);
 #define LUA_LOADLIBNAME	"package"
 LUAMOD_API int (luaopen_package) (lua_State *L);
 
+#define LUA_ERISLIBNAME	"eris"
+LUAMOD_API int (luaopen_eris) (lua_State *L);
+
 
 /* open all previous libraries */
 LUALIB_API void (luaL_openlibs) (lua_State *L);

lualib.h

@@ -42,7 +42,7 @@ LIBS = -lm
 CORE_T=	liblua.a
 CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
-	lundump.o lvm.o lzio.o lctype.o
+	lundump.o lvm.o lzio.o lctype.o eris.o
 AUX_O=	lauxlib.o
 LIB_O=	lbaselib.o lcorolib.o ldblib.o ltablib.o lstrlib.o lpico8lib.o linit.o
 
@@ -156,5 +156,8 @@ lvm.o: lvm.c lua.h luaconf.h fix32.h ldebug.h lstate.h lobject.h \
  ltable.h lvm.h
 lzio.o: lzio.c lua.h luaconf.h fix32.h llimits.h lmem.h lstate.h \
  lobject.h ltm.h lzio.h
+eris.o: eris.c lua.h luaconf.h lauxlib.h lualib.h ldebug.h lstate.h \
+ lobject.h llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h \
+ eris.h
 
 # (end of Makefile)