diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-10-07 15:29:13 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-10-07 15:29:13 -0300 |
commit | 2a21f6c894e23a201f4028cd222a5790b79018fe (patch) | |
tree | d8e55b99e29ba5f444748608f363cb3ad797efd3 | |
parent | 3670db99b65f74d2671bfa9aa37ca7794c32332d (diff) | |
download | lua-2a21f6c894e23a201f4028cd222a5790b79018fe.tar.gz lua-2a21f6c894e23a201f4028cd222a5790b79018fe.tar.bz2 lua-2a21f6c894e23a201f4028cd222a5790b79018fe.zip |
'lua_Kcontext' -> 'lua_KContext'
-rw-r--r-- | lapi.c | 6 | ||||
-rw-r--r-- | lbaselib.c | 6 | ||||
-rw-r--r-- | ldo.c | 4 | ||||
-rw-r--r-- | lstate.h | 4 | ||||
-rw-r--r-- | ltests.c | 6 | ||||
-rw-r--r-- | lua.h | 12 |
6 files changed, 19 insertions, 19 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lapi.c,v 2.234 2014/08/21 20:07:56 roberto Exp roberto $ | 2 | ** $Id: lapi.c,v 2.235 2014/08/27 14:59:33 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 | */ |
@@ -877,7 +877,7 @@ LUA_API void lua_setuservalue (lua_State *L, int idx) { | |||
877 | 877 | ||
878 | 878 | ||
879 | LUA_API void lua_callk (lua_State *L, int nargs, int nresults, | 879 | LUA_API void lua_callk (lua_State *L, int nargs, int nresults, |
880 | lua_Kcontext ctx, lua_KFunction k) { | 880 | lua_KContext ctx, lua_KFunction k) { |
881 | StkId func; | 881 | StkId func; |
882 | lua_lock(L); | 882 | lua_lock(L); |
883 | api_check(k == NULL || !isLua(L->ci), | 883 | api_check(k == NULL || !isLua(L->ci), |
@@ -916,7 +916,7 @@ static void f_call (lua_State *L, void *ud) { | |||
916 | 916 | ||
917 | 917 | ||
918 | LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc, | 918 | LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc, |
919 | lua_Kcontext ctx, lua_KFunction k) { | 919 | lua_KContext ctx, lua_KFunction k) { |
920 | struct CallS c; | 920 | struct CallS c; |
921 | int status; | 921 | int status; |
922 | ptrdiff_t func; | 922 | ptrdiff_t func; |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lbaselib.c,v 1.298 2014/09/30 13:53:26 roberto Exp roberto $ | 2 | ** $Id: lbaselib.c,v 1.299 2014/10/01 11:54:56 roberto Exp roberto $ |
3 | ** Basic library | 3 | ** Basic library |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -370,7 +370,7 @@ static int luaB_load (lua_State *L) { | |||
370 | /* }====================================================== */ | 370 | /* }====================================================== */ |
371 | 371 | ||
372 | 372 | ||
373 | static int dofilecont (lua_State *L, int d1, lua_Kcontext d2) { | 373 | static int dofilecont (lua_State *L, int d1, lua_KContext d2) { |
374 | (void)d1; (void)d2; /* only to match 'lua_Kfunction' prototype */ | 374 | (void)d1; (void)d2; /* only to match 'lua_Kfunction' prototype */ |
375 | return lua_gettop(L) - 1; | 375 | return lua_gettop(L) - 1; |
376 | } | 376 | } |
@@ -421,7 +421,7 @@ static int luaB_select (lua_State *L) { | |||
421 | ** 'extra' values (where 'extra' is exactly the number of items to be | 421 | ** 'extra' values (where 'extra' is exactly the number of items to be |
422 | ** ignored). | 422 | ** ignored). |
423 | */ | 423 | */ |
424 | static int finishpcall (lua_State *L, int status, lua_Kcontext extra) { | 424 | static int finishpcall (lua_State *L, int status, lua_KContext extra) { |
425 | if (status != LUA_OK && status != LUA_YIELD) { /* error? */ | 425 | if (status != LUA_OK && status != LUA_YIELD) { /* error? */ |
426 | lua_pushboolean(L, 0); /* first result (false) */ | 426 | lua_pushboolean(L, 0); /* first result (false) */ |
427 | lua_pushvalue(L, -2); /* error message */ | 427 | lua_pushvalue(L, -2); /* error message */ |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ldo.c,v 2.126 2014/07/17 13:53:37 roberto Exp roberto $ | 2 | ** $Id: ldo.c,v 2.127 2014/08/01 17:33:08 roberto Exp roberto $ |
3 | ** Stack and Call structure of Lua | 3 | ** Stack and Call structure of Lua |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -593,7 +593,7 @@ LUA_API int lua_isyieldable (lua_State *L) { | |||
593 | } | 593 | } |
594 | 594 | ||
595 | 595 | ||
596 | LUA_API int lua_yieldk (lua_State *L, int nresults, lua_Kcontext ctx, | 596 | LUA_API int lua_yieldk (lua_State *L, int nresults, lua_KContext ctx, |
597 | lua_KFunction k) { | 597 | lua_KFunction k) { |
598 | CallInfo *ci = L->ci; | 598 | CallInfo *ci = L->ci; |
599 | luai_userstateyield(L, nresults); | 599 | luai_userstateyield(L, nresults); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lstate.h,v 2.115 2014/08/01 17:33:08 roberto Exp roberto $ | 2 | ** $Id: lstate.h,v 2.116 2014/10/06 21:34:34 roberto Exp roberto $ |
3 | ** Global State | 3 | ** Global State |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -74,7 +74,7 @@ typedef struct CallInfo { | |||
74 | struct { /* only for C functions */ | 74 | struct { /* only for C functions */ |
75 | lua_KFunction k; /* continuation in case of yields */ | 75 | lua_KFunction k; /* continuation in case of yields */ |
76 | ptrdiff_t old_errfunc; | 76 | ptrdiff_t old_errfunc; |
77 | lua_Kcontext ctx; /* context info. in case of yields */ | 77 | lua_KContext ctx; /* context info. in case of yields */ |
78 | } c; | 78 | } c; |
79 | } u; | 79 | } u; |
80 | ptrdiff_t extra; | 80 | ptrdiff_t extra; |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ltests.c,v 2.186 2014/10/01 11:54:56 roberto Exp roberto $ | 2 | ** $Id: ltests.c,v 2.187 2014/10/06 17:06:49 roberto Exp roberto $ |
3 | ** Internal Module for Debugging of the Lua Implementation | 3 | ** Internal Module for Debugging of the Lua Implementation |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -986,7 +986,7 @@ static void pushcode (lua_State *L, int code) { | |||
986 | 986 | ||
987 | 987 | ||
988 | static int testC (lua_State *L); | 988 | static int testC (lua_State *L); |
989 | static int Cfunck (lua_State *L, int status, lua_Kcontext ctx); | 989 | static int Cfunck (lua_State *L, int status, lua_KContext ctx); |
990 | 990 | ||
991 | /* | 991 | /* |
992 | ** arithmetic operation encoding for 'arith' instruction | 992 | ** arithmetic operation encoding for 'arith' instruction |
@@ -1323,7 +1323,7 @@ static int Cfunc (lua_State *L) { | |||
1323 | } | 1323 | } |
1324 | 1324 | ||
1325 | 1325 | ||
1326 | static int Cfunck (lua_State *L, int status, lua_Kcontext ctx) { | 1326 | static int Cfunck (lua_State *L, int status, lua_KContext ctx) { |
1327 | pushcode(L, status); | 1327 | pushcode(L, status); |
1328 | lua_setglobal(L, "status"); | 1328 | lua_setglobal(L, "status"); |
1329 | lua_pushinteger(L, ctx); | 1329 | lua_pushinteger(L, ctx); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lua.h,v 1.315 2014/10/01 11:54:56 roberto Exp roberto $ | 2 | ** $Id: lua.h,v 1.316 2014/10/04 22:57:36 roberto Exp roberto $ |
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 |
@@ -94,7 +94,7 @@ typedef LUA_INTEGER lua_Integer; | |||
94 | typedef LUA_UNSIGNED lua_Unsigned; | 94 | typedef LUA_UNSIGNED lua_Unsigned; |
95 | 95 | ||
96 | /* type for continuation-function contexts */ | 96 | /* type for continuation-function contexts */ |
97 | typedef LUA_KCONTEXT lua_Kcontext; | 97 | typedef LUA_KCONTEXT lua_KContext; |
98 | 98 | ||
99 | 99 | ||
100 | /* | 100 | /* |
@@ -105,7 +105,7 @@ typedef int (*lua_CFunction) (lua_State *L); | |||
105 | /* | 105 | /* |
106 | ** Type for continuation functions | 106 | ** Type for continuation functions |
107 | */ | 107 | */ |
108 | typedef int (*lua_KFunction) (lua_State *L, int status, lua_Kcontext ctx); | 108 | typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx); |
109 | 109 | ||
110 | 110 | ||
111 | /* | 111 | /* |
@@ -268,11 +268,11 @@ LUA_API void (lua_setuservalue) (lua_State *L, int idx); | |||
268 | ** 'load' and 'call' functions (load and run Lua code) | 268 | ** 'load' and 'call' functions (load and run Lua code) |
269 | */ | 269 | */ |
270 | LUA_API void (lua_callk) (lua_State *L, int nargs, int nresults, | 270 | LUA_API void (lua_callk) (lua_State *L, int nargs, int nresults, |
271 | lua_Kcontext ctx, lua_KFunction k); | 271 | lua_KContext ctx, lua_KFunction k); |
272 | #define lua_call(L,n,r) lua_callk(L, (n), (r), 0, NULL) | 272 | #define lua_call(L,n,r) lua_callk(L, (n), (r), 0, NULL) |
273 | 273 | ||
274 | LUA_API int (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc, | 274 | LUA_API int (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc, |
275 | lua_Kcontext ctx, lua_KFunction k); | 275 | lua_KContext ctx, lua_KFunction k); |
276 | #define lua_pcall(L,n,r,f) lua_pcallk(L, (n), (r), (f), 0, NULL) | 276 | #define lua_pcall(L,n,r,f) lua_pcallk(L, (n), (r), (f), 0, NULL) |
277 | 277 | ||
278 | LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt, | 278 | LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt, |
@@ -285,7 +285,7 @@ LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip); | |||
285 | /* | 285 | /* |
286 | ** coroutine functions | 286 | ** coroutine functions |
287 | */ | 287 | */ |
288 | LUA_API int (lua_yieldk) (lua_State *L, int nresults, lua_Kcontext ctx, | 288 | LUA_API int (lua_yieldk) (lua_State *L, int nresults, lua_KContext ctx, |
289 | lua_KFunction k); | 289 | lua_KFunction k); |
290 | #define lua_yield(L,n) lua_yieldk(L, (n), 0, NULL) | 290 | #define lua_yield(L,n) lua_yieldk(L, (n), 0, NULL) |
291 | LUA_API int (lua_resume) (lua_State *L, lua_State *from, int narg); | 291 | LUA_API int (lua_resume) (lua_State *L, lua_State *from, int narg); |