diff options
| author | Oskari Timperi <oskari.timperi@iki.fi> | 2018-04-04 19:31:57 +0300 |
|---|---|---|
| committer | Oskari Timperi <oskari.timperi@iki.fi> | 2018-04-04 19:31:57 +0300 |
| commit | 242470f1aec66c967a774355b9a36b3f6bf83e1e (patch) | |
| tree | d8e35a114de42643a4e9c8ee33cc72c4f0dbadee /examples/addressbook/phonenumber_pb.nim | |
| parent | fb2830b23a89c6a511a089c2b045820e74bb5b9a (diff) | |
| download | nimpb-242470f1aec66c967a774355b9a36b3f6bf83e1e.tar.gz nimpb-242470f1aec66c967a774355b9a36b3f6bf83e1e.zip | |
Don't generate procs for enums, use generic ones from nimpb.nim
Diffstat (limited to 'examples/addressbook/phonenumber_pb.nim')
| -rw-r--r-- | examples/addressbook/phonenumber_pb.nim | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/examples/addressbook/phonenumber_pb.nim b/examples/addressbook/phonenumber_pb.nim index 21c3f76..b09f1a0 100644 --- a/examples/addressbook/phonenumber_pb.nim +++ b/examples/addressbook/phonenumber_pb.nim @@ -15,18 +15,6 @@ type number: string ftype: PhoneType -proc readPhoneType*(stream: ProtobufStream): PhoneType = - PhoneType(readUInt32(stream)) - -proc writePhoneType*(stream: ProtobufStream, value: PhoneType) = - writeUInt32(stream, uint32(value)) - -proc writePhoneType*(stream: ProtobufStream, value: PhoneType, fieldNumber: int) = - writeUInt32(stream, uint32(value), fieldNumber) - -proc sizeOfPhoneType*(value: PhoneType): uint64 = - sizeOfUInt32(uint32(value)) - proc newPhoneNumber*(): PhoneNumber proc writePhoneNumber*(stream: ProtobufStream, message: PhoneNumber) proc readPhoneNumber*(stream: ProtobufStream): PhoneNumber @@ -78,13 +66,13 @@ proc sizeOfPhoneNumber*(message: PhoneNumber): uint64 = result = result + sizeOfString(message.number) if hasftype(message): result = result + sizeOfTag(2, WireType.Varint) - result = result + sizeOfPhoneType(message.ftype) + result = result + sizeOfEnum[PhoneType](message.ftype) proc writePhoneNumber*(stream: ProtobufStream, message: PhoneNumber) = if hasnumber(message): writeString(stream, message.number, 1) if hasftype(message): - writePhoneType(stream, message.ftype, 2) + writeEnum(stream, message.ftype, 2) proc readPhoneNumber*(stream: ProtobufStream): PhoneNumber = result = newPhoneNumber() @@ -100,7 +88,7 @@ proc readPhoneNumber*(stream: ProtobufStream): PhoneNumber = setnumber(result, readString(stream)) of 2: expectWireType(wireType, WireType.Varint) - setftype(result, readPhoneType(stream)) + setftype(result, readEnum[PhoneType](stream)) else: skipField(stream, wireType) proc serialize*(message: PhoneNumber): string = |
