new operator must return JSObject even for errors.

[cycript.git] / sig / copy.cpp

diff --git a/sig/copy.cpp b/sig/copy.cpp
index cdb2f4c08516ead29d4d79e7439af6d4da3e68ed..1f9decdb35de5871371fe8ff226b52d93de6ec70 100644 (file)
--- a/sig/copy.cpp
+++ b/sig/copy.cpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -26,55 +26,105 @@
 #include "Pooling.hpp"
 #include "sig/parse.hpp"
 
 #include "Pooling.hpp"
 #include "sig/parse.hpp"
 

-#ifdef HAVE_FFI_FFI_H
-#include <ffi/ffi.h>
-#else
-#include <ffi.h>
-#endif
-

 namespace sig {
 
 void Copy(CYPool &pool, Element &lhs, const Element &rhs) {
     lhs.name = pool.strdup(rhs.name);
 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 = new(pool) Type;
-        Copy(pool, *lhs.type, *rhs.type);
-    }
+    _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.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 Copy(CYPool &pool, Type &lhs, const Type &rhs) {
-    lhs.primitive = rhs.primitive;
-    lhs.name = pool.strdup(rhs.name);
-    lhs.flags = rhs.flags;
+Void *Void::Copy(CYPool &pool, const char *rename) const {
+    return new(pool) Void();
+}

 
 

-    if (sig::IsFunctional(rhs.primitive) || sig::IsAggregate(rhs.primitive))
-        Copy(pool, lhs.data.signature, rhs.data.signature);
-    else {
-        sig::Type *&lht(lhs.data.data.type);
-        sig::Type *const &rht(rhs.data.data.type);
-
-        if (rht == NULL)
-            lht = NULL;
-        else {
-            lht = new(pool) Type;
-            Copy(pool, *lht, *rht);
-        }
+Unknown *Unknown::Copy(CYPool &pool, const char *rename) const {
+    return new(pool) Unknown();
+}
+
+String *String::Copy(CYPool &pool, const char *rename) const {
+    return new(pool) String();
+}
+
+#ifdef CY_OBJECTIVEC
+Meta *Meta::Copy(CYPool &pool, const char *rename) const {
+    return new(pool) Meta();
+}
+
+Selector *Selector::Copy(CYPool &pool, const char *rename) const {
+    return new(pool) Selector();
+}
+#endif
+
+Bits *Bits::Copy(CYPool &pool, const char *rename) const {
+    return new(pool) Bits(size);
+}

 
 

-        lhs.data.data.size = rhs.data.data.size;
+Pointer *Pointer::Copy(CYPool &pool, const char *rename) const {
+    return new(pool) Pointer(*type.Copy(pool));
+}
+
+Array *Array::Copy(CYPool &pool, const char *rename) const {
+    return 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));
+}
+#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 *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);
+    return copy;
+}
+
+Function *Function::Copy(CYPool &pool, const char *rename) const {
+    Function *copy(new(pool) Function(variadic));
+    sig::Copy(pool, copy->signature, signature);
+    return 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;
+}
+#endif
+

 void Copy(CYPool &pool, ffi_type &lhs, ffi_type &rhs) {
     lhs.size = rhs.size;
     lhs.alignment = rhs.alignment;
 void Copy(CYPool &pool, ffi_type &lhs, ffi_type &rhs) {
     lhs.size = rhs.size;
     lhs.alignment = rhs.alignment;


@@ -98,4 +148,16 @@ void Copy(CYPool &pool, ffi_type &lhs, ffi_type &rhs) {
     }
 }
 
     }
 }
 

+const char *Type::GetName() const {
+    return NULL;
+}
+
+const char *Enum::GetName() const {
+    return name;
+}
+
+const char *Aggregate::GetName() const {
+    return name;
+}
+

 }
 }