AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,063 Commits 35 Branches 138 Tags 124 MiB
af8e7ef9a3
Commit Graph

3063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Skeet
2a15051a1e Introduce a Parser property into MessageDescriptor, and populate it from 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.
 2015-11-19 08:50:28 +00:00
Jon Skeet
c581acb562 Merge pull request #944 from jskeet/umbrella-classname 
Change the way the "umbrella class" (descriptors) is named/namespaced
 2015-11-19 08:48:50 +00:00
Gabriel Kliot
09d03dfc7e Fixed a bug in CSharp SampleUsage. 2015-11-18 23:09:05 -08:00
Thomas Van Lenten
1745f7eae9 Add support for the conformance test for objc when run on OS X 2015-11-18 11:58:19 -05:00
Thomas Van Lenten
8162451b72 Merge pull request #984 from thomasvl/prefix_validation_tweaks 
Reorder the checks so anything in the expected file is an implicit whitelisting
 2015-11-18 10:43:19 -05:00
Thomas Van Lenten
2a91c64f49 Reorder the checks so anything in the expected file is an implicit whitelisting. 
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.
 2015-11-17 16:48:59 -05:00
Jisi Liu
6a3d6d9fd5 Merge pull request #982 from pherl/bazel_test 
Make the cc wkt proto target public.
 2015-11-17 12:44:29 -08:00
Jisi Liu
6a40bf89d3 Make the cc wkt proto target public. 2015-11-17 12:37:56 -08:00
Joshua Haberman
496826efa0 Merge pull request #978 from thomasvl/conformance_tweaks 
Cleanups of deps and ignores for conformance
 2015-11-17 09:50:30 +00:00
Thomas Van Lenten
42f2eee932 Cleanups of deps and ignores for conformance 
- 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.
 2015-11-16 11:29:59 -05:00
Lukacs T. Berki
915d9cd245 add headers 2015-11-16 09:36:32 +01:00
Thomas Van Lenten
8b31d7410a Merge pull request #960 from thomasvl/xctool_support 
Switch ObjC Travis testing to using xctool
 2015-11-09 17:43:24 -05:00
Thomas Van Lenten
76b61384a2 Switch ObjC Travis testing to using xctool 
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.
 2015-11-09 15:06:32 -05:00
Thomas Van Lenten
a663afb23b Merge pull request #959 from thomasvl/travis_mac2 
Add ObjC build to travis setup
 2015-11-09 14:04:49 -05:00
Thomas Van Lenten
9642b821f2 Add ObjC build to travis setup 
- Add objc for iOS and OS X builds to travis configs.
- Update handing of python install to deal with newer OS X versions.
 2015-11-09 10:54:32 -05:00
Jon Skeet
284bb452e4 Generated code changes and manual changes for previous commit. 2015-11-09 09:22:45 +00:00
Jon Skeet
61a50b9e6b Change how the reflection descriptor class is generated. 
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.
 2015-11-09 09:22:43 +00:00
Jan Tattermusch
64aa954dae Merge pull request #954 from jskeet/blank-lines-in-comments 
Stop removing all blank lines in doc comments.
 2015-11-08 19:17:08 -08:00
Paul Yang
1e54dcfc70 Merge pull request #949 from thomasvl/newer_sims 
Tweaks to the Mac build script
 2015-11-06 12:19:37 -08:00
Jon Skeet
cff900e8f9 Generated code for previous commit. 2015-11-06 18:38:31 +00:00
Jon Skeet
f4f601bd47 Stop removing all blank lines in doc comments. 
This fixes issue #832.

Generated code changes in next commit.
 2015-11-06 18:38:16 +00:00
Jan Tattermusch
ffe25c76ea Merge pull request #941 from jskeet/recursion-limit 
Add recursion limit handling to JSON parsing.
 2015-11-05 18:41:05 -08:00
Feng Xiao
1470ced7ce Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtime 
include plugin.proto and generated code in protobuf-java
 2015-11-05 16:35:34 -08:00
Thomas Van Lenten
f1a3c8fe0d Tweaks to the Mac build script 
- 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.
 2015-11-05 17:24:55 -05:00
Joshua Humphries
37b262bfb4 include plugin.proto and generated code in protobuf-java 2015-11-05 15:56:23 -05:00
Jon Skeet
6fa17e7597 Reimplement JSON recursion by detecting the depth in the tokenizer. 
Added a TODO around a possible change to the tokenizer API, changing PushBack(token) into just Rewind() or something similar.
 2015-11-05 19:44:26 +00:00
