Merge branch 'eris' into zepto8

Author: samhocevar

eris.c

@@ -604,28 +604,31 @@ read_uint8_t(Info *info) {
 
 static uint16_t
 read_uint16_t(Info *info) {
-  return  (uint16_t)read_uint8_t(info) |
-         ((uint16_t)read_uint8_t(info) << 8);
+  uint16_t value = (uint16_t)read_uint8_t(info);
+  value |= (uint16_t)read_uint8_t(info) << 8;
+  return value;
 }
 
 static uint32_t
 read_uint32_t(Info *info) {
-  return  (uint32_t)read_uint8_t(info) |
-         ((uint32_t)read_uint8_t(info) << 8) |
-         ((uint32_t)read_uint8_t(info) << 16) |
-         ((uint32_t)read_uint8_t(info) << 24);
+  uint32_t value = (uint32_t)read_uint8_t(info);
+  value |= (uint32_t)read_uint8_t(info) << 8;
+  value |= (uint32_t)read_uint8_t(info) << 16;
+  value |= (uint32_t)read_uint8_t(info) << 24;
+  return value;
 }
 
 static uint64_t
 read_uint64_t(Info *info) {
-  return  (uint64_t)read_uint8_t(info) |
-         ((uint64_t)read_uint8_t(info) << 8) |
-         ((uint64_t)read_uint8_t(info) << 16) |
-         ((uint64_t)read_uint8_t(info) << 24) |
-         ((uint64_t)read_uint8_t(info) << 32) |
-         ((uint64_t)read_uint8_t(info) << 40) |
-         ((uint64_t)read_uint8_t(info) << 48) |
-         ((uint64_t)read_uint8_t(info) << 56);
+  uint64_t value = (uint64_t)read_uint8_t(info);
+  value |= (uint64_t)read_uint8_t(info) << 8;
+  value |= (uint64_t)read_uint8_t(info) << 16;
+  value |= (uint64_t)read_uint8_t(info) << 24;
+  value |= (uint64_t)read_uint8_t(info) << 32;
+  value |= (uint64_t)read_uint8_t(info) << 40;
+  value |= (uint64_t)read_uint8_t(info) << 48;
+  value |= (uint64_t)read_uint8_t(info) << 56;
+  return value;
 }
 
 static int16_t

lua.h

@@ -355,7 +355,7 @@ LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
 
 #if defined(eris_c)
 /* Utility macro for populating the perms table with internal C functions. */
-# define eris_persist(lib, fn)\
+# define eris_persist_static(lib, fn)\
     extern lua_CFunction __perm_##lib##_##fn;\
     if (forUnpersist) {\
       lua_pushstring(L, "__eris." #lib "_" #fn);\
@@ -368,7 +368,7 @@ LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
     lua_rawset(L, -3);
 #else
 /* Utility macro to export internal C functions to eris. */
-# define eris_persist(lib, fn)\
+# define eris_persist_static(lib, fn)\
     static int fn (lua_State *L);\
     lua_CFunction __perm_##lib##_##fn = fn;
 #endif
@@ -380,30 +380,30 @@ static void populateperms(lua_State *L, bool forUnpersist)
 {
 #endif
 #if defined(eris_c) || defined(lstrlib_c)
-  eris_persist(strlib, gmatch_aux)
+  eris_persist_static(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)
+  eris_persist_static(loadlib, searcher_preload)
+  eris_persist_static(loadlib, searcher_Lua)
+  eris_persist_static(loadlib, searcher_C)
+  eris_persist_static(loadlib, searcher_Croot)
 #endif
 #if defined(eris_c) || defined(liolib_c)
-  eris_persist(iolib, io_readline)
+  eris_persist_static(iolib, io_readline)
 #endif*/
 #if defined(eris_c) || defined(lbaselib_c)
-  eris_persist(baselib, pcallcont)
-  eris_persist(baselib, luaB_next)
-  eris_persist(baselib, ipairsaux)
+  eris_persist_static(baselib, pcallcont)
+  eris_persist_static(baselib, luaB_next)
+  eris_persist_static(baselib, ipairsaux)
 #endif
 #if defined(eris_c) || defined(lcorolib_c)
-  eris_persist(corolib, luaB_auxwrap)
+  eris_persist_static(corolib, luaB_auxwrap)
 #endif
 #if defined(eris_c)
 }
 #endif
 
-#undef eris_persist
+#undef eris_persist_static