aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2005-08-04 10:37:38 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2005-08-04 10:37:38 -0300
commit680fc88cc2976724611e6cec58379c6078d648b2 (patch)
tree7333fccf4a82d747e19ed97bf06fe7baae4a4663
parentd96f088a267e3ee9db938fd742dae51fb9bfb793 (diff)
downloadlua-680fc88cc2976724611e6cec58379c6078d648b2.tar.gz
lua-680fc88cc2976724611e6cec58379c6078d648b2.tar.bz2
lua-680fc88cc2976724611e6cec58379c6078d648b2.zip
a small bug
-rw-r--r--ldebug.c3
-rw-r--r--lgc.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/ldebug.c b/ldebug.c
index a89aab8c..24752fb3 100644
--- a/ldebug.c
+++ b/ldebug.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: ldebug.c,v 2.24 2005/06/28 13:01:31 roberto Exp roberto $ 2** $Id: ldebug.c,v 2.25 2005/07/11 13:59:03 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*/
@@ -152,6 +152,7 @@ static void funcinfo (lua_Debug *ar, Closure *cl) {
152 if (cl->c.isC) { 152 if (cl->c.isC) {
153 ar->source = "=[C]"; 153 ar->source = "=[C]";
154 ar->linedefined = -1; 154 ar->linedefined = -1;
155 ar->lastlinedefined = -1;
155 ar->what = "C"; 156 ar->what = "C";
156 } 157 }
157 else { 158 else {
diff --git a/lgc.c b/lgc.c
index 3d1af41f..f6030844 100644
--- a/lgc.c
+++ b/lgc.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lgc.c,v 2.33 2005/05/31 14:25:18 roberto Exp roberto $ 2** $Id: lgc.c,v 2.34 2005/06/07 18:53:45 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*/
@@ -528,10 +528,10 @@ static void remarkupvals (global_State *g) {
528static void atomic (lua_State *L) { 528static void atomic (lua_State *L) {
529 global_State *g = G(L); 529 global_State *g = G(L);
530 size_t udsize; /* total size of userdata to be finalized */ 530 size_t udsize; /* total size of userdata to be finalized */
531 /* remark objects cautch by write barrier */
532 propagateall(g);
533 /* remark occasional upvalues of (maybe) dead threads */ 531 /* remark occasional upvalues of (maybe) dead threads */
534 remarkupvals(g); 532 remarkupvals(g);
533 /* traverse objects cautch by write barrier and by 'remarkupvals' */
534 propagateall(g);
535 /* remark weak tables */ 535 /* remark weak tables */
536 g->gray = g->weak; 536 g->gray = g->weak;
537 g->weak = NULL; 537 g->weak = NULL;