Jon Skeet
3a72a1eeaf Merge pull request #940 from jskeet/json-names 
Move the creation of the "fields by JSON name" dictionary to the descriptor
 2015-11-05 17:09:37 +00:00
Jan Tattermusch
25c045a180 Merge pull request #942 from jskeet/json-exception 
Created a new exception for JSON failures.
 2015-11-05 08:57:57 -08:00
Paul Yang
a030cc750c Merge pull request #943 from thomasvl/conformance 
Update the Mac build script to include the conformance tests
 2015-11-05 06:11:12 -08:00
Jon Skeet
0fb39c4afe Created a new exception for JSON failures. 
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.
 2015-11-05 10:40:22 +00:00
Thomas Van Lenten
f0411ec974 Update the Mac build script to include the conformance tests 
- Kick off the conformance tests
- Add missing ignore for something generated by a build on the conformance directory.
 2015-11-04 15:14:54 -05:00
Jon Skeet
3d257a9dc1 Add recursion limit handling to JSON parsing. 
Fixes issue #932.
 2015-11-04 11:30:22 +00:00
Jon Skeet
6a94273549 Move the creation of the "fields by JSON name" dictionary to the descriptor. 2015-11-04 09:09:14 +00:00
Jon Skeet
b6a32e909b Merge pull request #923 from jskeet/json-parsing 
Implement JSON parsing in C#.
 2015-11-03 22:39:08 -08:00
Feng Xiao
55ad57a235 Merge pull request #936 from andrewharp/patch-1 
Build protoc for host platform to enable cross-compilation.
 2015-11-03 15:22:12 -08:00
Feng Xiao
0cf6198cf1 Merge pull request #939 from dougkwan/master 
Add support for POWER Linux
 2015-11-03 15:21:30 -08:00
Doug Kwan
2a50e67c78 Add support for POWER Linux 2015-11-03 14:49:42 -08:00
Andrew Harp
38f131fd8c Build protoc for host platform to enable cross-compilation. 
This is necessary to run protoc on the host as a dependency for Android BUILD targets with Bazel.
 2015-11-03 16:39:32 -05:00
Jon Skeet
fb2488225f Implement JSON parsing in C#. 
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.
 2015-11-03 19:05:11 +00:00
Jisi Liu
aa3675415e Merge pull request #930 from pherl/bazel_test 
add warning notes for cc|py_proto_library rules.
 2015-11-02 15:02:39 -08:00
Feng Xiao
ec9f45b106 Merge pull request #931 from xfxyjwf/fix_compile 
Fix compilation errors when built internally.
 2015-11-02 14:10:36 -08:00
Feng Xiao
9659ea9e56 Fix compilation errors when built internally. 
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
 2015-11-02 12:39:27 -08:00
Jisi Liu
d4bef7d41b add warning notes for cc|py_proto_library rules. 
To mention that the interface may change or be removed when bazel has
support it natively.
 2015-11-02 12:24:32 -08:00
Jan Tattermusch
59635c13d9 Merge pull request #929 from jskeet/unsafe-internal 
Make BytesString.Unsafe internal (which it should have been all along)
 2015-11-02 04:49:34 -08:00
Jon Skeet
885406abcf Make BytesString.Unsafe internal (which it should have been all along) 2015-11-02 09:59:06 +00:00
Feng Xiao
8eebad1082 Merge pull request #924 from bbarenblat/master 
Correct spelling
 2015-10-31 09:41:36 -07:00
Benjamin Barenblat
a2ce9cb9ea Correct spelling 2015-10-30 14:05:24 -04:00
Jan Tattermusch
46f8a79826 Merge pull request #905 from jskeet/wrapper-clear 
Fix clearing wrapper type fields with reflection.
 2015-10-30 07:33:39 -07:00
Jon Skeet
f5a0a7feeb Fix clearing wrapper type fields with reflection. 
The nullable value type fields already worked, but the use of the CLR property concealed the difference between string and StringWrapper fields.
 2015-10-30 09:37:01 +00:00
Feng Xiao
a74e912a8b Merge pull request #922 from randomascii/master 
Get VS 2015 to use const int definitions
 2015-10-29 14:53:17 -07:00