@mustiikhalil already have a better one to handle nil. Use that.

liuliu · Oct 2, 2020 · 3fe1dbc · 3fe1dbc
1 parent a123187
commit 3fe1dbc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/app/Benchmarks/doc_mutating_generated.swift b/app/Benchmarks/doc_mutating_generated.swift
@@ -95,9 +95,8 @@ extension BenchDoc {
     let __content = self.content.to(flatBufferBuilder: &flatBufferBuilder)
     let __tag = self.tag.map { flatBufferBuilder.create(string: $0) } ?? Offset<String>()
     let start = zzz_DflatGen_BenchDoc.startBenchDoc(&flatBufferBuilder)
-    if let __pos = self.pos.to(flatBufferBuilder: &flatBufferBuilder) {
-      zzz_DflatGen_BenchDoc.add(pos: __pos, &flatBufferBuilder)
-    }
+    let __pos = self.pos.to(flatBufferBuilder: &flatBufferBuilder)
+    zzz_DflatGen_BenchDoc.add(pos: __pos, &flatBufferBuilder)
     zzz_DflatGen_BenchDoc.add(color: __color, &flatBufferBuilder)
     zzz_DflatGen_BenchDoc.add(title: __title, &flatBufferBuilder)
     zzz_DflatGen_BenchDoc.add(contentType: __contentType, &flatBufferBuilder)

diff --git a/src/parser/dflatc.swift b/src/parser/dflatc.swift
@@ -647,11 +647,7 @@ func GenStructSerializer(_ structDef: Struct, code: inout String) {
         case .struct:
           let subStructDef = structDefs[field.type.struct!]!
           if subStructDef.fixed {
-            // This may be nil, in that case, we don't need to write it out at all.
-            code += "    if let __\(field.name) = self.\(field.name).to(flatBufferBuilder: &flatBufferBuilder) {\n"
-            code += "      \(GetDflatGenFullyQualifiedName(structDef)).add(\(field.name): __\(field.name), &flatBufferBuilder)\n"
-            code += "    }\n"
-            break
+            code += "    let __\(field.name) = self.\(field.name).to(flatBufferBuilder: &flatBufferBuilder)\n"
           }
           fallthrough
         case .union, .enum, .string:

diff --git a/src/tests/monster_mutating_generated.swift b/src/tests/monster_mutating_generated.swift
@@ -80,9 +80,8 @@ extension MyGame.Sample.Monster {
     }
     let __vector_path = flatBufferBuilder.endVectorOfStructs(count: self.path.count)
     let start = zzz_DflatGen_MyGame_Sample_Monster.startMonster(&flatBufferBuilder)
-    if let __pos = self.pos.to(flatBufferBuilder: &flatBufferBuilder) {
+    let __pos = self.pos.to(flatBufferBuilder: &flatBufferBuilder)
     zzz_DflatGen_MyGame_Sample_Monster.add(pos: __pos, &flatBufferBuilder)
-    }
     zzz_DflatGen_MyGame_Sample_Monster.add(mana: self.mana, &flatBufferBuilder)
     zzz_DflatGen_MyGame_Sample_Monster.add(hp: self.hp, &flatBufferBuilder)
     zzz_DflatGen_MyGame_Sample_Monster.add(name: __name, &flatBufferBuilder)

diff --git a/src/tests/monster_v2_mutating_generated.swift b/src/tests/monster_v2_mutating_generated.swift
@@ -128,9 +128,8 @@ extension MyGame.SampleV2.Monster {
     let __wearType = self.wear._type
     let __wear = self.wear.to(flatBufferBuilder: &flatBufferBuilder)
     let start = zzz_DflatGen_MyGame_SampleV2_Monster.startMonster(&flatBufferBuilder)
-    if let __pos = self.pos.to(flatBufferBuilder: &flatBufferBuilder) {
+    let __pos = self.pos.to(flatBufferBuilder: &flatBufferBuilder)
     zzz_DflatGen_MyGame_SampleV2_Monster.add(pos: __pos, &flatBufferBuilder)
-    }
     zzz_DflatGen_MyGame_SampleV2_Monster.add(mana: self.mana, &flatBufferBuilder)
     zzz_DflatGen_MyGame_SampleV2_Monster.add(hp: self.hp, &flatBufferBuilder)
     zzz_DflatGen_MyGame_SampleV2_Monster.add(name: __name, &flatBufferBuilder)