From 256d292bf7ec7f6e55db6d373ec057fda01bb3f0 Mon Sep 17 00:00:00 2001 From: Oskari Timperi Date: Wed, 4 Apr 2018 16:57:58 +0300 Subject: Update examples and WKTs --- examples/addressbook/addressbook_pb.nim | 8 ++++---- examples/addressbook/phonenumber_pb.nim | 4 ++-- examples/simple/simple_pb.nim | 4 ++-- src/nimpb/wkt/any_pb.nim | 4 ++-- src/nimpb/wkt/api_pb.nim | 12 +++++------ src/nimpb/wkt/duration_pb.nim | 4 ++-- src/nimpb/wkt/field_mask_pb.nim | 4 ++-- src/nimpb/wkt/source_context_pb.nim | 4 ++-- src/nimpb/wkt/struct_pb.nim | 16 +++++++-------- src/nimpb/wkt/timestamp_pb.nim | 4 ++-- src/nimpb/wkt/type_pb.nim | 20 +++++++++--------- src/nimpb/wkt/wrappers_pb.nim | 36 ++++++++++++++++----------------- 12 files changed, 60 insertions(+), 60 deletions(-) diff --git a/examples/addressbook/addressbook_pb.nim b/examples/addressbook/addressbook_pb.nim index e495ada..d2255fe 100644 --- a/examples/addressbook/addressbook_pb.nim +++ b/examples/addressbook/addressbook_pb.nim @@ -138,8 +138,8 @@ proc readPerson*(stream: ProtobufStream): Person = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -214,8 +214,8 @@ proc readAddressBook*(stream: ProtobufStream): AddressBook = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/examples/addressbook/phonenumber_pb.nim b/examples/addressbook/phonenumber_pb.nim index a77d985..21c3f76 100644 --- a/examples/addressbook/phonenumber_pb.nim +++ b/examples/addressbook/phonenumber_pb.nim @@ -91,8 +91,8 @@ proc readPhoneNumber*(stream: ProtobufStream): PhoneNumber = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/examples/simple/simple_pb.nim b/examples/simple/simple_pb.nim index a2b1db3..f644fd2 100644 --- a/examples/simple/simple_pb.nim +++ b/examples/simple/simple_pb.nim @@ -90,8 +90,8 @@ proc readTest1*(stream: ProtobufStream): Test1 = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/any_pb.nim b/src/nimpb/wkt/any_pb.nim index 21a9f49..0dbc21c 100644 --- a/src/nimpb/wkt/any_pb.nim +++ b/src/nimpb/wkt/any_pb.nim @@ -75,8 +75,8 @@ proc readgoogle_protobuf_Any*(stream: ProtobufStream): google_protobuf_Any = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/api_pb.nim b/src/nimpb/wkt/api_pb.nim index 15fb7b7..d050d41 100644 --- a/src/nimpb/wkt/api_pb.nim +++ b/src/nimpb/wkt/api_pb.nim @@ -227,8 +227,8 @@ proc readgoogle_protobuf_Method*(stream: ProtobufStream): google_protobuf_Method while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -331,8 +331,8 @@ proc readgoogle_protobuf_Mixin*(stream: ProtobufStream): google_protobuf_Mixin = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -543,8 +543,8 @@ proc readgoogle_protobuf_Api*(stream: ProtobufStream): google_protobuf_Api = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/duration_pb.nim b/src/nimpb/wkt/duration_pb.nim index 54b0d4c..a44389f 100644 --- a/src/nimpb/wkt/duration_pb.nim +++ b/src/nimpb/wkt/duration_pb.nim @@ -75,8 +75,8 @@ proc readgoogle_protobuf_Duration*(stream: ProtobufStream): google_protobuf_Dura while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/field_mask_pb.nim b/src/nimpb/wkt/field_mask_pb.nim index 5576d12..1218253 100644 --- a/src/nimpb/wkt/field_mask_pb.nim +++ b/src/nimpb/wkt/field_mask_pb.nim @@ -55,8 +55,8 @@ proc readgoogle_protobuf_FieldMask*(stream: ProtobufStream): google_protobuf_Fie while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/source_context_pb.nim b/src/nimpb/wkt/source_context_pb.nim index 8d58812..36c7316 100644 --- a/src/nimpb/wkt/source_context_pb.nim +++ b/src/nimpb/wkt/source_context_pb.nim @@ -51,8 +51,8 @@ proc readgoogle_protobuf_SourceContext*(stream: ProtobufStream): google_protobuf while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/struct_pb.nim b/src/nimpb/wkt/struct_pb.nim index 0d378c4..7a03ae7 100644 --- a/src/nimpb/wkt/struct_pb.nim +++ b/src/nimpb/wkt/struct_pb.nim @@ -85,8 +85,8 @@ proc readgoogle_protobuf_Struct_FieldsEntryKV(stream: ProtobufStream, tbl: Table while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 1: key = readString(stream) gotKey = true @@ -146,8 +146,8 @@ proc readgoogle_protobuf_Struct*(stream: ProtobufStream): google_protobuf_Struct while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -213,8 +213,8 @@ proc readgoogle_protobuf_ListValue*(stream: ProtobufStream): google_protobuf_Lis while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -397,8 +397,8 @@ proc readgoogle_protobuf_Value*(stream: ProtobufStream): google_protobuf_Value = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/timestamp_pb.nim b/src/nimpb/wkt/timestamp_pb.nim index d3af2b0..3e7d4e7 100644 --- a/src/nimpb/wkt/timestamp_pb.nim +++ b/src/nimpb/wkt/timestamp_pb.nim @@ -75,8 +75,8 @@ proc readgoogle_protobuf_Timestamp*(stream: ProtobufStream): google_protobuf_Tim while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/type_pb.nim b/src/nimpb/wkt/type_pb.nim index 90ea596..ac737af 100644 --- a/src/nimpb/wkt/type_pb.nim +++ b/src/nimpb/wkt/type_pb.nim @@ -198,8 +198,8 @@ proc readgoogle_protobuf_Option*(stream: ProtobufStream): google_protobuf_Option while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -475,8 +475,8 @@ proc readgoogle_protobuf_Field*(stream: ProtobufStream): google_protobuf_Field = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -692,8 +692,8 @@ proc readgoogle_protobuf_Type*(stream: ProtobufStream): google_protobuf_Type = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -828,8 +828,8 @@ proc readgoogle_protobuf_EnumValue*(stream: ProtobufStream): google_protobuf_Enu while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -997,8 +997,8 @@ proc readgoogle_protobuf_Enum*(stream: ProtobufStream): google_protobuf_Enum = while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: diff --git a/src/nimpb/wkt/wrappers_pb.nim b/src/nimpb/wkt/wrappers_pb.nim index 18c9731..80e6160 100644 --- a/src/nimpb/wkt/wrappers_pb.nim +++ b/src/nimpb/wkt/wrappers_pb.nim @@ -123,8 +123,8 @@ proc readgoogle_protobuf_Int32Value*(stream: ProtobufStream): google_protobuf_In while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -182,8 +182,8 @@ proc readgoogle_protobuf_Int64Value*(stream: ProtobufStream): google_protobuf_In while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -241,8 +241,8 @@ proc readgoogle_protobuf_DoubleValue*(stream: ProtobufStream): google_protobuf_D while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -300,8 +300,8 @@ proc readgoogle_protobuf_StringValue*(stream: ProtobufStream): google_protobuf_S while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -359,8 +359,8 @@ proc readgoogle_protobuf_BoolValue*(stream: ProtobufStream): google_protobuf_Boo while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -418,8 +418,8 @@ proc readgoogle_protobuf_BytesValue*(stream: ProtobufStream): google_protobuf_By while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -477,8 +477,8 @@ proc readgoogle_protobuf_FloatValue*(stream: ProtobufStream): google_protobuf_Fl while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -536,8 +536,8 @@ proc readgoogle_protobuf_UInt64Value*(stream: ProtobufStream): google_protobuf_U while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: @@ -595,8 +595,8 @@ proc readgoogle_protobuf_UInt32Value*(stream: ProtobufStream): google_protobuf_U while not atEnd(stream): let tag = readTag(stream) - wireType = getTagWireType(tag) - case getTagFieldNumber(tag) + wireType = wireType(tag) + case fieldNumber(tag) of 0: raise newException(InvalidFieldNumberError, "Invalid field number: 0") of 1: -- cgit v1.2.3