diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2000-03-30 17:55:50 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2000-03-30 17:55:50 -0300 |
commit | 8f0f54ec3835f5d1637ae2720e2b4de6a177574a (patch) | |
tree | 8b925203df562cc955e71fef21dd607ac7e2469a | |
parent | 556a89e53751135f45d8dd1e84651461b67e1f81 (diff) | |
download | lua-8f0f54ec3835f5d1637ae2720e2b4de6a177574a.tar.gz lua-8f0f54ec3835f5d1637ae2720e2b4de6a177574a.tar.bz2 lua-8f0f54ec3835f5d1637ae2720e2b4de6a177574a.zip |
name change
-rw-r--r-- | ldebug.c | 12 | ||||
-rw-r--r-- | ldo.c | 6 | ||||
-rw-r--r-- | lgc.c | 6 | ||||
-rw-r--r-- | lobject.h | 10 |
4 files changed, 17 insertions, 17 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ldebug.c,v 1.14 2000/03/29 20:19:20 roberto Exp roberto $ | 2 | ** $Id: ldebug.c,v 1.15 2000/03/30 17:19:48 roberto Exp roberto $ |
3 | ** Debug Interface | 3 | ** Debug Interface |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -25,7 +25,7 @@ | |||
25 | static const lua_Type normtype[] = { /* ORDER LUA_T */ | 25 | static const lua_Type normtype[] = { /* ORDER LUA_T */ |
26 | TAG_USERDATA, TAG_NUMBER, TAG_STRING, TAG_TABLE, | 26 | TAG_USERDATA, TAG_NUMBER, TAG_STRING, TAG_TABLE, |
27 | TAG_LCLOSURE, TAG_CCLOSURE, TAG_NIL, | 27 | TAG_LCLOSURE, TAG_CCLOSURE, TAG_NIL, |
28 | TAG_LCLOSURE, TAG_CCLOSURE /* TAG_LCLMARK, TAG_CCLMARK */ | 28 | TAG_LCLOSURE, TAG_CCLOSURE /* TAG_LMARK, TAG_CMARK */ |
29 | }; | 29 | }; |
30 | 30 | ||
31 | 31 | ||
@@ -88,7 +88,7 @@ int lua_getstack (lua_State *L, int level, lua_Debug *ar) { | |||
88 | static int lua_nups (StkId f) { | 88 | static int lua_nups (StkId f) { |
89 | switch (ttype(f)) { | 89 | switch (ttype(f)) { |
90 | case TAG_LCLOSURE: case TAG_CCLOSURE: | 90 | case TAG_LCLOSURE: case TAG_CCLOSURE: |
91 | case TAG_LCLMARK: case TAG_CCLMARK: | 91 | case TAG_LMARK: case TAG_CMARK: |
92 | return f->value.cl->nelems; | 92 | return f->value.cl->nelems; |
93 | default: | 93 | default: |
94 | return 0; | 94 | return 0; |
@@ -102,7 +102,7 @@ static int lua_currentline (lua_State *L, StkId f) { | |||
102 | 102 | ||
103 | 103 | ||
104 | static Proto *getluaproto (StkId f) { | 104 | static Proto *getluaproto (StkId f) { |
105 | return (ttype(f) == TAG_LCLMARK) ? clvalue(f)->f.l : NULL; | 105 | return (ttype(f) == TAG_LMARK) ? clvalue(f)->f.l : NULL; |
106 | } | 106 | } |
107 | 107 | ||
108 | 108 | ||
@@ -135,12 +135,12 @@ int lua_setlocal (lua_State *L, const lua_Debug *ar, lua_Localvar *v) { | |||
135 | static void lua_funcinfo (lua_Debug *ar) { | 135 | static void lua_funcinfo (lua_Debug *ar) { |
136 | StkId func = ar->_func; | 136 | StkId func = ar->_func; |
137 | switch (ttype(func)) { | 137 | switch (ttype(func)) { |
138 | case TAG_LCLOSURE: case TAG_LCLMARK: | 138 | case TAG_LCLOSURE: case TAG_LMARK: |
139 | ar->source = clvalue(func)->f.l->source->str; | 139 | ar->source = clvalue(func)->f.l->source->str; |
140 | ar->linedefined = clvalue(func)->f.l->lineDefined; | 140 | ar->linedefined = clvalue(func)->f.l->lineDefined; |
141 | ar->what = "Lua"; | 141 | ar->what = "Lua"; |
142 | break; | 142 | break; |
143 | case TAG_CCLOSURE: case TAG_CCLMARK: | 143 | case TAG_CCLOSURE: case TAG_CMARK: |
144 | ar->source = "(C)"; | 144 | ar->source = "(C)"; |
145 | ar->linedefined = -1; | 145 | ar->linedefined = -1; |
146 | ar->what = "C"; | 146 | ar->what = "C"; |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ldo.c,v 1.70 2000/03/29 20:19:20 roberto Exp roberto $ | 2 | ** $Id: ldo.c,v 1.71 2000/03/30 17:19:48 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 | */ |
@@ -183,14 +183,14 @@ void luaD_call (lua_State *L, StkId func, int nResults) { | |||
183 | retry: /* for `function' tag method */ | 183 | retry: /* for `function' tag method */ |
184 | switch (ttype(func)) { | 184 | switch (ttype(func)) { |
185 | case TAG_LCLOSURE: { | 185 | case TAG_LCLOSURE: { |
186 | ttype(func) = TAG_LCLMARK; | 186 | ttype(func) = TAG_LMARK; |
187 | if (callhook) | 187 | if (callhook) |
188 | luaD_callHook(L, func, callhook, "call"); | 188 | luaD_callHook(L, func, callhook, "call"); |
189 | firstResult = luaV_execute(L, clvalue(func), func+1); | 189 | firstResult = luaV_execute(L, clvalue(func), func+1); |
190 | break; | 190 | break; |
191 | } | 191 | } |
192 | case TAG_CCLOSURE: { | 192 | case TAG_CCLOSURE: { |
193 | ttype(func) = TAG_CCLMARK; | 193 | ttype(func) = TAG_CMARK; |
194 | if (callhook) | 194 | if (callhook) |
195 | luaD_callHook(L, func, callhook, "call"); | 195 | luaD_callHook(L, func, callhook, "call"); |
196 | firstResult = callCclosure(L, clvalue(func), func+1); | 196 | firstResult = callCclosure(L, clvalue(func), func+1); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lgc.c,v 1.44 2000/03/27 20:10:21 roberto Exp roberto $ | 2 | ** $Id: lgc.c,v 1.45 2000/03/29 20:19:20 roberto Exp roberto $ |
3 | ** Garbage Collector | 3 | ** Garbage Collector |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -102,10 +102,10 @@ static int markobject (lua_State *L, TObject *o) { | |||
102 | case TAG_TABLE: | 102 | case TAG_TABLE: |
103 | hashmark(L, avalue(o)); | 103 | hashmark(L, avalue(o)); |
104 | break; | 104 | break; |
105 | case TAG_LCLOSURE: case TAG_LCLMARK: | 105 | case TAG_LCLOSURE: case TAG_LMARK: |
106 | protomark(L, clvalue(o)->f.l); | 106 | protomark(L, clvalue(o)->f.l); |
107 | /* go trhough */ | 107 | /* go trhough */ |
108 | case TAG_CCLOSURE: case TAG_CCLMARK: | 108 | case TAG_CCLOSURE: case TAG_CMARK: |
109 | closuremark(L, clvalue(o)); | 109 | closuremark(L, clvalue(o)); |
110 | break; | 110 | break; |
111 | default: break; /* numbers, etc */ | 111 | default: break; /* numbers, etc */ |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lobject.h,v 1.56 2000/03/27 20:10:21 roberto Exp roberto $ | 2 | ** $Id: lobject.h,v 1.57 2000/03/29 20:19:20 roberto Exp roberto $ |
3 | ** Type definitions for Lua objects | 3 | ** Type definitions for Lua objects |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -45,8 +45,8 @@ typedef enum { | |||
45 | TAG_CCLOSURE, /* fixed tag for C closures */ | 45 | TAG_CCLOSURE, /* fixed tag for C closures */ |
46 | TAG_NIL, /* last "pre-defined" tag */ | 46 | TAG_NIL, /* last "pre-defined" tag */ |
47 | 47 | ||
48 | TAG_LCLMARK, /* mark for Lua closures */ | 48 | TAG_LMARK, /* mark for Lua closures */ |
49 | TAG_CCLMARK, /* mark for C closures */ | 49 | TAG_CMARK, /* mark for C closures */ |
50 | 50 | ||
51 | TAG_LINE | 51 | TAG_LINE |
52 | } lua_Type; | 52 | } lua_Type; |
@@ -58,12 +58,12 @@ typedef enum { | |||
58 | /* | 58 | /* |
59 | ** check whether `t' is a mark | 59 | ** check whether `t' is a mark |
60 | */ | 60 | */ |
61 | #define is_T_MARK(t) ((t) == TAG_LCLMARK || (t) == TAG_CCLMARK) | 61 | #define is_T_MARK(t) ((t) == TAG_LMARK || (t) == TAG_CMARK) |
62 | 62 | ||
63 | 63 | ||
64 | typedef union { | 64 | typedef union { |
65 | struct TString *ts; /* TAG_STRING, TAG_USERDATA */ | 65 | struct TString *ts; /* TAG_STRING, TAG_USERDATA */ |
66 | struct Closure *cl; /* TAG_[CL]CLOSURE, TAG_[CL]CLMARK */ | 66 | struct Closure *cl; /* TAG_[CL]CLOSURE, TAG_[CL]MARK */ |
67 | struct Hash *a; /* TAG_TABLE */ | 67 | struct Hash *a; /* TAG_TABLE */ |
68 | Number n; /* TAG_NUMBER */ | 68 | Number n; /* TAG_NUMBER */ |
69 | int i; /* TAG_LINE */ | 69 | int i; /* TAG_LINE */ |