aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Conformance test implementation for Python.Josh Haberman2015-12-025-5/+146
|
* Merge pull request #1019 from thomasvl/correct_conformance_compileThomas Van Lenten2015-12-022-2/+8
|\ | | | | Ensure the conformance build of objc code is using the Mac OS X SDK
| * Ensure the conformance build of objc code is using the Mac OS X SDK andThomas Van Lenten2015-12-022-2/+8
|/
* Merge pull request #1000 from jskeet/any-formatJon Skeet2015-12-026-525/+894
|\ | | | | JSON handling for Any
| * Handle JSON parsing for Any.Jon Skeet2015-12-025-509/+761
| | | | | | | | This required a rework of the tokenizer to allow for a "replaying" tokenizer, basically in case the @type value comes after the data itself. This rework is nice in some ways (all the pushback and object depth logic in one place) but is a little fragile in terms of token push-back when using the replay tokenizer. It'll be fine for the scenario we need it for, but we should be careful...
| * JSON formatting for Any.Jon Skeet2015-12-022-18/+135
|/
* Merge pull request #1016 from tswast/tutorial-regionsFeng Xiao2015-12-011-3/+17
|\ | | | | Add region tags for protocol buffers tutorials.
| * Add region tags for protocol buffers tutorials.Tim Swast2015-12-011-3/+17
|/ | | | | | | | | Since these tags might be confusing, added a note that these are not part of the normal protocol buffers syntax. I also linked to the main tutorials page that uses these examples https://developers.google.com/protocol-buffers/docs/tutorials so that anyone who arrived here without going through that info first can get more explanation if they want.
* Merge pull request #998 from tswast/goexampleFeng Xiao2015-11-308-0/+410
|\ | | | | Add a Go language example.
| * 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.
* | Merge pull request #1011 from c0nk/wip-implicit-cast-fixFeng Xiao2015-11-302-6/+8
|\ \ | | | | | | Fix some narrowing implicit casts [NFC]
| * | Fix some narrowing implicit casts [NFC]Kal Conley2015-11-282-6/+8
|/ /
* | Merge pull request #1007 from dlh3/patch-1Feng Xiao2015-11-251-2/+2
|\ \ | | | | | | Fix minor typo in LazyField javadoc
| * | Fix typo in LazyField javadocDave Hughes2015-11-241-2/+2
|/ / | | | | "equals".equals("euqals") == false
* | Merge pull request #1005 from oon3m0oo/emscriptenFeng Xiao2015-11-242-1/+5
|\ \ | | | | | | Adds support for building protobuf with emscripten
| * | Adds support for buliding protobuf with emscripten; we just needed the ↵Craig Donner2015-11-242-1/+5
|/ / | | | | | | proper platform define used in the right place.
* | Merge pull request #1003 from sainaetr/patch-1Thomas Van Lenten2015-11-231-0/+1
|\| | | | | Update GPBProtocolBuffers.h
| * 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