Print NULL instead of crashing for CString.toCYON.

[cycript.git] / Decode.cpp

diff --git a/Decode.cpp b/Decode.cpp
index d64bc809285637d198ab47f51b6193b1b7e4b4b0..acf8b957dacb517f6fb0cf3f3cd7d19de6ebea35 100644 (file)
--- a/Decode.cpp
+++ b/Decode.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -77,7 +77,7 @@ CYTypedIdentifier *Decode_(CYPool &pool, struct sig::Type *type) {
         } break;
 
         case sig::bit_P: _assert(false); break;
-        case sig::char_P: return $ CYTypedIdentifier($ CYTypeVariable("char"));
+        case sig::schar_P: return $ CYTypedIdentifier($ CYTypeSigned($ CYTypeVariable("char")));
         case sig::double_P: return $ CYTypedIdentifier($ CYTypeVariable("double"));
         case sig::float_P: return $ CYTypedIdentifier($ CYTypeVariable("float"));
         case sig::int_P: return $ CYTypedIdentifier($ CYTypeVariable("int"));
@@ -86,10 +86,19 @@ CYTypedIdentifier *Decode_(CYPool &pool, struct sig::Type *type) {
         case sig::short_P: return $ CYTypedIdentifier($ CYTypeShort($ CYTypeVariable("int")));
 
         case sig::void_P: return $ CYTypedIdentifier($ CYTypeVoid());
+        case sig::char_P: return $ CYTypedIdentifier($ CYTypeVariable("char"));
 
         case sig::struct_P: {
-            _assert(type->name != NULL);
-            return $ CYTypedIdentifier($ CYTypeVariable(type->name));
+            CYTypeStructField *fields(NULL);
+            for (size_t i(type->data.signature.count); i != 0; --i) {
+                sig::Element &element(type->data.signature.elements[i - 1]);
+                CYTypedIdentifier *typed(Decode(pool, element.type));
+                if (element.name != NULL)
+                    typed->identifier_ = $I(element.name);
+                fields = $ CYTypeStructField(typed, fields);
+            }
+            CYIdentifier *name(type->name == NULL ? NULL : $I(type->name));
+            return $ CYTypedIdentifier($ CYTypeStruct(name, $ CYStructTail(fields)));
         } break;
     }