aboutsummaryrefslogtreecommitdiff
path: root/lstate.h
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2006-08-15 16:59:20 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2006-08-15 16:59:20 -0300
commit93bf6185048256a5df05986460f233ee65136731 (patch)
treed7c86e4c11eb3a834be95bfe901f1a9a89b2d9a8 /lstate.h
parentdfe2f1eeff07b0fc42f6a4255624e704d9c9beb5 (diff)
downloadlua-93bf6185048256a5df05986460f233ee65136731.tar.gz
lua-93bf6185048256a5df05986460f233ee65136731.tar.bz2
lua-93bf6185048256a5df05986460f233ee65136731.zip
BUG: there is only one C stack, so nCcalls must be global
Diffstat (limited to 'lstate.h')
-rw-r--r--lstate.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/lstate.h b/lstate.h
index 89fc82d1..d96e7b3b 100644
--- a/lstate.h
+++ b/lstate.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lstate.h,v 2.24 2006/02/06 18:27:59 roberto Exp roberto $ 2** $Id: lstate.h,v 2.25 2006/07/11 15:53:29 roberto Exp $
3** Global State 3** Global State
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -69,6 +69,7 @@ typedef struct global_State {
69 stringtable strt; /* hash table for strings */ 69 stringtable strt; /* hash table for strings */
70 lua_Alloc frealloc; /* function to reallocate memory */ 70 lua_Alloc frealloc; /* function to reallocate memory */
71 void *ud; /* auxiliary data to `frealloc' */ 71 void *ud; /* auxiliary data to `frealloc' */
72 unsigned short nCcalls; /* number of nested C calls */
72 lu_byte currentwhite; 73 lu_byte currentwhite;
73 lu_byte gcstate; /* state of garbage collector */ 74 lu_byte gcstate; /* state of garbage collector */
74 lu_byte emergencygc; /* true when collect was trigged by alloc error */ 75 lu_byte emergencygc; /* true when collect was trigged by alloc error */
@@ -112,7 +113,7 @@ struct lua_State {
112 CallInfo *base_ci; /* array of CallInfo's */ 113 CallInfo *base_ci; /* array of CallInfo's */
113 int stacksize; 114 int stacksize;
114 int size_ci; /* size of array `base_ci' */ 115 int size_ci; /* size of array `base_ci' */
115 unsigned short nCcalls; /* number of nested C calls */ 116 unsigned short baseCcalls; /* number of nested C calls when resuming */
116 lu_byte hookmask; 117 lu_byte hookmask;
117 lu_byte allowhook; 118 lu_byte allowhook;
118 int basehookcount; 119 int basehookcount;