summaryrefslogtreecommitdiff
path: root/upb/bindings
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2015-05-17 16:11:07 -0700
committerJosh Haberman <jhaberman@gmail.com>2015-05-17 16:24:08 -0700
commite2840a4aa1b6a7a2ca1421d0d6da3e56992e5090 (patch)
treee0712b93de15663281e0da4fb45800d8d3b83489 /upb/bindings
parent0c7eb664fc134b67dec304077e39eecdaff940f3 (diff)
Restructure tables for C89 port and smaller size.
Changes the data layout of tables slightly so that string keys are prefixed with their size, rather than the size being inline in the table itself. This has a few benefits: 1. inttables shrink a bit, because there is no longer a wasted and unused size field sitting in them. 2. This avoids the need to have a union in the table. This is important for an impending C89 port of upb, since C89 has literally no way of statically initializing a non-first union member.
Diffstat (limited to 'upb/bindings')
-rw-r--r--upb/bindings/lua/upb/table.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/upb/bindings/lua/upb/table.c b/upb/bindings/lua/upb/table.c
index e574ab0..4bda63d 100644
--- a/upb/bindings/lua/upb/table.c
+++ b/upb/bindings/lua/upb/table.c
@@ -66,9 +66,11 @@ static void lupbtable_pushent(lua_State *L, const upb_tabent *e,
lua_newtable(L);
if (!upb_tabent_isempty(e)) {
if (inttab) {
- lua_pushnumber(L, e->key.num);
+ lua_pushnumber(L, e->key);
} else {
- lua_pushlstring(L, e->key.s.str, e->key.s.length);
+ uint32_t len;
+ const char *str = upb_tabstr(e->key, &len);
+ lua_pushlstring(L, str, len);
}
lua_setfield(L, -2, "key");
lupbtable_pushval(L, e->val, ctype);
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback