Replace sig::Primitive with full object hierarchy.

[cycript.git] / sig / copy.cpp

diff --git a/sig/copy.cpp b/sig/copy.cpp
index 07ea6616add2d47387160b361502346c046cd731..8b43fc1187664a17162010b45b41b7621f3864a6 100644 (file)
--- a/sig/copy.cpp
+++ b/sig/copy.cpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 


@@ -23,30 +23,21 @@
 #define _GNU_SOURCE
 #endif
 
 #define _GNU_SOURCE
 #endif
 

-#include <apr_strings.h>

 #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 {
 
 namespace sig {
 

-void Copy(apr_pool_t *pool, Element &lhs, Element &rhs) {
-    lhs.name = apr_pstrdup(pool, rhs.name);
+void Copy(CYPool &pool, Element &lhs, const Element &rhs) {
+    lhs.name = pool.strdup(rhs.name);

     if (rhs.type == NULL)
         lhs.type = NULL;
     if (rhs.type == NULL)
         lhs.type = NULL;

-    else {
-        lhs.type = new(pool) Type;
-        Copy(pool, *lhs.type, *rhs.type);
-    }
+    else
+        lhs.type = rhs.type->Copy(pool);

     lhs.offset = rhs.offset;
 }
 
     lhs.offset = rhs.offset;
 }
 

-void Copy(apr_pool_t *pool, Signature &lhs, Signature &rhs) {
+void Copy(CYPool &pool, Signature &lhs, const Signature &rhs) {

     size_t count(rhs.count);
     lhs.count = count;
     lhs.elements = new(pool) Element[count];
     size_t count(rhs.count);
     lhs.count = count;
     lhs.elements = new(pool) Element[count];


@@ -54,29 +45,64 @@ void Copy(apr_pool_t *pool, Signature &lhs, Signature &rhs) {
         Copy(pool, lhs.elements[index], rhs.elements[index]);
 }
 
         Copy(pool, lhs.elements[index], rhs.elements[index]);
 }
 

-void Copy(apr_pool_t *pool, Type &lhs, Type &rhs) {
-    lhs.primitive = rhs.primitive;
-    lhs.name = apr_pstrdup(pool, rhs.name);
-    lhs.flags = rhs.flags;
+Void *Void::Copy(CYPool &pool, const char *name) const {
+    return new(pool) Void();
+}

 
 

-    if (sig::IsAggregate(rhs.primitive))
-        Copy(pool, lhs.data.signature, rhs.data.signature);
-    else {
-        sig::Type *&lht(lhs.data.data.type);
-        sig::Type *&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 *name) const {
+    return new(pool) Unknown();
+}

 
 

-        lhs.data.data.size = rhs.data.data.size;
-    }
+String *String::Copy(CYPool &pool, const char *name) const {
+    return new(pool) String();

 }
 
 }
 

-void Copy(apr_pool_t *pool, ffi_type &lhs, ffi_type &rhs) {
+Meta *Meta::Copy(CYPool &pool, const char *name) const {
+    return new(pool) Meta();
+}
+
+Selector *Selector::Copy(CYPool &pool, const char *name) const {
+    return new(pool) Selector();
+}
+
+Bits *Bits::Copy(CYPool &pool, const char *name) const {
+    return new(pool) Bits(size);
+}
+
+Pointer *Pointer::Copy(CYPool &pool, const char *name) const {
+    return new(pool) Pointer(*type.Copy(pool));
+}
+
+Array *Array::Copy(CYPool &pool, const char *name) 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;
+}
+
+Aggregate *Aggregate::Copy(CYPool &pool, const char *name) const {
+    Aggregate *copy(new(pool) Aggregate(overlap, name));
+    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());
+    sig::Copy(pool, copy->signature, signature);
+    return copy;
+}
+
+Block *Block::Copy(CYPool &pool, const char *name) const {
+    Block *copy(new(pool) Block());
+    sig::Copy(pool, copy->signature, signature);
+    return copy;
+}
+
+void Copy(CYPool &pool, ffi_type &lhs, ffi_type &rhs) {

     lhs.size = rhs.size;
     lhs.alignment = rhs.alignment;
     lhs.type = rhs.type;
     lhs.size = rhs.size;
     lhs.alignment = rhs.alignment;
     lhs.type = rhs.type;


@@ -99,4 +125,16 @@ void Copy(apr_pool_t *pool, ffi_type &lhs, ffi_type &rhs) {
     }
 }
 
     }
 }
 

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

 }
 }