Lua 5.3.0-rc3

Lua Team committed 11 years ago

Commit 48416b81 parent f4a972718 files · +220 −181Browse files

Unified · Split

18 files

README +1 −1
doc/contents.html +1 −1
doc/manual.html +21 −17
doc/readme.html +1 −1
src/Makefile +1 −1
src/lapi.c +2 −2
src/lcode.c +10 −24
src/ldblib.c +7 −2
src/ldebug.c +4 −3
src/liolib.c +3 −5
src/lmathlib.c +5 −3
src/lobject.c +2 −2
src/loslib.c +3 −3
src/lparser.c +4 −4
src/lprefix.h +8 −2
src/lua.h +3 −3
src/luaconf.h +2 −10
src/lvm.c +142 −97

@@ -1,5 +1,5 @@
1		1
2	This is Lua 5.3.0, released on 22 Dec 2014.	2	This is Lua 5.3.0, released on 02 Jan 2015.
3		3
4	For installation instructions, license details, and	4	For installation instructions, license details, and
5	further information about Lua, see doc/readme.html.	5	further information about Lua, see doc/readme.html.

doc/contents.html+1−1

@@ -33,7 +33,7 @@ For a complete introduction to Lua programming, see the book · 32 unmodified lines
33	<A HREF="#index">index</A>	33	<A HREF="#index">index</A>
34	<HR>	34	<HR>
35	<SMALL>	35	<SMALL>
36	Copyright © 2014 Lua.org, PUC-Rio.	36	Copyright © 2015 Lua.org, PUC-Rio.
37	Freely available under the terms of the	37	Freely available under the terms of the
38	<A HREF="http://www.lua.org/license.html">Lua license</A>.	38	<A HREF="http://www.lua.org/license.html">Lua license</A>.
39	</SMALL>	39	</SMALL>

doc/manual.html+21−17

 by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes
 <p>
 <small>
-Copyright &copy; 2014 Lua.org, PUC-Rio.
+Copyright &copy; 2015 Lua.org, PUC-Rio.
 Freely available under the terms of the
 <a href="http://www.lua.org/license.html">Lua license</a>.
 </small>
 <!-- ====================================================================== -->
 <p>
-<!-- $Id: manual.of,v 1.142 2014/12/22 13:31:36 roberto Exp $ -->
+<!-- $Id: manual.of,v 1.143 2015/01/02 13:07:38 roberto Exp $ -->
 </ul>
 <p>
-With the exception of float division and exponentiation,
+With the exception of exponentiation and float division,
 the arithmetic operators work as follows:
 If both operands are integers,
 the operation is performed over integers and the result is an integer.
 <p>
-Float division (<code>/</code>) and exponentiation
+Exponentiation and float division (<code>/</code>)
 always convert their operands to floats
 and the result is always a float.
 Exponentiation uses the ISO&nbsp;C function <code>pow</code>,
 Lua provides some automatic conversions between some
 types and representations at run time.
 Bitwise operators always convert float operands to integers.
-Float division and exponentiation
+Exponentiation and float division
 always convert integer operands to floats.
 All other arithmetic operations applied to mixed numbers
 (integers and floats) convert the integer operand to a float;
 </pre><p>
 Note the external, explicit call to the continuation:
 Lua will call the continuation only if needed, that is,
-in case of errors or resuming after an yield.
+in case of errors or resuming after a yield.
 If the called function returns normally without ever yielding,
 <a href="#lua_pcallk"><code>lua_pcallk</code></a> (and <a href="#lua_callk"><code>lua_callk</code></a>) will also return normally.
 (Of course, instead of calling the continuation in that case,
 continuation function.)
 For <a href="#lua_pcallk"><code>lua_pcallk</code></a>,
 the status is the same value that would be returned by <a href="#lua_pcallk"><code>lua_pcallk</code></a>,
-except that it is <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> when being executed after an yield
+except that it is <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> when being executed after a yield
 (instead of <a href="#pdf-LUA_OK"><code>LUA_OK</code></a>).
 For <a href="#lua_yieldk"><code>lua_yieldk</code></a> and <a href="#lua_callk"><code>lua_callk</code></a>,
 the status is always <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> when Lua calls the continuation.
 <pre>void *lua_upvalueid (lua_State *L, int funcindex, int n);</pre>
 <p>
-Returns an unique identifier for the upvalue numbered <code>n</code>
+Returns a unique identifier for the upvalue numbered <code>n</code>
 from the closure at index <code>funcindex</code>.
 Parameters <code>funcindex</code> and <code>n</code> are as in the <a href="#lua_getupvalue"><code>lua_getupvalue</code></a>
 (see <a href="#lua_getupvalue"><code>lua_getupvalue</code></a>)
 adds to this new table the pair <code>__name = tname</code>,
 adds to the registry the pair <code>[tname] = new table</code>,
 and returns 1.
