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 /lstring.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 'lstring.c')
-rw-r--r-- | lstring.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -43,7 +43,7 @@ | |||
43 | */ | 43 | */ |
44 | int luaS_eqlngstr (TString *a, TString *b) { | 44 | int luaS_eqlngstr (TString *a, TString *b) { |
45 | size_t len = a->u.lnglen; | 45 | size_t len = a->u.lnglen; |
46 | lua_assert(a->tt == LUA_TLNGSTR && b->tt == LUA_TLNGSTR); | 46 | lua_assert(a->tt == LUA_VLNGSTR && b->tt == LUA_VLNGSTR); |
47 | return (a == b) || /* same instance or... */ | 47 | return (a == b) || /* same instance or... */ |
48 | ((len == b->u.lnglen) && /* equal length and ... */ | 48 | ((len == b->u.lnglen) && /* equal length and ... */ |
49 | (memcmp(getstr(a), getstr(b), len) == 0)); /* equal contents */ | 49 | (memcmp(getstr(a), getstr(b), len) == 0)); /* equal contents */ |
@@ -60,7 +60,7 @@ unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) { | |||
60 | 60 | ||
61 | 61 | ||
62 | unsigned int luaS_hashlongstr (TString *ts) { | 62 | unsigned int luaS_hashlongstr (TString *ts) { |
63 | lua_assert(ts->tt == LUA_TLNGSTR); | 63 | lua_assert(ts->tt == LUA_VLNGSTR); |
64 | if (ts->extra == 0) { /* no hash? */ | 64 | if (ts->extra == 0) { /* no hash? */ |
65 | ts->hash = luaS_hash(getstr(ts), ts->u.lnglen, ts->hash); | 65 | ts->hash = luaS_hash(getstr(ts), ts->u.lnglen, ts->hash); |
66 | ts->extra = 1; /* now it has its hash */ | 66 | ts->extra = 1; /* now it has its hash */ |
@@ -165,7 +165,7 @@ static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) { | |||
165 | 165 | ||
166 | 166 | ||
167 | TString *luaS_createlngstrobj (lua_State *L, size_t l) { | 167 | TString *luaS_createlngstrobj (lua_State *L, size_t l) { |
168 | TString *ts = createstrobj(L, l, LUA_TLNGSTR, G(L)->seed); | 168 | TString *ts = createstrobj(L, l, LUA_VLNGSTR, G(L)->seed); |
169 | ts->u.lnglen = l; | 169 | ts->u.lnglen = l; |
170 | return ts; | 170 | return ts; |
171 | } | 171 | } |
@@ -215,7 +215,7 @@ static TString *internshrstr (lua_State *L, const char *str, size_t l) { | |||
215 | growstrtab(L, tb); | 215 | growstrtab(L, tb); |
216 | list = &tb->hash[lmod(h, tb->size)]; /* rehash with new size */ | 216 | list = &tb->hash[lmod(h, tb->size)]; /* rehash with new size */ |
217 | } | 217 | } |
218 | ts = createstrobj(L, l, LUA_TSHRSTR, h); | 218 | ts = createstrobj(L, l, LUA_VSHRSTR, h); |
219 | memcpy(getstr(ts), str, l * sizeof(char)); | 219 | memcpy(getstr(ts), str, l * sizeof(char)); |
220 | ts->shrlen = cast_byte(l); | 220 | ts->shrlen = cast_byte(l); |
221 | ts->u.hnext = *list; | 221 | ts->u.hnext = *list; |
@@ -271,7 +271,7 @@ Udata *luaS_newudata (lua_State *L, size_t s, int nuvalue) { | |||
271 | GCObject *o; | 271 | GCObject *o; |
272 | if (unlikely(s > MAX_SIZE - udatamemoffset(nuvalue))) | 272 | if (unlikely(s > MAX_SIZE - udatamemoffset(nuvalue))) |
273 | luaM_toobig(L); | 273 | luaM_toobig(L); |
274 | o = luaC_newobj(L, LUA_TUSERDATA, sizeudata(nuvalue, s)); | 274 | o = luaC_newobj(L, LUA_VUSERDATA, sizeudata(nuvalue, s)); |
275 | u = gco2u(o); | 275 | u = gco2u(o); |
276 | u->len = s; | 276 | u->len = s; |
277 | u->nuvalue = nuvalue; | 277 | u->nuvalue = nuvalue; |