From: John L. <jr...@us...> - 2007-04-25 02:52:28
|
Update of /cvsroot/wxlua/wxLua/modules/lua/etc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9859/wxLua/modules/lua/etc Modified Files: README lua.pc luavs.bat strict.lua Log Message: Updated lua to 5.1.2 Index: README =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README 29 Mar 2006 05:48:10 -0000 1.2 --- README 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 21,24 **** --- 21,25 ---- luavs.bat Script to build Lua under "Visual Studio .NET Command Prompt". + Run it from the toplevel as etc\luavs.bat. min.c Index: luavs.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/luavs.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luavs.bat 29 Mar 2006 05:48:10 -0000 1.1 --- luavs.bat 25 Apr 2007 02:52:20 -0000 1.2 *************** *** 1,7 **** ! cd src ! cl /O2 /W3 /c /DLUA_BUILD_AS_DLL l*.c ! del lua.obj luac.obj ! link /DLL /out:lua51.dll l*.obj ! cl /O2 /W3 /c /DLUA_BUILD_AS_DLL lua.c ! link /out:lua.exe lua.obj lua51.lib ! cd .. --- 1,15 ---- ! rem script to build Lua under "Visual Studio .NET Command Prompt". ! rem do not run it from this directory, run it from the toplevel: etc\luavs.bat ! rem it creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src. ! ! cd src ! cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL l*.c ! del lua.obj luac.obj ! link /DLL /out:lua51.dll l*.obj ! cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL lua.c ! link /out:lua.exe lua.obj lua51.lib ! cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE l*.c print.c ! del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj loslib.obj ltablib.obj lstrlib.obj loadlib.obj ! link /out:luac.exe *.obj ! del *.obj ! cd .. Index: strict.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/strict.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** strict.lua 29 Mar 2006 06:02:05 -0000 1.1 --- strict.lua 25 Apr 2007 02:52:20 -0000 1.2 *************** *** 15,21 **** mt.__declared = {} mt.__newindex = function (t, n, v) if not mt.__declared[n] then ! local w = debug.getinfo(2, "S").what if w ~= "main" and w ~= "C" then error("assign to undeclared variable '"..n.."'", 2) --- 15,26 ---- mt.__declared = {} + local function what () + local d = debug.getinfo(3, "S") + return d and d.what or "C" + end + mt.__newindex = function (t, n, v) if not mt.__declared[n] then ! local w = what() if w ~= "main" and w ~= "C" then error("assign to undeclared variable '"..n.."'", 2) *************** *** 27,31 **** mt.__index = function (t, n) ! if not mt.__declared[n] and debug.getinfo(2, "S").what ~= "C" then error("variable '"..n.."' is not declared", 2) end --- 32,36 ---- mt.__index = function (t, n) ! if not mt.__declared[n] and what() ~= "C" then error("variable '"..n.."' is not declared", 2) end Index: lua.pc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/lua.pc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lua.pc 12 Jun 2006 03:50:37 -0000 1.2 --- lua.pc 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 6,10 **** V= 5.1 # grep '^R=' ../Makefile ! R= 5.1.1 # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --- 6,10 ---- V= 5.1 # grep '^R=' ../Makefile ! R= 5.1.2 # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' |