diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2001-02-23 14:17:25 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2001-02-23 14:17:25 -0300 |
commit | 39b79783297bee79db9853b63d199e120a009a8f (patch) | |
tree | c738c621c4c28d8822c2f785400786301985273b /ltable.c | |
parent | d164e2294f73d8e69f00d95a66014514b2dd0ec0 (diff) | |
download | lua-39b79783297bee79db9853b63d199e120a009a8f.tar.gz lua-39b79783297bee79db9853b63d199e120a009a8f.tar.bz2 lua-39b79783297bee79db9853b63d199e120a009a8f.zip |
first (big) step to support wide chars
Diffstat (limited to 'ltable.c')
-rw-r--r-- | ltable.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ltable.c,v 1.75 2001/02/01 17:40:48 roberto Exp roberto $ | 2 | ** $Id: ltable.c,v 1.76 2001/02/20 18:15:33 roberto Exp roberto $ |
3 | ** Lua tables (hash) | 3 | ** Lua tables (hash) |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -59,9 +59,9 @@ Node *luaH_next (lua_State *L, Hash *t, const TObject *key) { | |||
59 | else { | 59 | else { |
60 | const TObject *v = luaH_get(t, key); | 60 | const TObject *v = luaH_get(t, key); |
61 | if (v == &luaO_nilobject) | 61 | if (v == &luaO_nilobject) |
62 | luaD_error(L, "invalid key for `next'"); | 62 | luaD_error(L, l_s("invalid key for `next'")); |
63 | i = (int)(((const char *)v - | 63 | i = (int)(((const l_char *)v - |
64 | (const char *)(&t->node[0].val)) / sizeof(Node)) + 1; | 64 | (const l_char *)(&t->node[0].val)) / sizeof(Node)) + 1; |
65 | } | 65 | } |
66 | for (; i<t->size; i++) { | 66 | for (; i<t->size; i++) { |
67 | Node *n = node(t, i); | 67 | Node *n = node(t, i); |
@@ -82,7 +82,7 @@ int luaH_nexti (Hash *t, int i) { | |||
82 | 82 | ||
83 | 83 | ||
84 | #define check_grow(L, p, n) \ | 84 | #define check_grow(L, p, n) \ |
85 | if ((p) >= MAX_INT/(n)) luaD_error(L, "table overflow"); | 85 | if ((p) >= MAX_INT/(n)) luaD_error(L, l_s("table overflow")); |
86 | 86 | ||
87 | /* | 87 | /* |
88 | ** returns smaller power of 2 larger than `n' (minimum is MINPOWER2) | 88 | ** returns smaller power of 2 larger than `n' (minimum is MINPOWER2) |
@@ -270,7 +270,7 @@ TObject *luaH_set (lua_State *L, Hash *t, const TObject *key) { | |||
270 | case LUA_TNUMBER: return luaH_setnum(L, t, nvalue(key)); | 270 | case LUA_TNUMBER: return luaH_setnum(L, t, nvalue(key)); |
271 | case LUA_TSTRING: return luaH_setstr(L, t, tsvalue(key)); | 271 | case LUA_TSTRING: return luaH_setstr(L, t, tsvalue(key)); |
272 | case LUA_TNIL: | 272 | case LUA_TNIL: |
273 | if (L) luaD_error(L, "table index is nil"); | 273 | if (L) luaD_error(L, l_s("table index is nil")); |
274 | return (TObject *)&luaO_nilobject; /* get option */ | 274 | return (TObject *)&luaO_nilobject; /* get option */ |
275 | default: return luaH_setany(L, t, key); | 275 | default: return luaH_setany(L, t, key); |
276 | } | 276 | } |