Update included configure to match autoconf input.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index 34ad2574517d9bee46510a26dcaf65acbab952db..f7ad60ddb112c32008e029e22ec407e9dbd0801b 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU 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 free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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.
+ * 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 General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -22,18 +22,18 @@
 #ifndef CYCRIPT_INTERNAL_HPP
 #define CYCRIPT_INTERNAL_HPP
 
 #ifndef CYCRIPT_INTERNAL_HPP
 #define CYCRIPT_INTERNAL_HPP
 

-#include "Pooling.hpp"
+#include <sig/parse.hpp>
+#include <sig/ffi_type.hpp>

 
 #include <JavaScriptCore/JSBase.h>
 #include <JavaScriptCore/JSContextRef.h>
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
 
 #include <JavaScriptCore/JSBase.h>
 #include <JavaScriptCore/JSContextRef.h>
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 

-#include <sig/parse.hpp>
-#include <sig/ffi_type.hpp>
+#include "Pooling.hpp"

 
 JSGlobalContextRef CYGetJSContext(JSContextRef context);
 
 JSGlobalContextRef CYGetJSContext(JSContextRef context);

-void Structor_(apr_pool_t *pool, sig::Type *&type);
+void Structor_(CYPool &pool, sig::Type *&type);

 
 JSObjectRef CYMakeType(JSContextRef context, const char *type);
 JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);
 
 JSObjectRef CYMakeType(JSContextRef context, const char *type);
 JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);


@@ -49,17 +49,16 @@ struct Type_privateData :
     sig::Type *type_;
 
     void Set(sig::Type *type) {
     sig::Type *type_;
 
     void Set(sig::Type *type) {

-        type_ = new(pool_) sig::Type;
-        sig::Copy(pool_, *type_, *type);
+        type_ = new(*pool_) sig::Type;
+        sig::Copy(*pool_, *type_, *type);

     }
 
     }
 

-    Type_privateData(apr_pool_t *pool, const char *type) :
+    Type_privateData(CYPool &pool, const char *type) :
+        CYData(pool),

         ffi_(NULL)
     {
         ffi_(NULL)
     {

-        _assert(pool != NULL);
-        pool_ = pool;

         sig::Signature signature;
         sig::Signature signature;

-        sig::Parse(pool_, &signature, type, &Structor_);
+        sig::Parse(*pool_, &signature, type, &Structor_);

         type_ = signature.elements[0].type;
     }
 
         type_ = signature.elements[0].type;
     }
 


@@ -67,7 +66,7 @@ struct Type_privateData :
         ffi_(NULL)
     {
         sig::Signature signature;
         ffi_(NULL)
     {
         sig::Signature signature;

-        sig::Parse(pool_, &signature, type, &Structor_);
+        sig::Parse(*pool_, &signature, type, &Structor_);

         type_ = signature.elements[0].type;
     }
 
         type_ = signature.elements[0].type;
     }
 


@@ -79,14 +78,14 @@ struct Type_privateData :
     }
 
     Type_privateData(sig::Type *type, ffi_type *ffi) {
     }
 
     Type_privateData(sig::Type *type, ffi_type *ffi) {

-        ffi_ = new(pool_) ffi_type;
-        sig::Copy(pool_, *ffi_, *ffi);
+        ffi_ = new(*pool_) ffi_type;
+        sig::Copy(*pool_, *ffi_, *ffi);

         Set(type);
     }
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {
         Set(type);
     }
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {

-            ffi_ = new(pool_) ffi_type;
+            ffi_ = new(*pool_) ffi_type;

 
             sig::Element element;
             element.name = NULL;
 
             sig::Element element;
             element.name = NULL;


@@ -98,7 +97,7 @@ struct Type_privateData :
             signature.count = 1;
 
             ffi_cif cif;
             signature.count = 1;
 
             ffi_cif cif;

-            sig::sig_ffi_cif(pool_, &sig::ObjectiveC, &signature, &cif);
+            sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature, &cif);

             *ffi_ = *cif.rtype;
         }
 
             *ffi_ = *cif.rtype;
         }
 


@@ -168,11 +167,11 @@ struct Functor :
     Functor(const char *type, void (*value)()) :
         CYValue(reinterpret_cast<void *>(value))
     {
     Functor(const char *type, void (*value)()) :
         CYValue(reinterpret_cast<void *>(value))
     {

-        sig::Parse(pool_, &signature_, type, &Structor_);
-        sig::sig_ffi_cif(pool_, &sig::ObjectiveC, &signature_, &cif_);
+        sig::Parse(*pool_, &signature_, type, &Structor_);
+        sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature_, &cif_);

     }
 
     }
 

-    void (*GetValue())() const {
+    void (*GetValue() const)() {

         return reinterpret_cast<void (*)()>(value_);
     }
 
         return reinterpret_cast<void (*)()>(value_);
     }