+(The entry <code>__name</code> is used by some error-reporting functions.)
 <p>
 <a href="#luaL_setfuncs"><code>luaL_setfuncs</code></a>.
 <code>name</code> is the function name and <code>func</code> is a pointer to
 the function.
-Any array of <a href="#luaL_Reg"><code>luaL_Reg</code></a> must end with an sentinel entry
+Any array of <a href="#luaL_Reg"><code>luaL_Reg</code></a> must end with a sentinel entry
 in which both <code>name</code> and <code>func</code> are <code>NULL</code>.
 <li>
 a single character class followed by '<code>*</code>',
-which matches 0 or more repetitions of characters in the class.
+which matches zero or more repetitions of characters in the class.
 These repetition items will always match the longest possible sequence;
 </li>
 <li>
 a single character class followed by '<code>+</code>',
-which matches 1 or more repetitions of characters in the class.
+which matches one or more repetitions of characters in the class.
 These repetition items will always match the longest possible sequence;
 </li>
 <li>
 a single character class followed by '<code>-</code>',
-which also matches 0 or more repetitions of characters in the class.
+which also matches zero or more repetitions of characters in the class.
 Unlike '<code>*</code>',
 these repetition items will always match the shortest possible sequence;
 </li>
 <li>
 a single character class followed by '<code>?</code>',
-which matches 0 or 1 occurrence of a character in the class;
+which matches zero or one occurrence of a character in the class.
+It always matches one occurrence if possible;
 </li>
 <li>
 <p>
 The first parameter or local variable has index&nbsp;1, and so on,
-until the last active variable.
+following the order that they are declared in the code,
+counting only the variables that are active
+in the current scope of the function.
 Negative indices refer to vararg parameters;
 -1 is the first vararg parameter.
 The function returns <b>nil</b> if there is no variable with the given index,
 <p>
 Variable names starting with '<code>(</code>' (open parenthesis)
 represent variables with no known names
-(internal variables like loop control variables,
+(internal variables such as loop control variables,
 and variables from chunks saved without debug information).
 <p>
-Returns an unique identifier (as a light userdata)
+Returns a unique identifier (as a light userdata)
 for the upvalue numbered <code>n</code>
 from the given function.
 <HR>
 <SMALL CLASS="footer">
 Last update:
-Mon Dec 22 12:28:03 BRST 2014
+Fri Jan  2 11:29:40 BRST 2015
 </SMALL>
 <!--
 Last change: revised for Lua 5.3.0 (final)

doc/readme.html+1−1

@@ -333,7 +333,7 @@ For details, see · 332 unmodified lines
333	<A HREF="http://www.lua.org/license.html">this</A>.	333	<A HREF="http://www.lua.org/license.html">this</A>.
334		334
335	<BLOCKQUOTE STYLE="padding-bottom: 0em">	335	<BLOCKQUOTE STYLE="padding-bottom: 0em">
336	Copyright © 1994–2014 Lua.org, PUC-Rio.	336	Copyright © 1994–2015 Lua.org, PUC-Rio.
337		337
338	<P>	338	<P>
339	Permission is hereby granted, free of charge, to any person obtaining a copy	339	Permission is hereby granted, free of charge, to any person obtaining a copy

src/Makefile+1−1

@@ -6,7 +6,7 @@ · 5 unmodified lines
6	# Your platform. See PLATS for possible values.	6	# Your platform. See PLATS for possible values.
7	PLAT= none	7	PLAT= none
8		8
9	CC= gcc	9	CC= gcc -std=c99
10	CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)	10	CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
11	LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)	11	LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
12	LIBS= -lm $(SYSLIBS) $(MYLIBS)	12	LIBS= -lm $(SYSLIBS) $(MYLIBS)

