summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2017-07-17 21:54:38 +0200
committerJoshua Haberman <jhaberman@gmail.com>2017-07-17 21:55:58 +0200
commitbe9094d91a2da777002a0f713306ac1bb74a6ac5 (patch)
tree431430e1e82092bbe95216a83e672761ab4d4613 /tools
parent4da95f621330608f6dbd166cd376052c5deb6f02 (diff)
New encode/decode: most (171 / 192) conformance tests pass.
Diffstat (limited to 'tools')
-rw-r--r--tools/make_c_api.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/make_c_api.lua b/tools/make_c_api.lua
index 9e6d734..cfcf38d 100644
--- a/tools/make_c_api.lua
+++ b/tools/make_c_api.lua
@@ -417,7 +417,7 @@ local function write_c_file(filedef, hfilename, append)
append('static const upb_msglayout_fieldinit_v1 %s[%s] = {\n',
fields_array_name, field_count)
for _, field in ipairs(fields_number_order) do
- local submsg_index = "-1"
+ local submsg_index = "UPB_NO_SUBMSG"
local oneof_index = "UPB_NOT_IN_ONEOF"
if field:type() == upb.TYPE_MESSAGE then
submsg_index = submsg_indexes[field:subdef()]
@@ -430,7 +430,7 @@ local function write_c_file(filedef, hfilename, append)
field:number(),
msgname,
(field:containing_oneof() and field:containing_oneof():name()) or field:name(),
- hasbit_indexes[field] or "-1",
+ hasbit_indexes[field] or "UPB_NO_HASBIT",
oneof_index,
submsg_index,
field:descriptor_type(),
@@ -448,7 +448,7 @@ local function write_c_file(filedef, hfilename, append)
msgname, field_count,
0, -- TODO: oneof_count
'false', -- TODO: extendable
- 'true' -- TODO: is_proto2
+ msg:file():syntax() == upb.SYNTAX_PROTO2
)
append('};\n\n')
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback