Port Error.toCYON() to JS and write Date.toCYON().

[cycript.git] / Decode.cpp

diff --git a/Decode.cpp b/Decode.cpp
index d64bc809285637d198ab47f51b6193b1b7e4b4b0..e7ea5f9e3acdc834abea915d54d287948de83440 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 {{{ */
@@ -88,8 +88,16 @@ CYTypedIdentifier *Decode_(CYPool &pool, struct sig::Type *type) {
         case sig::void_P: return $ CYTypedIdentifier($ CYTypeVoid());
 
         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, fields));
         } break;
     }