src/blua/lparser.c

@@ -24,6 +24,7 @@
 #include "lstate.h"
 #include "lstring.h"
 #include "ltable.h"
+#include "lvm.h"
 
 
 
@@ -1006,11 +1007,33 @@ static void poplhs (FuncState *fs) {
 }
 
 
-static void assignment (LexState *ls) {
+static void implicitlocal (LexState *ls, expdesc *v, int *nvarsp) {
+  TValue *name;
+  int n;
+  if (v->k == VGLOBAL) {
+    /* Overwriting this shouldn't matter as long as
+       I put it back, right? Right? :sweat_drops: */
+    StkId old = ls->L->base;
+    /* I tried to optimize this down as far as I could... */
+    name = &ls->fs->f->k[v->u.s.info];/* global's name from singlevar */
+    luaV_gettable(ls->L, gt(ls->L), name, (TValue *)ls->L->base);
+    if (ttisnil(ls->L->base)) {/* james: if global don't exist, make local */
+      n = (*nvarsp)++;
+      new_localvar(ls, rawtsvalue(name), n);
+      /* can't forget to enumerate it as local! */
+      v->k = VLOCAL;
+      v->u.s.info = ls->fs->nactvar + n;
+    }
+    ls->L->base = old;
+  }
+}
+
+static void assignment (LexState *ls, int *nvarsp) {
   expdesc e;
   expdesc_list *lh = ls->fs->lhs;
   check_condition(ls, VLOCAL <= lh->v.k && lh->v.k <= VINDEXED,
                       "syntax error");
+  implicitlocal(ls, &lh->v, nvarsp);
   if (testnext(ls, ',')) {  /* assignment -> `,' primaryexp assignment */
     expdesc_list nv;
     nv.prev = lh;
@@ -1020,7 +1043,7 @@ static void assignment (LexState *ls) {
     luaY_checklimit(ls->fs, ls->fs->nrhs, LUAI_MAXCCALLS - ls->L->nCcalls,
                     "variables in assignment");
     pushlhs(ls->fs, &nv);
-    assignment(ls);
+    assignment(ls, nvarsp);
     poplhs(ls->fs);
   }
   else {  /* assignment -> `=' explist1 */
@@ -1348,6 +1371,7 @@ static void localstat (LexState *ls) {
 static int funcname (LexState *ls, expdesc *v) {
   /* funcname -> NAME {field} [`:' NAME] */
   int needself = 0;
+  int nvars = 0;
   singlevar(ls, v);
   while (ls->t.token == '.')
     field(ls, v);
@@ -1355,6 +1379,8 @@ static int funcname (LexState *ls, expdesc *v) {
     needself = 1;
     field(ls, v);
   }
+  implicitlocal(ls, v, &nvars);
+  adjustlocalvars(ls, nvars);
   return needself;
 }
 
@@ -1375,6 +1401,7 @@ static void exprstat (LexState *ls) {
   /* stat -> func | assignment */
   FuncState *fs = ls->fs;
   expdesc_list v;
+  int nvars = 0;
   primaryexp(ls, &v.v);
   if (v.v.k == VCALL)  /* stat -> func */
     SETARG_C(getcode(fs, &v.v), 1);  /* call statement uses no results */
@@ -1382,10 +1409,11 @@ static void exprstat (LexState *ls) {
     v.prev = NULL;
     lua_assert(ls->fs->lhs == NULL && ls->fs->nlhs == 0 && ls->fs->nrhs == 0);
     pushlhs(ls->fs, &v);
-    assignment(ls);
+    assignment(ls, &nvars);
     poplhs(ls->fs);
     ls->fs->nrhs = 0;
     lua_assert(ls->fs->lhs == NULL && ls->fs->nlhs == 0);
+    adjustlocalvars(ls, nvars);
   }
 }
 

src/lua_script.c

@@ -316,20 +316,19 @@ static int setglobals(lua_State *L)
 	const char *csname;
 	char *name;
 
-	lua_remove(L, 1); // we're not gonna be using _G
-	csname = lua_tostring(L, 1);
+	csname = lua_tostring(L, 2);
 
 	// make an uppercase copy of the name
 	name = Z_StrDup(csname);
 	strupr(name);
 
-	if (fastncmp(name, "A_", 2) && lua_isfunction(L, 2))
+	if (fastncmp(name, "A_", 3) && lua_isfunction(L, 3))
 	{
 		// Accept new A_Action functions
 		// Add the action to Lua actions refrence table
 		lua_getfield(L, LUA_REGISTRYINDEX, LREG_ACTIONS);
 		lua_pushstring(L, name); // "A_ACTION"
-		lua_pushvalue(L, 2); // function
+		lua_pushvalue(L, 3); // function
 		lua_rawset(L, -3); // rawset doesn't trigger this metatable again.
 		// otherwise we would've used setfield, obviously.
 
@@ -337,11 +336,15 @@ static int setglobals(lua_State *L)
 		return 0;
 	}
 
-	if (LUA_CheckGlobals(L, csname))
-		return 0;
-
 	Z_Free(name);
-	return luaL_error(L, "Implicit global " LUA_QS " prevented. Create a local variable instead.", csname);
+
+	if (! LUA_CheckGlobals(L, csname))
+	{
+		lua_settop(L, 3);
+		lua_rawset(L, 1);
+	}
+
+	return 0;
 }
 
 // Clear and create a new Lua state, laddo!