aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a Go language example.Tim Swast2015-11-258-0/+410
| | | | | | | | | | | | | | | | | | This follows the other examples so that it can be used as a tutorial, such as the ones at: https://developers.google.com/protocol-buffers/docs/tutorials Even though Go generally does not use Makefiles, I added targets for the Go examples to be consistent with the other languages. Edit: Fix Travis run. Change to use $HOME instead of ~. Add protoc to path. GOPATH entry cannot start with shell metacharacter '~': "~/gocode" Edit(2): Fix Go code style to address comments.
* Update GPBProtocolBuffers.hOsman Cihangir2015-11-241-0/+1
|
* Merge pull request #1001 from thomasvl/fix_last_objc_conformance_testsThomas Van Lenten2015-11-232-7/+2
|\ | | | | Set the stream limit to the length of the data.
| * Set the stream limit to the length of the data.Thomas Van Lenten2015-11-232-7/+2
|/ | | | - Mark all conformance tests as now passing.
* Merge pull request #980 from thomasvl/obj_conformanceThomas Van Lenten2015-11-237-7/+245
|\ | | | | Add support for the conformance test for objc when run on OS X
| * Add support for the conformance test for objc when run on OS XThomas Van Lenten2015-11-187-7/+245
| |
* | Merge pull request #990 from jskeet/namingJon Skeet2015-11-2229-245/+208
|\ \ | | | | | | Tidying up reflection further
| * | Generated code changes for previous commit (basically ↵Jon Skeet2015-11-2221-22/+22
| | | | | | | | | | | | InternalBuildGeneratedFileFrom => FromGeneratedCode)
| * | Tidy up reflection in advance of attempting to implement DynamicMessage.Jon Skeet2015-11-2210-225/+188
|/ / | | | | | | | | | | | | | | | | There are corner cases where MessageDescriptor.{ClrType,Parser} will return null, and these are now documented. However, normally they *should* be implemented, even for descriptors of for dynamic messages. Ditto FieldDescriptor.Accessor. We'll still need a fair amount of work to implement dynamic messages, but this change means that the public API will be remain intact. Additionally, this change starts making use of C# 6 features in the files that it touches. This is far from exhaustive, and later PRs will have more. Generated code changes coming in the next commit.
* | Merge pull request #994 from jskeet/type-registryJon Skeet2015-11-224-0/+279
|\ \ | | | | | | Added the type registry in advance of implementing Any support.
| * | Added the type registry in advance of implementing Any support.Jon Skeet2015-11-214-0/+279
|/ / | | | | | | Biting off just this bit first as I don't need the changes from a previous PR for this part.
* | Merge pull request #988 from gabikliot/CSharp-SampleUsage-Big-FixJan Tattermusch2015-11-191-2/+5
|\ \ | | | | | | Fixed a bug in CSharp SampleUsage.
| * | Removed redundant comment.Gabriel Kliot2015-11-191-1/+0
| | |
| * | Fixed a bug in CSharp SampleUsage.Gabriel Kliot2015-11-181-1/+5
| |/
* | Merge pull request #989 from jskeet/rename-umbrellaJan Tattermusch2015-11-1910-42/+37
|\ \ | | | | | | Rename "umbrella" to "reflection" consistently.
| * | Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-1910-42/+37
| | | | | | | | | | | | This changes csharp_names.h, which will require a corresponding change in GRPC.
* | | Merge pull request #977 from lberki/masterJisi Liu2015-11-191-0/+2
|\ \ \ | |/ / |/| | add headers
| * | add headersLukacs T. Berki2015-11-161-0/+2
| | |
* | | Merge pull request #974 from jskeet/parserJon Skeet2015-11-1925-122/+244
|\ \ \ | | | | | | | | Parser property in MessageDescriptor
| * | | Finished an implementation commentJon Skeet2015-11-191-1/+3
| | | |
| * | | Generated code from previous commit.Jon Skeet2015-11-1920-105/+107
| | | |
| * | | Introduce a Parser property into MessageDescriptor, and populate it from ↵Jon Skeet2015-11-195-17/+135
|/ / / | | | | | | | | | | | | | | | generated types. Generated code coming in next commit - in a subsequent PR I want to do a bit of renaming and redocumenting around this, in anticipation of DynamicMessage.
* | | Merge pull request #944 from jskeet/umbrella-classnameJon Skeet2015-11-1931-524/+454
|\ \ \ | |_|/ |/| | Change the way the "umbrella class" (descriptors) is named/namespaced
| * | Generated code changes and manual changes for previous commit.Jon Skeet2015-11-0928-468/+442
| | |
| * | Change how the reflection descriptor class is generated.Jon Skeet2015-11-093-56/+12
| | | | | | | | | | | | | | | Instead of having a Proto nested namespace to avoid conflicts between the descriptor-holding static class and message classes, just append "Reflection" to the name. Generated code changes (and corresponding manual changes) in following commit.
* | | Merge pull request #984 from thomasvl/prefix_validation_tweaksThomas Van Lenten2015-11-181-50/+51
|\ \ \ | | | | | | | | Reorder the checks so anything in the expected file is an implicit whitelisting
| * | | Reorder the checks so anything in the expected file is an implicit whitelisting.Thomas Van Lenten2015-11-171-50/+51
| | | | | | | | | | | | | | | | | | | | | | | | In the old flow, any 2 char prefix in the expected file was still generating a warning about being a poor prefix. Now we check the expected file first, so anything expected is let through.
* | | | Merge pull request #982 from pherl/bazel_testJisi Liu2015-11-171-0/+1
|\ \ \ \ | |/ / / |/| | | Make the cc wkt proto target public.
| * | | Make the cc wkt proto target public.Jisi Liu2015-11-171-0/+1
| | | |
* | | | Merge pull request #978 from thomasvl/conformance_tweaksJoshua Haberman2015-11-173-4/+17
|\ \ \ \ | |_|_|/ |/| | | Cleanups of deps and ignores for conformance
| * | | Cleanups of deps and ignores for conformanceThomas Van Lenten2015-11-163-4/+17
|/ / / | | | | | | | | | | | | | | | - Hopefully complete the deps for other languages for the generated conformance proto sources. - List the generated sources for cleanup by make's clean rules. - Make the toplevel nuke the pyc files that can get created in the ObjC dir.
* | | Merge pull request #960 from thomasvl/xctool_supportThomas Van Lenten2015-11-091-6/+43
|\ \ \ | | | | | | | | Switch ObjC Travis testing to using xctool
| * | | Switch ObjC Travis testing to using xctoolThomas Van Lenten2015-11-091-6/+43
|/ / / | | | | | | | | | | | | | | | | | | | | | xctool is preinstalled on the Travis OS X images and it seems to do better with iOS simulator flake, so use it instead of xcodebuild. xctool also is less chatty compared to xcodebuild, so it makes the logs a little easier to read.
* | | Merge pull request #959 from thomasvl/travis_mac2Thomas Van Lenten2015-11-092-1/+34
|\ \ \ | |_|/ |/| | Add ObjC build to travis setup
| * | Add ObjC build to travis setupThomas Van Lenten2015-11-092-1/+34
|/ / | | | | | | | | - Add objc for iOS and OS X builds to travis configs. - Update handing of python install to deal with newer OS X versions.
* | Merge pull request #954 from jskeet/blank-lines-in-commentsJan Tattermusch2015-11-0811-2/+133
|\ \ | | | | | | Stop removing all blank lines in doc comments.
| * | Generated code for previous commit.Jon Skeet2015-11-0610-0/+115
| | |
| * | Stop removing all blank lines in doc comments.Jon Skeet2015-11-061-2/+18
| | | | | | | | | | | | | | | | | | This fixes issue #832. Generated code changes in next commit.
* | | Merge pull request #949 from thomasvl/newer_simsPaul Yang2015-11-061-17/+51
|\ \ \ | |/ / |/| | Tweaks to the Mac build script
| * | Tweaks to the Mac build scriptThomas Van Lenten2015-11-051-17/+51
| | | | | | | | | | | | | | | | | | - Support building with Xcode 6.4 or 7.x - Fix an error in usage info. - Add a flag to build the core parts of protobuf only.
* | | Merge pull request #941 from jskeet/recursion-limitJan Tattermusch2015-11-056-15/+135
|\ \ \ | | | | | | | | Add recursion limit handling to JSON parsing.
| * | | Reimplement JSON recursion by detecting the depth in the tokenizer.Jon Skeet2015-11-054-34/+124
| | | | | | | | | | | | | | | | Added a TODO around a possible change to the tokenizer API, changing PushBack(token) into just Rewind() or something similar.
| * | | Add recursion limit handling to JSON parsing.Jon Skeet2015-11-043-44/+74
| | | | | | | | | | | | | | | | Fixes issue #932.
* | | | Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtimeFeng Xiao2015-11-051-0/+2
|\ \ \ \ | |_|/ / |/| | | include plugin.proto and generated code in protobuf-java
| * | | include plugin.proto and generated code in protobuf-javaJoshua Humphries2015-11-051-0/+2
|/ / /
* | | Merge pull request #940 from jskeet/json-namesJon Skeet2015-11-052-6/+16
|\ \ \ | | | | | | | | Move the creation of the "fields by JSON name" dictionary to the descriptor
| * | | Move the creation of the "fields by JSON name" dictionary to the descriptor.Jon Skeet2015-11-042-6/+16
| |/ /
* | | Merge pull request #942 from jskeet/json-exceptionJan Tattermusch2015-11-058-40/+111
|\ \ \ | | | | | | | | Created a new exception for JSON failures.
| * | | Created a new exception for JSON failures.Jon Skeet2015-11-058-40/+111
| |/ / | | | | | | | | | | | | | | | This is only thrown directly by JsonTokenizer, but surfaces from JsonParser as well. I've added doc comments to hopefully make everything clear. The exception is actually thrown by the reader within JsonTokenizer, in anticipation of keeping track of the location within the document, but that change is not within this PR.
* | | Merge pull request #943 from thomasvl/conformancePaul Yang2015-11-052-1/+6
|\ \ \ | |/ / |/| | Update the Mac build script to include the conformance tests