diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-04-21 16:26:52 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-21 16:26:52 -0700 |
| commit | ac2689cec721eb94b49dfbfed310e2e0e3bdfa2b (patch) | |
| tree | 1f6b0b65b2a8b49d281b23ed4a1ef066525e4556 /upb/table.int.h | |
| parent | e6fa3f9d869765544b8e424e8573fe8d9af35534 (diff) | |
Put oneofs in the same table as fields. (#60)
* Put oneofs in the same table as fields.
Oneofs and fields are not allowed to have names that conflict,
so we might as well put them all in the same table. This also
allows an efficient operation that looks for both fields and
oneofs in a single lookup.
Added support for OneofDef to Lua to allow testing of this.
* Addressed PR comments.
Diffstat (limited to 'upb/table.int.h')
| -rw-r--r-- | upb/table.int.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/upb/table.int.h b/upb/table.int.h index d908196..131a74f 100644 --- a/upb/table.int.h +++ b/upb/table.int.h @@ -261,13 +261,18 @@ typedef struct { } upb_table; #ifdef NDEBUG -#define UPB_TABLE_INIT(count, mask, ctype, size_lg2, entries) \ - {count, mask, ctype, size_lg2, entries} +# define UPB_TABLE_INIT(count, mask, ctype, size_lg2, entries) \ + {count, mask, ctype, size_lg2, entries} #else +# ifdef UPB_DEBUG_REFS /* At the moment the only mutable tables we statically initialize are debug * ref tables. */ -#define UPB_TABLE_INIT(count, mask, ctype, size_lg2, entries) \ - {count, mask, ctype, size_lg2, entries, &upb_alloc_debugrefs} +# define UPB_TABLE_INIT(count, mask, ctype, size_lg2, entries) \ + {count, mask, ctype, size_lg2, entries, &upb_alloc_debugrefs} +# else +# define UPB_TABLE_INIT(count, mask, ctype, size_lg2, entries) \ + {count, mask, ctype, size_lg2, entries, NULL} +# endif #endif typedef struct { |