Updated for Factorio 1.1.9

Author: Rseding91

src/LuaCPPUtilities.hpp

@@ -5,6 +5,9 @@
 inline const char* lua_pushstring(lua_State* L, const std::string& s)
 { return lua_pushlstring(L, s.c_str(), s.size()); }
 
+inline const char* lua_pushstring(lua_State* L, std::string_view s)
+{ return lua_pushlstring(L, s.data(), s.size()); }
+
 inline void  lua_getfield(lua_State* L, int idx, const std::string& k)
 { lua_getlfield(L, idx, k.c_str(), k.size()); }
 

src/lapi.c

@@ -290,14 +290,14 @@ LUA_API int lua_iscfunction (lua_State *L, int idx) {
 }
 
 
-LUA_API int lua_isnumber (lua_State *L, int idx) {
+LUA_API int lua_isnumberorstringconvertabletonumber (lua_State *L, int idx) {
   TValue n;
   const TValue *o = index2addr(L, idx);
   return tonumber(o, &n);
 }
 
 
-LUA_API int lua_isstring (lua_State *L, int idx) {
+LUA_API int lua_isstringornumberconvertabletostring (lua_State *L, int idx) {
   int t = lua_type(L, idx);
   return (t == LUA_TSTRING || t == LUA_TNUMBER);
 }
@@ -690,6 +690,16 @@ LUA_API void lua_getglobal (lua_State *L, const char *var) {
   lua_unlock(L);
 }
 
+LUA_API void lua_rawgetglobal (lua_State *L, const char *var) {
+  Table *reg = hvalue(&G(L)->l_registry);
+  const TValue *gt;  /* global table */
+  lua_lock(L);
+  checkstack_locked(L, 1);
+  gt = luaH_getint(L, reg, LUA_RIDX_GLOBALS);
+  setsvalue2s(L, L->top++, luaS_new(L, var));
+  setobj2s(L, L->top - 1, luaH_get(L, hvalue(gt), L->top - 1));
+  lua_unlock(L);
+}
 
 LUA_API void lua_gettable (lua_State *L, int idx) {
   StkId t;

src/lbaselib.c

@@ -89,7 +89,7 @@ static int luaB_tonumber (lua_State *L) {
 static int luaB_error (lua_State *L) {
   int level = luaL_optint(L, 2, 1);
   lua_settop(L, 1);
-  if (lua_isstring(L, 1) && level > 0) {  /* add extra information? */
+  if (lua_isstringornumberconvertabletostring(L, 1) && level > 0) {  /* add extra information? */
     luaL_where(L, level);
     lua_pushvalue(L, 1);
     lua_concat(L, 2);
@@ -300,7 +300,7 @@ static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
     *size = 0;
     return NULL;
   }
-  else if (!lua_isstring(L, -1))
+  else if (!lua_isstringornumberconvertabletostring(L, -1))
     luaL_error(L, "reader function must return a string");
   lua_replace(L, RESERVEDSLOT);  /* save string in reserved slot */
   return lua_tolstring(L, RESERVEDSLOT, size);

src/lcorolib.c

@@ -69,7 +69,7 @@ static int luaB_auxwrap (lua_State *L) {
   lua_State *co = lua_tothread(L, lua_upvalueindex(1));
   int r = auxresume(L, co, lua_gettop(L));
   if (r < 0) {
-    if (lua_isstring(L, -1)) {  /* error object is a string? */
+    if (lua_isstringornumberconvertabletostring(L, -1)) {  /* error object is a string? */
       luaL_where(L, 1);  /* add extra info */
       lua_insert(L, -2);
       lua_concat(L, 2);

src/ldblib.c

@@ -117,7 +117,7 @@ static int db_getinfo (lua_State *L) {
   int arg;
   lua_State *L1 = getthread(L, &arg);
   const char *options = luaL_optstring(L, arg+2, "flnStu");
-  if (lua_isnumber(L, arg+1)) {
+  if (lua_isnumberorstringconvertabletonumber(L, arg+1)) {
     if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) {
       lua_pushnil(L);  /* level out of range */
       return 1;
@@ -161,7 +161,6 @@ static int db_getinfo (lua_State *L) {
   return 1;  /* return table */
 }
 
-
 static int db_getlocal (lua_State *L) {
   int arg;
   lua_State *L1 = getthread(L, &arg);
@@ -209,6 +208,8 @@ static int auxupvalue (lua_State *L, int get) {
   const char *name;
   int n = luaL_checkint(L, 2);
   luaL_checktype(L, 1, LUA_TFUNCTION);
+  if (!get && lua_iscfunction(L, 1))
+    luaL_error(L, "Cannot set upvalue of C function");
   name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
   if (name == NULL) return 0;
   lua_pushstring(L, name);

src/lgc.c

@@ -732,8 +732,8 @@ static GCObject **sweeplist (lua_State *L, GCObject** list, GCObject **p, lu_mem
   int tostop;  /* stop sweep when this is true */
   if (isgenerational(g)) {  /* generational mode? */
     toclear = ~0;  /* clear nothing */
-    toset = bitmask(OLDBIT);  /* set the old bit of all surviving objects */
-    tostop = bitmask(OLDBIT);  /* do not sweep old generation */
+    toset = BITMASK(OLDBIT);  /* set the old bit of all surviving objects */
+    tostop = BITMASK(OLDBIT);  /* do not sweep old generation */
   }
   else {  /* normal mode */
     toclear = maskcolors;  /* clear all color bits + old bit */
@@ -934,7 +934,7 @@ void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
 
 
 #define sweepphases  \
-	(bitmask(GCSsweepstring) | bitmask(GCSsweepudata) | bitmask(GCSsweep))
+	(BITMASK(GCSsweepstring) | BITMASK(GCSsweepudata) | BITMASK(GCSsweep))
 
 
 /*
@@ -972,7 +972,7 @@ void luaC_changemode (lua_State *L, int mode) {
   if (mode == g->gckind) return;  /* nothing to change */
   if (mode == KGC_GEN) {  /* change to generational mode */
     /* make sure gray lists are consistent */
-    luaC_runtilstate(L, bitmask(GCSpropagate));
+    luaC_runtilstate(L, BITMASK(GCSpropagate));
     g->GCestimate = gettotalbytes(g);
     g->gckind = KGC_GEN;
   }
@@ -1143,8 +1143,8 @@ static void generationalcollection (lua_State *L) {
   }
   else {
     lu_mem estimate = g->GCestimate;
-    luaC_runtilstate(L, ~bitmask(GCSpause));  /* run complete cycle */
-    luaC_runtilstate(L, bitmask(GCSpause));
+    luaC_runtilstate(L, ~BITMASK(GCSpause));  /* run complete cycle */
+    luaC_runtilstate(L, BITMASK(GCSpause));
     if (gettotalbytes(g) > (estimate / 100) * g->gcmajorinc)
       g->GCestimate = 0;  /* signal for a major collection */
   }
@@ -1218,13 +1218,13 @@ void luaC_fullgc (lua_State *L, int isemergency) {
     entersweep(L);
   }
   /* finish any pending sweep phase to start a new cycle */
-  luaC_runtilstate(L, bitmask(GCSpause));
+  luaC_runtilstate(L, BITMASK(GCSpause));
   /* run entire collector */
-  luaC_runtilstate(L, ~bitmask(GCSpause));
-  luaC_runtilstate(L, bitmask(GCSpause));
+  luaC_runtilstate(L, ~BITMASK(GCSpause));
+  luaC_runtilstate(L, BITMASK(GCSpause));
   if (origkind == KGC_GEN) {  /* generational mode? */
     /* generational mode must always start in propagate phase */
-    luaC_runtilstate(L, bitmask(GCSpropagate));
+    luaC_runtilstate(L, BITMASK(GCSpropagate));
   }
   g->gckind = origkind;
   luaE_setdebt(g, stddebt(g));

src/lgc.h

@@ -66,11 +66,11 @@
 #define resetbits(x,m)		((x) &= cast(lu_byte, ~(m)))
 #define setbits(x,m)		((x) |= (m))
 #define testbits(x,m)		((x) & (m))
-#define bitmask(b)		(1<<(b))
-#define bit2mask(b1,b2)		(bitmask(b1) | bitmask(b2))
-#define l_setbit(x,b)		setbits(x, bitmask(b))
-#define resetbit(x,b)		resetbits(x, bitmask(b))
-#define testbit(x,b)		testbits(x, bitmask(b))
+#define BITMASK(b)		(1<<(b))
+#define bit2mask(b1,b2)		(BITMASK(b1) | BITMASK(b2))
+#define l_setbit(x,b)		setbits(x, BITMASK(b))
+#define resetbit(x,b)		resetbits(x, BITMASK(b))
+#define testbit(x,b)		testbits(x, BITMASK(b))
 
 
 /* Layout for bit use in `marked' field: */
@@ -89,7 +89,7 @@
 #define iswhite(x)      testbits((x)->gch.marked, WHITEBITS)
 #define isblack(x)      testbit((x)->gch.marked, BLACKBIT)
 #define isgray(x)  /* neither white nor black */  \
-	(!testbits((x)->gch.marked, WHITEBITS | bitmask(BLACKBIT)))
+	(!testbits((x)->gch.marked, WHITEBITS | BITMASK(BLACKBIT)))
 
 #define isold(x)	testbit((x)->gch.marked, OLDBIT)