diff options
| author | Jon Skeet <jonskeet@google.com> | 2015-09-04 12:41:14 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-11-03 19:05:11 +0000 |
| commit | fb2488225fbd239f7880e3b493cbfd2f19da755b (patch) | |
| tree | e51173d483b91a77708dd3bdbffa1577bf89bbec /Makefile.am | |
| parent | aa3675415ec8da317793a3e151e44daaebc21ff8 (diff) | |
| download | protobuf-fb2488225fbd239f7880e3b493cbfd2f19da755b.tar.gz protobuf-fb2488225fbd239f7880e3b493cbfd2f19da755b.tar.bz2 protobuf-fb2488225fbd239f7880e3b493cbfd2f19da755b.zip | |
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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 62233012..7db38f05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,6 +82,8 @@ csharp_EXTRA_DIST= \ csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj \ csharp/src/Google.Protobuf.Test/IssuesTest.cs \ csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs \ + csharp/src/Google.Protobuf.Test/JsonParserTest.cs \ + csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs \ csharp/src/Google.Protobuf.Test/Properties/AppManifest.xml \ csharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs \ csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs \ @@ -119,6 +121,9 @@ csharp_EXTRA_DIST= \ csharp/src/Google.Protobuf/IMessage.cs \ csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs \ csharp/src/Google.Protobuf/JsonFormatter.cs \ + csharp/src/Google.Protobuf/JsonParser.cs \ + csharp/src/Google.Protobuf/JsonToken.cs \ + csharp/src/Google.Protobuf/JsonTokenizer.cs \ csharp/src/Google.Protobuf/LimitedInputStream.cs \ csharp/src/Google.Protobuf/MessageExtensions.cs \ csharp/src/Google.Protobuf/MessageParser.cs \ |