aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | Update the Mac build script to include the conformance testsThomas Van Lenten2015-11-042-1/+6
|/ / | | | | | | | | - Kick off the conformance tests - Add missing ignore for something generated by a build on the conformance directory.
* | Merge pull request #923 from jskeet/json-parsingJon Skeet2015-11-0317-22/+2915
|\ \ | | | | | | Implement JSON parsing in C#.
| * | Implement JSON parsing in C#.Jon Skeet2015-11-0317-22/+2915
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes all the well-known types except Any. Some aspects are likely to require further work when the details of the JSON parsing expectations are hammered out in more detail. Some of these have "ignored" tests already. Note that the choice *not* to use Json.NET was made for two reasons: - Going from 0 dependencies to 1 dependency is a big hit, and there's not much benefit here - Json.NET parses more leniently than we'd want; accommodating that would be nearly as much work as writing the tokenizer This only really affects the JsonTokenizer, which could be replaced by Json.NET. The JsonParser code would be about the same length with Json.NET... but I wouldn't be as confident in it.
* | | Merge pull request #936 from andrewharp/patch-1Feng Xiao2015-11-031-0/+1
|\ \ \ | | | | | | | | Build protoc for host platform to enable cross-compilation.
| * | | Build protoc for host platform to enable cross-compilation.Andrew Harp2015-11-031-0/+1
| |/ / | | | | | | This is necessary to run protoc on the host as a dependency for Android BUILD targets with Bazel.
* | | Merge pull request #939 from dougkwan/masterFeng Xiao2015-11-036-5/+7
|\ \ \ | |/ / |/| | Add support for POWER Linux
| * | Add support for POWER LinuxDoug Kwan2015-11-036-5/+7
|/ /
* | Merge pull request #930 from pherl/bazel_testJisi Liu2015-11-021-0/+8
|\| | | | | add warning notes for cc|py_proto_library rules.
| * add warning notes for cc|py_proto_library rules.Jisi Liu2015-11-021-0/+8
| | | | | | | | | | To mention that the interface may change or be removed when bazel has support it natively.
* | Merge pull request #931 from xfxyjwf/fix_compileFeng Xiao2015-11-023-3/+4
|\ \ | |/ |/| Fix compilation errors when built internally.
| * Fix compilation errors when built internally.Feng Xiao2015-11-023-3/+4
|/ | | | | | | | 1. mathlimits.h must be included before the inclusion of cmath (which gtest/gtest.h seems to include). 2. hash function for StringPiece doesn't work. Change-Id: I358a25d941a25b10b39fe76780eda41557699811
* Merge pull request #929 from jskeet/unsafe-internalJan Tattermusch2015-11-021-3/+3
|\ | | | | Make BytesString.Unsafe internal (which it should have been all along)
| * Make BytesString.Unsafe internal (which it should have been all along)Jon Skeet2015-11-021-3/+3
| |
* | Merge pull request #924 from bbarenblat/masterFeng Xiao2015-10-317-7/+7
|\ \ | |/ |/| Correct spelling
| * Correct spellingBenjamin Barenblat2015-10-307-7/+7
|/
* Merge pull request #905 from jskeet/wrapper-clearJan Tattermusch2015-10-303-2/+12
|\ | | | | Fix clearing wrapper type fields with reflection.
| * Fix clearing wrapper type fields with reflection.Jon Skeet2015-10-303-2/+12
|/ | | | The nullable value type fields already worked, but the use of the CLR property concealed the difference between string and StringWrapper fields.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-14 22:58:17 +0000