diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2014-01-21 18:38:49 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2014-01-21 18:38:49 -0800 |
| commit | 0fd2f830882402979a83010e89650e7245960d39 (patch) | |
| tree | 0968ca9424c5fb2433047519cbd54d3dd8d0b863 /tools | |
| parent | ce9bba3cb5409844f8f3d7dcc235a9ea30cad090 (diff) | |
Sync to internal Google development.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dump_cinit.lua | 11 | ||||
| -rw-r--r-- | tools/test_cinit.lua | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tools/dump_cinit.lua b/tools/dump_cinit.lua index c83aa04..e23e907 100644 --- a/tools/dump_cinit.lua +++ b/tools/dump_cinit.lua @@ -359,13 +359,14 @@ local function dump_defs_c(symtab, basename, append) else intfmt = "0" end - -- UPB_FIELDDEF_INIT(label, type, intfmt, tagdelim, name, num, msgdef, - -- 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 + -- UPB_FIELDDEF_INIT(label, type, intfmt, tagdelim, is_extension, name, + -- num, msgdef, subdef, selector_base, index, + -- default_value) + append(' UPB_FIELDDEF_INIT(%s, %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(), + boolstr(f:istagdelim()), boolstr(f:is_extension()), f:name(), f:number(), linktab:addr(f:containing_type()), subdef, f:_selector_base(), f:index(), reftable, reftable + 1 diff --git a/tools/test_cinit.lua b/tools/test_cinit.lua index 72d8826..3ed77b5 100644 --- a/tools/test_cinit.lua +++ b/tools/test_cinit.lua @@ -43,7 +43,7 @@ if arg[1] == "generate" then local appendh = dump_cinit.file_appender(f_h) f:write('#include "lua.h"\n') f:write('#define ELEMENTS(array) (sizeof(array)/sizeof(*array))\n') - f:write('#include "bindings/lua/upb.h"\n') + f:write('#include "upb/bindings/lua/upb.h"\n') dump_cinit.dump_defs(symtab, "test", appendh, appendc) f:write([[int luaopen_staticdefs(lua_State *L) { lua_newtable(L); |