Bake more standard header files into the C bridge.

[cycript.git] / sig / copy.cpp

diff --git a/sig/copy.cpp b/sig/copy.cpp
index 8b43fc1187664a17162010b45b41b7621f3864a6..63b72fe25ed4e7dfd8bb2d60be881906e73cd7d1 100644 (file)
--- 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 {{{ */
@@ -45,62 +45,69 @@ void Copy(CYPool &pool, Signature &lhs, const Signature &rhs) {
         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;
-    return copy;
+#ifdef CY_OBJECTIVEC
+Object *Object::Copy(CYPool &pool, const char *rename) const {
+    return new(pool) Object(pool.strdup(name));
 }
+#endif
 
-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,10 +136,6 @@ const char *Type::GetName() const {
     return NULL;
 }
 
-const char *Object::GetName() const {
-    return name;
-}
-
 const char *Aggregate::GetName() const {
     return name;
 }