diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-03-16 18:07:32 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-04-05 17:52:21 -0700 |
| commit | e9d79d2441732264e2b990a5b2dc76d13724db07 (patch) | |
| tree | 7faaccbd62043ef5652f891e61577a218a74adbc /Makefile | |
| parent | d0b9d0a9b782e46a483d4d72515f9ab4f72e402a (diff) | |
Added upb::FileDef, which represents the file defs are declared in.
It is entirely optional: MessageDef/EnumDef can still exist
on their own. But this can represent a def's file when it is
desirable to do so (eg. for code generators).
This approach will require that we change the way we handle
extensions. But I think it will be a good change overall.
Specifically, we previously handled extensions by duplicating
the extended message and then adding the extension as a regular
field to the duplicated message. This required also duplicating
any messages that could reach the extended message.
In the new world we will need a way of declaring and looking up
extensions separately from the message being extended.
This change also involves some notable changes to the generated
code:
- files are now called foo.upbdefs.h instead of foo.upb.h.
This reflects the fact that we might possibly generate several
different output files for a .proto file, and this one is just
for defs.
- we no longer generate selectors in the .h file.
- the upbdefs.c no longer vends a SymbolTable. Now it vends the
individual messages (and possibly a FileDef later). I think this
will compose better once we can generate files where one
generated files imports another.
We also make the descriptor reader vend a list of FileDefs now.
This is the best conceptual match for parsing a FileDescriptorSet.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -157,7 +157,7 @@ upb_SRCS = \ upb/upb.c \ upb_descriptor_SRCS = \ - upb/descriptor/descriptor.upb.c \ + upb/descriptor/descriptor.upbdefs.c \ upb/descriptor/reader.c \ upb_pb_SRCS = \ @@ -254,7 +254,7 @@ upb/descriptor/descriptor.pb: upb/descriptor/descriptor.proto protoc upb/descriptor/descriptor.proto -oupb/descriptor/descriptor.pb genfiles: upb/descriptor/descriptor.pb tools/upbc - ./tools/upbc upb/descriptor/descriptor.pb upb/descriptor/descriptor google_protobuf_descriptor + ./tools/upbc upb/descriptor/descriptor.pb $(LUA) third_party/dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) # upbc depends on these Lua extensions. |