#
#
# patch "lua/lbaselib.cc"
#  from [c1ee2d0ced8208b8bbcd92677879ca218f57bea3]
#    to [2d74fd901a61936cc6c6dd6b27ce74e4cf6b27bf]
# 
# patch "lua/lcode.cc"
#  from [7dcb0971d2d8ecbf2e73607798cfc961ceded859]
#    to [a5582b63b0d45d33123d29699e2eba79551fa704]
# 
# patch "lua/ldebug.cc"
#  from [da981c2818f7488c666c2ffaa53453c34d6c2cc5]
#    to [002b1d61fd4c08b09210de8359e231b3492856cb]
# 
# patch "lua/lfunc.cc"
#  from [36898aaafae0a1557806ce38240580d141a8e871]
#    to [8bf49521d76d9fc9b948d818e027806d305976b5]
# 
# patch "lua/loadlib.cc"
#  from [a09695f3546543bbfbc7e8211fd55b7142bf439b]
#    to [92e4846e97e9ca543f8be217e7d0a45369aca2bf]
# 
# patch "lua/loslib.cc"
#  from [81372f1a7d5ff1354481dba955674ad3a0335657]
#    to [83a5795fdf92e425015c0f512c4fe2bc3d90444f]
# 
# patch "lua/lparser.cc"
#  from [a5350188a696b19fdc1d4e739a9555a18c34d35f]
#    to [3598035e38edf7683bb52dae8f3a781eb2ad2dda]
# 
# patch "lua/lstrlib.cc"
#  from [c6616bf2d86fa5d574aa45af23b4b8d3c066023f]
#    to [b22ca5764c31a456cd97b3e1dcccc6cefc0bb79c]
# 
# patch "lua/lua.h"
#  from [47a61df3c7d2b8a19317a89aed2af23f941b76a1]
#    to [fc4aa068ed36acb5cdeb31b525b7dc6684f2c1b5]
# 
# patch "lua/luaconf.h"
#  from [cb93426cd9f25f17f34c0b8152455b7ccf4ce278]
#    to [deeb01d96c697e8b212cd318fcb9ae2fccc7da6c]
# 
# patch "lua/lvm.cc"
#  from [41165664357b538b053b87eb4b65e4fad942abb3]
#    to [eee0eb484e196b2dff4afdb04fd8018fd19f4ad7]
#
============================================================
--- lua/lbaselib.cc	c1ee2d0ced8208b8bbcd92677879ca218f57bea3
+++ lua/lbaselib.cc	2d74fd901a61936cc6c6dd6b27ce74e4cf6b27bf
@@ -1,5 +1,5 @@
 /*
-** $Id: lbaselib.c,v 1.191 2006/06/02 15:34:00 roberto Exp $
+** $Id: lbaselib.c,v 1.191a 2006/06/02 15:34:00 roberto Exp $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
============================================================
--- lua/lcode.cc	7dcb0971d2d8ecbf2e73607798cfc961ceded859
+++ lua/lcode.cc	a5582b63b0d45d33123d29699e2eba79551fa704
@@ -1,5 +1,5 @@
 /*
-** $Id: lcode.c,v 2.25 2006/03/21 19:28:49 roberto Exp $
+** $Id: lcode.c,v 2.25a 2006/03/21 19:28:49 roberto Exp $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
@@ -35,15 +35,20 @@ void luaK_nil (FuncState *fs, int from, 
 void luaK_nil (FuncState *fs, int from, int n) {
   Instruction *previous;
   if (fs->pc > fs->lasttarget) {  /* no jumps to current position? */