src/lapi.c+2−2

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lapi.c,v 2.243 2014/11/12 13:28:54 roberto Exp $	2	** $Id: lapi.c,v 2.244 2014/12/26 14:43:45 roberto Exp $
3	** Lua API	3	** Lua API
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -676,7 +676,7 @@ LUA_API void lua_createtable (lua_State *L, int narray, int nrec) { · 670 unmodified lines
676		676
677	LUA_API int lua_getmetatable (lua_State *L, int objindex) {	677	LUA_API int lua_getmetatable (lua_State *L, int objindex) {
678	const TValue *obj;	678	const TValue *obj;
679	Table *mt = NULL;	679	Table *mt;
680	int res = 0;	680	int res = 0;
681	lua_lock(L);	681	lua_lock(L);
682	obj = index2addr(L, objindex);	682	obj = index2addr(L, objindex);

src/lcode.c+10−24

 /*
-** $Id: lcode.c,v 2.98 2014/12/19 13:36:32 roberto Exp $
+** $Id: lcode.c,v 2.99 2014/12/29 16:49:25 roberto Exp $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
 #define MAXREGS		250
-/* test for x == -0 ('signbit' needs 'math.h') */
-#if defined(signbit)
-#define isminuszero(x)	((x) == 0.0 && signbit(x))
-#else
-#define isminuszero(x)	((x) == 0.0 && 1.0/(x) < 0.0)
-#endif
 #define hasjumps(e)	((e)->t != (e)->f)
 }
-/*
-** Both NaN and -0.0 should not go to the constant table, as they have
-** problems with the hashing. (NaN is not a valid key, -0.0 collides
-** with +0.0.)
-*/
 static int luaK_numberK (FuncState *fs, lua_Number r) {
   TValue o;
-  lua_assert(!luai_numisnan(r) && !isminuszero(r));
   setfltvalue(&o, r);
   return addk(fs, &o, &o);
 }
 ** return false if folding can raise an error
 */
 static int validop (int op, TValue *v1, TValue *v2) {
-  lua_Integer i;
-  if (luai_numinvalidop(op, nvalue(v1), nvalue(v2))) return 0;
   switch (op) {
     case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
-    case LUA_OPSHL: case LUA_OPSHR: case LUA_OPBNOT:  /* conversion errors */
+    case LUA_OPSHL: case LUA_OPSHR: case LUA_OPBNOT: {  /* conversion errors */
+      lua_Integer i;
       return (tointeger(v1, &i) && tointeger(v2, &i));
-    case LUA_OPIDIV: case LUA_OPMOD:  /* integer division by 0 */
+    }
-      return !(ttisinteger(v1) && ttisinteger(v2) && ivalue(v2) == 0);
+    case LUA_OPDIV: case LUA_OPIDIV: case LUA_OPMOD:  /* division by 0 */
+      return (nvalue(v2) != 0);
     default: return 1;  /* everything else is valid */
   }
 }
   TValue v1, v2, res;
   if (!tonumeral(e1, &v1) || !tonumeral(e2, &v2) || !validop(op, &v1, &v2))
     return 0;  /* non-numeric operands or not safe to fold */
-  luaO_arith(fs->ls->L, op, &v1, &v2, &res);
+  luaO_arith(fs->ls->L, op, &v1, &v2, &res);  /* does operation */
   if (ttisinteger(&res)) {
     e1->k = VKINT;
     e1->u.ival = ivalue(&res);
   }
-  else {
+  else {  /* folds neither NaN nor 0.0 (to avoid collapsing with -0.0) */
     lua_Number n = fltvalue(&res);
-    if (luai_numisnan(n) || isminuszero(n))
+    if (luai_numisnan(n) || n == 0)
-      return 0;  /* folds neither NaN nor -0 */
+      return 0;
     e1->k = VKFLT;
     e1->u.nval = n;
   }

src/ldblib.c+7−2

 /*
-** $Id: ldblib.c,v 1.147 2014/12/08 15:47:25 roberto Exp $
+** $Id: ldblib.c,v 1.148 2015/01/02 12:52:22 roberto Exp $
 ** Interface from Lua to its debug API
 ** See Copyright Notice in lua.h
 */
 static int db_setlocal (lua_State *L) {
   int arg;
+  const char *name;
   lua_State *L1 = getthread(L, &arg);
   lua_Debug ar;
   int level = (int)luaL_checkinteger(L, arg + 1);
+  int nvar = (int)luaL_checkinteger(L, arg + 2);
   if (!lua_getstack(L1, level, &ar))  /* out of range? */
     return luaL_argerror(L, arg+1, "level out of range");
   luaL_checkany(L, arg+3);
   lua_settop(L, arg+3);
   lua_xmove(L, L1, 1);
-  lua_pushstring(L, lua_setlocal(L1, &ar, (int)luaL_checkinteger(L, arg+2)));
+  name = lua_setlocal(L1, &ar, nvar);
+  if (name == NULL)
+    lua_pop(L1, 1);  /* pop value (if not popped by 'lua_setlocal') */
+  lua_pushstring(L, name);
   return 1;
 }

src/ldebug.c+4−3

 /*
-** $Id: ldebug.c,v 2.109 2014/12/10 11:30:09 roberto Exp $
+** $Id: ldebug.c,v 2.110 2015/01/02 12:52:22 roberto Exp $
 ** Debug Interface
 ** See Copyright Notice in lua.h
 */
   StkId pos = 0;  /* to avoid warnings */
   const char *name = findlocal(L, ar->i_ci, n, &pos);
   lua_lock(L);
-  if (name)
+  if (name) {
     setobjs2s(L, pos, L->top - 1);
-  L->top--;  /* pop value */
+    L->top--;  /* pop value */
+  }
   lua_unlock(L);
   return name;
 }

src/liolib.c+3−5

 /*
-** $Id: liolib.c,v 2.141 2014/11/21 12:17:33 roberto Exp $
+** $Id: liolib.c,v 2.142 2015/01/02 12:50:28 roberto Exp $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
 static int read_line (lua_State *L, FILE *f, int chop) {
   luaL_Buffer b;
-  int c;
+  int c = '\0';
   luaL_buffinit(L, &b);
-  for (;;) {
+  while (c != EOF && c != '\n') {  /* repeat until end of line */
     char *buff = luaL_prepbuffer(&b);  /* pre-allocate buffer */
     int i = 0;
     l_lockfile(f);  /* no memory errors can happen inside the lock */
       buff[i++] = c;
     l_unlockfile(f);
     luaL_addsize(&b, i);
-    if (i < LUAL_BUFFERSIZE)
-      break;
   }
   if (!chop && c == '\n')  /* want a newline and have one? */
     luaL_addchar(&b, c);  /* add ending newline to result */

src/lmathlib.c+5−3

 /*
-** $Id: lmathlib.c,v 1.113 2014/11/07 11:31:58 roberto Exp $
+** $Id: lmathlib.c,v 1.114 2014/12/27 20:32:26 roberto Exp $
 ** Standard mathematical library
 ** See Copyright Notice in lua.h
 */
 #if defined(LUA_USE_POSIX)
 #define l_rand()	random()
 #define l_srand(x)	srandom(x)
+#define L_RANDMAX	2147483647	/* (2^31 - 1), following POSIX */
 #else
 #define l_rand()	rand()
 #define l_srand(x)	srand(x)
+#define L_RANDMAX	RAND_MAX
 #endif
 #endif				/* } */
 /*
 ** This function uses 'double' (instead of 'lua_Number') to ensure that
-** all bits from 'l_rand' can be represented, and that 'RAND_MAX + 1.0'
+** all bits from 'l_rand' can be represented, and that 'RANDMAX + 1.0'
 ** will keep full precision (ensuring that 'r' is always less than 1.0.)
 */
 static int math_random (lua_State *L) {
   lua_Integer low, up;
-  double r = (double)l_rand() * (1.0 / ((double)RAND_MAX + 1.0));
+  double r = (double)l_rand() * (1.0 / ((double)L_RANDMAX + 1.0));
   switch (lua_gettop(L)) {  /* check number of arguments */
     case 0: {  /* no arguments */
       lua_pushnumber(L, (lua_Number)r);  /* Number between 0 and 1 */

src/lobject.c+2−2

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lobject.c,v 2.100 2014/11/21 12:15:57 roberto Exp $	2	** $Id: lobject.c,v 2.101 2014/12/26 14:43:45 roberto Exp $
3	** Some generic functions over Lua objects	3	** Some generic functions over Lua objects
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -189,7 +189,7 @@ static lua_Number lua_strx2number (const char s, char *endptr) { · 183 unmodified lines
189	int sigdig = 0; /* number of significant digits */	189	int sigdig = 0; /* number of significant digits */
190	int nosigdig = 0; /* number of non-significant digits */	190	int nosigdig = 0; /* number of non-significant digits */
191	int e = 0; /* exponent correction */	191	int e = 0; /* exponent correction */
192	int neg = 0; /* 1 if number is negative */	192	int neg; /* 1 if number is negative */
193	int dot = 0; /* true after seen a dot */	193	int dot = 0; /* true after seen a dot */
194	endptr = cast(char , s); /* nothing is valid yet */	194	endptr = cast(char , s); /* nothing is valid yet */
195	while (lisspace(cast_uchar(s))) s++; / skip initial spaces */	195	while (lisspace(cast_uchar(s))) s++; / skip initial spaces */

src/loslib.c+3−3

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: loslib.c,v 1.53 2014/12/10 15:42:42 roberto Exp $	2	** $Id: loslib.c,v 1.54 2014/12/26 14:46:07 roberto Exp $
3	** Standard Operating System library	3	** Standard Operating System library
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -100,8 +100,8 @@ · 94 unmodified lines
100	#else /* }{ */	100	#else /* }{ */
101		101
102	/* ISO C definitions */	102	/* ISO C definitions */
103	#define l_gmtime(t,r) ((void)r, gmtime(t))	103	#define l_gmtime(t,r) ((void)(r)->tm_sec, gmtime(t))
104	#define l_localtime(t,r) ((void)r, localtime(t))	104	#define l_localtime(t,r) ((void)(r)->tm_sec, localtime(t))
105		105
106	#endif /* } */	106	#endif /* } */
107		107

src/lparser.c+4−4

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lparser.c,v 2.146 2014/11/27 18:41:43 roberto Exp $	2	** $Id: lparser.c,v 2.147 2014/12/27 20:31:43 roberto Exp $
3	** Lua Parser	3	** Lua Parser
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -47,8 +47,8 @@ · 41 unmodified lines
47	*/	47	*/
48	typedef struct BlockCnt {	48	typedef struct BlockCnt {
49	struct BlockCnt previous; / chain */	49	struct BlockCnt previous; / chain */
50	short firstlabel; /* index of first label in this block */	50	int firstlabel; /* index of first label in this block */
51	short firstgoto; /* index of first pending goto in this block */	51	int firstgoto; /* index of first pending goto in this block */
52	lu_byte nactvar; /* # active locals outside the block */	52	lu_byte nactvar; /* # active locals outside the block */
53	lu_byte upval; /* true if some variable in the block is an upvalue */	53	lu_byte upval; /* true if some variable in the block is an upvalue */
54	lu_byte isloop; /* true if 'block' is a loop */	54	lu_byte isloop; /* true if 'block' is a loop */
@@ -386,7 +386,7 @@ static int newlabelentry (LexState ls, Labellist l, TString *name, · 331 unmodified lines
386	l->arr[n].line = line;	386	l->arr[n].line = line;
387	l->arr[n].nactvar = ls->fs->nactvar;	387	l->arr[n].nactvar = ls->fs->nactvar;
388	l->arr[n].pc = pc;	388	l->arr[n].pc = pc;
389	l->n++;	389	l->n = n + 1;
390	return n;	390	return n;
391	}	391	}
392		392

src/lprefix.h+8−2

 /*
-** $Id: lprefix.h,v 1.1 2014/11/03 15:12:44 roberto Exp $
+** $Id: lprefix.h,v 1.2 2014/12/29 16:54:13 roberto Exp $
 ** Definitions for Lua code that must come before any other header file
 ** See Copyright Notice in lua.h
 */
 /*
 ** Allows POSIX/XSI stuff
 */
+#if !defined(LUA_USE_C89)	/* { */
 #if !defined(_XOPEN_SOURCE)
 #define _XOPEN_SOURCE           600
+#elif _XOPEN_SOURCE == 0
+#undef _XOPEN_SOURCE  /* use -D_XOPEN_SOURCE=0 to undefine it */
 #endif
 /*
 ** Allows manipulation of large files in gcc and some other compilers
 */
-#if !defined(_FILE_OFFSET_BITS)
+#if !defined(LUA_32BITS) && !defined(_FILE_OFFSET_BITS)
 #define _LARGEFILE_SOURCE       1
 #define _FILE_OFFSET_BITS       64
 #endif
+#endif				/* } */
 /*
 ** Windows stuff

src/lua.h+3−3

src/luaconf.h+2−10

 /*
-** $Id: luaconf.h,v 1.236 2014/12/19 13:31:12 roberto Exp $
+** $Id: luaconf.h,v 1.238 2014/12/29 13:27:55 roberto Exp $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
 #include <math.h>
 /* floor division (defined as 'floor(a/b)') */
-#define luai_numidiv(L,a,b)	((void)L, l_mathop(floor)((a)/(b)))
+#define luai_numidiv(L,a,b)	((void)L, l_mathop(floor)(luai_numdiv(L,a,b)))
 /*
 ** module: defined as 'a - floor(a/b)*b'; the previous definition gives
 #endif
-/*
-** The following macro checks whether an operation is not safe to be
-** performed by the constant folder. It should result in zero only if
-** the operation is safe.
-*/
-#define luai_numinvalidop(op,a,b)	0
 /*
 @@ LUA_INTEGER is the integer type used by Lua.
 **

src/lvm.c+142−97

 /*
-** $Id: lvm.c,v 2.231 2014/12/19 13:36:32 roberto Exp $
+** $Id: lvm.c,v 2.232 2014/12/27 20:30:38 roberto Exp $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
 #define vmdispatch(o)	switch(o)
-#define vmcase(l,b)	case l: {b}  break;
+#define vmcase(l)	case l:
-#define vmcasenb(l,b)	case l: {b}		/* nb = no break */
+#define vmbreak		break
 void luaV_execute (lua_State *L) {
   CallInfo *ci = L->ci;
     lua_assert(base == ci->u.l.base);
     lua_assert(base <= L->top && L->top < L->stack + L->stacksize);
     vmdispatch (GET_OPCODE(i)) {
-      vmcase(OP_MOVE,
+      vmcase(OP_MOVE) {
         setobjs2s(L, ra, RB(i));
-      )
+        vmbreak;
-      vmcase(OP_LOADK,
+      }
+      vmcase(OP_LOADK) {
         TValue *rb = k + GETARG_Bx(i);
         setobj2s(L, ra, rb);
-      )
+        vmbreak;
-      vmcase(OP_LOADKX,
+      }
+      vmcase(OP_LOADKX) {
         TValue *rb;
         lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
         rb = k + GETARG_Ax(*ci->u.l.savedpc++);
         setobj2s(L, ra, rb);
-      )
+        vmbreak;
-      vmcase(OP_LOADBOOL,
+      }
+      vmcase(OP_LOADBOOL) {
         setbvalue(ra, GETARG_B(i));
         if (GETARG_C(i)) ci->u.l.savedpc++;  /* skip next instruction (if C) */
-      )
+        vmbreak;
-      vmcase(OP_LOADNIL,
+      }
+      vmcase(OP_LOADNIL) {
         int b = GETARG_B(i);
         do {
           setnilvalue(ra++);
         } while (b--);
-      )
+        vmbreak;
-      vmcase(OP_GETUPVAL,
+      }
+      vmcase(OP_GETUPVAL) {
         int b = GETARG_B(i);
         setobj2s(L, ra, cl->upvals[b]->v);
-      )
+        vmbreak;
-      vmcase(OP_GETTABUP,
+      }
+      vmcase(OP_GETTABUP) {
         int b = GETARG_B(i);
         Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra));
-      )
+        vmbreak;
-      vmcase(OP_GETTABLE,
+      }
+      vmcase(OP_GETTABLE) {
         Protect(luaV_gettable(L, RB(i), RKC(i), ra));
-      )
+        vmbreak;
-      vmcase(OP_SETTABUP,
+      }
+      vmcase(OP_SETTABUP) {
         int a = GETARG_A(i);
         Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i)));
-      )
+        vmbreak;
-      vmcase(OP_SETUPVAL,
+      }
+      vmcase(OP_SETUPVAL) {
         UpVal *uv = cl->upvals[GETARG_B(i)];
         setobj(L, uv->v, ra);
         luaC_upvalbarrier(L, uv);
-      )
+        vmbreak;
-      vmcase(OP_SETTABLE,
+      }
+      vmcase(OP_SETTABLE) {
         Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
-      )
+        vmbreak;
-      vmcase(OP_NEWTABLE,
+      }
+      vmcase(OP_NEWTABLE) {
         int b = GETARG_B(i);
         int c = GETARG_C(i);
         Table *t = luaH_new(L);
         if (b != 0 || c != 0)
           luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c));
         checkGC(L, ra + 1);
-      )
+        vmbreak;
-      vmcase(OP_SELF,
+      }
+      vmcase(OP_SELF) {
         StkId rb = RB(i);
         setobjs2s(L, ra+1, rb);
         Protect(luaV_gettable(L, rb, RKC(i), ra));
-      )
+        vmbreak;
-      vmcase(OP_ADD,
+      }
+      vmcase(OP_ADD) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Number nb; lua_Number nc;
           setfltvalue(ra, luai_numadd(L, nb, nc));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_ADD)); }
