Updated protoc-gen to Swift 2.0

Author: dutcher

JSONSerializerSwiftTests/Test.swift

@@ -1,34 +1,29 @@
 import JSONSerializerSwift
-// PASTE GENERATED CODE BELOW :
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: template.proto
-
-/**
-* @fileoverview Generated Protocol Buffer code for file template.proto.
-*/
 
 public func ==(a: DemoMessage, b: DemoMessage) -> Bool {
     return (
-        a.demoDouble == b.demoDouble
-     && a.demoInt32 == b.demoInt32
-     && a.demoInt64 == b.demoInt64
-     && a.demoBool == b.demoBool
-     && a.demoString == b.demoString
-     && a.demoNestedMessage == b.demoNestedMessage
-     && a.demoRepeated == b.demoRepeated
-     && a.demoRepeatedNestedMessage == b.demoRepeatedNestedMessage
+        a.sizeInBytes == b.sizeInBytes
+            && a.demoDouble == b.demoDouble
+            && a.demoInt32 == b.demoInt32
+            && a.demoInt64 == b.demoInt64
+            && a.demoBool == b.demoBool
+            && a.demoString == b.demoString
+            && a.demoNestedMessage == b.demoNestedMessage
+            && a.demoRepeated == b.demoRepeated
+            && a.demoRepeatedNestedMessage == b.demoRepeatedNestedMessage
     )
 }
 
 public func ==(a: DemoMessage.DemoNestedMessage, b: DemoMessage.DemoNestedMessage) -> Bool {
     return (
-        a.nestedString == b.nestedString
-     && a.nestedInt32 == b.nestedInt32
+        a.sizeInBytes == b.sizeInBytes
+            && a.nestedString == b.nestedString
+            && a.nestedInt32 == b.nestedInt32
     )
 }
 
 public class DemoMessage: Equatable {
+    public let sizeInBytes: Int
     public let demoDouble: Float64?
     public let demoInt32: Int?
     public let demoInt64: Int?
@@ -38,7 +33,8 @@ public class DemoMessage: Equatable {
     public let demoRepeated: [String]
     public let demoRepeatedNestedMessage: [DemoNestedMessage]!
 
-    init(demoDouble: Float64?, demoInt32: Int?, demoInt64: Int?, demoBool: Bool?, demoString: String?, demoNestedMessage: DemoNestedMessage?, demoRepeated: [String], demoRepeatedNestedMessage: [DemoNestedMessage]!) {
+    init(sizeInBytes: Int, demoDouble: Float64?, demoInt32: Int?, demoInt64: Int?, demoBool: Bool?, demoString: String?, demoNestedMessage: DemoNestedMessage?, demoRepeated: [String], demoRepeatedNestedMessage: [DemoNestedMessage]!) {
+        self.sizeInBytes = sizeInBytes
         self.demoDouble = demoDouble
         self.demoInt32 = demoInt32
         self.demoInt64 = demoInt64
@@ -90,6 +86,7 @@ public class DemoMessage: Equatable {
 
         if let v = self.demoNestedMessage {
             w.writeTag(50)
+            w.writeVarInt(v.sizeInBytes)
             v.toWriter(w)
         }
 
@@ -100,6 +97,7 @@ public class DemoMessage: Equatable {
 
         for v in self.demoRepeatedNestedMessage {
             w.writeTag(66)
+            w.writeVarInt(v.sizeInBytes)
             v.toWriter(w)
         }
 
@@ -142,30 +140,68 @@ public class DemoMessage: Equatable {
             case 42:
                 demoString = r.readString()
             case 50:
+                let limit = r.pushLimit(r.readVarInt())
                 demoNestedMessage = DemoMessage.DemoNestedMessage.fromReader(r)
+                r.popLimit(limit)
             case 58:
                 demoRepeated.append(r.readString())
             case 66:
+                let limit = r.pushLimit(r.readVarInt())
                 demoRepeatedNestedMessage.append(DemoMessage.DemoNestedMessage.fromReader(r))
+                r.popLimit(limit)
             default:
                 break loop
             }
         }
 
         r.popTagMap()
 
-        return DemoMessage(demoDouble: demoDouble, demoInt32: demoInt32, demoInt64: demoInt64, demoBool: demoBool, demoString: demoString, demoNestedMessage: demoNestedMessage, demoRepeated: demoRepeated, demoRepeatedNestedMessage: demoRepeatedNestedMessage)
+        let sizeInBytes = DemoMessage.sizeOf(demoDouble, demoInt32: demoInt32, demoInt64: demoInt64, demoBool: demoBool, demoString: demoString, demoNestedMessage: demoNestedMessage, demoRepeated: demoRepeated, demoRepeatedNestedMessage: demoRepeatedNestedMessage)
+        return DemoMessage(sizeInBytes: sizeInBytes, demoDouble: demoDouble, demoInt32: demoInt32, demoInt64: demoInt64, demoBool: demoBool, demoString: demoString, demoNestedMessage: demoNestedMessage, demoRepeated: demoRepeated, demoRepeatedNestedMessage: demoRepeatedNestedMessage)
+    }
+    
+    class func sizeOf(demoDouble: Float64?, demoInt32: Int?, demoInt64: Int?, demoBool: Bool?, demoString: String?, demoNestedMessage: DemoNestedMessage?, demoRepeated: [String], demoRepeatedNestedMessage: [DemoNestedMessage]!) -> Int {
+        var n = 0
+        
+        if let _ = demoDouble {
+            n += 1 + 8
+        }
+        if let v = demoInt32 {
+            n += 1 + sizeOfVarInt(Int(v))
+        }
+        if let v = demoInt64 {
+            n += 1 + sizeOfVarInt(Int(v))
+        }
+        if let _ = demoBool {
+            n += 1 + 1
+        }
+        if let v = demoString {
+            n += 1 + sizeOfString(v)
+        }
+        if let v = demoNestedMessage {
+            n += 1 + sizeOfVarInt(v.sizeInBytes) + v.sizeInBytes
+        }
+        for v in demoRepeated {
+            n += 1 + sizeOfString(v)
+        }
+        for v in demoRepeatedNestedMessage {
+            n += 1 + sizeOfVarInt(v.sizeInBytes) + v.sizeInBytes
+        }
+        
+        return n
     }
 
     public class func builder() -> DemoMessageBuilder {
         return DemoMessageBuilder()
     }
 
     public class DemoNestedMessage: Equatable {
+        public let sizeInBytes: Int
         public let nestedString: String?
         public let nestedInt32: Int?
 
-        init(nestedString: String?, nestedInt32: Int?) {
+        init(sizeInBytes: Int, nestedString: String?, nestedInt32: Int?) {
+            self.sizeInBytes = sizeInBytes
             self.nestedString = nestedString
             self.nestedInt32 = nestedInt32
         }
@@ -215,7 +251,21 @@ public class DemoMessage: Equatable {
 
             r.popTagMap()
 
-            return DemoNestedMessage(nestedString: nestedString, nestedInt32: nestedInt32)
+            let sizeInBytes = DemoNestedMessage.sizeOf(nestedString, nestedInt32: nestedInt32)
+            return DemoNestedMessage(sizeInBytes: sizeInBytes, nestedString: nestedString, nestedInt32: nestedInt32)
+        }
+        
+        class func sizeOf(nestedString: String?, nestedInt32: Int?) -> Int {
+            var n = 0
+            
+            if let v = nestedString {
+                n += 1 + sizeOfString(v)
+            }
+            if let v = nestedInt32 {
+                n += 1 + sizeOfVarInt(Int(v))
+            }
+            
+            return n
         }
 
         public class func builder() -> DemoNestedMessageBuilder {
@@ -255,7 +305,8 @@ public class DemoMessage: Equatable {
         }
 
         public func build() -> DemoNestedMessage {
-            return DemoNestedMessage(nestedString: nestedString, nestedInt32: nestedInt32)
+            let sizeInBytes = DemoNestedMessage.sizeOf(nestedString, nestedInt32: nestedInt32)
+            return DemoNestedMessage(sizeInBytes: sizeInBytes, nestedString: nestedString, nestedInt32: nestedInt32)
         }
     }
 
@@ -365,7 +416,23 @@ public class DemoMessageBuilder {
     }
 
     public func build() -> DemoMessage {
-        return DemoMessage(demoDouble: demoDouble, demoInt32: demoInt32, demoInt64: demoInt64, demoBool: demoBool, demoString: demoString, demoNestedMessage: demoNestedMessage, demoRepeated: demoRepeated, demoRepeatedNestedMessage: demoRepeatedNestedMessage)
+        let sizeInBytes = DemoMessage.sizeOf(demoDouble, demoInt32: demoInt32, demoInt64: demoInt64, demoBool: demoBool, demoString: demoString, demoNestedMessage: demoNestedMessage, demoRepeated: demoRepeated, demoRepeatedNestedMessage: demoRepeatedNestedMessage)
+        return DemoMessage(sizeInBytes: sizeInBytes, demoDouble: demoDouble, demoInt32: demoInt32, demoInt64: demoInt64, demoBool: demoBool, demoString: demoString, demoNestedMessage: demoNestedMessage, demoRepeated: demoRepeated, demoRepeatedNestedMessage: demoRepeatedNestedMessage)
     }
 }
 
+private func sizeOfVarInt(v: Int) -> Int {
+    var n = 0
+    var x = v
+    repeat {
+        x = x >> 7
+        n++
+    } while (x > 0)
+    return n
+}
+
+private func sizeOfString(s: String) -> Int {
+    let b = s.utf8.count
+    return sizeOfVarInt(b) + b
+}
+