Hello community,
here is the log from the commit of package lua for openSUSE:Factory checked in at 2014-04-03 16:38:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lua (Old)
and /work/SRC/openSUSE:Factory/.lua.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lua/lua.changes 2013-09-09 19:45:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lua.new/lua.changes 2014-04-03 16:38:45.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Mar 31 11:05:05 UTC 2014 - pgajdos@suse.com
+
+- updated to 5.2.3:
+ * yieldable pcall and metamethods
+ * new lexical scheme for globals
+ * ephemeron tables
+ * new library for bitwise operations
+ * light C functions
+ * emergency garbage collector
+ * <CODE>goto</CODE> statement
+ * finalizers for tables
+
+-------------------------------------------------------------------
Old:
----
lua-5.2.2.tar.gz
New:
----
lua-5.2.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lua.spec ++++++
--- /var/tmp/diff_new_pack.7VNHF9/_old 2014-04-03 16:38:46.000000000 +0200
+++ /var/tmp/diff_new_pack.7VNHF9/_new 2014-04-03 16:38:46.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lua
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: lua
-Version: 5.2.2
+Version: 5.2.3
Release: 0
Summary: Small Embeddable Language with Simple Procedural Syntax
License: MIT
++++++ lua-5.2.2.tar.gz -> lua-5.2.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/Makefile new/lua-5.2.3/Makefile
--- old/lua-5.2.2/Makefile 2012-05-17 16:05:54.000000000 +0200
+++ new/lua-5.2.3/Makefile 2013-11-10 01:49:35.000000000 +0100
@@ -46,7 +46,7 @@
# Lua version and release.
V= 5.2
-R= $V.1
+R= $V.3
# Targets start here.
all: $(PLAT)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/README new/lua-5.2.3/README
--- old/lua-5.2.2/README 2013-03-21 12:57:07.000000000 +0100
+++ new/lua-5.2.3/README 2013-11-10 01:49:06.000000000 +0100
@@ -1,5 +1,5 @@
-This is Lua 5.2.2, released on 21 Mar 2013.
+This is Lua 5.2.3, released on 11 Nov 2013.
For installation instructions, license details, and
further information about Lua, see doc/readme.html.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/doc/lua.css new/lua-5.2.3/doc/lua.css
--- old/lua-5.2.2/doc/lua.css 2012-11-10 21:12:33.000000000 +0100
+++ new/lua-5.2.3/doc/lua.css 2013-11-10 01:56:14.000000000 +0100
@@ -1,30 +1,37 @@
+html {
+ background-color: #F8F8F8 ;
+}
+
body {
+ border: solid #a0a0a0 1px ;
+ border-radius: 20px ;
+ padding: 26px ;
+ margin: 16px ;
color: #000000 ;
background-color: #FFFFFF ;
font-family: Helvetica, Arial, sans-serif ;
text-align: justify ;
- margin-right: 30px ;
- margin-left: 30px ;
}
h1, h2, h3, h4 {
font-family: Verdana, Geneva, sans-serif ;
font-weight: normal ;
- font-style: italic ;
+ font-style: normal ;
}
h2 {
padding-top: 0.4em ;
padding-bottom: 0.4em ;
- padding-left: 1em ;
- padding-right: 1em ;
- background-color: #E0E0FF ;
+ padding-left: 0.8em ;
+ padding-right: 0.8em ;
+ background-color: #D0D0FF ;
border-radius: 8px ;
+ border: solid #a0a0a0 1px ;
}
h3 {
padding-left: 0.5em ;
- border-left: solid #E0E0FF 1em ;
+ border-left: solid #D0D0FF 1em ;
}
table h3 {
@@ -45,7 +52,7 @@
a:link:hover, a:visited:hover {
color: #000080 ;
- background-color: #E0E0FF ;
+ background-color: #D0D0FF ;
}
a:link:active, a:visited:active {
@@ -57,17 +64,23 @@
height: 1px ;
color: #a0a0a0 ;
background-color: #a0a0a0 ;
+ display: none ;
+}
+
+table hr {
+ display: block ;
}
:target {
background-color: #F8F8F8 ;
padding: 8px ;
border: solid #a0a0a0 2px ;
+ border-radius: 8px ;
}
.footer {
color: gray ;
- font-size: small ;
+ font-size: x-small ;
}
input[type=text] {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/doc/manual.css new/lua-5.2.3/doc/manual.css
--- old/lua-5.2.2/doc/manual.css 2012-11-10 21:24:49.000000000 +0100
+++ new/lua-5.2.3/doc/manual.css 2013-11-10 01:45:08.000000000 +0100
@@ -16,11 +16,12 @@
}
p+h1, ul+h1 {
+ font-style: normal ;
padding-top: 0.4em ;
padding-bottom: 0.4em ;
- padding-left: 24px ;
- margin-left: -24px ;
- background-color: #E0E0FF ;
+ padding-left: 16px ;
+ margin-left: -16px ;
+ background-color: #D0D0FF ;
border-radius: 8px ;
+ border: solid #000080 1px ;
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/doc/readme.html new/lua-5.2.3/doc/readme.html
--- old/lua-5.2.2/doc/readme.html 2013-02-22 13:24:21.000000000 +0100
+++ new/lua-5.2.3/doc/readme.html 2013-11-10 01:39:17.000000000 +0100
@@ -7,6 +7,7 @@
<STYLE TYPE="text/css">
blockquote, .display {
border: solid #a0a0a0 2px ;
+ border-radius: 8px ;
padding: 1em ;
margin: 0px ;
}
@@ -109,7 +110,7 @@
<OL>
<LI>
Open a terminal window and move to
-the top-level directory, which is named <TT>lua-5.2.2</TT>.
+the top-level directory, which is named <TT>lua-5.2.3</TT>.
The Makefile there controls both the build process and the installation process.
<P>
<LI>
@@ -402,10 +403,10 @@
<HR>
<SMALL CLASS="footer">
Last update:
-Fri Feb 22 09:24:20 BRT 2013
+Sat Nov 9 22:39:16 BRST 2013
</SMALL>
<!--
-Last change: revised for Lua 5.2.2
+Last change: revised for Lua 5.2.3
-->
</BODY>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/Makefile new/lua-5.2.3/src/Makefile
--- old/lua-5.2.2/src/Makefile 2012-12-27 11:51:43.000000000 +0100
+++ new/lua-5.2.3/src/Makefile 2013-11-11 12:45:49.000000000 +0100
@@ -106,7 +106,7 @@
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
macosx:
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"
+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc
mingw:
$(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lapi.c new/lua-5.2.3/src/lapi.c
--- old/lua-5.2.2/src/lapi.c 2013-03-16 22:10:18.000000000 +0100
+++ new/lua-5.2.3/src/lapi.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lapi.c,v 2.171 2013/03/16 21:10:18 roberto Exp $
+** $Id: lapi.c,v 2.171.1.1 2013/04/12 18:48:47 roberto Exp $
** Lua API
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lapi.h new/lua-5.2.3/src/lapi.h
--- old/lua-5.2.2/src/lapi.h 2009-11-27 16:37:59.000000000 +0100
+++ new/lua-5.2.3/src/lapi.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lapi.h,v 2.7 2009/11/27 15:37:59 roberto Exp $
+** $Id: lapi.h,v 2.7.1.1 2013/04/12 18:48:47 roberto Exp $
** Auxiliary functions from Lua API
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lauxlib.c new/lua-5.2.3/src/lauxlib.c
--- old/lua-5.2.2/src/lauxlib.c 2013-03-21 14:54:57.000000000 +0100
+++ new/lua-5.2.3/src/lauxlib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lauxlib.c,v 1.248 2013/03/21 13:54:57 roberto Exp $
+** $Id: lauxlib.c,v 1.248.1.1 2013/04/12 18:48:47 roberto Exp $
** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lauxlib.h new/lua-5.2.3/src/lauxlib.h
--- old/lua-5.2.2/src/lauxlib.h 2011-11-29 16:55:08.000000000 +0100
+++ new/lua-5.2.3/src/lauxlib.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lauxlib.h,v 1.120 2011/11/29 15:55:08 roberto Exp $
+** $Id: lauxlib.h,v 1.120.1.1 2013/04/12 18:48:47 roberto Exp $
** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lbaselib.c new/lua-5.2.3/src/lbaselib.c
--- old/lua-5.2.2/src/lbaselib.c 2013-02-21 14:44:53.000000000 +0100
+++ new/lua-5.2.3/src/lbaselib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lbaselib.c,v 1.276 2013/02/21 13:44:53 roberto Exp $
+** $Id: lbaselib.c,v 1.276.1.1 2013/04/12 18:48:47 roberto Exp $
** Basic library
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lbitlib.c new/lua-5.2.3/src/lbitlib.c
--- old/lua-5.2.2/src/lbitlib.c 2013-03-19 14:19:12.000000000 +0100
+++ new/lua-5.2.3/src/lbitlib.c 2013-07-09 20:01:41.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lbitlib.c,v 1.18 2013/03/19 13:19:12 roberto Exp $
+** $Id: lbitlib.c,v 1.18.1.2 2013/07/09 18:01:41 roberto Exp $
** Standard library for bitwise operations
** See Copyright Notice in lua.h
*/
@@ -129,7 +129,8 @@
b_uint r = luaL_checkunsigned(L, 1);
i &= (LUA_NBITS - 1); /* i = i % NBITS */
r = trim(r);
- r = (r << i) | (r >> (LUA_NBITS - i));
+ if (i != 0) /* avoid undefined shift of LUA_NBITS when i == 0 */
+ r = (r << i) | (r >> (LUA_NBITS - i));
lua_pushunsigned(L, trim(r));
return 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lcode.c new/lua-5.2.3/src/lcode.c
--- old/lua-5.2.2/src/lcode.c 2012-08-16 19:34:28.000000000 +0200
+++ new/lua-5.2.3/src/lcode.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lcode.c,v 2.62 2012/08/16 17:34:28 roberto Exp $
+** $Id: lcode.c,v 2.62.1.1 2013/04/12 18:48:47 roberto Exp $
** Code generator for Lua
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lcode.h new/lua-5.2.3/src/lcode.h
--- old/lua-5.2.2/src/lcode.h 2011-08-30 18:26:41.000000000 +0200
+++ new/lua-5.2.3/src/lcode.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lcode.h,v 1.58 2011/08/30 16:26:41 roberto Exp $
+** $Id: lcode.h,v 1.58.1.1 2013/04/12 18:48:47 roberto Exp $
** Code generator for Lua
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lcorolib.c new/lua-5.2.3/src/lcorolib.c
--- old/lua-5.2.2/src/lcorolib.c 2013-02-21 14:44:53.000000000 +0100
+++ new/lua-5.2.3/src/lcorolib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lcorolib.c,v 1.5 2013/02/21 13:44:53 roberto Exp $
+** $Id: lcorolib.c,v 1.5.1.1 2013/04/12 18:48:47 roberto Exp $
** Coroutine Library
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lctype.c new/lua-5.2.3/src/lctype.c
--- old/lua-5.2.2/src/lctype.c 2011-10-03 18:19:23.000000000 +0200
+++ new/lua-5.2.3/src/lctype.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lctype.c,v 1.11 2011/10/03 16:19:23 roberto Exp $
+** $Id: lctype.c,v 1.11.1.1 2013/04/12 18:48:47 roberto Exp $
** 'ctype' functions for Lua
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lctype.h new/lua-5.2.3/src/lctype.h
--- old/lua-5.2.2/src/lctype.h 2011-07-15 14:50:29.000000000 +0200
+++ new/lua-5.2.3/src/lctype.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lctype.h,v 1.12 2011/07/15 12:50:29 roberto Exp $
+** $Id: lctype.h,v 1.12.1.1 2013/04/12 18:48:47 roberto Exp $
** 'ctype' functions for Lua
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ldblib.c new/lua-5.2.3/src/ldblib.c
--- old/lua-5.2.2/src/ldblib.c 2012-01-19 21:14:44.000000000 +0100
+++ new/lua-5.2.3/src/ldblib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ldblib.c,v 1.132 2012/01/19 20:14:44 roberto Exp $
+** $Id: ldblib.c,v 1.132.1.1 2013/04/12 18:48:47 roberto Exp $
** Interface from Lua to its debug API
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ldebug.c new/lua-5.2.3/src/ldebug.c
--- old/lua-5.2.2/src/ldebug.c 2012-08-16 19:34:28.000000000 +0200
+++ new/lua-5.2.3/src/ldebug.c 2013-05-16 18:04:15.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ldebug.c,v 2.90 2012/08/16 17:34:28 roberto Exp $
+** $Id: ldebug.c,v 2.90.1.3 2013/05/16 16:04:15 roberto Exp $
** Debug Interface
** See Copyright Notice in lua.h
*/
@@ -327,12 +327,20 @@
}
+static int filterpc (int pc, int jmptarget) {
+ if (pc < jmptarget) /* is code conditional (inside a jump)? */
+ return -1; /* cannot know who sets that register */
+ else return pc; /* current position sets that register */
+}
+
+
/*
** try to find last instruction before 'lastpc' that modified register 'reg'
*/
static int findsetreg (Proto *p, int lastpc, int reg) {
int pc;
int setreg = -1; /* keep last instruction that changed 'reg' */
+ int jmptarget = 0; /* any code before this address is conditional */
for (pc = 0; pc < lastpc; pc++) {
Instruction i = p->code[pc];
OpCode op = GET_OPCODE(i);
@@ -341,33 +349,38 @@
case OP_LOADNIL: {
int b = GETARG_B(i);
if (a <= reg && reg <= a + b) /* set registers from 'a' to 'a+b' */
- setreg = pc;
+ setreg = filterpc(pc, jmptarget);
break;
}
case OP_TFORCALL: {
- if (reg >= a + 2) setreg = pc; /* affect all regs above its base */
+ if (reg >= a + 2) /* affect all regs above its base */
+ setreg = filterpc(pc, jmptarget);
break;
}
case OP_CALL:
case OP_TAILCALL: {
- if (reg >= a) setreg = pc; /* affect all registers above base */
+ if (reg >= a) /* affect all registers above base */
+ setreg = filterpc(pc, jmptarget);
break;
}
case OP_JMP: {
int b = GETARG_sBx(i);
int dest = pc + 1 + b;
/* jump is forward and do not skip `lastpc'? */
- if (pc < dest && dest <= lastpc)
- pc += b; /* do the jump */
+ if (pc < dest && dest <= lastpc) {
+ if (dest > jmptarget)
+ jmptarget = dest; /* update 'jmptarget' */
+ }
break;
}
case OP_TEST: {
- if (reg == a) setreg = pc; /* jumped code can change 'a' */
+ if (reg == a) /* jumped code can change 'a' */
+ setreg = filterpc(pc, jmptarget);
break;
}
default:
if (testAMode(op) && reg == a) /* any instruction that set A */
- setreg = pc;
+ setreg = filterpc(pc, jmptarget);
break;
}
}
@@ -518,7 +531,7 @@
l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2) {
if (ttisstring(p1) || ttisnumber(p1)) p1 = p2;
- lua_assert(!ttisstring(p1) && !ttisnumber(p2));
+ lua_assert(!ttisstring(p1) && !ttisnumber(p1));
luaG_typeerror(L, p1, "concatenate");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ldebug.h new/lua-5.2.3/src/ldebug.h
--- old/lua-5.2.2/src/ldebug.h 2011-10-07 22:45:19.000000000 +0200
+++ new/lua-5.2.3/src/ldebug.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ldebug.h,v 2.7 2011/10/07 20:45:19 roberto Exp $
+** $Id: ldebug.h,v 2.7.1.1 2013/04/12 18:48:47 roberto Exp $
** Auxiliary functions from Debug Interface module
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ldo.c new/lua-5.2.3/src/ldo.c
--- old/lua-5.2.2/src/ldo.c 2012-10-01 16:05:04.000000000 +0200
+++ new/lua-5.2.3/src/ldo.c 2013-11-08 19:22:50.000000000 +0100
@@ -1,5 +1,5 @@
/*
-** $Id: ldo.c,v 2.108 2012/10/01 14:05:04 roberto Exp $
+** $Id: ldo.c,v 2.108.1.3 2013/11/08 18:22:50 roberto Exp $
** Stack and Call structure of Lua
** See Copyright Notice in lua.h
*/
@@ -260,6 +260,7 @@
StkId base, fixed;
lua_assert(actual >= nfixargs);
/* move fixed parameters to final position */
+ luaD_checkstack(L, p->maxstacksize); /* check again for new 'base' */
fixed = L->top - actual; /* first fixed argument */
base = L->top; /* final position of first argument */
for (i=0; ip;
- luaD_checkstack(L, p->maxstacksize);
- func = restorestack(L, funcr);
n = cast_int(L->top - func) - 1; /* number of real arguments */
+ luaD_checkstack(L, p->maxstacksize);
for (; n < p->numparams; n++)
setnilvalue(L->top++); /* complete missing arguments */
- base = (!p->is_vararg) ? func + 1 : adjust_varargs(L, p, n);
+ if (!p->is_vararg) {
+ func = restorestack(L, funcr);
+ base = func + 1;
+ }
+ else {
+ base = adjust_varargs(L, p, n);
+ func = restorestack(L, funcr); /* previous call can change stack */
+ }
ci = next_ci(L); /* now 'enter' new function */
ci->nresults = nresults;
ci->func = func;
@@ -527,6 +534,7 @@
LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) {
int status;
+ int oldnny = L->nny; /* save 'nny' */
lua_lock(L);
luai_userstateresume(L, nargs);
L->nCcalls = (from) ? from->nCcalls + 1 : 1;
@@ -548,7 +556,7 @@
}
lua_assert(status == L->status);
}
- L->nny = 1; /* do not allow yields */
+ L->nny = oldnny; /* restore 'nny' */
L->nCcalls--;
lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0));
lua_unlock(L);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ldo.h new/lua-5.2.3/src/ldo.h
--- old/lua-5.2.2/src/ldo.h 2011-11-29 16:55:08.000000000 +0100
+++ new/lua-5.2.3/src/ldo.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ldo.h,v 2.20 2011/11/29 15:55:08 roberto Exp $
+** $Id: ldo.h,v 2.20.1.1 2013/04/12 18:48:47 roberto Exp $
** Stack and Call structure of Lua
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ldump.c new/lua-5.2.3/src/ldump.c
--- old/lua-5.2.2/src/ldump.c 2012-01-24 00:02:10.000000000 +0100
+++ new/lua-5.2.3/src/ldump.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ldump.c,v 2.17 2012/01/23 23:02:10 roberto Exp $
+** $Id: ldump.c,v 2.17.1.1 2013/04/12 18:48:47 roberto Exp $
** save precompiled Lua chunks
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lfunc.c new/lua-5.2.3/src/lfunc.c
--- old/lua-5.2.2/src/lfunc.c 2012-10-03 14:36:46.000000000 +0200
+++ new/lua-5.2.3/src/lfunc.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lfunc.c,v 2.30 2012/10/03 12:36:46 roberto Exp $
+** $Id: lfunc.c,v 2.30.1.1 2013/04/12 18:48:47 roberto Exp $
** Auxiliary functions to manipulate prototypes and closures
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lfunc.h new/lua-5.2.3/src/lfunc.h
--- old/lua-5.2.2/src/lfunc.h 2012-05-08 15:53:33.000000000 +0200
+++ new/lua-5.2.3/src/lfunc.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lfunc.h,v 2.8 2012/05/08 13:53:33 roberto Exp $
+** $Id: lfunc.h,v 2.8.1.1 2013/04/12 18:48:47 roberto Exp $
** Auxiliary functions to manipulate prototypes and closures
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lgc.c new/lua-5.2.3/src/lgc.c
--- old/lua-5.2.2/src/lgc.c 2013-03-16 22:10:18.000000000 +0100
+++ new/lua-5.2.3/src/lgc.c 2013-04-26 20:22:05.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lgc.c,v 2.140 2013/03/16 21:10:18 roberto Exp $
+** $Id: lgc.c,v 2.140.1.2 2013/04/26 18:22:05 roberto Exp $
** Garbage Collector
** See Copyright Notice in lua.h
*/
@@ -493,17 +493,24 @@
static lu_mem traversestack (global_State *g, lua_State *th) {
+ int n = 0;
StkId o = th->stack;
if (o == NULL)
return 1; /* stack not completely built yet */
- for (; o < th->top; o++)
+ for (; o < th->top; o++) /* mark live elements in the stack */
markvalue(g, o);
if (g->gcstate == GCSatomic) { /* final traversal? */
StkId lim = th->stack + th->stacksize; /* real end of stack */
for (; o < lim; o++) /* clear not-marked stack slice */
setnilvalue(o);
}
- return sizeof(lua_State) + sizeof(TValue) * th->stacksize;
+ else { /* count call infos to compute size */
+ CallInfo *ci;
+ for (ci = &th->base_ci; ci != th->ci; ci = ci->next)
+ n++;
+ }
+ return sizeof(lua_State) + sizeof(TValue) * th->stacksize +
+ sizeof(CallInfo) * n;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lgc.h new/lua-5.2.3/src/lgc.h
--- old/lua-5.2.2/src/lgc.h 2012-09-11 14:53:08.000000000 +0200
+++ new/lua-5.2.3/src/lgc.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lgc.h,v 2.58 2012/09/11 12:53:08 roberto Exp $
+** $Id: lgc.h,v 2.58.1.1 2013/04/12 18:48:47 roberto Exp $
** Garbage Collector
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/linit.c new/lua-5.2.3/src/linit.c
--- old/lua-5.2.2/src/linit.c 2011-04-08 21:17:36.000000000 +0200
+++ new/lua-5.2.3/src/linit.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $
+** $Id: linit.c,v 1.32.1.1 2013/04/12 18:48:47 roberto Exp $
** Initialization of libraries for lua.c and other clients
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/liolib.c new/lua-5.2.3/src/liolib.c
--- old/lua-5.2.2/src/liolib.c 2013-03-21 14:57:27.000000000 +0100
+++ new/lua-5.2.3/src/liolib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,17 +1,17 @@
/*
-** $Id: liolib.c,v 2.111 2013/03/21 13:57:27 roberto Exp $
+** $Id: liolib.c,v 2.112.1.1 2013/04/12 18:48:47 roberto Exp $
** Standard I/O (and system) library
** See Copyright Notice in lua.h
*/
/*
-** POSIX idiosyncrasy!
** This definition must come before the inclusion of 'stdio.h'; it
** should not affect non-POSIX systems
*/
#if !defined(_FILE_OFFSET_BITS)
-#define _FILE_OFFSET_BITS 64
+#define _LARGEFILE_SOURCE 1
+#define _FILE_OFFSET_BITS 64
#endif
@@ -80,36 +80,37 @@
/*
** {======================================================
-** lua_fseek/lua_ftell: configuration for longer offsets
+** lua_fseek: configuration for longer offsets
** =======================================================
*/
-#if !defined(lua_fseek) /* { */
+#if !defined(lua_fseek) && !defined(LUA_ANSI) /* { */
-#if defined(LUA_USE_POSIX)
+#if defined(LUA_USE_POSIX) /* { */
#define l_fseek(f,o,w) fseeko(f,o,w)
#define l_ftell(f) ftello(f)
#define l_seeknum off_t
#elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \
- && defined(_MSC_VER) && (_MSC_VER >= 1400)
+ && defined(_MSC_VER) && (_MSC_VER >= 1400) /* }{ */
/* Windows (but not DDK) and Visual C++ 2005 or higher */
#define l_fseek(f,o,w) _fseeki64(f,o,w)
#define l_ftell(f) _ftelli64(f)
#define l_seeknum __int64
-#else
+#endif /* } */
+#endif /* } */
+
+
+#if !defined(l_fseek) /* default definitions */
#define l_fseek(f,o,w) fseek(f,o,w)
#define l_ftell(f) ftell(f)
#define l_seeknum long
-
#endif
-#endif /* } */
-
/* }====================================================== */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/llex.c new/lua-5.2.3/src/llex.c
--- old/lua-5.2.2/src/llex.c 2013-03-16 22:10:18.000000000 +0100
+++ new/lua-5.2.3/src/llex.c 2013-08-30 17:49:41.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: llex.c,v 2.63 2013/03/16 21:10:18 roberto Exp $
+** $Id: llex.c,v 2.63.1.2 2013/08/30 15:49:41 roberto Exp $
** Lexical Analyzer
** See Copyright Notice in lua.h
*/
@@ -133,6 +133,9 @@
setbvalue(o, 1); /* t[string] = true */
luaC_checkGC(L);
}
+ else { /* string already present */
+ ts = rawtsvalue(keyfromval(o)); /* re-use value previously stored */
+ }
L->top--; /* remove string from stack */
return ts;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/llex.h new/lua-5.2.3/src/llex.h
--- old/lua-5.2.2/src/llex.h 2011-11-30 13:43:51.000000000 +0100
+++ new/lua-5.2.3/src/llex.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: llex.h,v 1.72 2011/11/30 12:43:51 roberto Exp $
+** $Id: llex.h,v 1.72.1.1 2013/04/12 18:48:47 roberto Exp $
** Lexical Analyzer
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/llimits.h new/lua-5.2.3/src/llimits.h
--- old/lua-5.2.2/src/llimits.h 2013-02-20 15:08:56.000000000 +0100
+++ new/lua-5.2.3/src/llimits.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: llimits.h,v 1.103 2013/02/20 14:08:56 roberto Exp $
+** $Id: llimits.h,v 1.103.1.1 2013/04/12 18:48:47 roberto Exp $
** Limits, basic types, and some other `installation-dependent' definitions
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lmathlib.c new/lua-5.2.3/src/lmathlib.c
--- old/lua-5.2.2/src/lmathlib.c 2013-03-07 19:21:32.000000000 +0100
+++ new/lua-5.2.3/src/lmathlib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lmathlib.c,v 1.83 2013/03/07 18:21:32 roberto Exp $
+** $Id: lmathlib.c,v 1.83.1.1 2013/04/12 18:48:47 roberto Exp $
** Standard mathematical library
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lmem.c new/lua-5.2.3/src/lmem.c
--- old/lua-5.2.2/src/lmem.c 2012-05-23 17:41:53.000000000 +0200
+++ new/lua-5.2.3/src/lmem.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lmem.c,v 1.84 2012/05/23 15:41:53 roberto Exp $
+** $Id: lmem.c,v 1.84.1.1 2013/04/12 18:48:47 roberto Exp $
** Interface to Memory Manager
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lmem.h new/lua-5.2.3/src/lmem.h
--- old/lua-5.2.2/src/lmem.h 2013-02-20 15:08:21.000000000 +0100
+++ new/lua-5.2.3/src/lmem.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lmem.h,v 1.40 2013/02/20 14:08:21 roberto Exp $
+** $Id: lmem.h,v 1.40.1.1 2013/04/12 18:48:47 roberto Exp $
** Interface to Memory Manager
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/loadlib.c new/lua-5.2.3/src/loadlib.c
--- old/lua-5.2.2/src/loadlib.c 2012-05-30 14:33:44.000000000 +0200
+++ new/lua-5.2.3/src/loadlib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: loadlib.c,v 1.111 2012/05/30 12:33:44 roberto Exp $
+** $Id: loadlib.c,v 1.111.1.1 2013/04/12 18:48:47 roberto Exp $
** Dynamic library loader for Lua
** See Copyright Notice in lua.h
**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lobject.c new/lua-5.2.3/src/lobject.c
--- old/lua-5.2.2/src/lobject.c 2013-02-20 15:08:56.000000000 +0100
+++ new/lua-5.2.3/src/lobject.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lobject.c,v 2.58 2013/02/20 14:08:56 roberto Exp $
+** $Id: lobject.c,v 2.58.1.1 2013/04/12 18:48:47 roberto Exp $
** Some generic functions over Lua objects
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lobject.h new/lua-5.2.3/src/lobject.h
--- old/lua-5.2.2/src/lobject.h 2012-09-11 20:21:44.000000000 +0200
+++ new/lua-5.2.3/src/lobject.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lobject.h,v 2.71 2012/09/11 18:21:44 roberto Exp $
+** $Id: lobject.h,v 2.71.1.1 2013/04/12 18:48:47 roberto Exp $
** Type definitions for Lua objects
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lopcodes.c new/lua-5.2.3/src/lopcodes.c
--- old/lua-5.2.2/src/lopcodes.c 2012-05-14 15:34:18.000000000 +0200
+++ new/lua-5.2.3/src/lopcodes.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lopcodes.c,v 1.49 2012/05/14 13:34:18 roberto Exp $
+** $Id: lopcodes.c,v 1.49.1.1 2013/04/12 18:48:47 roberto Exp $
** Opcodes for Lua virtual machine
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lopcodes.h new/lua-5.2.3/src/lopcodes.h
--- old/lua-5.2.2/src/lopcodes.h 2011-07-15 14:50:29.000000000 +0200
+++ new/lua-5.2.3/src/lopcodes.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lopcodes.h,v 1.142 2011/07/15 12:50:29 roberto Exp $
+** $Id: lopcodes.h,v 1.142.1.1 2013/04/12 18:48:47 roberto Exp $
** Opcodes for Lua virtual machine
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/loslib.c new/lua-5.2.3/src/loslib.c
--- old/lua-5.2.2/src/loslib.c 2012-10-19 17:54:02.000000000 +0200
+++ new/lua-5.2.3/src/loslib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: loslib.c,v 1.40 2012/10/19 15:54:02 roberto Exp $
+** $Id: loslib.c,v 1.40.1.1 2013/04/12 18:48:47 roberto Exp $
** Standard Operating System library
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lparser.c new/lua-5.2.3/src/lparser.c
--- old/lua-5.2.2/src/lparser.c 2013-02-06 14:37:39.000000000 +0100
+++ new/lua-5.2.3/src/lparser.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lparser.c,v 2.130 2013/02/06 13:37:39 roberto Exp $
+** $Id: lparser.c,v 2.130.1.1 2013/04/12 18:48:47 roberto Exp $
** Lua Parser
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lparser.h new/lua-5.2.3/src/lparser.h
--- old/lua-5.2.2/src/lparser.h 2012-05-08 15:53:33.000000000 +0200
+++ new/lua-5.2.3/src/lparser.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lparser.h,v 1.70 2012/05/08 13:53:33 roberto Exp $
+** $Id: lparser.h,v 1.70.1.1 2013/04/12 18:48:47 roberto Exp $
** Lua Parser
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lstate.c new/lua-5.2.3/src/lstate.c
--- old/lua-5.2.2/src/lstate.c 2012-10-02 19:40:53.000000000 +0200
+++ new/lua-5.2.3/src/lstate.c 2013-11-08 18:45:31.000000000 +0100
@@ -1,5 +1,5 @@
/*
-** $Id: lstate.c,v 2.99 2012/10/02 17:40:53 roberto Exp $
+** $Id: lstate.c,v 2.99.1.2 2013/11/08 17:45:31 roberto Exp $
** Global State
** See Copyright Notice in lua.h
*/
@@ -192,6 +192,8 @@
g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
luaS_fix(g->memerrmsg); /* it should never be collected */
g->gcrunning = 1; /* allow gc */
+ g->version = lua_version(NULL);
+ luai_userstateopen(L);
}
@@ -222,6 +224,8 @@
global_State *g = G(L);
luaF_close(L, L->stack); /* close all upvalues for this thread */
luaC_freeallobjects(L); /* collect all objects */
+ if (g->version) /* closing a fully built state? */
+ luai_userstateclose(L);
luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
luaZ_freebuffer(L, &g->buff);
freestack(L);
@@ -287,7 +291,7 @@
setnilvalue(&g->l_registry);
luaZ_initbuffer(L, &g->buff);
g->panic = NULL;
- g->version = lua_version(NULL);
+ g->version = NULL;
g->gcstate = GCSpause;
g->allgc = NULL;
g->finobj = NULL;
@@ -306,8 +310,6 @@
close_state(L);
L = NULL;
}
- else
- luai_userstateopen(L);
return L;
}
@@ -315,7 +317,6 @@
LUA_API void lua_close (lua_State *L) {
L = G(L)->mainthread; /* only the main thread can be closed */
lua_lock(L);
- luai_userstateclose(L);
close_state(L);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lstate.h new/lua-5.2.3/src/lstate.h
--- old/lua-5.2.2/src/lstate.h 2012-07-02 15:37:04.000000000 +0200
+++ new/lua-5.2.3/src/lstate.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lstate.h,v 2.82 2012/07/02 13:37:04 roberto Exp $
+** $Id: lstate.h,v 2.82.1.1 2013/04/12 18:48:47 roberto Exp $
** Global State
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lstring.c new/lua-5.2.3/src/lstring.c
--- old/lua-5.2.2/src/lstring.c 2013-01-08 14:50:10.000000000 +0100
+++ new/lua-5.2.3/src/lstring.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lstring.c,v 2.26 2013/01/08 13:50:10 roberto Exp $
+** $Id: lstring.c,v 2.26.1.1 2013/04/12 18:48:47 roberto Exp $
** String table (keeps all strings handled by Lua)
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lstring.h new/lua-5.2.3/src/lstring.h
--- old/lua-5.2.2/src/lstring.h 2012-02-01 22:57:15.000000000 +0100
+++ new/lua-5.2.3/src/lstring.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lstring.h,v 1.49 2012/02/01 21:57:15 roberto Exp $
+** $Id: lstring.h,v 1.49.1.1 2013/04/12 18:48:47 roberto Exp $
** String table (keep all strings handled by Lua)
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lstrlib.c new/lua-5.2.3/src/lstrlib.c
--- old/lua-5.2.2/src/lstrlib.c 2012-08-14 20:12:34.000000000 +0200
+++ new/lua-5.2.3/src/lstrlib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lstrlib.c,v 1.178 2012/08/14 18:12:34 roberto Exp $
+** $Id: lstrlib.c,v 1.178.1.1 2013/04/12 18:48:47 roberto Exp $
** Standard library for string operations and pattern-matching
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ltable.c new/lua-5.2.3/src/ltable.c
--- old/lua-5.2.2/src/ltable.c 2012-09-11 21:37:16.000000000 +0200
+++ new/lua-5.2.3/src/ltable.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ltable.c,v 2.72 2012/09/11 19:37:16 roberto Exp $
+** $Id: ltable.c,v 2.72.1.1 2013/04/12 18:48:47 roberto Exp $
** Lua tables (hash)
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ltable.h new/lua-5.2.3/src/ltable.h
--- old/lua-5.2.2/src/ltable.h 2011-08-17 22:26:47.000000000 +0200
+++ new/lua-5.2.3/src/ltable.h 2013-08-30 17:49:41.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ltable.h,v 2.16 2011/08/17 20:26:47 roberto Exp $
+** $Id: ltable.h,v 2.16.1.2 2013/08/30 15:49:41 roberto Exp $
** Lua tables (hash)
** See Copyright Notice in lua.h
*/
@@ -17,6 +17,10 @@
#define invalidateTMcache(t) ((t)->flags = 0)
+/* returns the key, given the value of a table entry */
+#define keyfromval(v) \
+ (gkey(cast(Node *, cast(char *, (v)) - offsetof(Node, i_val))))
+
LUAI_FUNC const TValue *luaH_getint (Table *t, int key);
LUAI_FUNC void luaH_setint (lua_State *L, Table *t, int key, TValue *value);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ltablib.c new/lua-5.2.3/src/ltablib.c
--- old/lua-5.2.2/src/ltablib.c 2013-03-07 19:17:24.000000000 +0100
+++ new/lua-5.2.3/src/ltablib.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ltablib.c,v 1.65 2013/03/07 18:17:24 roberto Exp $
+** $Id: ltablib.c,v 1.65.1.1 2013/04/12 18:48:47 roberto Exp $
** Library for Table Manipulation
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ltm.c new/lua-5.2.3/src/ltm.c
--- old/lua-5.2.2/src/ltm.c 2011-06-02 21:31:40.000000000 +0200
+++ new/lua-5.2.3/src/ltm.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ltm.c,v 2.14 2011/06/02 19:31:40 roberto Exp $
+** $Id: ltm.c,v 2.14.1.1 2013/04/12 18:48:47 roberto Exp $
** Tag methods
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/ltm.h new/lua-5.2.3/src/ltm.h
--- old/lua-5.2.2/src/ltm.h 2011-02-28 18:32:10.000000000 +0100
+++ new/lua-5.2.3/src/ltm.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: ltm.h,v 2.11 2011/02/28 17:32:10 roberto Exp $
+** $Id: ltm.h,v 2.11.1.1 2013/04/12 18:48:47 roberto Exp $
** Tag methods
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lua.c new/lua-5.2.3/src/lua.c
--- old/lua-5.2.2/src/lua.c 2012-09-29 22:07:06.000000000 +0200
+++ new/lua-5.2.3/src/lua.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lua.c,v 1.206 2012/09/29 20:07:06 roberto Exp $
+** $Id: lua.c,v 1.206.1.1 2013/04/12 18:48:47 roberto Exp $
** Lua stand-alone interpreter
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lua.h new/lua-5.2.3/src/lua.h
--- old/lua-5.2.2/src/lua.h 2013-03-15 14:04:22.000000000 +0100
+++ new/lua-5.2.3/src/lua.h 2013-11-11 13:09:16.000000000 +0100
@@ -1,5 +1,5 @@
/*
-** $Id: lua.h,v 1.285 2013/03/15 13:04:22 roberto Exp $
+** $Id: lua.h,v 1.285.1.2 2013/11/11 12:09:16 roberto Exp $
** Lua - A Scripting Language
** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
** See Copyright Notice at the end of this file
@@ -19,7 +19,7 @@
#define LUA_VERSION_MAJOR "5"
#define LUA_VERSION_MINOR "2"
#define LUA_VERSION_NUM 502
-#define LUA_VERSION_RELEASE "2"
+#define LUA_VERSION_RELEASE "3"
#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/luac.c new/lua-5.2.3/src/luac.c
--- old/lua-5.2.2/src/luac.c 2011-11-29 18:46:33.000000000 +0100
+++ new/lua-5.2.3/src/luac.c 2013-07-04 03:03:46.000000000 +0200
@@ -203,7 +203,7 @@
}
/*
-** $Id: print.c,v 1.68 2011/09/30 10:21:20 lhf Exp $
+** $Id: print.c,v 1.69 2013/07/04 01:03:46 lhf Exp $
** print bytecodes
** See Copyright Notice in lua.h
*/
@@ -251,7 +251,7 @@
static void PrintConstant(const Proto* f, int i)
{
const TValue* o=&f->k[i];
- switch (ttype(o))
+ switch (ttypenv(o))
{
case LUA_TNIL:
printf("nil");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/luaconf.h new/lua-5.2.3/src/luaconf.h
--- old/lua-5.2.2/src/luaconf.h 2013-03-16 22:10:18.000000000 +0100
+++ new/lua-5.2.3/src/luaconf.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: luaconf.h,v 1.176 2013/03/16 21:10:18 roberto Exp $
+** $Id: luaconf.h,v 1.176.1.1 2013/04/12 18:48:47 roberto Exp $
** Configuration file for Lua
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lualib.h new/lua-5.2.3/src/lualib.h
--- old/lua-5.2.2/src/lualib.h 2011-12-08 13:11:37.000000000 +0100
+++ new/lua-5.2.3/src/lualib.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lualib.h,v 1.43 2011/12/08 12:11:37 roberto Exp $
+** $Id: lualib.h,v 1.43.1.1 2013/04/12 18:48:47 roberto Exp $
** Lua standard libraries
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lundump.c new/lua-5.2.3/src/lundump.c
--- old/lua-5.2.2/src/lundump.c 2012-05-08 15:53:33.000000000 +0200
+++ new/lua-5.2.3/src/lundump.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lundump.c,v 2.22 2012/05/08 13:53:33 roberto Exp $
+** $Id: lundump.c,v 2.22.1.1 2013/04/12 18:48:47 roberto Exp $
** load precompiled Lua chunks
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lundump.h new/lua-5.2.3/src/lundump.h
--- old/lua-5.2.2/src/lundump.h 2012-05-08 15:53:33.000000000 +0200
+++ new/lua-5.2.3/src/lundump.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lundump.h,v 1.39 2012/05/08 13:53:33 roberto Exp $
+** $Id: lundump.h,v 1.39.1.1 2013/04/12 18:48:47 roberto Exp $
** load precompiled Lua chunks
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lvm.c new/lua-5.2.3/src/lvm.c
--- old/lua-5.2.2/src/lvm.c 2013-03-16 22:10:18.000000000 +0100
+++ new/lua-5.2.3/src/lvm.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lvm.c,v 2.155 2013/03/16 21:10:18 roberto Exp $
+** $Id: lvm.c,v 2.155.1.1 2013/04/12 18:48:47 roberto Exp $
** Lua virtual machine
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lvm.h new/lua-5.2.3/src/lvm.h
--- old/lua-5.2.2/src/lvm.h 2013-01-08 15:06:55.000000000 +0100
+++ new/lua-5.2.3/src/lvm.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lvm.h,v 2.18 2013/01/08 14:06:55 roberto Exp $
+** $Id: lvm.h,v 2.18.1.1 2013/04/12 18:48:47 roberto Exp $
** Lua virtual machine
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lzio.c new/lua-5.2.3/src/lzio.c
--- old/lua-5.2.2/src/lzio.c 2012-05-14 15:34:18.000000000 +0200
+++ new/lua-5.2.3/src/lzio.c 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lzio.c,v 1.35 2012/05/14 13:34:18 roberto Exp $
+** $Id: lzio.c,v 1.35.1.1 2013/04/12 18:48:47 roberto Exp $
** Buffered streams
** See Copyright Notice in lua.h
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lua-5.2.2/src/lzio.h new/lua-5.2.3/src/lzio.h
--- old/lua-5.2.2/src/lzio.h 2011-07-15 14:48:03.000000000 +0200
+++ new/lua-5.2.3/src/lzio.h 2013-04-12 20:48:47.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** $Id: lzio.h,v 1.26 2011/07/15 12:48:03 roberto Exp $
+** $Id: lzio.h,v 1.26.1.1 2013/04/12 18:48:47 roberto Exp $
** Buffered streams
** See Copyright Notice in lua.h
*/
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org