-      )
+        vmbreak;
-      vmcase(OP_SUB,
+      }
+      vmcase(OP_SUB) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Number nb; lua_Number nc;
           setfltvalue(ra, luai_numsub(L, nb, nc));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SUB)); }
-      )
+        vmbreak;
-      vmcase(OP_MUL,
+      }
+      vmcase(OP_MUL) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Number nb; lua_Number nc;
           setfltvalue(ra, luai_nummul(L, nb, nc));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_MUL)); }
-      )
+        vmbreak;
-      vmcase(OP_DIV,  /* float division (always with floats) */
+      }
+      vmcase(OP_DIV) {  /* float division (always with floats) */
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Number nb; lua_Number nc;
           setfltvalue(ra, luai_numdiv(L, nb, nc));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_DIV)); }
-      )
+        vmbreak;
-      vmcase(OP_BAND,
+      }
+      vmcase(OP_BAND) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Integer ib; lua_Integer ic;
           setivalue(ra, intop(&, ib, ic));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BAND)); }
-      )
+        vmbreak;
-      vmcase(OP_BOR,
+      }
+      vmcase(OP_BOR) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Integer ib; lua_Integer ic;
           setivalue(ra, intop(|, ib, ic));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BOR)); }
-      )
+        vmbreak;
-      vmcase(OP_BXOR,
+      }
+      vmcase(OP_BXOR) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Integer ib; lua_Integer ic;
           setivalue(ra, intop(^, ib, ic));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BXOR)); }
