diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2013-12-20 17:40:40 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2013-12-20 17:40:40 -0800 |
| commit | ce9bba3cb5409844f8f3d7dcc235a9ea30cad090 (patch) | |
| tree | 6c4e0a7c023c790a278f3616c749280c8da205af /tools | |
| parent | aa8db6ab5ea18848247b8c4ac4715cf344941e94 (diff) | |
Sync from Google-internal development.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dump_cinit.lua | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/dump_cinit.lua b/tools/dump_cinit.lua index 8a6d158..c83aa04 100644 --- a/tools/dump_cinit.lua +++ b/tools/dump_cinit.lua @@ -330,13 +330,15 @@ local function dump_defs_c(symtab, basename, append) append("const upb_msgdef %s = {\n", linktab:cdecl(upb.DEF_MSG)) for m in linktab:objs(upb.DEF_MSG) do local tables = gettables(m) - -- UPB_MSGDEF_INIT(name, itof, ntof) - append(' UPB_MSGDEF_INIT("%s", %s, %s, %s, ' .. + -- UPB_MSGDEF_INIT(name, selector_count, submsg_field_count, itof, ntof, + -- refs, ref2s) + append(' UPB_MSGDEF_INIT("%s", %d, %d, %s, %s,' .. '&reftables[%d], &reftables[%d]),\n', m:full_name(), + m:_selector_count(), + m:_submsg_field_count(), dumper:inttable(tables.int), dumper:strtable(tables.str), - m:_selector_count(), reftable, reftable + 1) reftable = reftable + 2 end @@ -358,14 +360,14 @@ local function dump_defs_c(symtab, basename, append) intfmt = "0" end -- UPB_FIELDDEF_INIT(label, type, intfmt, tagdelim, name, num, msgdef, - -- subdef, selector_base, default_value) - append(' UPB_FIELDDEF_INIT(%s, %s, %s, %s, "%s", %d, %s, %s, %d, ' .. + -- subdef, selector_base, index, default_value) + append(' UPB_FIELDDEF_INIT(%s, %s, %s, %s, "%s", %d, %s, %s, %d, %d, ' .. '{0},' .. -- TODO: support default value '&reftables[%d], &reftables[%d]),\n', const(f, "label"), const(f, "type"), intfmt, boolstr(f:istagdelim()), f:name(), f:number(), linktab:addr(f:containing_type()), subdef, - f:_selector_base(), + f:_selector_base(), f:index(), reftable, reftable + 1 ) reftable = reftable + 2 |