plan9-archive/lua

src/Makefile+42−9

 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+# Your platform. See PLATS for possible values.
+PLAT= none
 CC= gcc
 CFLAGS= -O2 -Wall $(MYCFLAGS)
 AR= ar rcu
 MYCFLAGS=
 MYLDFLAGS=
 MYLIBS=
-# enable dynamic loading and line editing in Linux
-# MYCFLAGS= -DLUA_USE_DLOPEN -DLUA_USE_READLINE
-# MYLIBS= -Wl,-E -ldl -lreadline -lhistory -lncurses
 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+PLATS= ansi bsd generic linux macosx mingw posix
 LUA_A=	liblua.a
 CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
 ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
 ALL_A= $(LUA_A)
+default: $(PLAT)
 all:	$(ALL_T)
 o:	$(ALL_O)
 	@$(CC) $(CFLAGS) -MM l*.c print.c
 echo:
+	@echo "PLAT = $(PLAT)"
 	@echo "CC = $(CC)"
 	@echo "CFLAGS = $(CFLAGS)"
 	@echo "AR = $(AR)"
 	@echo "MYLDFLAGS = $(MYLDFLAGS)"
 	@echo "MYLIBS = $(MYLIBS)"
+# convenience targets for usual platforms
+none:
+	@echo "Please choose a platform: $(PLATS)"
+ansi:
+	$(MAKE) all MYCFLAGS=-DLUA_ANSI
+bsd:
+	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
+generic:
+	$(MAKE) all MYCFLAGS=
+linux:
+	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
+macosx:
+	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+mingw:
+	$(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
+	"AR=gcc -shared -o" "RANLIB=strip --strip-unneeded" \
+	"MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
+posix:
+	$(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
 # DO NOT DELETE
 lapi.o: lapi.c lua.h luaconf.h lapi.h lobject.h llimits.h ldebug.h \
 ldo.o: ldo.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
   lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h ltable.h \
   lstring.h lundump.h lvm.h
-ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lopcodes.h lstate.h \
+ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \
-  ltm.h lzio.h lmem.h lundump.h
+  lzio.h lmem.h lundump.h
 lfunc.o: lfunc.c lua.h luaconf.h lfunc.h lobject.h llimits.h lgc.h lmem.h \
   lstate.h ltm.h lzio.h
 lgc.o: lgc.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
 lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h
 lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
   ltm.h lzio.h lmem.h ldo.h
-loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h
+loadlib.o: loadlib.c lauxlib.h lua.h luaconf.h lobject.h llimits.h \
+  lualib.h
 lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \
   ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h
-lopcodes.o: lopcodes.c lua.h luaconf.h lobject.h llimits.h lopcodes.h
+lopcodes.o: lopcodes.c lopcodes.h llimits.h lua.h luaconf.h
 loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h
 lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
   lzio.h lmem.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h \
   lstate.h ltm.h lzio.h lmem.h lfunc.h lopcodes.h lstring.h lgc.h \
   lundump.h
 lundump.o: lundump.c lua.h luaconf.h ldebug.h lstate.h lobject.h \
-  llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lopcodes.h lstring.h lgc.h \
+  llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h lundump.h
-  lundump.h
 lvm.o: lvm.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
   lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h lvm.h
 lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \

src/lapi.c+13−14

 /*
-** $Id: lapi.c,v 2.51 2005/10/20 11:35:50 roberto Exp $
+** $Id: lapi.c,v 2.53 2006/01/10 12:50:00 roberto Exp $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
 #define api_checknelems(L, n)	api_check(L, (n) <= (L->top - L->base))
-#define api_checkvalidindex(L, i)	api_check(L, (i) != &luaO_nilobject)
+#define api_checkvalidindex(L, i)	api_check(L, (i) != luaO_nilobject)
 #define api_incr_top(L)   {api_check(L, L->top < L->ci->top); L->top++;}
   if (idx > 0) {
     TValue *o = L->base + (idx - 1);
     api_check(L, idx <= L->ci->top - L->base);
-    if (o >= L->top) return cast(TValue *, &luaO_nilobject);
+    if (o >= L->top) return cast(TValue *, luaO_nilobject);
     else return o;
   }
   else if (idx > LUA_REGISTRYINDEX) {
       idx = LUA_GLOBALSINDEX - idx;
       return (idx <= func->c.nupvalues)
                 ? &func->c.upvalue[idx-1]
-                : cast(TValue *, &luaO_nilobject);
+                : cast(TValue *, luaO_nilobject);
     }
   }
 }
 LUA_API int lua_gettop (lua_State *L) {
-  return cast(int, L->top - L->base);
+  return cast_int(L->top - L->base);
 }
 LUA_API int lua_type (lua_State *L, int idx) {
   StkId o = index2adr(L, idx);
-  return (o == &luaO_nilobject) ? LUA_TNONE : ttype(o);
+  return (o == luaO_nilobject) ? LUA_TNONE : ttype(o);
 }
 LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
   StkId o1 = index2adr(L, index1);
   StkId o2 = index2adr(L, index2);
-  return (o1 == &luaO_nilobject || o2 == &luaO_nilobject) ? 0
+  return (o1 == luaO_nilobject || o2 == luaO_nilobject) ? 0
          : luaO_rawequalObj(o1, o2);
 }
   lua_lock(L);  /* may call tag method */
   o1 = index2adr(L, index1);
   o2 = index2adr(L, index2);
-  i = (o1 == &luaO_nilobject || o2 == &luaO_nilobject) ? 0
+  i = (o1 == luaO_nilobject || o2 == luaO_nilobject) ? 0 : equalobj(L, o1, o2);
-       : equalobj(L, o1, o2);
   lua_unlock(L);
   return i;
 }
   lua_lock(L);  /* may call tag method */
   o1 = index2adr(L, index1);
   o2 = index2adr(L, index2);
-  i = (o1 == &luaO_nilobject || o2 == &luaO_nilobject) ? 0
+  i = (o1 == luaO_nilobject || o2 == luaO_nilobject) ? 0
        : luaV_lessthan(L, o1, o2);
   lua_unlock(L);
   return i;
 LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
   lua_lock(L);
-  setnvalue(L->top, cast(lua_Number, n));
+  setnvalue(L->top, cast_num(n));
   api_incr_top(L);
   lua_unlock(L);
 }
     }
     case LUA_GCCOUNT: {
       /* GC values are expressed in Kbytes: #bytes/2^10 */
-      res = cast(int, g->totalbytes >> 10);
+      res = cast_int(g->totalbytes >> 10);
       break;
     }
     case LUA_GCCOUNTB: {
-      res = cast(int, g->totalbytes & 0x3ff);
+      res = cast_int(g->totalbytes & 0x3ff);
       break;
     }
     case LUA_GCSTEP: {
   api_checknelems(L, n);
   if (n >= 2) {
     luaC_checkGC(L);
-    luaV_concat(L, n, cast(int, L->top - L->base) - 1);
+    luaV_concat(L, n, cast_int(L->top - L->base) - 1);
     L->top -= (n-1);
   }
   else if (n == 0) {  /* push empty string */

src/lauxlib.c+13−5

 /*
-** $Id: lauxlib.c,v 1.156 2005/10/21 13:47:42 roberto Exp $
+** $Id: lauxlib.c,v 1.157 2005/12/29 15:32:11 roberto Exp $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
 }
+static int libsize (const luaL_Reg *l) {
+  int size = 0;
+  for (; l->name; l++) size++;
+  return size;
+}
 LUALIB_API void luaI_openlib (lua_State *L, const char *libname,
                               const luaL_Reg *l, int nup) {
   if (libname) {
+    int size = libsize(l);
     /* check whether lib already exists */
-    luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED");
+    luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", size);
     lua_getfield(L, -1, libname);  /* get _LOADED[libname] */
     if (!lua_istable(L, -1)) {  /* not found? */
       lua_pop(L, 1);  /* remove previous result */
       /* try global variable (and create one if it does not exist) */
-      if (luaL_findtable(L, LUA_GLOBALSINDEX, libname) != NULL)
+      if (luaL_findtable(L, LUA_GLOBALSINDEX, libname, size) != NULL)
         luaL_error(L, "name conflict for module " LUA_QS, libname);
       lua_pushvalue(L, -1);
       lua_setfield(L, -3, libname);  /* _LOADED[libname] = new table */
 LUALIB_API const char *luaL_findtable (lua_State *L, int idx,
-                                       const char *fname) {
+                                       const char *fname, int szhint) {
   const char *e;
   lua_pushvalue(L, idx);
   do {
     lua_rawget(L, -2);
     if (lua_isnil(L, -1)) {  /* no such field? */
       lua_pop(L, 1);  /* remove this nil */
-      lua_newtable(L);  /* create a new table for field */
+      lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */
       lua_pushlstring(L, fname, e - fname);
       lua_pushvalue(L, -2);
       lua_settable(L, -4);  /* set new table into field */

src/lauxlib.h+2−2

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lauxlib.h,v 1.86 2005/10/21 13:47:42 roberto Exp $	2	** $Id: lauxlib.h,v 1.87 2005/12/29 15:32:11 roberto Exp $
3	** Auxiliary functions for building Lua libraries	3	** Auxiliary functions for building Lua libraries
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -86,7 +86,7 @@ LUALIB_API const char (luaL_gsub) (lua_State L, const char s, const char p, · 80 unmodified lines
86	const char *r);	86	const char *r);
87		87
88	LUALIB_API const char (luaL_findtable) (lua_State L, int idx,	88	LUALIB_API const char (luaL_findtable) (lua_State L, int idx,
89	const char *fname);	89	const char *fname, int szhint);
90		90
91		91
92		92

src/lbaselib.c+3−3

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lbaselib.c,v 1.186 2005/10/21 13:47:42 roberto Exp $	2	** $Id: lbaselib.c,v 1.188 2005/12/29 15:32:11 roberto Exp $
3	** Basic library	3	** Basic library
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -201,7 +201,7 @@ static int luaB_collectgarbage (lua_State *L) { · 195 unmodified lines
201	switch (optsnum[o]) {	201	switch (optsnum[o]) {
202	case LUA_GCCOUNT: {	202	case LUA_GCCOUNT: {
203	int b = lua_gc(L, LUA_GCCOUNTB, 0);	203	int b = lua_gc(L, LUA_GCCOUNTB, 0);
204	lua_pushnumber(L, ((lua_Number)res*1024 + b)/1000);	204	lua_pushnumber(L, ((lua_Number)res*1024 + b)/1024);
205	return 1;	205	return 1;
206	}	206	}
207	case LUA_GCSTEP: {	207	case LUA_GCSTEP: {
@@ -625,7 +625,7 @@ static void base_open (lua_State *L) { · 417 unmodified lines
625	auxopen(L, "ipairs", luaB_ipairs, ipairsaux);	625	auxopen(L, "ipairs", luaB_ipairs, ipairsaux);
626	auxopen(L, "pairs", luaB_pairs, luaB_next);	626	auxopen(L, "pairs", luaB_pairs, luaB_next);
627	/* `newproxy' needs a weaktable as upvalue */	627	/* `newproxy' needs a weaktable as upvalue */
628	lua_newtable(L); /* new table `w' */	628	lua_createtable(L, 0, 1); /* new table `w' */
629	lua_pushvalue(L, -1); /* `w' will be its own metatable */	629	lua_pushvalue(L, -1); /* `w' will be its own metatable */
630	lua_setmetatable(L, -2);	630	lua_setmetatable(L, -2);
631	lua_pushliteral(L, "kv");	631	lua_pushliteral(L, "kv");

src/lcode.c+6−6

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lcode.c,v 2.22 2005/11/16 11:55:27 roberto Exp $	2	** $Id: lcode.c,v 2.24 2005/12/22 16:19:56 roberto Exp $
3	** Code generator for Lua	3	** Code generator for Lua
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -196,7 +196,7 @@ void luaK_checkstack (FuncState *fs, int n) { · 190 unmodified lines
196	if (newstack > fs->f->maxstacksize) {	196	if (newstack > fs->f->maxstacksize) {
197	if (newstack >= MAXSTACK)	197	if (newstack >= MAXSTACK)
198	luaX_syntaxerror(fs->ls, "function or expression too complex");	198	luaX_syntaxerror(fs->ls, "function or expression too complex");
199	fs->f->maxstacksize = cast(lu_byte, newstack);	199	fs->f->maxstacksize = cast_byte(newstack);
200	}	200	}
201	}	201	}
202		202
@@ -227,11 +227,11 @@ static int addk (FuncState fs, TValue k, TValue *v) { · 24 unmodified lines
227	Proto *f = fs->f;	227	Proto *f = fs->f;
228	int oldsize = f->sizek;	228	int oldsize = f->sizek;
229	if (ttisnumber(idx)) {	229	if (ttisnumber(idx)) {
230	lua_assert(luaO_rawequalObj(&fs->f->k[cast(int, nvalue(idx))], v));	230	lua_assert(luaO_rawequalObj(&fs->f->k[cast_int(nvalue(idx))], v));
231	return cast(int, nvalue(idx));	231	return cast_int(nvalue(idx));
232	}	232	}
233	else { /* constant not found; create a new entry */	233	else { /* constant not found; create a new entry */
234	setnvalue(idx, cast(lua_Number, fs->nk));	234	setnvalue(idx, cast_num(fs->nk));
235	luaM_growvector(L, f->k, fs->nk, f->sizek, TValue,	235	luaM_growvector(L, f->k, fs->nk, f->sizek, TValue,
236	MAXARG_Bx, "constant table overflow");	236	MAXARG_Bx, "constant table overflow");
237	while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);	237	while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
@@ -647,7 +647,7 @@ static int constfolding (OpCode op, expdesc e1, expdesc e2) { · 409 unmodified lines
647	case OP_LEN: return 0; /* no constant folding for 'len' */	647	case OP_LEN: return 0; /* no constant folding for 'len' */
648	default: lua_assert(0); r = 0; break;	648	default: lua_assert(0); r = 0; break;
649	}	649	}
650	if (r != r) return 0; /* do not attempt to produce NaN */	650	if (luai_numisnan(r)) return 0; /* do not attempt to produce NaN */
651	e1->u.nval = r;	651	e1->u.nval = r;
652	return 1;	652	return 1;
653	}	653	}

src/ldblib.c+3−3

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: ldblib.c,v 1.103 2005/11/01 16:08:32 roberto Exp $	2	** $Id: ldblib.c,v 1.104 2005/12/29 15:32:11 roberto Exp $
3	** Interface from Lua to its debug API	3	** Interface from Lua to its debug API
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -116,7 +116,7 @@ static int db_getinfo (lua_State *L) { · 110 unmodified lines
116	return luaL_argerror(L, arg+1, "function or level expected");	116	return luaL_argerror(L, arg+1, "function or level expected");
117	if (!lua_getinfo(L1, options, &ar))	117	if (!lua_getinfo(L1, options, &ar))
118	return luaL_argerror(L, arg+2, "invalid option");	118	return luaL_argerror(L, arg+2, "invalid option");
119	lua_newtable(L);	119	lua_createtable(L, 0, 2);
120	if (strchr(options, 'S')) {	120	if (strchr(options, 'S')) {
121	settabss(L, "source", ar.source);	121	settabss(L, "source", ar.source);
122	settabss(L, "short_src", ar.short_src);	122	settabss(L, "short_src", ar.short_src);
@@ -246,7 +246,7 @@ static void gethooktable (lua_State *L) { · 123 unmodified lines
246	lua_rawget(L, LUA_REGISTRYINDEX);	246	lua_rawget(L, LUA_REGISTRYINDEX);
247	if (!lua_istable(L, -1)) {	247	if (!lua_istable(L, -1)) {
248	lua_pop(L, 1);	248	lua_pop(L, 1);
249	lua_newtable(L);	249	lua_createtable(L, 0, 1);
250	lua_pushlightuserdata(L, (void *)&KEY_HOOK);	250	lua_pushlightuserdata(L, (void *)&KEY_HOOK);
251	lua_pushvalue(L, -2);	251	lua_pushvalue(L, -2);
252	lua_rawset(L, LUA_REGISTRYINDEX);	252	lua_rawset(L, LUA_REGISTRYINDEX);

src/ldebug.c+4−4

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: ldebug.c,v 2.28 2005/11/01 16:08:52 roberto Exp $	2	** $Id: ldebug.c,v 2.29 2005/12/22 16:19:56 roberto Exp $
3	** Debug Interface	3	** Debug Interface
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -61,7 +61,7 @@ LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count) { · 55 unmodified lines
61	L->hook = func;	61	L->hook = func;
62	L->basehookcount = count;	62	L->basehookcount = count;
63	resethookcount(L);	63	resethookcount(L);
64	L->hookmask = cast(lu_byte, mask);	64	L->hookmask = cast_byte(mask);
65	return 1;	65	return 1;
66	}	66	}
67		67
@@ -92,7 +92,7 @@ LUA_API int lua_getstack (lua_State L, int level, lua_Debug ar) { · 24 unmodified lines
92	}	92	}
93	if (level == 0 && ci > L->base_ci) { /* level found? */	93	if (level == 0 && ci > L->base_ci) { /* level found? */
94	status = 1;	94	status = 1;
95	ar->i_ci = cast(int, ci - L->base_ci);	95	ar->i_ci = cast_int(ci - L->base_ci);
96	}	96	}
97	else if (level < 0) { /* level is of a lost tail call? */	97	else if (level < 0) { /* level is of a lost tail call? */
98	status = 1;	98	status = 1;
@@ -550,7 +550,7 @@ void luaG_typeerror (lua_State L, const TValue o, const char *op) { · 451 unmodified lines
550	const char *name = NULL;	550	const char *name = NULL;
551	const char *t = luaT_typenames[ttype(o)];	551	const char *t = luaT_typenames[ttype(o)];
552	const char *kind = (isinstack(L->ci, o)) ?	552	const char *kind = (isinstack(L->ci, o)) ?
553	getobjname(L, L->ci, cast(int, o - L->base), &name) :	553	getobjname(L, L->ci, cast_int(o - L->base), &name) :
554	NULL;	554	NULL;
555	if (kind)	555	if (kind)
556	luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)",	556	luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)",

src/ldo.c+8−9

 /*
-** $Id: ldo.c,v 2.36 2005/10/23 17:52:42 roberto Exp $
+** $Id: ldo.c,v 2.37 2005/12/22 16:19:56 roberto Exp $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
 static void restore_stack_limit (lua_State *L) {
   lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK - 1);
   if (L->size_ci > LUAI_MAXCALLS) {  /* there was an overflow? */
-    int inuse = cast(int, L->ci - L->base_ci);
+    int inuse = cast_int(L->ci - L->base_ci);
     if (inuse + 1 < LUAI_MAXCALLS)  /* can `undo' overflow? */
       luaD_reallocCI(L, LUAI_MAXCALLS);
   }
     LUAI_THROW(L, L->errorJmp);
   }
   else {
-    L->status = cast(lu_byte, errcode);
+    L->status = cast_byte(errcode);
     if (G(L)->panic) {
       resetstack(L, errcode);
       lua_unlock(L);
     if (event == LUA_HOOKTAILRET)
       ar.i_ci = 0;  /* tail call; no debug information about it */
     else
-      ar.i_ci = cast(int, L->ci - L->base_ci);
+      ar.i_ci = cast_int(L->ci - L->base_ci);
     luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
     L->ci->top = L->top + LUA_MINSTACK;
     lua_assert(L->ci->top <= L->stack_last);
     for (i=0; i<nvar; i++)  /* put extra arguments into `arg' table */
       setobj2n(L, luaH_setnum(L, htab, i+1), L->top - nvar + i);
     /* store counter in field `n' */
-    setnvalue(luaH_setstr(L, htab, luaS_newliteral(L, "n")),
+    setnvalue(luaH_setstr(L, htab, luaS_newliteral(L, "n")), cast_num(nvar));
-                                   cast(lua_Number, nvar));
   }
 #endif
   /* move fixed parameters to final position */
         L->top = base + p->numparams;
     }
     else {  /* vararg function */
-      int nargs = cast(int, L->top - func) - 1;
+      int nargs = cast_int(L->top - func) - 1;
       base = adjust_varargs(L, p, nargs);
       func = restorestack(L, funcr);  /* previous call may change the stack */
     }
       L->base = L->ci->base;
   }
   L->status = 0;
-  luaV_execute(L, cast(int, L->ci - L->base_ci));
+  luaV_execute(L, cast_int(L->ci - L->base_ci));
 }
   lua_assert(L->errfunc == 0 && L->nCcalls == 0);
   status = luaD_rawrunprotected(L, resume, L->top - nargs);
   if (status != 0) {  /* error? */
-    L->status = cast(lu_byte, status);  /* mark thread as `dead' */
+    L->status = cast_byte(status);  /* mark thread as `dead' */
     luaD_seterrorobj(L, status, L->top);
     L->ci->top = L->top;
   }

src/lfunc.c+3−3

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lfunc.c,v 2.11 2005/05/05 20:47:02 roberto Exp $	2	** $Id: lfunc.c,v 2.12 2005/12/22 16:19:56 roberto Exp $
3	** Auxiliary functions to manipulate prototypes and closures	3	** Auxiliary functions to manipulate prototypes and closures
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -25,7 +25,7 @@ Closure luaF_newCclosure (lua_State L, int nelems, Table *e) { · 19 unmodified lines
25	luaC_link(L, obj2gco(c), LUA_TFUNCTION);	25	luaC_link(L, obj2gco(c), LUA_TFUNCTION);
26	c->c.isC = 1;	26	c->c.isC = 1;
27	c->c.env = e;	27	c->c.env = e;
28	c->c.nupvalues = cast(lu_byte, nelems);	28	c->c.nupvalues = cast_byte(nelems);
29	return c;	29	return c;
30	}	30	}
31		31
@@ -35,7 +35,7 @@ Closure luaF_newLclosure (lua_State L, int nelems, Table *e) { · 3 unmodified lines
35	luaC_link(L, obj2gco(c), LUA_TFUNCTION);	35	luaC_link(L, obj2gco(c), LUA_TFUNCTION);
36	c->l.isC = 0;	36	c->l.isC = 0;
37	c->l.env = e;	37	c->l.env = e;
38	c->l.nupvalues = cast(lu_byte, nelems);	38	c->l.nupvalues = cast_byte(nelems);
39	while (nelems--) c->l.upvals[nelems] = NULL;	39	while (nelems--) c->l.upvals[nelems] = NULL;
40	return c;	40	return c;
41	}	41	}

src/lgc.c+8−9

 /*
-** $Id: lgc.c,v 2.36 2005/08/24 17:06:36 roberto Exp $
+** $Id: lgc.c,v 2.37 2005/12/22 16:19:56 roberto Exp $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
 #define GCFINALIZECOST	100
-#define maskmarks \
+#define maskmarks	cast_byte(~(bitmask(BLACKBIT)|WHITEBITS))
-	cast(lu_byte, ~(bitmask(BLACKBIT)|WHITEBITS))
 #define makewhite(g,x)	\
-   ((x)->gch.marked = ((x)->gch.marked & maskmarks) | luaC_white(g))
+   ((x)->gch.marked = cast_byte(((x)->gch.marked & maskmarks) | luaC_white(g)))
 #define white2gray(x)	reset2bits((x)->gch.marked, WHITE0BIT, WHITE1BIT)
 #define black2gray(x)	resetbit((x)->gch.marked, BLACKBIT)
     weakvalue = (strchr(svalue(mode), 'v') != NULL);
     if (weakkey || weakvalue) {  /* is really weak? */
       h->marked &= ~(KEYWEAK | VALUEWEAK);  /* clear bits */
-      h->marked |= cast(lu_byte, (weakkey << KEYWEAKBIT) |
+      h->marked |= cast_byte((weakkey << KEYWEAKBIT) |
-                                 (weakvalue << VALUEWEAKBIT));
+                             (weakvalue << VALUEWEAKBIT));
       h->gclist = g->weak;  /* must be cleared after GC, ... */
       g->weak = obj2gco(h);  /* ... so put in the appropriate list */
     }
 static void checkstacksizes (lua_State *L, StkId max) {
-  int ci_used = cast(int, L->ci - L->base_ci);  /* number of `ci' in use */
+  int ci_used = cast_int(L->ci - L->base_ci);  /* number of `ci' in use */
-  int s_used = cast(int, max - L->stack);  /* part of stack in use */
+  int s_used = cast_int(max - L->stack);  /* part of stack in use */
   if (L->size_ci > LUAI_MAXCALLS)  /* handling overflow? */
     return;  /* do not touch the stacks */
   if (4*ci_used < L->size_ci && 2*BASIC_CI_SIZE < L->size_ci)
   propagateall(g);  /* remark, to propagate `preserveness' */
   cleartable(g->weak);  /* remove collected objects from weak tables */
   /* flip current white */
-  g->currentwhite = cast(lu_byte, otherwhite(g));
+  g->currentwhite = cast_byte(otherwhite(g));
   g->sweepstrgc = 0;
   g->sweepgc = &g->rootgc;
   g->gcstate = GCSsweepstring;

src/linit.c+2−2

 /*
-** $Id: linit.c,v 1.13 2005/08/26 17:36:32 roberto Exp $
+** $Id: linit.c,v 1.14 2005/12/29 15:32:11 roberto Exp $
 ** Initialization of libraries for lua.c
 ** See Copyright Notice in lua.h
 */
 static const luaL_Reg lualibs[] = {
   {"", luaopen_base},
+  {LUA_LOADLIBNAME, luaopen_package},
   {LUA_TABLIBNAME, luaopen_table},
   {LUA_IOLIBNAME, luaopen_io},
   {LUA_OSLIBNAME, luaopen_os},
   {LUA_STRLIBNAME, luaopen_string},
   {LUA_MATHLIBNAME, luaopen_math},
   {LUA_DBLIBNAME, luaopen_debug},
-  {LUA_LOADLIBNAME, luaopen_package},
   {NULL, NULL}
 };

src/liolib.c+4−4

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: liolib.c,v 2.69 2005/10/19 13:05:11 roberto Exp $	2	** $Id: liolib.c,v 2.70 2005/12/29 15:32:11 roberto Exp $
3	** Standard I/O (and system) library	3	** Standard I/O (and system) library
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -507,8 +507,8 @@ static void createstdfile (lua_State L, FILE f, int k, const char *fname) { · 501 unmodified lines
507		507
508	LUALIB_API int luaopen_io (lua_State *L) {	508	LUALIB_API int luaopen_io (lua_State *L) {
509	createmeta(L);	509	createmeta(L);
510	/* create new (private) environment */	510	/* create (private) environment (with fields IO_INPUT, IO_OUTPUT, __close) */
511	lua_newtable(L);	511	lua_createtable(L, 2, 1);
512	lua_replace(L, LUA_ENVIRONINDEX);	512	lua_replace(L, LUA_ENVIRONINDEX);
513	/* open library */	513	/* open library */
514	luaL_register(L, LUA_IOLIBNAME, iolib);	514	luaL_register(L, LUA_IOLIBNAME, iolib);
@@ -518,7 +518,7 @@ LUALIB_API int luaopen_io (lua_State *L) { · 3 unmodified lines
518	createstdfile(L, stderr, 0, "stderr");	518	createstdfile(L, stderr, 0, "stderr");
519	/* create environment for 'popen' */	519	/* create environment for 'popen' */
520	lua_getfield(L, -1, "popen");	520	lua_getfield(L, -1, "popen");
521	lua_newtable(L);	521	lua_createtable(L, 0, 1);
522	lua_pushcfunction(L, io_pclose);	522	lua_pushcfunction(L, io_pclose);
523	lua_setfield(L, -2, "__close");	523	lua_setfield(L, -2, "__close");
524	lua_setfenv(L, -2);	524	lua_setfenv(L, -2);

src/llex.c+46−6

@@ -1,11 +1,12 @@
1	/*	1	/*
2	** $Id: llex.c,v 2.13 2005/11/08 19:45:14 roberto Exp $	2	** $Id: llex.c,v 2.17 2005/12/22 16:19:56 roberto Exp $
3	** Lexical Analyzer	3	** Lexical Analyzer
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
6		6
7		7
8	#include <ctype.h>	8	#include <ctype.h>
		9	#include <locale.h>
9	#include <string.h>	10	#include <string.h>
10		11
11	#define llex_c	12	#define llex_c
@@ -65,7 +66,7 @@ void luaX_init (lua_State *L) { · 53 unmodified lines
65	TString *ts = luaS_new(L, luaX_tokens[i]);	66	TString *ts = luaS_new(L, luaX_tokens[i]);
66	luaS_fix(ts); /* reserved words are never collected */	67	luaS_fix(ts); /* reserved words are never collected */
67	lua_assert(strlen(luaX_tokens[i])+1 <= TOKEN_LEN);	68	lua_assert(strlen(luaX_tokens[i])+1 <= TOKEN_LEN);
68	ts->tsv.reserved = cast(lu_byte, i+1); /* reserved word */	69	ts->tsv.reserved = cast_byte(i+1); /* reserved word */
69	}	70	}
70	}	71	}
71		72
@@ -134,6 +135,7 @@ static void inclinenumber (LexState *ls) { · 62 unmodified lines
134		135
135		136
136	void luaX_setinput (lua_State L, LexState ls, ZIO z, TString source) {	137	void luaX_setinput (lua_State L, LexState ls, ZIO z, TString source) {
		138	ls->decpoint = '.';
137	ls->L = L;	139	ls->L = L;
138	ls->lookahead.token = TK_EOS; /* no look-ahead token */	140	ls->lookahead.token = TK_EOS; /* no look-ahead token */
139	ls->z = z;	141	ls->z = z;
@@ -163,6 +165,27 @@ static int check_next (LexState ls, const char set) { · 23 unmodified lines
163	}	165	}
164		166
165		167
		168	static void buffreplace (LexState *ls, char from, char to) {
		169	int n = luaZ_bufflen(ls->buff);
		170	char *p = luaZ_buffer(ls->buff);
		171	while (n--)
		172	if (p[n] == from) p[n] = to;
		173	}
		174
		175
		176	static void trydecpoint (LexState ls, SemInfo seminfo) {
		177	/* format error: try to update decimal point separator */
		178	struct lconv *cv = localeconv();
		179	char old = ls->decpoint;
		180	ls->decpoint = (cv ? cv->decimal_point[0] : '.');
		181	buffreplace(ls, old, ls->decpoint); /* try updated decimal separator */
		182	if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
		183	/* format error with correct decimal point: no more options */
		184	buffreplace(ls, ls->decpoint, '.'); /* undo change (for error message) */
		185	luaX_lexerror(ls, "malformed number", TK_NUMBER);
		186	}
		187	}
		188
166		189
167	/* LUA_NUMBER */	190	/* LUA_NUMBER */
168	static void read_numeral (LexState ls, SemInfo seminfo) {	191	static void read_numeral (LexState ls, SemInfo seminfo) {
@@ -177,8 +200,9 @@ static void read_numeral (LexState ls, SemInfo seminfo) { · 8 unmodified lines
177	}	200	}
178	}	201	}
179	save(ls, '\0');	202	save(ls, '\0');
180	if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r))	203	buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */
181	luaX_lexerror(ls, "malformed number", TK_NUMBER);	204	if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) /* format error? */
		205	trydecpoint(ls, seminfo); /* try to update decimal point separator */
182	}	206	}
183		207
184		208
@@ -306,7 +330,7 @@ static void read_string (LexState ls, int del, SemInfo seminfo) { · 121 unmodified lines
306	}	330	}
307		331
308		332
309	int luaX_lex (LexState ls, SemInfo seminfo) {	333	static int llex (LexState ls, SemInfo seminfo) {
310	luaZ_resetbuffer(ls->buff);	334	luaZ_resetbuffer(ls->buff);
311	for (;;) {	335	for (;;) {
312	switch (ls->current) {	336	switch (ls->current) {
@@ -419,4 +443,20 @@ int luaX_lex (LexState ls, SemInfo seminfo) { · 106 unmodified lines
419	}	443	}
420	}	444	}
421		445
422	#undef next	446
		447	void luaX_next (LexState *ls) {
		448	ls->lastline = ls->linenumber;
		449	if (ls->lookahead.token != TK_EOS) { /* is there a look-ahead token? */
		450	ls->t = ls->lookahead; /* use this one */
		451	ls->lookahead.token = TK_EOS; /* and discharge it */
		452	}
		453	else
		454	ls->t.token = llex(ls, &ls->t.seminfo); /* read next token */
		455	}
		456
		457
		458	void luaX_lookahead (LexState *ls) {
		459	lua_assert(ls->lookahead.token == TK_EOS);
		460	ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
		461	}
		462

src/llex.h+4−2

 /*
-** $Id: llex.h,v 1.55 2005/06/06 13:30:25 roberto Exp $
+** $Id: llex.h,v 1.57 2005/12/07 15:43:05 roberto Exp $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
   ZIO *z;  /* input stream */
   Mbuffer *buff;  /* buffer for tokens */
   TString *source;  /* current source name */
+  char decpoint;  /* locale decimal point */
 } LexState;
 LUAI_FUNC void luaX_setinput (lua_State *L, LexState *LS, ZIO *z,
                               TString *source);
 LUAI_FUNC TString *luaX_newstring (LexState *LS, const char *str, size_t l);
-LUAI_FUNC int luaX_lex (LexState *LS, SemInfo *seminfo);
+LUAI_FUNC void luaX_next (LexState *ls);
+LUAI_FUNC void luaX_lookahead (LexState *ls);
 LUAI_FUNC void luaX_lexerror (LexState *ls, const char *msg, int token);
 LUAI_FUNC void luaX_syntaxerror (LexState *ls, const char *s);
 LUAI_FUNC const char *luaX_token2str (LexState *ls, int token);

src/llimits.h+18−5

 /*
-** $Id: llimits.h,v 1.67 2005/08/24 16:15:49 roberto Exp $
+** $Id: llimits.h,v 1.69 2005/12/27 17:12:00 roberto Exp $
 ** Limits, basic types, and some other `installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
 #include "lua.h"
-#define api_check	luai_apicheck
 typedef LUAI_UINT32 lu_int32;
 typedef LUAI_UMEM lu_mem;
 typedef LUAI_UACNUMBER l_uacNumber;
-#define check_exp(c,e)	(lua_assert(c), (e))
+/* internal assertions for in-house debugging */
+#ifdef lua_assert
+#define check_exp(c,e)		(lua_assert(c), (e))
+#define api_check(l,e)		lua_assert(e)
+#else
+#define lua_assert(c)		((void)0)
+#define check_exp(c,e)		(e)
+#define api_check		luai_apicheck
+#endif
 #ifndef UNUSED
 #define cast(t, exp)	((t)(exp))
 #endif
+#define cast_byte(i)	cast(lu_byte, (i))
+#define cast_num(i)	cast(lua_Number, (i))
+#define cast_int(i)	cast(int, (i))
 /*

src/lmem.c+1−17

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lmem.c,v 1.69 2005/02/23 17:30:22 roberto Exp $	2	** $Id: lmem.c,v 1.70 2005/12/26 13:35:47 roberto Exp $
3	** Interface to Memory Manager	3	** Interface to Memory Manager
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -81,22 +81,6 @@ void luaM_realloc_ (lua_State L, void *block, size_t osize, size_t nsize) { · 75 unmodified lines
81	luaD_throw(L, LUA_ERRMEM);	81	luaD_throw(L, LUA_ERRMEM);
82	lua_assert((nsize == 0) == (block == NULL));	82	lua_assert((nsize == 0) == (block == NULL));
83	g->totalbytes = (g->totalbytes - osize) + nsize;	83	g->totalbytes = (g->totalbytes - osize) + nsize;
84	#if 0
85	{ /* auxiliar patch to monitor garbage collection */
86	static unsigned long total = 0; /* our "time" */
87	static lu_mem last = 0; /* last totalmem that generated an output */
88	static FILE f = NULL; / output file */
89	if (nsize <= osize) total += 1; /* "time" always grow */
90	else total += (nsize - osize);
91	if ((int)g->totalbytes - (int)last > 1000 \|\|
92	(int)g->totalbytes - (int)last < -1000) {
93	last = g->totalbytes;
94	if (f == NULL) f = fopen("trace", "w");
95	fprintf(f, "%lu %u %u %u %d\n", total, g->totalbytes, g->GCthreshold,
96	g->estimate, g->gcstate);
97	}
98	}
99	#endif
100	return block;	84	return block;
101	}	85	}
102		86

src/loadlib.c+38−27

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: loadlib.c,v 1.48 2005/10/17 18:01:51 roberto Exp $	2	** $Id: loadlib.c,v 1.51 2005/12/29 15:32:11 roberto Exp $
3	** Dynamic library loader for Lua	3	** Dynamic library loader for Lua
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	**	5	**
@@ -16,8 +16,9 @@ · 10 unmodified lines
16	#define loadlib_c	16	#define loadlib_c
17	#define LUA_LIB	17	#define LUA_LIB
18		18
19	#include "lua.h"
20	#include "lauxlib.h"	19	#include "lauxlib.h"
		20	#include "lobject.h"
		21	#include "lua.h"
21	#include "lualib.h"	22	#include "lualib.h"
22		23
23		24
@@ -236,11 +237,8 @@ static lua_CFunction ll_sym (lua_State L, void lib, const char *sym) { · 212 unmodified lines
236	#define LIB_FAIL "absent"	237	#define LIB_FAIL "absent"
237		238
238		239
239	#if defined(__ELF__) \|\| defined(__sun) \|\| defined(sgi) \|\| defined(__hpux)	240	#define DLMSG "dynamic libraries not enabled; check your Lua installation"
240	#define DLMSG LUA_QL("loadlib") " not enabled; check your Lua installation"	241
241	#else
242	#define DLMSG LUA_QL("loadlib") " not supported"
243	#endif
244		242
245	static void ll_unloadlib (void *lib) {	243	static void ll_unloadlib (void *lib) {
246	(void)lib; /* to avoid warnings */	244	(void)lib; /* to avoid warnings */
@@ -362,20 +360,23 @@ static const char findfile (lua_State L, const char *name, · 115 unmodified lines
362	path = lua_tostring(L, -1);	360	path = lua_tostring(L, -1);
363	if (path == NULL)	361	if (path == NULL)
364	luaL_error(L, LUA_QL("package.%s") " must be a string", pname);	362	luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
		363	lua_pushstring(L, ""); /* error accumulator */
365	while ((path = pushnexttemplate(L, path)) != NULL) {	364	while ((path = pushnexttemplate(L, path)) != NULL) {
366	const char *filename;	365	const char *filename;
367	filename = luaL_gsub(L, lua_tostring(L, -1), LUA_PATH_MARK, name);	366	filename = luaL_gsub(L, lua_tostring(L, -1), LUA_PATH_MARK, name);
368	if (readable(filename)) /* does file exist and is readable? */	367	if (readable(filename)) /* does file exist and is readable? */
369	return filename; /* return that file name */	368	return filename; /* return that file name */
370	lua_pop(L, 2); /* remove path template and file name */	369	lua_pop(L, 2); /* remove path template and file name */
		370	luaO_pushfstring(L, "\n\tno file " LUA_QS, filename);
		371	lua_concat(L, 2);
371	}	372	}
372	return NULL; /* not found */	373	return NULL; /* not found */
373	}	374	}
374		375
375		376
376	static void loaderror (lua_State *L) {	377	static void loaderror (lua_State L, const char filename) {
377	luaL_error(L, "error loading module " LUA_QS " (%s)",	378	luaL_error(L, "error loading module " LUA_QS " from file " LUA_QS ":\n\t%s",
378	lua_tostring(L, 1), lua_tostring(L, -1));	379	lua_tostring(L, 1), filename, lua_tostring(L, -1));
379	}	380	}
380		381
381		382
@@ -383,9 +384,9 @@ static int loader_Lua (lua_State *L) { · 1 unmodified line
383	const char *filename;	384	const char *filename;
384	const char *name = luaL_checkstring(L, 1);	385	const char *name = luaL_checkstring(L, 1);
385	filename = findfile(L, name, "path");	386	filename = findfile(L, name, "path");
386	if (filename == NULL) return 0; /* library not found in this path */	387	if (filename == NULL) return 1; /* library not found in this path */
387	if (luaL_loadfile(L, filename) != 0)	388	if (luaL_loadfile(L, filename) != 0)
388	loaderror(L);	389	loaderror(L, filename);
389	return 1; /* library loaded successfully */	390	return 1; /* library loaded successfully */
390	}	391	}
391		392
@@ -405,10 +406,10 @@ static int loader_C (lua_State *L) { · 13 unmodified lines
405	const char *funcname;	406	const char *funcname;
406	const char *name = luaL_checkstring(L, 1);	407	const char *name = luaL_checkstring(L, 1);
407	const char *filename = findfile(L, name, "cpath");	408	const char *filename = findfile(L, name, "cpath");
408	if (filename == NULL) return 0; /* library not found in this path */	409	if (filename == NULL) return 1; /* library not found in this path */
409	funcname = mkfuncname(L, name);	410	funcname = mkfuncname(L, name);
410	if (ll_loadfunc(L, filename, funcname) != 0)	411	if (ll_loadfunc(L, filename, funcname) != 0)
411	loaderror(L);	412	loaderror(L, filename);
412	return 1; /* library loaded successfully */	413	return 1; /* library loaded successfully */
413	}	414	}
414		415
@@ -422,22 +423,26 @@ static int loader_Croot (lua_State *L) { · 7 unmodified lines
422	if (p == NULL) return 0; /* is root */	423	if (p == NULL) return 0; /* is root */
423	lua_pushlstring(L, name, p - name);	424	lua_pushlstring(L, name, p - name);
424	filename = findfile(L, lua_tostring(L, -1), "cpath");	425	filename = findfile(L, lua_tostring(L, -1), "cpath");
425	if (filename == NULL) return 0; /* root not found */	426	if (filename == NULL) return 1; /* root not found */
426	funcname = mkfuncname(L, name);	427	funcname = mkfuncname(L, name);
427	if ((stat = ll_loadfunc(L, filename, funcname)) != 0) {	428	if ((stat = ll_loadfunc(L, filename, funcname)) != 0) {
428	if (stat == ERRFUNC) return 0; /* function not found */	429	if (stat != ERRFUNC) loaderror(L, filename); /* real error */
429	else	430	luaO_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
430	loaderror(L); /* real error */	431	name, filename);
		432	return 1; /* function not found */
431	}	433	}
432	return 1;	434	return 1;
433	}	435	}
434		436
435		437
436	static int loader_preload (lua_State *L) {	438	static int loader_preload (lua_State *L) {
		439	const char *name = luaL_checkstring(L, 1);
437	lua_getfield(L, LUA_ENVIRONINDEX, "preload");	440	lua_getfield(L, LUA_ENVIRONINDEX, "preload");
438	if (!lua_istable(L, -1))	441	if (!lua_istable(L, -1))
439	luaL_error(L, LUA_QL("package.preload") " must be a table");	442	luaL_error(L, LUA_QL("package.preload") " must be a table");
440	lua_getfield(L, -1, luaL_checkstring(L, 1));	443	lua_getfield(L, -1, name);
		444	if (lua_isnil(L, -1)) /* not found? */
		445	luaO_pushfstring(L, "\n\tno field package.preload['%s']", name);
441	return 1;	446	return 1;
442	}	447	}
443		448
@@ -461,14 +466,20 @@ static int ll_require (lua_State *L) { · 17 unmodified lines
461	lua_getfield(L, LUA_ENVIRONINDEX, "loaders");	466	lua_getfield(L, LUA_ENVIRONINDEX, "loaders");
462	if (!lua_istable(L, -1))	467	if (!lua_istable(L, -1))
463	luaL_error(L, LUA_QL("package.loaders") " must be a table");	468	luaL_error(L, LUA_QL("package.loaders") " must be a table");
		469	lua_pushstring(L, ""); /* error message accumulator */
464	for (i=1; ; i++) {	470	for (i=1; ; i++) {
465	lua_rawgeti(L, -1, i); /* get a loader */	471	lua_rawgeti(L, -2, i); /* get a loader */
466	if (lua_isnil(L, -1))	472	if (lua_isnil(L, -1))
467	luaL_error(L, "module " LUA_QS " not found", name);	473	luaL_error(L, "module " LUA_QS " not found:%s",
		474	name, lua_tostring(L, -2));
468	lua_pushstring(L, name);	475	lua_pushstring(L, name);
469	lua_call(L, 1, 1); /* call it */	476	lua_call(L, 1, 1); /* call it */
470	if (lua_isnil(L, -1)) lua_pop(L, 1); /* did not found module */	477	if (lua_isfunction(L, -1)) /* did it find module? */
471	else break; /* module loaded successfully */	478	break; /* module loaded successfully */
		479	else if (lua_isstring(L, -1)) /* loader returned error message? */
		480	lua_concat(L, 2); /* accumulate it */
		481	else
		482	lua_pop(L, 1);
472	}	483	}
473	lua_pushlightuserdata(L, sentinel);	484	lua_pushlightuserdata(L, sentinel);
474	lua_setfield(L, 2, name); /* _LOADED[name] = sentinel */	485	lua_setfield(L, 2, name); /* _LOADED[name] = sentinel */
@@ -539,7 +550,7 @@ static int ll_module (lua_State *L) { · 64 unmodified lines
539	if (!lua_istable(L, -1)) { /* not found? */	550	if (!lua_istable(L, -1)) { /* not found? */
540	lua_pop(L, 1); /* remove previous result */	551	lua_pop(L, 1); /* remove previous result */
541	/* try global variable (and create one if it does not exist) */	552	/* try global variable (and create one if it does not exist) */
542	if (luaL_findtable(L, LUA_GLOBALSINDEX, modname) != NULL)	553	if (luaL_findtable(L, LUA_GLOBALSINDEX, modname, 1) != NULL)
543	return luaL_error(L, "name conflict for module " LUA_QS, modname);	554	return luaL_error(L, "name conflict for module " LUA_QS, modname);
544	lua_pushvalue(L, -1);	555	lua_pushvalue(L, -1);
545	lua_setfield(L, loaded, modname); /* _LOADED[modname] = new table */	556	lua_setfield(L, loaded, modname); /* _LOADED[modname] = new table */
@@ -562,7 +573,7 @@ static int ll_module (lua_State *L) { · 16 unmodified lines
562	static int ll_seeall (lua_State *L) {	573	static int ll_seeall (lua_State *L) {
563	luaL_checktype(L, 1, LUA_TTABLE);	574	luaL_checktype(L, 1, LUA_TTABLE);
564	if (!lua_getmetatable(L, 1)) {	575	if (!lua_getmetatable(L, 1)) {
565	lua_newtable(L); /* create new metatable */	576	lua_createtable(L, 0, 1); /* create new metatable */
566	lua_pushvalue(L, -1);	577	lua_pushvalue(L, -1);
567	lua_setmetatable(L, 1);	578	lua_setmetatable(L, 1);
568	}	579	}
@@ -629,7 +640,7 @@ LUALIB_API int luaopen_package (lua_State *L) { · 60 unmodified lines
629	lua_pushvalue(L, -1);	640	lua_pushvalue(L, -1);
630	lua_replace(L, LUA_ENVIRONINDEX);	641	lua_replace(L, LUA_ENVIRONINDEX);
631	/* create `loaders' table */	642	/* create `loaders' table */
632	lua_newtable(L);	643	lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1);
633	/* fill it with pre-defined loaders */	644	/* fill it with pre-defined loaders */
634	for (i=0; loaders[i] != NULL; i++) {	645	for (i=0; loaders[i] != NULL; i++) {
635	lua_pushcfunction(L, loaders[i]);	646	lua_pushcfunction(L, loaders[i]);
@@ -643,7 +654,7 @@ LUALIB_API int luaopen_package (lua_State *L) { · 7 unmodified lines
643	LUA_EXECDIR "\n" LUA_IGMARK);	654	LUA_EXECDIR "\n" LUA_IGMARK);
644	lua_setfield(L, -2, "config");	655	lua_setfield(L, -2, "config");
645	/* set field `loaded' */	656	/* set field `loaded' */
646	luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED");	657	luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 2);
647	lua_setfield(L, -2, "loaded");	658	lua_setfield(L, -2, "loaded");
648	/* set field `preload' */	659	/* set field `preload' */
649	lua_newtable(L);	660	lua_newtable(L);

src/lobject.c+6−6

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lobject.c,v 2.19 2005/10/24 17:37:52 roberto Exp $	2	** $Id: lobject.c,v 2.21 2006/01/10 12:50:00 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	*/
@@ -24,7 +24,7 @@ · 18 unmodified lines
24		24
25		25
26		26
27	const TValue luaO_nilobject = {{NULL}, LUA_TNIL};	27	const TValue luaO_nilobject_ = {{NULL}, LUA_TNIL};
28		28
29		29
30	/*	30	/*
@@ -39,7 +39,7 @@ int luaO_int2fb (unsigned int x) { · 8 unmodified lines
39	e++;	39	e++;
40	}	40	}
41	if (x < 8) return x;	41	if (x < 8) return x;
42	else return ((e+1) << 3) \| (cast(int, x) - 8);	42	else return ((e+1) << 3) \| (cast_int(x) - 8);
43	}	43	}
44		44
45		45
@@ -129,12 +129,12 @@ const char luaO_pushvfstring (lua_State L, const char *fmt, va_list argp) { · 83 unmodified lines
129	break;	129	break;
130	}	130	}
131	case 'd': {	131	case 'd': {
132	setnvalue(L->top, cast(lua_Number, va_arg(argp, int)));	132	setnvalue(L->top, cast_num(va_arg(argp, int)));
133	incr_top(L);	133	incr_top(L);
134	break;	134	break;
135	}	135	}
136	case 'f': {	136	case 'f': {
137	setnvalue(L->top, cast(lua_Number, va_arg(argp, l_uacNumber)));	137	setnvalue(L->top, cast_num(va_arg(argp, l_uacNumber)));
138	incr_top(L);	138	incr_top(L);
139	break;	139	break;
140	}	140	}
@@ -161,7 +161,7 @@ const char luaO_pushvfstring (lua_State L, const char *fmt, va_list argp) { · 20 unmodified lines
161	fmt = e+2;	161	fmt = e+2;
162	}	162	}
163	pushstr(L, fmt);	163	pushstr(L, fmt);
164	luaV_concat(L, n+1, cast(int, L->top - L->base) - 1);	164	luaV_concat(L, n+1, cast_int(L->top - L->base) - 1);
165	L->top -= n;	165	L->top -= n;
166	return svalue(L->top - 1);	166	return svalue(L->top - 1);
167	}	167	}

src/lobject.h+9−5

 /*
-** $Id: lobject.h,v 2.18 2005/10/24 17:37:33 roberto Exp $
+** $Id: lobject.h,v 2.19 2006/01/10 12:51:53 roberto Exp $
 ** Type definitions for Lua objects
 ** See Copyright Notice in lua.h
 */
 ** Tables
 */
-typedef struct TKey {
+typedef union TKey {
-  TValuefields;
+  struct {
-  struct Node *next;  /* for chaining */
+    TValuefields;
+    struct Node *next;  /* for chaining */
+  } nk;
+  TValue tvk;
 } TKey;
 #define sizenode(t)	(twoto((t)->lsizenode))
+#define luaO_nilobject		(&luaO_nilobject_)
-LUAI_DATA const TValue luaO_nilobject;
+LUAI_DATA const TValue luaO_nilobject_;
 #define ceillog2(x)	(luaO_log2((x)-1) + 1)

src/lopcodes.h+2−2

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lopcodes.h,v 1.123 2005/10/23 17:37:55 roberto Exp $	2	** $Id: lopcodes.h,v 1.124 2005/12/02 18:42:08 roberto Exp $
3	** Opcodes for Lua virtual machine	3	** Opcodes for Lua virtual machine
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -208,7 +208,7 @@ OP_VARARG/* A B R(A), R(A+1), ..., R(A+B-1) = vararg */ · 202 unmodified lines
208	} OpCode;	208	} OpCode;
209		209
210		210
211	#define NUM_OPCODES (cast(int, OP_VARARG+1))	211	#define NUM_OPCODES (cast(int, OP_VARARG) + 1)
212		212
213		213
214		214

src/loslib.c+24−24

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: loslib.c,v 1.14 2005/10/21 13:47:42 roberto Exp $	2	** $Id: loslib.c,v 1.16 2005/12/22 16:19:56 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	*/
@@ -37,26 +37,26 @@ static int os_pushresult (lua_State L, int i, const char filename) { · 31 unmodified lines
37	}	37	}
38		38
39		39
40	static int io_execute (lua_State *L) {	40	static int os_execute (lua_State *L) {
41	lua_pushinteger(L, system(luaL_optstring(L, 1, NULL)));	41	lua_pushinteger(L, system(luaL_optstring(L, 1, NULL)));
42	return 1;	42	return 1;
43	}	43	}
44		44
45		45
46	static int io_remove (lua_State *L) {	46	static int os_remove (lua_State *L) {
47	const char *filename = luaL_checkstring(L, 1);	47	const char *filename = luaL_checkstring(L, 1);
48	return os_pushresult(L, remove(filename) == 0, filename);	48	return os_pushresult(L, remove(filename) == 0, filename);
49	}	49	}
50		50
51		51
52	static int io_rename (lua_State *L) {	52	static int os_rename (lua_State *L) {
53	const char *fromname = luaL_checkstring(L, 1);	53	const char *fromname = luaL_checkstring(L, 1);
54	const char *toname = luaL_checkstring(L, 2);	54	const char *toname = luaL_checkstring(L, 2);
55	return os_pushresult(L, rename(fromname, toname) == 0, fromname);	55	return os_pushresult(L, rename(fromname, toname) == 0, fromname);
56	}	56	}
57		57
58		58
59	static int io_tmpname (lua_State *L) {	59	static int os_tmpname (lua_State *L) {
60	char buff[LUA_TMPNAMBUFSIZE];	60	char buff[LUA_TMPNAMBUFSIZE];
61	int err;	61	int err;
62	lua_tmpnam(buff, err);	62	lua_tmpnam(buff, err);
@@ -67,13 +67,13 @@ static int io_tmpname (lua_State *L) { · 4 unmodified lines
67	}	67	}
68		68
69		69
70	static int io_getenv (lua_State *L) {	70	static int os_getenv (lua_State *L) {
71	lua_pushstring(L, getenv(luaL_checkstring(L, 1))); /* if NULL push nil */	71	lua_pushstring(L, getenv(luaL_checkstring(L, 1))); /* if NULL push nil */
72	return 1;	72	return 1;
73	}	73	}
74		74
75		75
76	static int io_clock (lua_State *L) {	76	static int os_clock (lua_State *L) {
77	lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC);	77	lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC);
78	return 1;	78	return 1;
79	}	79	}
@@ -123,7 +123,7 @@ static int getfield (lua_State L, const char key, int d) { · 43 unmodified lines
123	}	123	}
124		124
125		125
126	static int io_date (lua_State *L) {	126	static int os_date (lua_State *L) {
127	const char *s = luaL_optstring(L, 1, "%c");	127	const char *s = luaL_optstring(L, 1, "%c");
128	time_t t = lua_isnoneornil(L, 2) ? time(NULL) :	128	time_t t = lua_isnoneornil(L, 2) ? time(NULL) :
129	(time_t)luaL_checknumber(L, 2);	129	(time_t)luaL_checknumber(L, 2);
@@ -159,7 +159,7 @@ static int io_date (lua_State *L) { · 29 unmodified lines
159	}	159	}
160		160
161		161
162	static int io_time (lua_State *L) {	162	static int os_time (lua_State *L) {
163	time_t t;	163	time_t t;
164	if (lua_isnoneornil(L, 1)) /* called without args? */	164	if (lua_isnoneornil(L, 1)) /* called without args? */
165	t = time(NULL); /* get current time */	165	t = time(NULL); /* get current time */
@@ -179,12 +179,12 @@ static int io_time (lua_State *L) { · 13 unmodified lines
179	if (t == (time_t)(-1))	179	if (t == (time_t)(-1))
180	lua_pushnil(L);	180	lua_pushnil(L);
181	else	181	else
182	lua_pushnumber(L, t);	182	lua_pushnumber(L, (lua_Number)t);
183	return 1;	183	return 1;
184	}	184	}
185		185
186		186
187	static int io_difftime (lua_State *L) {	187	static int os_difftime (lua_State *L) {
188	lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),	188	lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
189	(time_t)(luaL_optnumber(L, 2, 0))));	189	(time_t)(luaL_optnumber(L, 2, 0))));
190	return 1;	190	return 1;
@@ -193,7 +193,7 @@ static int io_difftime (lua_State *L) { · 2 unmodified lines
193	/* }====================================================== */	193	/* }====================================================== */
194		194
195		195
196	static int io_setloc (lua_State *L) {	196	static int os_setlocale (lua_State *L) {
197	static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,	197	static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
198	LC_NUMERIC, LC_TIME};	198	LC_NUMERIC, LC_TIME};
199	static const char *const catnames[] = {"all", "collate", "ctype", "monetary",	199	static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
@@ -206,23 +206,23 @@ static int io_setloc (lua_State *L) { · 6 unmodified lines
206	}	206	}
207		207
208		208
209	static int io_exit (lua_State *L) {	209	static int os_exit (lua_State *L) {
210	exit(luaL_optint(L, 1, EXIT_SUCCESS));	210	exit(luaL_optint(L, 1, EXIT_SUCCESS));
211	return 0; /* to avoid warnings */	211	return 0; /* to avoid warnings */
212	}	212	}
213		213
214	static const luaL_Reg syslib[] = {	214	static const luaL_Reg syslib[] = {
215	{"clock", io_clock},	215	{"clock", os_clock},
216	{"date", io_date},	216	{"date", os_date},
217	{"difftime", io_difftime},	217	{"difftime", os_difftime},
218	{"execute", io_execute},	218	{"execute", os_execute},
219	{"exit", io_exit},	219	{"exit", os_exit},
220	{"getenv", io_getenv},	220	{"getenv", os_getenv},
221	{"remove", io_remove},	221	{"remove", os_remove},
222	{"rename", io_rename},	222	{"rename", os_rename},
223	{"setlocale", io_setloc},	223	{"setlocale", os_setlocale},
224	{"time", io_time},	224	{"time", os_time},
225	{"tmpname", io_tmpname},	225	{"tmpname", os_tmpname},
226	{NULL, NULL}	226	{NULL, NULL}
227	};	227	};
228		228

src/lparser.c+31−49

 /*
-** $Id: lparser.c,v 2.38 2005/10/24 17:38:47 roberto Exp $
+** $Id: lparser.c,v 2.40 2005/12/22 16:19:56 roberto Exp $
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
 static void expr (LexState *ls, expdesc *v);
-static void next (LexState *ls) {
-  ls->lastline = ls->linenumber;
-  if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
-    ls->t = ls->lookahead;  /* use this one */
-    ls->lookahead.token = TK_EOS;  /* and discharge it */
-  }
-  else
-    ls->t.token = luaX_lex(ls, &ls->t.seminfo);  /* read next token */
-}
-static void lookahead (LexState *ls) {
-  lua_assert(ls->lookahead.token == TK_EOS);
-  ls->lookahead.token = luaX_lex(ls, &ls->lookahead.seminfo);
-}
 static void anchor_token (LexState *ls) {
   if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) {
     TString *ts = ls->t.seminfo.ts;
 static int testnext (LexState *ls, int c) {
   if (ls->t.token == c) {
-    next(ls);
+    luaX_next(ls);
     return 1;
   }
   else return 0;
 static void checknext (LexState *ls, int c) {
   check(ls, c);
-  next(ls);
+  luaX_next(ls);
 }
   TString *ts;
   check(ls, TK_NAME);
   ts = ls->t.seminfo.ts;
-  next(ls);
+  luaX_next(ls);
   return ts;
 }
 static void adjustlocalvars (LexState *ls, int nvars) {
   FuncState *fs = ls->fs;
-  fs->nactvar = cast(lu_byte, fs->nactvar + nvars);
+  fs->nactvar = cast_byte(fs->nactvar + nvars);
   for (; nvars; nvars--) {
     getlocvar(fs, fs->nactvar - nvars).startpc = fs->pc;
   }
   f->upvalues[f->nups] = name;
   luaC_objbarrier(fs->L, f, name);
   lua_assert(v->k == VLOCAL || v->k == VUPVAL);
-  fs->upvalues[f->nups].k = cast(lu_byte, v->k);
+  fs->upvalues[f->nups].k = cast_byte(v->k);
-  fs->upvalues[f->nups].info = cast(lu_byte, v->u.s.info);
+  fs->upvalues[f->nups].info = cast_byte(v->u.s.info);
   return f->nups++;
 }
   luaX_setinput(L, &lexstate, z, luaS_new(L, name));
   open_func(&lexstate, &funcstate);
   funcstate.f->is_vararg = VARARG_ISVARARG;  /* main func. is always vararg */
-  next(&lexstate);  /* read first token */
+  luaX_next(&lexstate);  /* read first token */
   chunk(&lexstate);
   check(&lexstate, TK_EOS);
   close_func(&lexstate);
   FuncState *fs = ls->fs;
   expdesc key;
   luaK_exp2anyreg(fs, v);
-  next(ls);  /* skip the dot or colon */
+  luaX_next(ls);  /* skip the dot or colon */
   checkname(ls, &key);
   luaK_indexed(fs, v, &key);
 }
 static void yindex (LexState *ls, expdesc *v) {
   /* index -> '[' expr ']' */
-  next(ls);  /* skip the '[' */
+  luaX_next(ls);  /* skip the '[' */
   expr(ls, v);
   luaK_exp2val(ls->fs, v);
   checknext(ls, ']');
     closelistfield(fs, &cc);
     switch(ls->t.token) {
       case TK_NAME: {  /* may be listfields or recfields */
-        lookahead(ls);
+        luaX_lookahead(ls);
         if (ls->lookahead.token != '=')  /* expression? */
           listfield(ls, &cc);
         else
           break;
         }
         case TK_DOTS: {  /* param -> `...' */
-          next(ls);
+          luaX_next(ls);
 #if defined(LUA_COMPAT_VARARG)
           /* use `arg' as default name */
           new_localvarliteral(ls, "arg", nparams++);
     } while (!f->is_vararg && testnext(ls, ','));
   }
   adjustlocalvars(ls, nparams);
-  f->numparams = fs->nactvar - (f->is_vararg & VARARG_HASARG);
+  f->numparams = cast_byte(fs->nactvar - (f->is_vararg & VARARG_HASARG));
   luaK_reserveregs(fs, fs->nactvar);  /* reserve register for parameters */
 }
     case '(': {  /* funcargs -> `(' [ explist1 ] `)' */
       if (line != ls->lastline)
         luaX_syntaxerror(ls,"ambiguous syntax (function call x new statement)");
-      next(ls);
+      luaX_next(ls);
       if (ls->t.token == ')')  /* arg list is empty? */
         args.k = VVOID;
       else {
     }
     case TK_STRING: {  /* funcargs -> STRING */
       codestring(ls, &args, ls->t.seminfo.ts);
-      next(ls);  /* must use `seminfo' before `next' */
+      luaX_next(ls);  /* must use `seminfo' before `next' */
       break;
     }
     default: {
   switch (ls->t.token) {
     case '(': {
       int line = ls->linenumber;
-      next(ls);
+      luaX_next(ls);
       expr(ls, v);
       check_match(ls, ')', '(', line);
       luaK_dischargevars(ls->fs, v);
       }
       case ':': {  /* `:' NAME funcargs */
         expdesc key;
-        next(ls);
+        luaX_next(ls);
         checkname(ls, &key);
         luaK_self(fs, v, &key);
         funcargs(ls, v);
       return;
     }
     case TK_FUNCTION: {
-      next(ls);
+      luaX_next(ls);
       body(ls, v, 0, ls->linenumber);
       return;
     }
       return;
     }
   }
-  next(ls);
+  luaX_next(ls);
 }
   enterlevel(ls);
   uop = getunopr(ls->t.token);
   if (uop != OPR_NOUNOPR) {
-    next(ls);
+    luaX_next(ls);
     subexpr(ls, v, UNARY_PRIORITY);
     luaK_prefix(ls->fs, uop, v);
   }
   while (op != OPR_NOBINOPR && priority[op].left > limit) {
     expdesc v2;
     BinOpr nextop;
-    next(ls);
+    luaX_next(ls);
     luaK_infix(ls->fs, op, v);
     /* read sub-expression with higher priority */
     nextop = subexpr(ls, &v2, priority[op].right);
   int whileinit;
   int condexit;
   BlockCnt bl;
-  next(ls);  /* skip WHILE */
+  luaX_next(ls);  /* skip WHILE */
   whileinit = luaK_getlabel(fs);
   condexit = cond(ls);
   enterblock(fs, &bl, 1);
   BlockCnt bl1, bl2;
   enterblock(fs, &bl1, 1);  /* loop block */
   enterblock(fs, &bl2, 0);  /* scope block */
-  next(ls);  /* skip REPEAT */
+  luaX_next(ls);  /* skip REPEAT */
   chunk(ls);
   check_match(ls, TK_UNTIL, TK_REPEAT, line);
   condexit = cond(ls);  /* read condition (inside scope block) */
   TString *varname;
   BlockCnt bl;
   enterblock(fs, &bl, 1);  /* scope for loop and control variables */
-  next(ls);  /* skip `for' */
+  luaX_next(ls);  /* skip `for' */
   varname = str_checkname(ls);  /* first variable name */
   switch (ls->t.token) {
     case '=': fornum(ls, varname, line); break;
 static int test_then_block (LexState *ls) {
   /* test_then_block -> [IF | ELSEIF] cond THEN block */
   int condexit;
-  next(ls);  /* skip IF or ELSEIF */
+  luaX_next(ls);  /* skip IF or ELSEIF */
   condexit = cond(ls);
   checknext(ls, TK_THEN);
   block(ls);  /* `then' part */
   if (ls->t.token == TK_ELSE) {
     luaK_concat(fs, &escapelist, luaK_jump(fs));
     luaK_patchtohere(fs, flist);
-    next(ls);  /* skip ELSE (after patch, for correct line info) */
+    luaX_next(ls);  /* skip ELSE (after patch, for correct line info) */
     block(ls);  /* `else' part */
   }
   else
   /* funcstat -> FUNCTION funcname body */
   int needself;
   expdesc v, b;
-  next(ls);  /* skip FUNCTION */
+  luaX_next(ls);  /* skip FUNCTION */
   needself = funcname(ls, &v);
   body(ls, &b, needself, line);
   luaK_storevar(ls->fs, &v, &b);
   FuncState *fs = ls->fs;
   expdesc e;
   int first, nret;  /* registers with returned values */
-  next(ls);  /* skip RETURN */
+  luaX_next(ls);  /* skip RETURN */
   if (block_follow(ls->t.token) || ls->t.token == ';')
     first = nret = 0;  /* return no values */
   else {
       return 0;
     }
     case TK_DO: {  /* stat -> DO block END */
-      next(ls);  /* skip DO */
+      luaX_next(ls);  /* skip DO */
       block(ls);
       check_match(ls, TK_END, TK_DO, line);
       return 0;
       return 0;
     }
     case TK_LOCAL: {  /* stat -> localstat */
-      next(ls);  /* skip LOCAL */
+      luaX_next(ls);  /* skip LOCAL */
       if (testnext(ls, TK_FUNCTION))  /* local function? */
         localfunc(ls);
       else
       return 1;  /* must be last statement */
     }
     case TK_BREAK: {  /* stat -> breakstat */
-      next(ls);  /* skip BREAK */
+      luaX_next(ls);  /* skip BREAK */
       breakstat(ls);
       return 1;  /* must be last statement */
     }

src/lstring.c+2−2

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lstring.c,v 2.7 2005/02/18 12:40:02 roberto Exp $	2	** $Id: lstring.c,v 2.8 2005/12/22 16:19:56 roberto Exp $
3	** String table (keeps all strings handled by Lua)	3	** String table (keeps all strings handled by Lua)
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -35,7 +35,7 @@ void luaS_resize (lua_State *L, int newsize) { · 29 unmodified lines
35	GCObject next = p->gch.next; / save next */	35	GCObject next = p->gch.next; / save next */
36	unsigned int h = gco2ts(p)->hash;	36	unsigned int h = gco2ts(p)->hash;
37	int h1 = lmod(h, newsize); /* new position */	37	int h1 = lmod(h, newsize); /* new position */
38	lua_assert(cast(int, h%newsize) == lmod(h, newsize));	38	lua_assert(cast_int(h%newsize) == lmod(h, newsize));
39	p->gch.next = newhash[h1]; /* chain it */	39	p->gch.next = newhash[h1]; /* chain it */
40	newhash[h1] = p;	40	newhash[h1] = p;
41	p = next;	41	p = next;

src/lstrlib.c+38−21

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lstrlib.c,v 1.127 2005/10/26 13:28:19 roberto Exp $	2	** $Id: lstrlib.c,v 1.130 2005/12/29 15:32:11 roberto Exp $
3	** Standard library for string operations and pattern-matching	3	** Standard library for string operations and pattern-matching
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -683,8 +683,13 @@ static int str_gsub (lua_State *L) { · 677 unmodified lines
683		683
684	/* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */	684	/* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */
685	#define MAX_ITEM 512	685	#define MAX_ITEM 512
686	/* maximum size of each format specification (such as '%-099.99d') */	686	/* valid flags in a format specification */
687	#define MAX_FORMAT 20	687	#define FLAGS "-+ #0"
		688	/*
		689	** maximum size of each format specification (such as '%-099.99d')
		690	** (+10 accounts for %99.99x plus margin of error)
		691	*/
		692	#define MAX_FORMAT (sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
688		693
689		694
690	static void addquoted (lua_State L, luaL_Buffer b, int arg) {	695	static void addquoted (lua_State L, luaL_Buffer b, int arg) {
@@ -712,30 +717,37 @@ static void addquoted (lua_State L, luaL_Buffer b, int arg) { · 21 unmodified lines
712	luaL_addchar(b, '"');	717	luaL_addchar(b, '"');
713	}	718	}
714		719
715		720	static const char scanformat (lua_State L, const char strfrmt, char form) {
716	static const char scanformat (lua_State L, const char *strfrmt,
717	char form, int hasprecision) {
718	const char *p = strfrmt;	721	const char *p = strfrmt;
719	while (strchr("-+ #0", p)) p++; / skip flags */	722	while (strchr(FLAGS, p)) p++; / skip flags */
		723	if ((size_t)(p - strfrmt) >= sizeof(FLAGS))
		724	luaL_error(L, "invalid format (repeated flags)");
720	if (isdigit(uchar(p))) p++; / skip width */	725	if (isdigit(uchar(p))) p++; / skip width */
721	if (isdigit(uchar(p))) p++; / (2 digits at most) */	726	if (isdigit(uchar(p))) p++; / (2 digits at most) */
722	if (*p == '.') {	727	if (*p == '.') {
723	p++;	728	p++;
724	*hasprecision = 1;
725	if (isdigit(uchar(p))) p++; / skip precision */	729	if (isdigit(uchar(p))) p++; / skip precision */
726	if (isdigit(uchar(p))) p++; / (2 digits at most) */	730	if (isdigit(uchar(p))) p++; / (2 digits at most) */
727	}	731	}
728	if (isdigit(uchar(*p)))	732	if (isdigit(uchar(*p)))
729	luaL_error(L, "invalid format (width or precision too long)");	733	luaL_error(L, "invalid format (width or precision too long)");
730	if (p-strfrmt+2 > MAX_FORMAT) /* +2 to include `%' and the specifier */	734	*(form++) = '%';
731	luaL_error(L, "invalid format (too long)");	735	strncpy(form, strfrmt, p - strfrmt + 1);
732	form[0] = L_ESC;	736	form += p - strfrmt + 1;
733	strncpy(form+1, strfrmt, p-strfrmt+1);	737	*form = '\0';
734	form[p-strfrmt+2] = 0;
735	return p;	738	return p;
736	}	739	}
737		740
738		741
		742	static void addintlen (char *form) {
		743	size_t l = strlen(form);
		744	char spec = form[l - 1];
		745	strcpy(form + l - 1, LUA_INTFRMLEN);
		746	form[l + sizeof(LUA_INTFRMLEN) - 2] = spec;
		747	form[l + sizeof(LUA_INTFRMLEN) - 1] = '\0';
		748	}
		749
		750
739	static int str_format (lua_State *L) {	751	static int str_format (lua_State *L) {
740	int arg = 1;	752	int arg = 1;
741	size_t sfl;	753	size_t sfl;
@@ -751,21 +763,26 @@ static int str_format (lua_State *L) { · 9 unmodified lines
751	else { /* format item */	763	else { /* format item */
752	char form[MAX_FORMAT]; /* to store the format (`%...') */	764	char form[MAX_FORMAT]; /* to store the format (`%...') */
753	char buff[MAX_ITEM]; /* to store the formatted item */	765	char buff[MAX_ITEM]; /* to store the formatted item */
754	int hasprecision = 0;
755	arg++;	766	arg++;
756	strfrmt = scanformat(L, strfrmt, form, &hasprecision);	767	strfrmt = scanformat(L, strfrmt, form);
757	switch (*strfrmt++) {	768	switch (*strfrmt++) {
758	case 'c': case 'd': case 'i': {	769	case 'c': {
759	sprintf(buff, form, luaL_checkint(L, arg));	770	sprintf(buff, form, (int)luaL_checknumber(L, arg));
		771	break;
		772	}
		773	case 'd': case 'i': {
		774	addintlen(form);
		775	sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
760	break;	776	break;
761	}	777	}
762	case 'o': case 'u': case 'x': case 'X': {	778	case 'o': case 'u': case 'x': case 'X': {
763	sprintf(buff, form, (unsigned int)(luaL_checknumber(L, arg)));	779	addintlen(form);
		780	sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
764	break;	781	break;
765	}	782	}
766	case 'e': case 'E': case 'f':	783	case 'e': case 'E': case 'f':
767	case 'g': case 'G': {	784	case 'g': case 'G': {
768	sprintf(buff, form, luaL_checknumber(L, arg));	785	sprintf(buff, form, (double)luaL_checknumber(L, arg));
769	break;	786	break;
770	}	787	}
771	case 'q': {	788	case 'q': {
@@ -775,7 +792,7 @@ static int str_format (lua_State *L) { · 3 unmodified lines
775	case 's': {	792	case 's': {
776	size_t l;	793	size_t l;
777	const char *s = luaL_checklstring(L, arg, &l);	794	const char *s = luaL_checklstring(L, arg, &l);
778	if (!hasprecision && l >= 100) {	795	if (!strchr(form, '.') && l >= 100) {
779	/* no precision and string is too long to be formatted;	796	/* no precision and string is too long to be formatted;
780	keep original string */	797	keep original string */
781	lua_pushvalue(L, arg);	798	lua_pushvalue(L, arg);
@@ -820,7 +837,7 @@ static const luaL_Reg strlib[] = { · 38 unmodified lines
820		837
821		838
822	static void createmetatable (lua_State *L) {	839	static void createmetatable (lua_State *L) {
823	lua_newtable(L); /* create metatable for strings */	840	lua_createtable(L, 0, 1); /* create metatable for strings */
824	lua_pushliteral(L, ""); /* dummy string */	841	lua_pushliteral(L, ""); /* dummy string */
825	lua_pushvalue(L, -2);	842	lua_pushvalue(L, -2);
826	lua_setmetatable(L, -2); /* set string metatable */	843	lua_setmetatable(L, -2); /* set string metatable */

src/ltable.c+53−39

 /*
-** $Id: ltable.c,v 2.27 2005/10/24 17:37:52 roberto Exp $
+** $Id: ltable.c,v 2.31 2006/01/10 13:13:06 roberto Exp $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
 /*
 ** number of ints inside a lua_Number
 */
-#define numints		cast(int, sizeof(lua_Number)/sizeof(int))
+#define numints		cast_int(sizeof(lua_Number)/sizeof(int))
-const Node luaH_dummynode = {
+#define dummynode		(&dummynode_)
+static const Node dummynode_ = {
   {{NULL}, LUA_TNIL},  /* value */
-  {{NULL}, LUA_TNIL, NULL}  /* key */
+  {{{NULL}, LUA_TNIL, NULL}}  /* key */
 };
 ** returns the `main' position of an element in a table (that is, the index
 ** of its hash value)
 */
-Node *luaH_mainposition (const Table *t, const TValue *key) {
+static Node *mainposition (const Table *t, const TValue *key) {
   switch (ttype(key)) {
     case LUA_TNUMBER:
       return hashnum(t, nvalue(key));
     lua_Number n = nvalue(key);
     int k;
     lua_number2int(k, n);
-    if (luai_numeq(cast(lua_Number, k), nvalue(key)))
+    if (luai_numeq(cast_num(k), nvalue(key)))
       return k;
   }
   return -1;  /* `key' did not match some condition */
   if (0 < i && i <= t->sizearray)  /* is `key' inside array part? */
     return i-1;  /* yes; that's the index (corrected to C) */
   else {
-    Node *n = luaH_mainposition(t, key);
+    Node *n = mainposition(t, key);
     do {  /* check whether `key' is somewhere in the chain */
       /* key may be dead already, but it is ok to use it in `next' */
       if (luaO_rawequalObj(key2tval(n), key) ||
             (ttype(gkey(n)) == LUA_TDEADKEY && iscollectable(key) &&
              gcvalue(gkey(n)) == gcvalue(key))) {
-        i = cast(int, n - gnode(t, 0));  /* key index in hash table */
+        i = cast_int(n - gnode(t, 0));  /* key index in hash table */
         /* hash elements are numbered after array ones */
         return i + t->sizearray;
       }
   int i = findindex(L, t, key);  /* find original element */
   for (i++; i < t->sizearray; i++) {  /* try first array part */
     if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
-      setnvalue(key, cast(lua_Number, i+1));
+      setnvalue(key, cast_num(i+1));
       setobj2s(L, key+1, &t->array[i]);
       return 1;
     }
 static void setnodevector (lua_State *L, Table *t, int size) {
   int lsize;
   if (size == 0) {  /* no elements to hash part? */
-    t->node = cast(Node *, &luaH_dummynode);  /* use common `dummynode' */
+    t->node = cast(Node *, dummynode);  /* use common `dummynode' */
     lsize = 0;
   }
   else {
     size = twoto(lsize);
     t->node = luaM_newvector(L, size, Node);
     for (i=0; i<size; i++) {
-      gnext(&t->node[i]) = NULL;
+      Node *n = gnode(t, i);
-      setnilvalue(gkey(gnode(t, i)));
+      gnext(n) = NULL;
-      setnilvalue(gval(gnode(t, i)));
+      setnilvalue(gkey(n));
+      setnilvalue(gval(n));
     }
   }
-  t->lsizenode = cast(lu_byte, lsize);
+  t->lsizenode = cast_byte(lsize);
   t->lastfree = gnode(t, size);  /* all positions are free */
 }
     if (!ttisnil(gval(old)))
       setobjt2t(L, luaH_set(L, t, key2tval(old)), gval(old));
   }
-  if (nold != &luaH_dummynode)
+  if (nold != dummynode)
     luaM_freearray(L, nold, twoto(oldhsize), Node);  /* free old array */
 }
 void luaH_resizearray (lua_State *L, Table *t, int nasize) {
-  int nsize = (t->node == &luaH_dummynode) ? 0 : sizenode(t);
+  int nsize = (t->node == dummynode) ? 0 : sizenode(t);
   resize(L, t, nasize, nsize);
 }
   Table *t = luaM_new(L, Table);
   luaC_link(L, obj2gco(t), LUA_TTABLE);
   t->metatable = NULL;
-  t->flags = cast(lu_byte, ~0);
+  t->flags = cast_byte(~0);
   /* temporary values (kept only if some malloc fails) */
   t->array = NULL;
   t->sizearray = 0;
   t->lsizenode = 0;
-  t->node = cast(Node *, &luaH_dummynode);
+  t->node = cast(Node *, dummynode);
   setarrayvector(L, t, narray);
   setnodevector(L, t, nhash);
   return t;
 void luaH_free (lua_State *L, Table *t) {
-  if (t->node != &luaH_dummynode)
+  if (t->node != dummynode)
     luaM_freearray(L, t->node, sizenode(t), Node);
   luaM_freearray(L, t->array, t->sizearray, TValue);
   luaM_free(L, t);
 ** position), new key goes to an empty position.
 */
 static TValue *newkey (lua_State *L, Table *t, const TValue *key) {
-  Node *mp = luaH_mainposition(t, key);
+  Node *mp = mainposition(t, key);
-  if (!ttisnil(gval(mp)) || mp == &luaH_dummynode) {
+  if (!ttisnil(gval(mp)) || mp == dummynode) {
     Node *othern;
     Node *n = getfreepos(t);  /* get a free place */
     if (n == NULL) {  /* cannot find a free place? */
       rehash(L, t, key);  /* grow table */
       return luaH_set(L, t, key);  /* re-insert key into grown table */
     }
-    lua_assert(n != &luaH_dummynode);
+    lua_assert(n != dummynode);
-    othern = luaH_mainposition(t, key2tval(mp));
+    othern = mainposition(t, key2tval(mp));
     if (othern != mp) {  /* is colliding node out of its main position? */
       /* yes; move colliding node into free position */
       while (gnext(othern) != mp) othern = gnext(othern);  /* find previous */
   if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray))
     return &t->array[key-1];
   else {
-    lua_Number nk = cast(lua_Number, key);
+    lua_Number nk = cast_num(key);
     Node *n = hashnum(t, nk);
     do {  /* check whether `key' is somewhere in the chain */
       if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
         return gval(n);  /* that's it */
       else n = gnext(n);
     } while (n);
-    return &luaO_nilobject;
+    return luaO_nilobject;
   }
 }
       return gval(n);  /* that's it */
     else n = gnext(n);
   } while (n);
-  return &luaO_nilobject;
+  return luaO_nilobject;
 }
 */
 const TValue *luaH_get (Table *t, const TValue *key) {
   switch (ttype(key)) {
-    case LUA_TNIL: return &luaO_nilobject;
+    case LUA_TNIL: return luaO_nilobject;
     case LUA_TSTRING: return luaH_getstr(t, rawtsvalue(key));
     case LUA_TNUMBER: {
       int k;
       lua_Number n = nvalue(key);
       lua_number2int(k, n);
-      if (luai_numeq(cast(lua_Number, k), nvalue(key))) /* index is int? */
+      if (luai_numeq(cast_num(k), nvalue(key))) /* index is int? */
         return luaH_getnum(t, k);  /* use specialized version */
       /* else go through */
     }
     default: {
-      Node *n = luaH_mainposition(t, key);
+      Node *n = mainposition(t, key);
       do {  /* check whether `key' is somewhere in the chain */
         if (luaO_rawequalObj(key2tval(n), key))
           return gval(n);  /* that's it */
         else n = gnext(n);
       } while (n);
-      return &luaO_nilobject;
+      return luaO_nilobject;
     }
   }
 }
 TValue *luaH_set (lua_State *L, Table *t, const TValue *key) {
   const TValue *p = luaH_get(t, key);
   t->flags = 0;
-  if (p != &luaO_nilobject)
+  if (p != luaO_nilobject)
     return cast(TValue *, p);
   else {
     if (ttisnil(key)) luaG_runerror(L, "table index is nil");
-    else if (ttisnumber(key) && !luai_numeq(nvalue(key), nvalue(key)))
+    else if (ttisnumber(key) && luai_numisnan(nvalue(key)))
       luaG_runerror(L, "table index is NaN");
     return newkey(L, t, key);
   }
 TValue *luaH_setnum (lua_State *L, Table *t, int key) {
   const TValue *p = luaH_getnum(t, key);
-  if (p != &luaO_nilobject)
+  if (p != luaO_nilobject)
     return cast(TValue *, p);
   else {
     TValue k;
-    setnvalue(&k, cast(lua_Number, key));
+    setnvalue(&k, cast_num(key));
     return newkey(L, t, &k);
   }
 }
 TValue *luaH_setstr (lua_State *L, Table *t, TString *key) {
   const TValue *p = luaH_getstr(t, key);
-  if (p != &luaO_nilobject)
+  if (p != luaO_nilobject)
     return cast(TValue *, p);
   else {
     TValue k;
 static int unbound_search (Table *t, unsigned int j) {
   unsigned int i = j;  /* i is zero or a present index */
-  j = j+1;
+  j++;
   /* find `i' and `j' such that i is present and j is not */
   while (!ttisnil(luaH_getnum(t, j))) {
     i = j;
-    j = i*2;
+    j *= 2;
     if (j > cast(unsigned int, MAX_INT)) {  /* overflow? */
       /* table was built with bad purposes: resort to linear search */
       i = 1;
     }
   }
   /* now do a binary search between them */
-  while (i < j-1) {
+  while (j - i > 1) {
     unsigned int m = (i+j)/2;
     if (ttisnil(luaH_getnum(t, m))) j = m;
     else i = m;
     return i;
   }
   /* else must find a boundary in hash part */
-  else if (t->node == &luaH_dummynode)  /* hash part is empty? */
+  else if (t->node == dummynode)  /* hash part is empty? */
     return j;  /* that is easy... */
   else return unbound_search(t, j);
 }
+#if defined(LUA_DEBUG)
+Node *luaH_mainposition (const Table *t, const TValue *key) {
+  return mainposition(t, key);
+}
+int luaH_isdummy (Node *n) { return n == dummynode; }
+#endif

src/ltable.h+8−7

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: ltable.h,v 2.8 2005/06/06 13:30:25 roberto Exp $	2	** $Id: ltable.h,v 2.10 2006/01/10 13:13:06 roberto Exp $
3	** Lua tables (hash)	3	** Lua tables (hash)
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -11,15 +11,13 @@ · 5 unmodified lines
11		11
12		12
13	#define gnode(t,i) (&(t)->node[i])	13	#define gnode(t,i) (&(t)->node[i])
14	#define gkey(n) (&(n)->i_key)	14	#define gkey(n) (&(n)->i_key.nk)
15	#define gval(n) (&(n)->i_val)	15	#define gval(n) (&(n)->i_val)
16	#define gnext(n) ((n)->i_key.next)	16	#define gnext(n) ((n)->i_key.nk.next)
17		17
18	#define key2tval(n) (cast(const TValue *, gkey(n)))	18	#define key2tval(n) (&(n)->i_key.tvk)
19		19
20		20
21	LUAI_DATA const Node luaH_dummynode;
22
23	LUAI_FUNC const TValue luaH_getnum (Table t, int key);	21	LUAI_FUNC const TValue luaH_getnum (Table t, int key);
24	LUAI_FUNC TValue luaH_setnum (lua_State L, Table *t, int key);	22	LUAI_FUNC TValue luaH_setnum (lua_State L, Table *t, int key);
25	LUAI_FUNC const TValue luaH_getstr (Table t, TString *key);	23	LUAI_FUNC const TValue luaH_getstr (Table t, TString *key);
@@ -32,8 +30,11 @@ LUAI_FUNC void luaH_free (lua_State L, Table t); · 6 unmodified lines
32	LUAI_FUNC int luaH_next (lua_State L, Table t, StkId key);	30	LUAI_FUNC int luaH_next (lua_State L, Table t, StkId key);
33	LUAI_FUNC int luaH_getn (Table *t);	31	LUAI_FUNC int luaH_getn (Table *t);
34		32
35	/* exported only for debugging */	33
		34	#if defined(LUA_DEBUG)
36	LUAI_FUNC Node luaH_mainposition (const Table t, const TValue *key);	35	LUAI_FUNC Node luaH_mainposition (const Table t, const TValue *key);
		36	LUAI_FUNC int luaH_isdummy (Node *n);
		37	#endif
37		38
38		39
39	#endif	40	#endif

src/ltm.c+3−3

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: ltm.c,v 2.6 2005/05/20 15:53:42 roberto Exp $	2	** $Id: ltm.c,v 2.8 2006/01/10 12:50:00 roberto Exp $
3	** Tag methods	3	** Tag methods
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -51,7 +51,7 @@ const TValue luaT_gettm (Table events, TMS event, TString *ename) { · 45 unmodified lines
51	const TValue *tm = luaH_getstr(events, ename);	51	const TValue *tm = luaH_getstr(events, ename);
52	lua_assert(event <= TM_EQ);	52	lua_assert(event <= TM_EQ);
53	if (ttisnil(tm)) { /* no tag method? */	53	if (ttisnil(tm)) { /* no tag method? */
54	events->flags \|= cast(lu_byte, 1u<<event); /* cache this fact */	54	events->flags \|= cast_byte(1u<<event); /* cache this fact */
55	return NULL;	55	return NULL;
56	}	56	}
57	else return tm;	57	else return tm;
@@ -70,6 +70,6 @@ const TValue luaT_gettmbyobj (lua_State L, const TValue *o, TMS event) { · 12 unmodified lines
70	default:	70	default:
71	mt = G(L)->mt[ttype(o)];	71	mt = G(L)->mt[ttype(o)];
72	}	72	}
73	return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : &luaO_nilobject);	73	return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject);
74	}	74	}
75		75

src/lua.c+9−5

 /*
-** $Id: lua.c,v 1.154 2005/10/24 17:38:47 roberto Exp $
+** $Id: lua.c,v 1.157 2005/12/29 16:23:32 roberto Exp $
 ** Lua stand-alone interpreter
 ** See Copyright Notice in lua.h
 */
   luaL_checkstack(L, narg + 3, "too many arguments to script");
   for (i=n+1; i < argc; i++)
     lua_pushstring(L, argv[i]);
-  lua_newtable(L);
+  lua_createtable(L, narg, n + 1);
   for (i=0; i < argc; i++) {
     lua_pushstring(L, argv[i]);
     lua_rawseti(L, -2, i - n);
   int status;
   const char *oldprogname = progname;
   progname = NULL;
-  print_version();
   while ((status = loadline(L)) != -1) {
     if (status == 0) status = docall(L, 0, 0);
     report(L, status);
     switch (argv[i][1]) {  /* option */
       case '-': return (argv[i+1] != NULL ? i+1 : 0);
       case '\0': return i;
-      case 'i': *pi = 1; break;
+      case 'i': *pi = 1;  /* go through */
       case 'v': *pv = 1; break;
       case 'e': *pe = 1;  /* go through */
       case 'l':
   int has_i = 0, has_v = 0, has_e = 0;
   globalL = L;
   if (argv[0] && argv[0][0]) progname = argv[0];
+  lua_gc(L, LUA_GCSTOP, 0);  /* stop collector during initialization */
   luaL_openlibs(L);  /* open libraries */
+  lua_gc(L, LUA_GCRESTART, 0);
   s->status = handle_luainit(L);
   if (s->status != 0) return 0;
   script = collectargs(argv, &has_i, &has_v, &has_e);
   if (has_i)
     dotty(L);
   else if (script == 0 && !has_e && !has_v) {
-    if (lua_stdin_is_tty()) dotty(L);
+    if (lua_stdin_is_tty()) {
+      print_version();
+      dotty(L);
+    }
     else dofile(L, NULL);  /* executes stdin as a file */
   }
   return 0;

src/lua.h+4−4

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lua.h,v 1.214 2005/10/20 11:35:50 roberto Exp $	2	** $Id: lua.h,v 1.216 2006/01/10 12:50:13 roberto Exp $
3	** Lua - An Extensible Extension Language	3	** Lua - An Extensible Extension 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
@@ -16,9 +16,9 @@ · 10 unmodified lines
16	#include "luaconf.h"	16	#include "luaconf.h"
17		17
18		18
19	#define LUA_VERSION "Lua 5.1 (beta)"	19	#define LUA_VERSION "Lua 5.1"
20	#define LUA_VERSION_NUM 501	20	#define LUA_VERSION_NUM 501
21	#define LUA_COPYRIGHT "Copyright (C) 1994-2005 Lua.org, PUC-Rio"	21	#define LUA_COPYRIGHT "Copyright (C) 1994-2006 Lua.org, PUC-Rio"
22	#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"	22	#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
23		23
24		24
@@ -358,7 +358,7 @@ struct lua_Debug { · 333 unmodified lines
358		358
359		359
360	/******************************************************************************	360	/******************************************************************************
361	* Copyright (C) 1994-2005 Lua.org, PUC-Rio. All rights reserved.	361	* Copyright (C) 1994-2006 Lua.org, PUC-Rio. All rights reserved.
362	*	362	*
363	* Permission is hereby granted, free of charge, to any person obtaining	363	* Permission is hereby granted, free of charge, to any person obtaining
364	* a copy of this software and associated documentation files (the	364	* a copy of this software and associated documentation files (the

src/luaconf.h+31−13

 /*
-** $Id: luaconf.h,v 1.74 2005/11/16 16:24:28 roberto Exp $
+** $Id: luaconf.h,v 1.77 2005/12/27 17:12:00 roberto Exp $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
 #define LUA_ANSI
 #endif
+#if !defined(LUA_ANSI) && defined(_WIN32)
+#define LUA_WIN
+#endif
 #if defined(LUA_USE_LINUX)
 #define LUA_USE_POSIX
 #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
-/*
-@@ lua_assert describes the internal assertions in Lua.
-** CHANGE that only if you need to debug Lua.
-*/
-#define lua_assert(c)		((void)0)
 /*
 @@ LUA_QL describes how error messages quote program elements.
 ** CHANGE it if you want a different appearance.
 #if defined(LUA_USE_ISATTY)
 #include <unistd.h>
 #define lua_stdin_is_tty()	isatty(0)
-#elif !defined(LUA_ANSI) && defined(_WIN32)
+#elif defined(LUA_WIN)
 #include <io.h>
 #include <stdio.h>
 #define lua_stdin_is_tty()	_isatty(_fileno(stdin))
 #include <assert.h>
 #define luai_apicheck(L,o)	{ (void)L; assert(o); }
 #else
-/* (By default lua_assert is empty, so luai_apicheck is also empty.) */
+#define luai_apicheck(L,o)	{ (void)L; }
-#define luai_apicheck(L,o)	{ (void)L; lua_assert(o); }
 #endif
 #define luai_numeq(a,b)		((a)==(b))
 #define luai_numlt(a,b)		((a)<(b))
 #define luai_numle(a,b)		((a)<=(b))
+#define luai_numisnan(a)	(!luai_numeq((a), (a)))
 #endif
 #define lua_popen(L,c,m)	((void)L, popen(c,m))
 #define lua_pclose(L,file)	((void)L, (pclose(file) != -1))
-#elif !defined(LUA_ANSI) && defined(_WIN32)
+#elif defined(LUA_WIN)
 #define lua_popen(L,c,m)	((void)L, _popen(c,m))
 #define lua_pclose(L,file)	((void)L, (_pclose(file) != -1))
 #define LUA_DL_DLOPEN
 #endif
-#if !defined(LUA_ANSI) && defined(_WIN32)
+#if defined(LUA_WIN)
 #define LUA_DL_DLL
 #endif
 #define luai_userstateyield(L,n)	((void)L)
+/*
+@@ LUA_INTFRMLEN is the length modifier for integer conversions
+@* in 'string.fomat'.
+@@ LUA_INTFRM_T is the integer type correspoding to the previous length
+@* modifier.
+** CHANGE them if your system supports long long or does not support long.
+*/
+#if defined(LUA_USELONGLONG)
+#define LUA_INTFRMLEN		"ll"
+#define LUA_INTFRM_T		long long
+#else
+#define LUA_INTFRMLEN		"l"
+#define LUA_INTFRM_T		long
+#endif
 /* =================================================================== */

src/lualib.h+7−1

 /*
-** $Id: lualib.h,v 1.35 2005/08/10 18:06:58 roberto Exp $
+** $Id: lualib.h,v 1.36 2005/12/27 17:12:00 roberto Exp $
 ** Lua standard libraries
 ** See Copyright Notice in lua.h
 */
 LUALIB_API void (luaL_openlibs) (lua_State *L);
+#ifndef lua_assert
+#define lua_assert(x)	((void)0)
+#endif
 #endif

src/lvm.c+7−7

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lvm.c,v 2.59 2005/11/01 16:08:45 roberto Exp $	2	** $Id: lvm.c,v 2.61 2006/01/10 12:50:00 roberto Exp $
3	** Lua virtual machine	3	** Lua virtual machine
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -509,16 +509,16 @@ void luaV_execute (lua_State *L, int nexeccalls) { · 503 unmodified lines
509	const TValue *rb = RB(i);	509	const TValue *rb = RB(i);
510	switch (ttype(rb)) {	510	switch (ttype(rb)) {
511	case LUA_TTABLE: {	511	case LUA_TTABLE: {
512	setnvalue(ra, cast(lua_Number, luaH_getn(hvalue(rb))));	512	setnvalue(ra, cast_num(luaH_getn(hvalue(rb))));
513	break;	513	break;
514	}	514	}
515	case LUA_TSTRING: {	515	case LUA_TSTRING: {
516	setnvalue(ra, cast(lua_Number, tsvalue(rb)->len));	516	setnvalue(ra, cast_num(tsvalue(rb)->len));
517	break;	517	break;
518	}	518	}
519	default: { /* try metamethod */	519	default: { /* try metamethod */
520	Protect(	520	Protect(
521	if (!call_binTM(L, rb, &luaO_nilobject, ra, TM_LEN))	521	if (!call_binTM(L, rb, luaO_nilobject, ra, TM_LEN))
522	luaG_typeerror(L, rb, "get length of");	522	luaG_typeerror(L, rb, "get length of");
523	)	523	)
524	}	524	}
@@ -693,10 +693,10 @@ void luaV_execute (lua_State *L, int nexeccalls) { · 168 unmodified lines
693	int last;	693	int last;
694	Table *h;	694	Table *h;
695	if (n == 0) {	695	if (n == 0) {
696	n = cast(int, L->top - ra) - 1;	696	n = cast_int(L->top - ra) - 1;
697	L->top = L->ci->top;	697	L->top = L->ci->top;
698	}	698	}
699	if (c == 0) c = cast(int, *pc++);	699	if (c == 0) c = cast_int(*pc++);
700	runtime_check(L, ttistable(ra));	700	runtime_check(L, ttistable(ra));
701	h = hvalue(ra);	701	h = hvalue(ra);
702	last = ((c-1)*LFIELDS_PER_FLUSH) + n;	702	last = ((c-1)*LFIELDS_PER_FLUSH) + n;
@@ -737,7 +737,7 @@ void luaV_execute (lua_State *L, int nexeccalls) { · 34 unmodified lines
737	int b = GETARG_B(i) - 1;	737	int b = GETARG_B(i) - 1;
738	int j;	738	int j;
739	CallInfo *ci = L->ci;	739	CallInfo *ci = L->ci;
740	int n = cast(int, ci->base - ci->func) - cl->p->numparams - 1;	740	int n = cast_int(ci->base - ci->func) - cl->p->numparams - 1;
741	if (b == LUA_MULTRET) {	741	if (b == LUA_MULTRET) {
742	Protect(luaD_checkstack(L, n));	742	Protect(luaD_checkstack(L, n));
743	ra = RA(i); /* previous call may change the stack */	743	ra = RA(i); /* previous call may change the stack */

src/print.c+5−2

 /*
-** $Id: print.c,v 1.53 2005/11/11 14:03:13 lhf Exp $
+** $Id: print.c,v 1.54 2006/01/11 22:49:27 lhf Exp $
 ** print bytecodes
 ** See Copyright Notice in lua.h
 */
    case '\r': printf("\\r"); break;
    case '\t': printf("\\t"); break;
    case '\v': printf("\\v"); break;
-   default:   printf(isprint((unsigned char)*s) ? "%c" : "\\%03d",*s);
+   default:	if (isprint((unsigned char)*s))
+   			printf("%c",*s);
+		else
+			printf("\\%03u",(unsigned char)*s);
   }
  }
  putchar('"');