aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Tweaks to Profile259 supportJon Skeet2015-07-286-11/+303
| | | | | | - Fix nupec paths - Remove an obsolete part of the JSON build - Add documentation and tests to reflection extension methods, and improve implementations
* First attempt at using profile 259 for Google.Protobuf.Jon Skeet2015-07-2714-15/+146
| | | | | | | | This requires .NET 4.5, and there are a few compatibility changes required around reflection. Creating a PR from this to see how our CI systems handle it. Will want to add more documentation, validation and probably tests before merging. This is in aid of issue #590.
* Merge pull request #641 from jtattermusch/csharp_descriptor_databaseJon Skeet2015-07-252-4/+21
|\ | | | | Expose original binary data for file descriptor
| * expose original binary data for filedescriptorJan Tattermusch2015-07-242-4/+21
|/
* Merge pull request #634 from jskeet/reflection2Jon Skeet2015-07-239-199/+342
|\ | | | | Reflection part 2 - for discussion
| * Implemented Jan's suggestion of FieldCollection, replacing ↵Jon Skeet2015-07-226-119/+128
| | | | | | | | | | | | | | | | | | | | FieldAccessorCollection. I think Jan was actually suggesting keeping both, but that feels redundant to me. The test diff is misleading here IMO, because I wouldn't expect real code using reflection to use several accessors one after another like this, unless it was within a loop. Evidence to the contrary would be welcome :) This change also incidentally goes part way to fixing the issue of the JSON formatter not writing out the fields in field number order - with this change, it does except for oneofs, which we can fix in a follow-up change. I haven't actually added a test with a message with fields deliberately out of order - I'm happy to do so though. It feels like it would make sense to be in google/src/protobuf, but it's not entirely clear what the rules of engagement are for adding new messages there. (unittest_proto3.proto?)
| * Added newlinesJon Skeet2015-07-222-2/+2
| |
| * First pass at making field access simpler.Jon Skeet2015-07-227-175/+309
|/ | | | This is definitely not ready to ship - I'm "troubled" by the disconnect between a list of fields in declaration order, and a mapping of field accessors by field number/name. Discussion required, but I find that easier when we've got code to look at :)
* Merge pull request #625 from jskeet/reflection-refactorJan Tattermusch2015-07-2248-1274/+772
|\ | | | | Reflection refactor
| * Fix typo in Makefile.amJon Skeet2015-07-221-1/+1
| |
| * Fix attribute mistake and regenerate code.Jon Skeet2015-07-224-10/+0
| |
| * Fix file lists for C#Jon Skeet2015-07-221-1/+1
| |
| * Generated code for previous commit.Jon Skeet2015-07-2217-511/+129
| |
| * Remove the usage of attributes for field/method discovery.Jon Skeet2015-07-2222-405/+243
| | | | | | | | Instead, introduce GeneratedCodeInfo which passes in what we need, and adjust the codegen to take account of this.
| * Fix comment typoJon Skeet2015-07-211-1/+1
| |
| * Generated code changes following previous commit.Jon Skeet2015-07-2118-728/+686
| |
| * Revamp to reflection.Jon Skeet2015-07-2135-278/+372
|/ | | | | | | | | | | | | | | | | Changes in brief: 1. Descriptor is now the entry point for all reflection. 2. IReflectedMessage has gone; there's now a Descriptor property in IMessage, which is explicitly implemented (due to the static property). 3. FieldAccessorTable has gone away 4. IFieldAccessor and OneofFieldAccessor still exist; we *could* put the functionality straight into FieldDescriptor and OneofDescriptor... I'm unsure about that. 5. There's a temporary property MessageDescriptor.FieldAccessorsByFieldNumber to make the test changes small - we probably want this to go away 6. Discovery for delegates is now via attributes applied to properties and the Clear method of a oneof I'm happy with 1-3. 4 I'm unsure about - feedback welcome. 5 will go away 6 I'm unsure about, both in design and implementation. Should we have a ProtobufMessageAttribute too? Should we find all the relevant attributes in MessageDescriptor and pass them down, to avoid an O(N^2) scenario? Generated code changes coming in the next commit.
* Merge pull request #629 from google/masterJon Skeet2015-07-2136-2000/+2393
|\ | | | | Integrate changes from upstream/master into csharp-experimental
| * Merge pull request #627 from jtattermusch/addressbook_proto3Jan Tattermusch2015-07-207-26/+26
| |\ | | | | | | Update addressbook.proto and examples code to proto3
| | * rename persons to peopleJan Tattermusch2015-07-207-8/+8
| | |
| | * use Google.Protobuf namespace for C#Jan Tattermusch2015-07-201-1/+1
| | |
| | * fixed java exampleJan Tattermusch2015-07-202-5/+5
| | |
| | * fix python exampleJan Tattermusch2015-07-202-5/+5
| | |
| | * fix C++ exampleJan Tattermusch2015-07-202-7/+7
| | |
| | * update addressbook.proto to proto3Jan Tattermusch2015-07-201-8/+8
| | |
| * | Merge pull request #621 from nico/staticassJisi Liu2015-07-201-2/+4
| |\ \ | | |/ | |/| Let GOOGLE_COMPILE_ASSERT use static_assert if available.
| | * Let GOOGLE_COMPILE_ASSERT use static_assert if available.Nico Weber2015-07-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation is that gcc 4.8+ and clang trunk warn on unused local typedefs, which COMPILE_ASSERT adds. After this change, the warning will be happy at least in C++11 builds. static_assert also produces a slighly nicer diagnostic than the typedef method. https://github.com/google/re2/commit/eb93e8bc43ac8d05322fb3e9fc885898ad924f8a did the same change in re2.
| * | Merge pull request #604 from haberman/ruby-conformanceJoshua Haberman2015-07-2016-579/+694
| |\ \ | | | | | | | | Added Ruby to conformance tests.
| | * | Fixed lint errors and responded to CR comments.Josh Haberman2015-07-172-27/+30
| | | | | | | | | | | | | | | | Change-Id: If7b1cc0f03f609a7f43ddafc8509b44207c60910
| | * | Exclude JRuby from conformance tests for now.Josh Haberman2015-07-171-7/+16
| | | | | | | | | | | | | | | | Change-Id: Id008ebac5159f773e1bde8b85acb2626cbd16de8
| | * | Added Ruby to conformance tests.Josh Haberman2015-07-1616-575/+678
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involved fixing a few important bugs in the Ruby implementation -- mostly cases of mixing upb field types and descriptor types (upb field types do not distinguish between int/sint/fixed/sfixed like descriptor types do). Also added protobuf-specific exceptions so parse errors can be caught specifically. Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036
| * | | Merge pull request #622 from pherl/splitheadersJisi Liu2015-07-172-0/+2
| |\ \ \ | | |_|/ | |/| | Addming missing includes in stubs headers.
| | * | Addming missing includes in stubs headers.Jisi Liu2015-07-172-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is to prepare removing those additional headers in common.h Change-Id: I707d6d8eaf193eb28195a827c7fec738b968ab3e
| * | | Merge pull request #613 from pherl/splitheadersJisi Liu2015-07-1710-1404/+1640
| |\| | | | | | | | | | Split up common.h headers
| | * | update header list.Jisi Liu2015-07-171-0/+3
| | | | | | | | | | | | | | | | Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
| | * | Merge branch 'master' of github.com:google/protobuf into splitheaderJisi Liu2015-07-171-0/+3
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
| | * | | Update make file for extra headers.Jisi Liu2015-07-172-0/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
| | * | | Split up common.h headersJisi Liu2015-07-168-1404/+1625
| | | |/ | | |/| | | | | | | | | Change-Id: I223783111d743aa5193bf70fa1b9b54c7b4389c3
| * | | Merge pull request #601 from anandolee/masterJie Luo2015-07-172-0/+35
| |\ \ \ | | |_|/ | |/| | ignore UTF-8 BOM
| | * | ignore UTF-8 BOM if it is in the begining of a proto fileJie Luo2015-07-162-0/+35
| | |/
| * / Install missing headersRob Earhart2015-07-141-0/+3
| |/ | | | | | | | | | | Install google/protobuf/stubs/status.h, and google/protobuf/stubs/stringpiece.h -- these are required in order to include google/protobuf/util/type_resolver.h. Install google/protobuf/stubs/bytestream.h -- this is required in order to include google/protobuf/util/json_util.h.
* | Merge pull request #628 from jtattermusch/csharp_addressbook_updateJan Tattermusch2015-07-205-47/+47
|\ \ | | | | | | C# addressbook update
| * | update addressbook exampleJan Tattermusch2015-07-203-6/+6
| | |
| * | regenerate Addressbook.csJan Tattermusch2015-07-201-39/+39
| | |
| * | update addressbook.protoJan Tattermusch2015-07-201-2/+2
|/ /
* | Merge pull request #624 from jskeet/wkt-jsonJan Tattermusch2015-07-203-1/+80
|\ \ | | | | | | First part of JSON formatting for well-known types.
| * | First part of JSON formatting for well-known types. I think we need a ↵Jon Skeet2015-07-203-1/+80
|/ / | | | | | | reflection API rethink before doing the rest.
* | Merge pull request #620 from google/jtattermusch-patch-2Jon Skeet2015-07-171-1/+1
|\ \ | | | | | | Fix typo in buildall.sh
| * | Fix typo in buildall.shJan Tattermusch2015-07-171-1/+1
|/ /
* | Merge pull request #616 from jskeet/renameJan Tattermusch2015-07-17101-142/+135
|\ \ | | | | | | First pass at the big rename from ProtocolBuffers to Google.Protobuf.