diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2011-12-02 11:18:41 -0200 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2011-12-02 11:18:41 -0200 |
commit | 01747f2c24d8334280b329dc11cf8f25ccc1f1a5 (patch) | |
tree | f022915862ebd40e687cdb517166cc0244bd6606 | |
parent | 7377fbdebc1e53e4c1545b18054f6b2e5257f2f8 (diff) | |
download | lua-01747f2c24d8334280b329dc11cf8f25ccc1f1a5.tar.gz lua-01747f2c24d8334280b329dc11cf8f25ccc1f1a5.tar.bz2 lua-01747f2c24d8334280b329dc11cf8f25ccc1f1a5.zip |
error message: "tag method" -> "metamethod"
-rw-r--r-- | lgc.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lgc.c,v 2.114 2011/10/03 17:54:25 roberto Exp roberto $ | 2 | ** $Id: lgc.c,v 2.115 2011/11/28 17:25:48 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 | */ |
@@ -291,7 +291,7 @@ static void reallymarkobject (global_State *g, GCObject *o) { | |||
291 | 291 | ||
292 | 292 | ||
293 | /* | 293 | /* |
294 | ** mark tag methods for basic types | 294 | ** mark metamethods for basic types |
295 | */ | 295 | */ |
296 | static void markmt (global_State *g) { | 296 | static void markmt (global_State *g) { |
297 | int i; | 297 | int i; |
@@ -774,7 +774,7 @@ static void GCTM (lua_State *L, int propagateerrors) { | |||
774 | int status; | 774 | int status; |
775 | lu_byte oldah = L->allowhook; | 775 | lu_byte oldah = L->allowhook; |
776 | int running = g->gcrunning; | 776 | int running = g->gcrunning; |
777 | L->allowhook = 0; /* stop debug hooks during GC tag method */ | 777 | L->allowhook = 0; /* stop debug hooks during GC metamethod */ |
778 | g->gcrunning = 0; /* avoid GC steps */ | 778 | g->gcrunning = 0; /* avoid GC steps */ |
779 | setobj2s(L, L->top, tm); /* push finalizer... */ | 779 | setobj2s(L, L->top, tm); /* push finalizer... */ |
780 | setobj2s(L, L->top + 1, &v); /* ... and its argument */ | 780 | setobj2s(L, L->top + 1, &v); /* ... and its argument */ |
@@ -784,7 +784,7 @@ static void GCTM (lua_State *L, int propagateerrors) { | |||
784 | g->gcrunning = running; /* restore state */ | 784 | g->gcrunning = running; /* restore state */ |
785 | if (status != LUA_OK && propagateerrors) { /* error while running __gc? */ | 785 | if (status != LUA_OK && propagateerrors) { /* error while running __gc? */ |
786 | if (status == LUA_ERRRUN) { /* is there an error msg.? */ | 786 | if (status == LUA_ERRRUN) { /* is there an error msg.? */ |
787 | luaO_pushfstring(L, "error in __gc tag method (%s)", | 787 | luaO_pushfstring(L, "error in __gc metamethod (%s)", |
788 | lua_tostring(L, -1)); | 788 | lua_tostring(L, -1)); |
789 | status = LUA_ERRGCMM; /* error in __gc metamethod */ | 789 | status = LUA_ERRGCMM; /* error in __gc metamethod */ |
790 | } | 790 | } |