-      )
+        vmbreak;
-      vmcase(OP_SHL,
+      }
+      vmcase(OP_SHL) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Integer ib; lua_Integer ic;
           setivalue(ra, luaV_shiftl(ib, ic));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SHL)); }
-      )
+        vmbreak;
-      vmcase(OP_SHR,
+      }
+      vmcase(OP_SHR) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Integer ib; lua_Integer ic;
           setivalue(ra, luaV_shiftl(ib, -ic));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SHR)); }
-      )
+        vmbreak;
-      vmcase(OP_MOD,
+      }
+      vmcase(OP_MOD) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Number nb; lua_Number nc;
           setfltvalue(ra, m);
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_MOD)); }
-      )
+        vmbreak;
-      vmcase(OP_IDIV,  /* floor division */
+      }
+      vmcase(OP_IDIV) {  /* floor division */
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Number nb; lua_Number nc;
           setfltvalue(ra, luai_numidiv(L, nb, nc));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_IDIV)); }
-      )
+        vmbreak;
-      vmcase(OP_POW,
+      }
+      vmcase(OP_POW) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         lua_Number nb; lua_Number nc;
           setfltvalue(ra, luai_numpow(L, nb, nc));
         }
         else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_POW)); }
-      )
+        vmbreak;
-      vmcase(OP_UNM,
+      }
+      vmcase(OP_UNM) {
         TValue *rb = RB(i);
         lua_Number nb;
         if (ttisinteger(rb)) {
         else {
           Protect(luaT_trybinTM(L, rb, rb, ra, TM_UNM));
         }
-      )
+        vmbreak;
-      vmcase(OP_BNOT,
+      }
+      vmcase(OP_BNOT) {
         TValue *rb = RB(i);
         lua_Integer ib;
         if (tointeger(rb, &ib)) {
         else {
           Protect(luaT_trybinTM(L, rb, rb, ra, TM_BNOT));
         }
-      )
+        vmbreak;
-      vmcase(OP_NOT,
+      }
+      vmcase(OP_NOT) {
         TValue *rb = RB(i);
         int res = l_isfalse(rb);  /* next assignment may change this value */
         setbvalue(ra, res);
-      )
+        vmbreak;
-      vmcase(OP_LEN,
+      }
+      vmcase(OP_LEN) {
         Protect(luaV_objlen(L, ra, RB(i)));
-      )
+        vmbreak;
-      vmcase(OP_CONCAT,
+      }
+      vmcase(OP_CONCAT) {
         int b = GETARG_B(i);
         int c = GETARG_C(i);
         StkId rb;
         setobjs2s(L, ra, rb);
         checkGC(L, (ra >= rb ? ra + 1 : rb));
         L->top = ci->top;  /* restore top */
-      )
+        vmbreak;
-      vmcase(OP_JMP,
+      }
+      vmcase(OP_JMP) {
         dojump(ci, i, 0);
-      )
+        vmbreak;
-      vmcase(OP_EQ,
+      }
+      vmcase(OP_EQ) {
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
         Protect(
           else
             donextjump(ci);
         )
-      )
+        vmbreak;
-      vmcase(OP_LT,
+      }
+      vmcase(OP_LT) {
         Protect(
           if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i))
             ci->u.l.savedpc++;
           else
             donextjump(ci);
         )
-      )
+        vmbreak;
-      vmcase(OP_LE,
+      }
+      vmcase(OP_LE) {
         Protect(
           if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i))
             ci->u.l.savedpc++;
           else
             donextjump(ci);
         )
