Don't generate procs for enums, use generic ones from nimpb.nim

2 files changed, 6 insertions, 30 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 =
diff --git a/examples/simple/simple_pb.nim b/examples/simple/simple_pb.nim
index f644fd2..0b1a056 100644
--- a/examples/simple/simple_pb.nim
+++ b/examples/simple/simple_pb.nim
@@ -14,18 +14,6 @@ type
         a: int32
         e: Test1_MyEnum
 
-proc readTest1_MyEnum*(stream: ProtobufStream): Test1_MyEnum =
-    Test1_MyEnum(readUInt32(stream))
-
-proc writeTest1_MyEnum*(stream: ProtobufStream, value: Test1_MyEnum) =
-    writeUInt32(stream, uint32(value))
-
-proc writeTest1_MyEnum*(stream: ProtobufStream, value: Test1_MyEnum, fieldNumber: int) =
-    writeUInt32(stream, uint32(value), fieldNumber)
-
-proc sizeOfTest1_MyEnum*(value: Test1_MyEnum): uint64 =
-    sizeOfUInt32(uint32(value))
-
 proc newTest1*(): Test1
 proc writeTest1*(stream: ProtobufStream, message: Test1)
 proc readTest1*(stream: ProtobufStream): Test1
@@ -77,13 +65,13 @@ proc sizeOfTest1*(message: Test1): uint64 =
         result = result + sizeOfInt32(message.a)
     if hase(message):
         result = result + sizeOfTag(2, WireType.Varint)
-        result = result + sizeOfTest1_MyEnum(message.e)
+        result = result + sizeOfEnum[Test1_MyEnum](message.e)
 
 proc writeTest1*(stream: ProtobufStream, message: Test1) =
     if hasa(message):
         writeInt32(stream, message.a, 1)
     if hase(message):
-        writeTest1_MyEnum(stream, message.e, 2)
+        writeEnum(stream, message.e, 2)
 
 proc readTest1*(stream: ProtobufStream): Test1 =
     result = newTest1()
@@ -99,7 +87,7 @@ proc readTest1*(stream: ProtobufStream): Test1 =
             seta(result, readInt32(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            sete(result, readTest1_MyEnum(stream))
+            sete(result, readEnum[Test1_MyEnum](stream))
         else: skipField(stream, wireType)
 
 proc serialize*(message: Test1): string =