aboutsummaryrefslogtreecommitdiff
path: root/lapi.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2002-06-06 09:40:22 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2002-06-06 09:40:22 -0300
commit16f4723398c0e4c21d9a94539022ac1a4358b5f2 (patch)
treef857f34c92f882f302981644d6bb4ea5a71fae78 /lapi.c
parentf1c43bbe19026b80b5185cbdd6dec6230028a999 (diff)
downloadlua-16f4723398c0e4c21d9a94539022ac1a4358b5f2.tar.gz
lua-16f4723398c0e4c21d9a94539022ac1a4358b5f2.tar.bz2
lua-16f4723398c0e4c21d9a94539022ac1a4358b5f2.zip
names & names
Diffstat (limited to 'lapi.c')
-rw-r--r--lapi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lapi.c b/lapi.c
index 680ce9e1..3a58fbc0 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 1.194 2002/06/03 17:46:34 roberto Exp roberto $ 2** $Id: lapi.c,v 1.195 2002/06/03 20:11:07 roberto Exp roberto $
3** Lua API 3** Lua API
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -100,7 +100,7 @@ LUA_API int lua_checkstack (lua_State *L, int size) {
100} 100}
101 101
102 102
103LUA_API lua_CFunction lua_setpanicf (lua_State *L, lua_CFunction panicf) { 103LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
104 lua_CFunction old; 104 lua_CFunction old;
105 lua_lock(L); 105 lua_lock(L);
106 old = G(L)->panic; 106 old = G(L)->panic;
@@ -563,14 +563,14 @@ LUA_API int lua_pcall (lua_State *L, int nargs, int nresults, int errf) {
563} 563}
564 564
565 565
566LUA_API int lua_load (lua_State *L, lua_Getblock getblock, void *ud, 566LUA_API int lua_load (lua_State *L, lua_Chunkreader reader, void *data,
567 const char *chunkname) { 567 const char *chunkname) {
568 ZIO z; 568 ZIO z;
569 int status; 569 int status;
570 int c; 570 int c;
571 lua_lock(L); 571 lua_lock(L);
572 if (!chunkname) chunkname = "?"; 572 if (!chunkname) chunkname = "?";
573 luaZ_init(&z, getblock, ud, chunkname); 573 luaZ_init(&z, reader, data, chunkname);
574 c = luaZ_lookahead(&z); 574 c = luaZ_lookahead(&z);
575 status = luaD_protectedparser(L, &z, (c == LUA_SIGNATURE[0])); 575 status = luaD_protectedparser(L, &z, (c == LUA_SIGNATURE[0]));
576 lua_unlock(L); 576 lua_unlock(L);