This commit is contained in:
Roberto Ierusalimschy 2002-11-26 10:53:29 -02:00
parent c194a46bc5
commit 1f55dbc699
2 changed files with 7 additions and 15 deletions

View File

@ -1,5 +1,5 @@
/* /*
** $Id: lbaselib.c,v 1.110 2002/11/25 17:33:33 roberto Exp roberto $ ** $Id: lbaselib.c,v 1.111 2002/11/26 08:45:36 roberto Exp roberto $
** Basic library ** Basic library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -223,7 +223,7 @@ static int luaB_pairs (lua_State *L) {
static int luaB_ipairs (lua_State *L) { static int luaB_ipairs (lua_State *L) {
lua_Number i = lua_tonumber(L, 2); lua_Number i = lua_tonumber(L, 2);
luaL_checktype(L, 1, LUA_TTABLE); luaL_checktype(L, 1, LUA_TTABLE);
if (i == 0 && lua_isnull(L, 2)) { /* `for' start? */ if (i == 0 && lua_isnone(L, 2)) { /* `for' start? */
lua_getglobal(L, "ipairs"); /* return generator, */ lua_getglobal(L, "ipairs"); /* return generator, */
lua_pushvalue(L, 1); /* state, */ lua_pushvalue(L, 1); /* state, */
lua_pushnumber(L, 0); /* and initial value */ lua_pushnumber(L, 0); /* and initial value */

18
lua.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lua.h,v 1.166 2002/11/25 17:47:13 roberto Exp roberto $ ** $Id: lua.h,v 1.167 2002/11/25 17:50:14 roberto Exp roberto $
** Lua - An Extensible Extension Language ** Lua - An Extensible Extension Language
** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil ** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil
** http://www.lua.org mailto:info@lua.org ** http://www.lua.org mailto:info@lua.org
@ -10,18 +10,13 @@
#ifndef lua_h #ifndef lua_h
#define lua_h #define lua_h
/* definition of `va_list' */
#include <stdarg.h> #include <stdarg.h>
/* definition of `size_t' */
#include <stddef.h> #include <stddef.h>
#define LUA_VERSION "Lua 5.0 (beta)"
#define LUA_VERSION "Lua 5.0 (alpha)"
#define LUA_COPYRIGHT "Copyright (C) 1994-2002 Tecgraf, PUC-Rio" #define LUA_COPYRIGHT "Copyright (C) 1994-2002 Tecgraf, PUC-Rio"
#define LUA_AUTHORS "W. Celes, R. Ierusalimschy & L. H. de Figueiredo" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
@ -43,7 +38,6 @@
#define LUA_ERRSYNTAX 3 #define LUA_ERRSYNTAX 3
#define LUA_ERRMEM 4 #define LUA_ERRMEM 4
#define LUA_ERRERR 5 #define LUA_ERRERR 5
#define LUA_ERRTHROW 6
typedef struct lua_State lua_State; typedef struct lua_State lua_State;
@ -88,7 +82,7 @@ typedef int (*lua_Chunkwriter) (lua_State *L, const void* p,
#endif #endif
/* type of Numbers in Lua */ /* type of numbers in Lua */
#ifndef LUA_NUMBER #ifndef LUA_NUMBER
typedef double lua_Number; typedef double lua_Number;
#else #else
@ -205,7 +199,7 @@ LUA_API int lua_yield (lua_State *L, int nresults);
LUA_API int lua_resume (lua_State *L, int narg); LUA_API int lua_resume (lua_State *L, int narg);
/* /*
** Garbage-collection functions ** garbage-collection functions
*/ */
LUA_API int lua_getgcthreshold (lua_State *L); LUA_API int lua_getgcthreshold (lua_State *L);
LUA_API int lua_getgccount (lua_State *L); LUA_API int lua_getgccount (lua_State *L);
@ -274,8 +268,6 @@ LUA_API int lua_pushupvalues (lua_State *L);
#define lua_getglobal(L,s) \ #define lua_getglobal(L,s) \
(lua_pushstring(L, s), lua_gettable(L, LUA_GLOBALSINDEX)) (lua_pushstring(L, s), lua_gettable(L, LUA_GLOBALSINDEX))
#define lua_isnull lua_isnone
/* compatibility with ref system */ /* compatibility with ref system */