-      )
+        vmbreak;
-      vmcase(OP_TEST,
+      }
+      vmcase(OP_TEST) {
         if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra))
             ci->u.l.savedpc++;
           else
           donextjump(ci);
-      )
+        vmbreak;
-      vmcase(OP_TESTSET,
+      }
+      vmcase(OP_TESTSET) {
         TValue *rb = RB(i);
         if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb))
           ci->u.l.savedpc++;
           setobjs2s(L, ra, rb);
           donextjump(ci);
         }
-      )
+        vmbreak;
-      vmcase(OP_CALL,
+      }
+      vmcase(OP_CALL) {
         int b = GETARG_B(i);
         int nresults = GETARG_C(i) - 1;
         if (b != 0) L->top = ra+b;  /* else previous instruction set top */
           ci->callstatus |= CIST_REENTRY;
           goto newframe;  /* restart luaV_execute over new Lua function */
         }
-      )
+        vmbreak;
-      vmcase(OP_TAILCALL,
+      }
+      vmcase(OP_TAILCALL) {
         int b = GETARG_B(i);
         if (b != 0) L->top = ra+b;  /* else previous instruction set top */
         lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
           lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize);
           goto newframe;  /* restart luaV_execute over new Lua function */
         }
-      )
+        vmbreak;
-      vmcasenb(OP_RETURN,
+      }
+      vmcase(OP_RETURN) {
         int b = GETARG_B(i);
         if (b != 0) L->top = ra+b-1;
         if (cl->p->sizep > 0) luaF_close(L, base);
           lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL);
           goto newframe;  /* restart luaV_execute over new Lua function */
         }
