diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2020-01-31 11:09:53 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2020-01-31 11:09:53 -0300 |
| commit | 46c3587a6feb28e1ee4a32aabe463b0ecb9e8f5e (patch) | |
| tree | 7e1ae9b55536171511506532a04f4ebe6dc764b0 /ltests.c | |
| parent | 69c7139ff88bf26e05d80bf19d0351e5c88d13a3 (diff) | |
| download | lua-46c3587a6feb28e1ee4a32aabe463b0ecb9e8f5e.tar.gz lua-46c3587a6feb28e1ee4a32aabe463b0ecb9e8f5e.tar.bz2 lua-46c3587a6feb28e1ee4a32aabe463b0ecb9e8f5e.zip | |
Clearer distinction between types and tags
LUA_T* represents only types; tags (types + Variants) are represented
by LUA_V* constants.
Diffstat (limited to 'ltests.c')
| -rw-r--r-- | ltests.c | 38 |
1 files changed, 19 insertions, 19 deletions
| @@ -303,7 +303,7 @@ static void printobj (global_State *g, GCObject *o) { | |||
| 303 | ttypename(novariant(o->tt)), (void *)o, | 303 | ttypename(novariant(o->tt)), (void *)o, |
| 304 | isdead(g,o) ? 'd' : isblack(o) ? 'b' : iswhite(o) ? 'w' : 'g', | 304 | isdead(g,o) ? 'd' : isblack(o) ? 'b' : iswhite(o) ? 'w' : 'g', |
| 305 | "ns01oTt"[getage(o)], o->marked); | 305 | "ns01oTt"[getage(o)], o->marked); |
| 306 | if (o->tt == LUA_TSHRSTR || o->tt == LUA_TLNGSTR) | 306 | if (o->tt == LUA_VSHRSTR || o->tt == LUA_VLNGSTR) |
| 307 | printf(" '%s'", getstr(gco2ts(o))); | 307 | printf(" '%s'", getstr(gco2ts(o))); |
| 308 | } | 308 | } |
| 309 | 309 | ||
| @@ -435,36 +435,36 @@ static void checkstack (global_State *g, lua_State *L1) { | |||
| 435 | 435 | ||
| 436 | static void checkrefs (global_State *g, GCObject *o) { | 436 | static void checkrefs (global_State *g, GCObject *o) { |
| 437 | switch (o->tt) { | 437 | switch (o->tt) { |
| 438 | case LUA_TUSERDATA: { | 438 | case LUA_VUSERDATA: { |
| 439 | checkudata(g, gco2u(o)); | 439 | checkudata(g, gco2u(o)); |
| 440 | break; | 440 | break; |
| 441 | } | 441 | } |
| 442 | case LUA_TUPVAL: { | 442 | case LUA_VUPVAL: { |
| 443 | checkvalref(g, o, gco2upv(o)->v); | 443 | checkvalref(g, o, gco2upv(o)->v); |
| 444 | break; | 444 | break; |
| 445 | } | 445 | } |
| 446 | case LUA_TTABLE: { | 446 | case LUA_VTABLE: { |
| 447 | checktable(g, gco2t(o)); | 447 | checktable(g, gco2t(o)); |
| 448 | break; | 448 | break; |
| 449 | } | 449 | } |
| 450 | case LUA_TTHREAD: { | 450 | case LUA_VTHREAD: { |
| 451 | checkstack(g, gco2th(o)); | 451 | checkstack(g, gco2th(o)); |
| 452 | break; | 452 | break; |
| 453 | } | 453 | } |
| 454 | case LUA_TLCL: { | 454 | case LUA_VLCL: { |
| 455 | checkLclosure(g, gco2lcl(o)); | 455 | checkLclosure(g, gco2lcl(o)); |
| 456 | break; | 456 | break; |
| 457 | } | 457 | } |
| 458 | case LUA_TCCL: { | 458 | case LUA_VCCL: { |
| 459 | checkCclosure(g, gco2ccl(o)); | 459 | checkCclosure(g, gco2ccl(o)); |
| 460 | break; | 460 | break; |
| 461 | } | 461 | } |
| 462 | case LUA_TPROTO: { | 462 | case LUA_VPROTO: { |
| 463 | checkproto(g, gco2p(o)); | 463 | checkproto(g, gco2p(o)); |
| 464 | break; | 464 | break; |
| 465 | } | 465 | } |
| 466 | case LUA_TSHRSTR: | 466 | case LUA_VSHRSTR: |
| 467 | case LUA_TLNGSTR: { | 467 | case LUA_VLNGSTR: { |
| 468 | lua_assert(!isgray(o)); /* strings are never gray */ | 468 | lua_assert(!isgray(o)); /* strings are never gray */ |
| 469 | break; | 469 | break; |
| 470 | } | 470 | } |
| @@ -497,8 +497,8 @@ static void checkobject (global_State *g, GCObject *o, int maybedead, | |||
| 497 | lua_assert(isblack(o) || | 497 | lua_assert(isblack(o) || |
| 498 | getage(o) == G_TOUCHED1 || | 498 | getage(o) == G_TOUCHED1 || |
| 499 | getage(o) == G_OLD0 || | 499 | getage(o) == G_OLD0 || |
| 500 | o->tt == LUA_TTHREAD || | 500 | o->tt == LUA_VTHREAD || |
| 501 | (o->tt == LUA_TUPVAL && upisopen(gco2upv(o)))); | 501 | (o->tt == LUA_VUPVAL && upisopen(gco2upv(o)))); |
| 502 | } | 502 | } |
| 503 | } | 503 | } |
| 504 | checkrefs(g, o); | 504 | checkrefs(g, o); |
| @@ -511,11 +511,11 @@ static void checkgraylist (global_State *g, GCObject *o) { | |||
| 511 | while (o) { | 511 | while (o) { |
| 512 | lua_assert(isgray(o) || getage(o) == G_TOUCHED2); | 512 | lua_assert(isgray(o) || getage(o) == G_TOUCHED2); |
| 513 | switch (o->tt) { | 513 | switch (o->tt) { |
| 514 | case LUA_TTABLE: o = gco2t(o)->gclist; break; | 514 | case LUA_VTABLE: o = gco2t(o)->gclist; break; |
| 515 | case LUA_TLCL: o = gco2lcl(o)->gclist; break; | 515 | case LUA_VLCL: o = gco2lcl(o)->gclist; break; |
| 516 | case LUA_TCCL: o = gco2ccl(o)->gclist; break; | 516 | case LUA_VCCL: o = gco2ccl(o)->gclist; break; |
| 517 | case LUA_TTHREAD: o = gco2th(o)->gclist; break; | 517 | case LUA_VTHREAD: o = gco2th(o)->gclist; break; |
| 518 | case LUA_TPROTO: o = gco2p(o)->gclist; break; | 518 | case LUA_VPROTO: o = gco2p(o)->gclist; break; |
| 519 | default: lua_assert(0); /* other objects cannot be in a gray list */ | 519 | default: lua_assert(0); /* other objects cannot be in a gray list */ |
| 520 | } | 520 | } |
| 521 | } | 521 | } |
| @@ -570,7 +570,7 @@ int lua_checkmemory (lua_State *L) { | |||
| 570 | 570 | ||
| 571 | /* check 'fixedgc' list */ | 571 | /* check 'fixedgc' list */ |
| 572 | for (o = g->fixedgc; o != NULL; o = o->next) { | 572 | for (o = g->fixedgc; o != NULL; o = o->next) { |
| 573 | lua_assert(o->tt == LUA_TSHRSTR && isgray(o) && getage(o) == G_OLD); | 573 | lua_assert(o->tt == LUA_VSHRSTR && isgray(o) && getage(o) == G_OLD); |
| 574 | } | 574 | } |
| 575 | 575 | ||
| 576 | /* check 'allgc' list */ | 576 | /* check 'allgc' list */ |
| @@ -584,7 +584,7 @@ int lua_checkmemory (lua_State *L) { | |||
| 584 | for (o = g->tobefnz; o != NULL; o = o->next) { | 584 | for (o = g->tobefnz; o != NULL; o = o->next) { |
| 585 | checkobject(g, o, 0, G_NEW); | 585 | checkobject(g, o, 0, G_NEW); |
| 586 | lua_assert(tofinalize(o)); | 586 | lua_assert(tofinalize(o)); |
| 587 | lua_assert(o->tt == LUA_TUSERDATA || o->tt == LUA_TTABLE); | 587 | lua_assert(o->tt == LUA_VUSERDATA || o->tt == LUA_VTABLE); |
| 588 | } | 588 | } |
| 589 | return 0; | 589 | return 0; |
| 590 | } | 590 | } |