aboutsummaryrefslogtreecommitdiff
path: root/csharp
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos in README.md/CHANGES.txtDongjoon Hyun2016-01-111-1/+1
|
* Merge pull request #1098 from jskeet/wkt-jsonJan Tattermusch2016-01-083-63/+55
|\ | | | | Ensure all formatted well-known-type values are valid JSON
| * Ensure all formatted well-known-type values are valid JSONJon Skeet2016-01-063-63/+55
| | | | | | | | | | | | | | This involves quoting timestamp/duration/field-mask values, even when they're not in fields. It's better for consistency. Fixes issue #1097.
* | Merge pull request #1088 from jskeet/codec-pruningJan Tattermusch2016-01-081-5/+0
|\ \ | | | | | | Remove unused method in FieldCodec.
| * | Remove unused method in FieldCodec.Jon Skeet2016-01-051-5/+0
| |/ | | | | | | (The method was last used a very long time ago, if ever.)
* / Improve number handling in JSON parsingJon Skeet2016-01-062-51/+91
|/ | | | | | - Tighten up on Infinity/NaN handling in terms of whitespace handling (and test casing) - Validate that values are genuinely integers when they've been parsed from a JSON number (ignoring the fact that 1.0000000000000000001 == 1 as a double...) - Allow exponents and decimal points in string representations
* Fix C# source generation shell script and remove out of date notesJon Skeet2016-01-042-125/+1301
| | | | | The conformance tests now use types which are part of src/google/protobuf, so we need to include src in the proto path. The notes around "fix-ups" have been out of date for some time now.
* add reference generator dependencyJan Tattermusch2015-12-172-0/+14
|
* Merge pull request #1049 from jskeet/any-formatJon Skeet2015-12-1721-117/+191
|\ | | | | Handle Any formatting for diagnostic purposes
| * Generated code changes from previous commit.Jon Skeet2015-12-1519-114/+117
| |
| * Make ToString() valid without a type registryJon Skeet2015-12-152-3/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses issue #1008, by creating a JsonFormatter which is private and only different to JsonFormatter.Default in terms of reference equality. Other plausible designs: - The same, but expose the diagnostic-only formatter - Add something to settings to say "I don't have a type registry at all" - Change the behaviour of JsonFormatter.Default (bad idea IMO, as we really *don't* want the result of this used as regular JSON to be parsed) Note that just trying to find a separate fix to issue #933 and using that to override Any.ToString() differently wouldn't work for messages that *contain* an Any. Generated code changes follow in the next commit.
* | Merge pull request #1051 from jtattermusch/support_coreclrJan Tattermusch2015-12-161-19/+38
|\ \ | | | | | | Make nuget package support coreCLR
| * | make nuget package support CoreCLRJan Tattermusch2015-12-161-19/+38
| |/
* / Add JSON parsing to conformance tests.Jon Skeet2015-12-161-19/+24
|/
* 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
|
* 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-229-224/+187
| | | | | | | | | 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.
* 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
| |
* | 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-194-16/+134
| | | | | | | | | | | | 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.
* | Generated code changes and manual changes for previous commit.Jon Skeet2015-11-0927-467/+441
|/
* Generated code for previous commit.Jon Skeet2015-11-0610-0/+115
|
* 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 #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
| |/
* / Created a new exception for JSON failures.Jon Skeet2015-11-057-40/+110
|/ | | | | | 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.
* Implement JSON parsing in C#.Jon Skeet2015-11-0316-22/+2910
| | | | | | | | | | 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.
* Make BytesString.Unsafe internal (which it should have been all along)Jon Skeet2015-11-021-3/+3
|
* 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 code for previous commit (oneof case contributing to hash code and ↵Jon Skeet2015-10-246-81/+133
| | | | equality).
* Include the oneof-case in equality and hash code generated code.Jon Skeet2015-10-241-0/+10
| | | | The included C# test will fail until the regenerated code is used, which is in the next commit.
* Merge pull request #846 from jskeet/tostringJon Skeet2015-10-075-115/+203
|\ | | | | Support ToString in RepeatedField and MapField.
| * Support ToString in RepeatedField and MapField.Jon Skeet2015-10-015-115/+203
| | | | | | | | | | | | This changes how we approach JSON formatting in general - instead of looking at the field a value came from, we just look at the type of the value. It's possible this *could* be slightly inefficient, but if we start caring about JSON performance deeply, we'll probably want to rewrite all of this anyway. It's definitely simpler this way. When we support dynamic messages, we'll need to modify JsonFormatter to handle enum values, as they won't come be "real" .NET enums at that point. It shouldn't be hard to do though.
* | Generated code from previous commit.Jon Skeet2015-10-0119-0/+1945
|/
* Fix typo in oneof case enum commentJon Skeet2015-09-305-9/+9
|
* Generated code changes for previous commit.Jon Skeet2015-09-2919-34/+34
|
* Generated code for previous commitJon Skeet2015-09-2919-0/+62
|
* Added documentation to generated code.Jon Skeet2015-09-292-2/+2
| | | | | | | | | | | There are now summaries for: - The Types nested class (which holds nested types) - The file descriptor class for each proto - The enum generated for each oneof (Also fixed two typos.) Generated code in next commit.
* Merge pull request #785 from jskeet/csharp-directoriesJan Tattermusch2015-09-2320-749/+1043
|\ | | | | Generate C# directory hierarchy with new option
| * Regenerated code. Most changes are whitespace, removing trailing spaces.Jon Skeet2015-09-0119-741/+1033
| | | | | | | | Other changes are due to the well-known types changing without us regenerating.
| * Generate a directory hierarchy based on namespace (C#)Jon Skeet2015-09-011-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new C# option, base_namespace. If the option is not specified, the behaviour is as before: no directories are generated. If the option *is* specified, all C# namespaces must be relative to the base namespace, and the directories are generated relative to that namespace. Example: - Any.proto declares csharp_namespace = "Google.Protobuf.WellKnownTypes" - We build with --csharp_out=Google.Protobuf --csharp_opt=base_namespace=Google.Protobuf - The Any.cs file is generated in Google.Protobuf/WellKnownTypes (where it currently lives) We need a change to descriptor.proto before this will all work (it wasn't in the right C# namespace) but that needs the other descriptors to be regenerated too. See next commit...
* | Pack/Unpack implementation for Any.Jon Skeet2015-09-045-0/+149
|/ | | | | We still need the JSON representation, which relies on something like a DescriptorPool to fetch message types from based on the type URL. That will come a bit later. (The DescriptorPool comment in this commit is just a note which will prove useful if we use DescriptorPool itself.)
* Update README.md for C#Jan Tattermusch2015-08-261-7/+12
|