-      )
+      }
-      vmcase(OP_FORLOOP,
+      vmcase(OP_FORLOOP) {
         if (ttisinteger(ra)) {  /* integer loop? */
           lua_Integer step = ivalue(ra + 2);
           lua_Integer idx = ivalue(ra) + step; /* increment index */
             setfltvalue(ra + 3, idx);  /* ...and external index */
           }
         }
-      )
+        vmbreak;
-      vmcase(OP_FORPREP,
+      }
+      vmcase(OP_FORPREP) {
         TValue *init = ra;
         TValue *plimit = ra + 1;
         TValue *pstep = ra + 2;
           setfltvalue(init, luai_numsub(L, ninit, nstep));
         }
         ci->u.l.savedpc += GETARG_sBx(i);
-      )
+        vmbreak;
-      vmcasenb(OP_TFORCALL,
+      }
+      vmcase(OP_TFORCALL) {
         StkId cb = ra + 3;  /* call base */
         setobjs2s(L, cb+2, ra+2);
         setobjs2s(L, cb+1, ra+1);
         ra = RA(i);
         lua_assert(GET_OPCODE(i) == OP_TFORLOOP);
         goto l_tforloop;
-      )
+      }
-      vmcase(OP_TFORLOOP,
+      vmcase(OP_TFORLOOP) {
         l_tforloop:
         if (!ttisnil(ra + 1)) {  /* continue loop? */
           setobjs2s(L, ra, ra + 1);  /* save control variable */
            ci->u.l.savedpc += GETARG_sBx(i);  /* jump back */
         }
-      )
+        vmbreak;
-      vmcase(OP_SETLIST,
+      }
+      vmcase(OP_SETLIST) {
         int n = GETARG_B(i);
         int c = GETARG_C(i);
         unsigned int last;
           luaC_barrierback(L, h, val);
         }
         L->top = ci->top;  /* correct top (in case of previous open call) */
-      )
+        vmbreak;
-      vmcase(OP_CLOSURE,
+      }
+      vmcase(OP_CLOSURE) {
         Proto *p = cl->p->p[GETARG_Bx(i)];
         LClosure *ncl = getcached(p, cl->upvals, base);  /* cached closure */
         if (ncl == NULL)  /* no match? */
         else
           setclLvalue(L, ra, ncl);  /* push cashed closure */
         checkGC(L, ra + 1);
-      )
+        vmbreak;
-      vmcase(OP_VARARG,
+      }
+      vmcase(OP_VARARG) {
         int b = GETARG_B(i) - 1;
         int j;
         int n = cast_int(base - ci->func) - cl->p->numparams - 1;
             setnilvalue(ra + j);
           }
         }
