diff options
| -rw-r--r-- | csharp/Google.Protobuf.Tools.nuspec | 37 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs | 1 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs | 1 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.nuspec | 14 | ||||
| -rw-r--r-- | objectivec/GPBCodedInputStream.h | 9 | ||||
| -rw-r--r-- | objectivec/GPBCodedInputStream.m | 8 |
6 files changed, 54 insertions, 16 deletions
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec new file mode 100644 index 00000000..2b66b081 --- /dev/null +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<package> + <metadata> + <id>Google.Protobuf.Tools</id> + <title>Google Protocol Buffers tools</title> + <summary>Tools for Protocol Buffers - Google's data interchange format.</summary> + <description>See project site for more info.</description> + <version>3.0.0-beta2</version> + <authors>Google Inc.</authors> + <owners>protobuf-packages</owners> + <licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl> + <projectUrl>https://github.com/google/protobuf</projectUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <releaseNotes>Tools for Protocol Buffers</releaseNotes> + <copyright>Copyright 2015, Google Inc.</copyright> + <tags>Protocol Buffers Binary Serialization Format Google proto proto3</tags> + </metadata> + <files> + <file src="protoc\windows_x86\protoc.exe" target="tools\windows_x86\protoc.exe" /> + <file src="protoc\windows_x64\protoc.exe" target="tools\windows_x64\protoc.exe" /> + <file src="protoc\linux_x86\protoc" target="tools\linux_x86\protoc" /> + <file src="protoc\linux_x64\protoc" target="tools\linux_x64\protoc" /> + <file src="protoc\macosx_x86\protoc" target="tools\macosx_x86\protoc" /> + <file src="protoc\macosx_x64\protoc" target="tools\macosx_x64\protoc" /> + <file src="..\src\google\protobuf\any.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\api.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\descriptor.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\duration.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\empty.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\field_mask.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\source_context.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\struct.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\timestamp.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\type.proto" target="tools\google\protobuf" /> + <file src="..\src\google\protobuf\wrappers.proto" target="tools\google\protobuf" /> + </files> +</package>
\ No newline at end of file diff --git a/csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs b/csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs index 42455043..344d727b 100644 --- a/csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs +++ b/csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs @@ -321,7 +321,6 @@ namespace Google.Protobuf [TestCase("1970-01-01T00:00:00.001Z", 1000000)] [TestCase("1970-01-01T00:00:00.010Z", 10000000)] [TestCase("1970-01-01T00:00:00.100Z", 100000000)] - [TestCase("1970-01-01T00:00:00.100Z", 100000000)] [TestCase("1970-01-01T00:00:00.120Z", 120000000)] [TestCase("1970-01-01T00:00:00.123Z", 123000000)] [TestCase("1970-01-01T00:00:00.123400Z", 123400000)] diff --git a/csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs b/csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs index a0a62227..527ab336 100644 --- a/csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs +++ b/csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs @@ -249,7 +249,6 @@ namespace Google.Protobuf [TestCase("[,", 1)] [TestCase("{", 1)] [TestCase("{,", 1)] - [TestCase("{", 1)] [TestCase("{[", 1)] [TestCase("{{", 1)] [TestCase("{0", 1)] diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.nuspec b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec index d5302544..f51bc89a 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.nuspec +++ b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec @@ -23,7 +23,6 @@ <group targetFramework="xamarin.ios" /> <group targetFramework="monotouch" /> <group targetFramework="monoandroid" /> - <!-- Dependencies for newer, more granular platforms (.NET Core etc) --> <group targetFramework="dotnet"> <dependency id="System.Collections" version="4.0.0" /> @@ -49,18 +48,5 @@ <file src="bin/ReleaseSigned/Google.Protobuf.pdb" target="lib/dotnet" /> <file src="bin/ReleaseSigned/Google.Protobuf.xml" target="lib/dotnet" /> <file src="**\*.cs" target="src" /> - <file src="..\..\..\cmake\Release\protoc.exe" target="tools" /> - <file src="..\..\..\src\google\protobuf\any.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\api.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\descriptor.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\duration.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\empty.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\field_mask.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\source_context.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\struct.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\timestamp.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\any.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\type.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\wrappers.proto" target="tools\google\protobuf" /> </files> </package>
\ No newline at end of file diff --git a/objectivec/GPBCodedInputStream.h b/objectivec/GPBCodedInputStream.h index 06198883..d64b64e3 100644 --- a/objectivec/GPBCodedInputStream.h +++ b/objectivec/GPBCodedInputStream.h @@ -109,6 +109,15 @@ NS_ASSUME_NONNULL_BEGIN /// or until an endgroup tag, whichever comes first. - (void)skipMessage; +/// Check to see if the logical end of the stream has been reached. +/// +/// This can return NO when there is no more data, but the current parsing +/// expected more data. +- (BOOL)isAtEnd; + +/// The offset into the stream. +- (size_t)position; + /// Verifies that the last call to @c -readTag returned the given tag value. /// This is used to verify that a nested group ended with the correct end tag. /// Throws @c NSParseErrorException if value does not match the last tag. diff --git a/objectivec/GPBCodedInputStream.m b/objectivec/GPBCodedInputStream.m index fd877838..eaa28e50 100644 --- a/objectivec/GPBCodedInputStream.m +++ b/objectivec/GPBCodedInputStream.m @@ -359,6 +359,14 @@ void GPBCodedInputStreamCheckLastTagWas(GPBCodedInputStreamState *state, } } +- (BOOL)isAtEnd { + return GPBCodedInputStreamIsAtEnd(&state_); +} + +- (size_t)position { + return state_.bufferPos; +} + - (double)readDouble { return GPBCodedInputStreamReadDouble(&state_); } |