X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/53cb77ff9ae5b8dc87f7924ede75be1e1944e004..HEAD:/sig/copy.cpp

diff --git a/sig/copy.cpp b/sig/copy.cpp
index 63b72fe..b8fc6b6 100644
--- a/sig/copy.cpp
+++ b/sig/copy.cpp
@@ -30,61 +30,77 @@ namespace sig {
 
 void Copy(CYPool &pool, Element &lhs, const Element &rhs) {
     lhs.name = pool.strdup(rhs.name);
-    if (rhs.type == NULL)
-        lhs.type = NULL;
-    else
-        lhs.type = rhs.type->Copy(pool);
+    _assert(rhs.type != NULL);
+    lhs.type = rhs.type->Copy(pool);
     lhs.offset = rhs.offset;
 }
 
 void Copy(CYPool &pool, Signature &lhs, const Signature &rhs) {
     size_t count(rhs.count);
     lhs.count = count;
-    lhs.elements = new(pool) Element[count];
-    for (size_t index(0); index != count; ++index)
-        Copy(pool, lhs.elements[index], rhs.elements[index]);
+    if (count == _not(size_t))
+        lhs.elements = NULL;
+    else {
+        lhs.elements = new(pool) Element[count];
+        for (size_t index(0); index != count; ++index)
+            Copy(pool, lhs.elements[index], rhs.elements[index]);
+    }
 }
 
 Void *Void::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) Void();
+    return Flag(new(pool) Void());
 }
 
 Unknown *Unknown::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) Unknown();
+    return Flag(new(pool) Unknown());
 }
 
 String *String::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) String();
+    return Flag(new(pool) String());
 }
 
 #ifdef CY_OBJECTIVEC
 Meta *Meta::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) Meta();
+    return Flag(new(pool) Meta());
 }
 
 Selector *Selector::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) Selector();
+    return Flag(new(pool) Selector());
 }
 #endif
 
 Bits *Bits::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) Bits(size);
+    return Flag(new(pool) Bits(size));
 }
 
 Pointer *Pointer::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) Pointer(*type.Copy(pool));
+    return Flag(new(pool) Pointer(*type.Copy(pool)));
 }
 
 Array *Array::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) Array(*type.Copy(pool), size);
+    return Flag(new(pool) Array(*type.Copy(pool), size));
 }
 
 #ifdef CY_OBJECTIVEC
 Object *Object::Copy(CYPool &pool, const char *rename) const {
-    return new(pool) Object(pool.strdup(name));
+    return Flag(new(pool) Object(pool.strdup(name)));
 }
 #endif
 
+Enum *Enum::Copy(CYPool &pool, const char *rename) const {
+    if (rename == NULL)
+        rename = pool.strdup(name);
+    else if (rename[0] == '\0')
+        rename = NULL;
+    Enum *copy(new(pool) Enum(*type.Copy(pool), count, rename));
+    copy->constants = new(pool) Constant[count];
+    for (size_t i(0); i != count; ++i) {
+        copy->constants[i].name = pool.strdup(constants[i].name);
+        copy->constants[i].value = constants[i].value;
+    }
+    return Flag(copy);
+}
+
 Aggregate *Aggregate::Copy(CYPool &pool, const char *rename) const {
     if (rename == NULL)
         rename = pool.strdup(name);
@@ -92,20 +108,20 @@ Aggregate *Aggregate::Copy(CYPool &pool, const char *rename) const {
         rename = NULL;
     Aggregate *copy(new(pool) Aggregate(overlap, rename));
     sig::Copy(pool, copy->signature, signature);
-    return copy;
+    return Flag(copy);
 }
 
 Function *Function::Copy(CYPool &pool, const char *rename) const {
     Function *copy(new(pool) Function(variadic));
     sig::Copy(pool, copy->signature, signature);
-    return copy;
+    return Flag(copy);
 }
 
 #ifdef CY_OBJECTIVEC
 Block *Block::Copy(CYPool &pool, const char *rename) const {
     Block *copy(new(pool) Block());
     sig::Copy(pool, copy->signature, signature);
-    return copy;
+    return Flag(copy);
 }
 #endif
 
@@ -136,6 +152,10 @@ const char *Type::GetName() const {
     return NULL;
 }
 
+const char *Enum::GetName() const {
+    return name;
+}
+
 const char *Aggregate::GetName() const {
     return name;
 }