-      )
+        vmbreak;
-      vmcase(OP_EXTRAARG,
+      }
+      vmcase(OP_EXTRAARG) {
         lua_assert(0);
-      )
+        vmbreak;
+      }
     }
   }
 }

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lua.h,v 1.324 2014/12/08 15:12:07 roberto Exp $	2	** $Id: lua.h,v 1.325 2014/12/26 17:24:27 roberto Exp $
3	** Lua - A Scripting Language	3	** Lua - A Scripting Language
4	** Lua.org, PUC-Rio, Brazil (http://www.lua.org)	4	** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
5	** See Copyright Notice at the end of this file	5	** See Copyright Notice at the end of this file
@@ -23,7 +23,7 @@ · 17 unmodified lines
23		23
24	#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR	24	#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
25	#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE	25	#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
26	#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2014 Lua.org, PUC-Rio"	26	#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2015 Lua.org, PUC-Rio"
27	#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"	27	#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
28		28
29		29
@@ -459,7 +459,7 @@ struct lua_Debug { · 429 unmodified lines
459		459
460		460
461	/******************************************************************************	461	/******************************************************************************
462	* Copyright (C) 1994-2014 Lua.org, PUC-Rio.	462	* Copyright (C) 1994-2015 Lua.org, PUC-Rio.
463	*	463	*
464	* Permission is hereby granted, free of charge, to any person obtaining	464	* Permission is hereby granted, free of charge, to any person obtaining
465	* a copy of this software and associated documentation files (the	465	* a copy of this software and associated documentation files (the