Fix Objective-C build failures (#1496)

3 files changed, 44 insertions, 12 deletions

diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index c52ea9bbf17..3923e3fabaf 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -3106,23 +3106,14 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
         if(returnType)
         {
             _M << nl << outTypeToString(returnType, p->returnIsOptional(), true) << " ret";
-            if(!isValueType(returnType))
-            {
-                _M << " = nil;";
-            }
-            else
-            {
-                _M << ";";
-            }
+            _M << " = " << defaultValue(returnType, p->returnIsOptional()) << ";";
         }
         if(p->returnsData())
         {
             for(ParamDeclList::const_iterator op = outParams.begin(); op != outParams.end(); ++op)
             {
-                if(!isValueType((*op)->type()))
-                {
-                    _M << nl << "*" << getParamName(*op, true) << " = nil;";
-                }
+                _M << nl << "*" << getParamName(*op, true) << " = " << defaultValue((*op)->type(), (*op)->optional())
+                   << ";";
             }
         }
         _M << nl << "if(!ok)";
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 1848cbcbf4d..cf7e34fd5f0 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -427,6 +427,46 @@ Slice::ObjCGenerator::typeToObjCTypeString(const TypePtr& type)
     }
 }
 
+string
+Slice::ObjCGenerator::defaultValue(const TypePtr& type, bool isOptional)
+{
+    if(isValueType(type) && !isOptional)
+    {
+         if(EnumPtr::dynamicCast(type))
+         {
+             return "0";
+         }
+         BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
+         if(builtin)
+         {
+             switch(builtin->kind())
+             {
+             case Builtin::KindBool:
+                 return "NO";
+             case Builtin::KindByte:
+             case Builtin::KindShort:
+             case Builtin::KindInt:
+             case Builtin::KindLong:
+                 return "0";
+             case Builtin::KindFloat:
+             case Builtin::KindDouble:
+                 return "0.0";
+             default:
+                 {
+                     assert(false);
+                     return "???";
+                 }
+             }
+         }
+         assert(false);
+         return "???";
+    }
+    else
+    {
+        return "nil";
+    }
+}
+
 bool
 Slice::ObjCGenerator::isValueType(const TypePtr& type)
 {
diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h
index 0c5176d67d8..4520ee7082a 100644
--- a/cpp/src/slice2objc/ObjCUtil.h
+++ b/cpp/src/slice2objc/ObjCUtil.h
@@ -52,6 +52,7 @@ protected:
     static std::string inTypeToString(const TypePtr&, bool, bool = false, bool = false);
     static std::string outTypeToString(const TypePtr&, bool, bool = false, bool = false);
     static std::string typeToObjCTypeString(const TypePtr&);
+    static std::string defaultValue(const TypePtr&, bool);
     static bool isValueType(const TypePtr&);
     static bool isString(const TypePtr&);
     static bool isClass(const TypePtr&);