X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/0559abf83c4cc9bbd896b69dfaae1e8422521479..447b698cea96010d0850e056348ef6cd085b96d9:/sig/copy.cpp?ds=sidebyside

diff --git a/sig/copy.cpp b/sig/copy.cpp
index 8b43fc1..1f9decd 100644
--- a/sig/copy.cpp
+++ b/sig/copy.cpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -30,77 +30,100 @@ 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 *name) const {
+Void *Void::Copy(CYPool &pool, const char *rename) const {
     return new(pool) Void();
 }
 
-Unknown *Unknown::Copy(CYPool &pool, const char *name) const {
+Unknown *Unknown::Copy(CYPool &pool, const char *rename) const {
     return new(pool) Unknown();
 }
 
-String *String::Copy(CYPool &pool, const char *name) const {
+String *String::Copy(CYPool &pool, const char *rename) const {
     return new(pool) String();
 }
 
-Meta *Meta::Copy(CYPool &pool, const char *name) const {
+#ifdef CY_OBJECTIVEC
+Meta *Meta::Copy(CYPool &pool, const char *rename) const {
     return new(pool) Meta();
 }
 
-Selector *Selector::Copy(CYPool &pool, const char *name) const {
+Selector *Selector::Copy(CYPool &pool, const char *rename) const {
     return new(pool) Selector();
 }
+#endif
 
-Bits *Bits::Copy(CYPool &pool, const char *name) const {
+Bits *Bits::Copy(CYPool &pool, const char *rename) const {
     return new(pool) Bits(size);
 }
 
-Pointer *Pointer::Copy(CYPool &pool, const char *name) const {
+Pointer *Pointer::Copy(CYPool &pool, const char *rename) const {
     return new(pool) Pointer(*type.Copy(pool));
 }
 
-Array *Array::Copy(CYPool &pool, const char *name) const {
+Array *Array::Copy(CYPool &pool, const char *rename) const {
     return new(pool) Array(*type.Copy(pool), size);
 }
 
-Object *Object::Copy(CYPool &pool, const char *name) const {
-    Object *copy(new(pool) Object(pool.strdup(name)));
-    copy->name = name;
+#ifdef CY_OBJECTIVEC
+Object *Object::Copy(CYPool &pool, const char *rename) const {
+    return 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 copy;
 }
 
-Aggregate *Aggregate::Copy(CYPool &pool, const char *name) const {
-    Aggregate *copy(new(pool) Aggregate(overlap, name));
+Aggregate *Aggregate::Copy(CYPool &pool, const char *rename) const {
+    if (rename == NULL)
+        rename = pool.strdup(name);
+    else if (rename[0] == '\0')
+        rename = NULL;
+    Aggregate *copy(new(pool) Aggregate(overlap, rename));
     sig::Copy(pool, copy->signature, signature);
-    copy->name = name;
     return copy;
 }
 
-Function *Function::Copy(CYPool &pool, const char *name) const {
-    Function *copy(new(pool) Function());
+Function *Function::Copy(CYPool &pool, const char *rename) const {
+    Function *copy(new(pool) Function(variadic));
     sig::Copy(pool, copy->signature, signature);
     return copy;
 }
 
-Block *Block::Copy(CYPool &pool, const char *name) const {
+#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;
 }
+#endif
 
 void Copy(CYPool &pool, ffi_type &lhs, ffi_type &rhs) {
     lhs.size = rhs.size;
@@ -129,7 +152,7 @@ const char *Type::GetName() const {
     return NULL;
 }
 
-const char *Object::GetName() const {
+const char *Enum::GetName() const {
     return name;
 }