-    if (fs->pc == 0)  /* function start? */
-      return;  /* positions are already clean */
-    if (GET_OPCODE(*(previous = &fs->f->code[fs->pc-1])) == OP_LOADNIL) {
-      int pfrom = GETARG_A(*previous);
-      int pto = GETARG_B(*previous);
-      if (pfrom <= from && from <= pto+1) {  /* can connect both? */
-        if (from+n-1 > pto)
-          SETARG_B(*previous, from+n-1);
-        return;
+    if (fs->pc == 0) {  /* function start? */
+      if (from >= fs->nactvar)
+        return;  /* positions are already clean */
+    }
+    else {
+      previous = &fs->f->code[fs->pc-1];
+      if (GET_OPCODE(*previous) == OP_LOADNIL) {
+        int pfrom = GETARG_A(*previous);
+        int pto = GETARG_B(*previous);
+        if (pfrom <= from && from <= pto+1) {  /* can connect both? */
+          if (from+n-1 > pto)
+            SETARG_B(*previous, from+n-1);
+          return;
+        }
       }
     }
   }
============================================================
--- lua/ldebug.cc	da981c2818f7488c666c2ffaa53453c34d6c2cc5
+++ lua/ldebug.cc	002b1d61fd4c08b09210de8359e231b3492856cb
@@ -1,5 +1,5 @@
 /*
-** $Id: ldebug.c,v 2.29 2005/12/22 16:19:56 roberto Exp $
+** $Id: ldebug.c,v 2.29a 2005/12/22 16:19:56 roberto Exp $
 ** Debug Interface
 ** See Copyright Notice in lua.h
 */
@@ -436,12 +436,12 @@ static Instruction symbexec (const Proto
         check(b < pt->sizep);
         nup = pt->p[b]->nups;
         check(pc + nup < pt->sizecode);
-        for (j = 1; j <= nup; ++j) {
+        for (j = 1; j <= nup; j++) {
           OpCode op1 = GET_OPCODE(pt->code[pc + j]);
           check(op1 == OP_GETUPVAL || op1 == OP_MOVE);
         }
         if (reg != NO_REG)  /* tracing? */
-          pc += nup;  /* do nut 'execute' these pseudo-instructions */
+          pc += nup;  /* do not 'execute' these pseudo-instructions */
         break;
       }
       case OP_VARARG: {
============================================================
--- lua/lfunc.cc	36898aaafae0a1557806ce38240580d141a8e871
+++ lua/lfunc.cc	8bf49521d76d9fc9b948d818e027806d305976b5
@@ -1,5 +1,5 @@
 /*
-** $Id: lfunc.c,v 2.12 2005/12/22 16:19:56 roberto Exp $
+** $Id: lfunc.c,v 2.12a 2005/12/22 16:19:56 roberto Exp $
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
@@ -55,7 +55,7 @@ UpVal *luaF_findupval (lua_State *L, Stk
   GCObject **pp = &L->openupval;
   UpVal *p;
   UpVal *uv;
-  while ((p = ngcotouv(*pp)) != NULL && p->v >= level) {
+  while (*pp != NULL && (p = ngcotouv(*pp))->v >= level) {
     lua_assert(p->v != &p->u.value);
     if (p->v == level) {  /* found a corresponding upvalue? */
       if (isdead(g, obj2gco(p)))  /* is it dead? */
@@ -96,7 +96,7 @@ void luaF_close (lua_State *L, StkId lev
 void luaF_close (lua_State *L, StkId level) {
   UpVal *uv;
   global_State *g = G(L);
-  while ((uv = ngcotouv(L->openupval)) != NULL && uv->v >= level) {
+  while (L->openupval != NULL && (uv = ngcotouv(L->openupval))->v >= level) {
     GCObject *o = obj2gco(uv);
     lua_assert(!isblack(o) && uv->v != &uv->u.value);
     L->openupval = uv->next;  /* remove from `open' list */
============================================================
--- lua/loadlib.cc	a09695f3546543bbfbc7e8211fd55b7142bf439b
+++ lua/loadlib.cc	92e4846e97e9ca543f8be217e7d0a45369aca2bf
@@ -1,5 +1,5 @@
 /*
-** $Id: loadlib.c,v 1.52 2006/04/10 18:27:23 roberto Exp $
+** $Id: loadlib.c,v 1.54a 2006/07/03 20:16:49 roberto Exp $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
@@ -16,9 +16,9 @@
 #define loadlib_c
 #define LUA_LIB
 
-#include "lauxlib.h"
-#include "lobject.h"
 #include "lua.h"
+
+#include "lauxlib.h"
 #include "lualib.h"
 
 
@@ -98,7 +98,7 @@ static void setprogdir (lua_State *L) {
   char buff[MAX_PATH + 1];
   char *lb;
   DWORD nsize = sizeof(buff)/sizeof(char);
-  DWORD n = GetModuleFileName(NULL, buff, nsize);
+  DWORD n = GetModuleFileNameA(NULL, buff, nsize);
   if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
     luaL_error(L, "unable to get ModuleFileName");
   else {
@@ -112,7 +112,7 @@ static void pusherror (lua_State *L) {
 static void pusherror (lua_State *L) {
   int error = GetLastError();
   char buffer[128];
-  if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
+  if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
       NULL, error, 0, buffer, sizeof(buffer), NULL))
     lua_pushstring(L, buffer);
   else
@@ -125,7 +125,7 @@ static void *ll_load (lua_State *L, cons
 
 
 static void *ll_load (lua_State *L, const char *path) {
-  HINSTANCE lib = LoadLibrary(path);
+  HINSTANCE lib = LoadLibraryA(path);
   if (lib == NULL) pusherror(L);
   return lib;
 }
@@ -356,15 +356,16 @@ static const char *findfile (lua_State *
   path = lua_tostring(L, -1);
   if (path == NULL)
     luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
-  lua_pushstring(L, "");  /* error accumulator */
+  lua_pushliteral(L, "");  /* error accumulator */
   while ((path = pushnexttemplate(L, path)) != NULL) {
     const char *filename;
     filename = luaL_gsub(L, lua_tostring(L, -1), LUA_PATH_MARK, name);
+    lua_remove(L, -2);  /* remove path template */
     if (readable(filename))  /* does file exist and is readable? */
       return filename;  /* return that file name */
-    lua_pop(L, 2);  /* remove path template and file name */ 
-    luaO_pushfstring(L, "\n\tno file " LUA_QS, filename);
-    lua_concat(L, 2);
+    lua_pushfstring(L, "\n\tno file " LUA_QS, filename);
+    lua_remove(L, -2);  /* remove file name */
+    lua_concat(L, 2);  /* add entry to possible error message */
   }
   return NULL;  /* not found */
 }
@@ -423,8 +424,8 @@ static int loader_Croot (lua_State *L) {
   funcname = mkfuncname(L, name);
   if ((stat = ll_loadfunc(L, filename, funcname)) != 0) {
     if (stat != ERRFUNC) loaderror(L, filename);  /* real error */
-    luaO_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
-                        name, filename);
+    lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
+                       name, filename);
     return 1;  /* function not found */
   }
   return 1;
@@ -438,7 +439,7 @@ static int loader_preload (lua_State *L)
     luaL_error(L, LUA_QL("package.preload") " must be a table");
   lua_getfield(L, -1, name);
   if (lua_isnil(L, -1))  /* not found? */
-    luaO_pushfstring(L, "\n\tno field package.preload['%s']", name);
+    lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
   return 1;
 }
 
@@ -462,7 +463,7 @@ static int ll_require (lua_State *L) {
   lua_getfield(L, LUA_ENVIRONINDEX, "loaders");
   if (!lua_istable(L, -1))
     luaL_error(L, LUA_QL("package.loaders") " must be a table");
-  lua_pushstring(L, "");  /* error message accumulator */
+  lua_pushliteral(L, "");  /* error message accumulator */
   for (i=1; ; i++) {
     lua_rawgeti(L, -2, i);  /* get a loader */
     if (lua_isnil(L, -1))
@@ -646,8 +647,8 @@ LUALIB_API int luaopen_package (lua_Stat
   setpath(L, "path", LUA_PATH, LUA_PATH_DEFAULT);  /* set field `path' */
   setpath(L, "cpath", LUA_CPATH, LUA_CPATH_DEFAULT); /* set field `cpath' */
   /* store config information */
-  lua_pushstring(L, LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n"
-                    LUA_EXECDIR "\n" LUA_IGMARK);
+  lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n"
+                     LUA_EXECDIR "\n" LUA_IGMARK);
   lua_setfield(L, -2, "config");
   /* set field `loaded' */
   luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 2);
============================================================
--- lua/loslib.cc	81372f1a7d5ff1354481dba955674ad3a0335657
+++ lua/loslib.cc	83a5795fdf92e425015c0f512c4fe2bc3d90444f
@@ -1,5 +1,5 @@
 /*
-** $Id: loslib.c,v 1.19 2006/04/26 18:19:49 roberto Exp $
+** $Id: loslib.c,v 1.20 2006/09/19 13:57:08 roberto Exp $
 ** Standard Operating System library
 ** See Copyright Notice in lua.h
 */
@@ -145,7 +145,7 @@ static int os_date (lua_State *L) {
     setfield(L, "yday", stm->tm_yday+1);
     setboolfield(L, "isdst", stm->tm_isdst);
   }
-   else {
+  else {
     char cc[3];
     luaL_Buffer b;
     cc[0] = '%'; cc[2] = '\0';
============================================================
--- lua/lparser.cc	a5350188a696b19fdc1d4e739a9555a18c34d35f
+++ lua/lparser.cc	3598035e38edf7683bb52dae8f3a781eb2ad2dda
@@ -1,5 +1,5 @@
 /*
-** $Id: lparser.c,v 2.42 2006/06/05 15:57:59 roberto Exp $
+** $Id: lparser.c,v 2.42a 2006/06/05 15:57:59 roberto Exp $
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
============================================================
--- lua/lstrlib.cc	c6616bf2d86fa5d574aa45af23b4b8d3c066023f
+++ lua/lstrlib.cc	b22ca5764c31a456cd97b3e1dcccc6cefc0bb79c
@@ -1,5 +1,5 @@
 /*
-** $Id: lstrlib.c,v 1.132 2006/04/26 20:41:19 roberto Exp $
+** $Id: lstrlib.c,v 1.132a 2006/04/26 20:41:19 roberto Exp $
 ** Standard library for string operations and pattern-matching
 ** See Copyright Notice in lua.h
 */
============================================================
--- lua/lua.h	47a61df3c7d2b8a19317a89aed2af23f941b76a1
+++ lua/lua.h	fc4aa068ed36acb5cdeb31b525b7dc6684f2c1b5
@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h,v 1.218 2006/06/02 15:34:00 roberto Exp $
+** $Id: lua.h,v 1.218a 2006/06/02 15:34:00 roberto Exp $
 ** Lua - An Extensible Extension Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
@@ -17,9 +17,9 @@
 
 
 #define LUA_VERSION	"Lua 5.1"
-#define LUA_RELEASE	"Lua 5.1.1"
+#define LUA_RELEASE	"Lua 5.1.2"
 #define LUA_VERSION_NUM	501
-#define LUA_COPYRIGHT	"Copyright (C) 1994-2006 Lua.org, PUC-Rio"
+#define LUA_COPYRIGHT	"Copyright (C) 1994-2007 Lua.org, PUC-Rio"
 #define LUA_AUTHORS 	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
 
 
@@ -359,7 +359,7 @@ struct lua_Debug {
 
 
 /******************************************************************************
-* Copyright (C) 1994-2006 Lua.org, PUC-Rio.  All rights reserved.
+* Copyright (C) 1994-2007 Lua.org, PUC-Rio.  All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
============================================================
--- lua/luaconf.h	cb93426cd9f25f17f34c0b8152455b7ccf4ce278
+++ lua/luaconf.h	deeb01d96c697e8b212cd318fcb9ae2fccc7da6c
@@ -1,5 +1,5 @@
 /*
-** $Id: luaconf.h,v 1.82 2006/04/10 18:27:23 roberto Exp $
+** $Id: luaconf.h,v 1.82a 2006/04/10 18:27:23 roberto Exp $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
@@ -367,7 +367,7 @@
 /*
 @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
 @* behavior.
-** CHANGE it to undefined as soon as you replace to 'luaL_registry'
+** CHANGE it to undefined as soon as you replace to 'luaL_register'
 ** your uses of 'luaL_openlib'
 */
 #define LUA_COMPAT_OPENLIB
============================================================
--- lua/lvm.cc	41165664357b538b053b87eb4b65e4fad942abb3
+++ lua/lvm.cc	eee0eb484e196b2dff4afdb04fd8018fd19f4ad7
@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.c,v 2.63 2006/06/05 15:58:59 roberto Exp $
+** $Id: lvm.c,v 2.63a 2006/06/05 15:58:59 roberto Exp $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -165,7 +165,7 @@ static int call_binTM (lua_State *L, con
   const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
   if (ttisnil(tm))
     tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
-  if (!ttisfunction(tm)) return 0;
+  if (ttisnil(tm)) return 0;
   callTMres(L, res, tm, p1, p2);
   return 1;
 }
@@ -281,10 +281,12 @@ void luaV_concat (lua_State *L, int tota
   do {
     StkId top = L->base + last + 1;
     int n = 2;  /* number of elements handled in this pass (at least 2) */
-    if (!tostring(L, top-2) || !tostring(L, top-1)) {
+    if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) {
       if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT))
         luaG_concaterror(L, top-2, top-1);
-    } else if (tsvalue(top-1)->len > 0) {  /* if len=0, do nothing */
+    } else if (tsvalue(top-1)->len == 0)  /* second op is empty? */
+      (void)tostring(L, top - 2);  /* result is first op (as string) */
+    else {
       /* at least two string values; get as many as possible */
       size_t tl = tsvalue(top-1)->len;
       char *buffer;