Only link libcycript against libffi (not cycript).

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index a3e9f0a7d7021fac0725b1f2f54a692e512bbb15..26f5d88cca4f85eb9465ee22b5ffe936cedc0250 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * 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.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * 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.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 #ifndef CYCRIPT_JAVASCRIPT_HPP
 /* }}} */
 
 #ifndef CYCRIPT_JAVASCRIPT_HPP


@@ -46,7 +28,15 @@
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 

+#ifdef HAVE_FFI_FFI_H
+#include <ffi/ffi.h>
+#else

 #include <ffi.h>
 #include <ffi.h>

+#endif
+
+#include <apr_pools.h>
+
+#include <String.hpp>

 
 extern JSStringRef Array_s;
 extern JSStringRef cy_s;
 
 extern JSStringRef Array_s;
 extern JSStringRef cy_s;


@@ -59,13 +49,15 @@ extern JSStringRef push_s;
 extern JSStringRef splice_s;
 extern JSStringRef toCYON_s;
 extern JSStringRef toJSON_s;
 extern JSStringRef splice_s;
 extern JSStringRef toCYON_s;
 extern JSStringRef toJSON_s;

+extern JSStringRef toPointer_s;
+extern JSStringRef toString_s;

 
 void CYInitializeDynamic();
 JSGlobalContextRef CYGetJSContext();
 JSObjectRef CYGetGlobalObject(JSContextRef context);
 
 extern "C" void CYSetupContext(JSGlobalContextRef context);
 
 void CYInitializeDynamic();
 JSGlobalContextRef CYGetJSContext();
 JSObjectRef CYGetGlobalObject(JSContextRef context);
 
 extern "C" void CYSetupContext(JSGlobalContextRef context);

-const char *CYExecute(apr_pool_t *pool, const char *code);
+const char *CYExecute(apr_pool_t *pool, CYUTF8String code);

 
 void CYSetArgs(int argc, const char *argv[]);
 
 
 void CYSetArgs(int argc, const char *argv[]);
 


@@ -121,7 +113,6 @@ struct CYHooks {
     void *(*ExecuteStart)(JSContextRef);
     void (*ExecuteEnd)(JSContextRef, void *);
 
     void *(*ExecuteStart)(JSContextRef);
     void (*ExecuteEnd)(JSContextRef, void *);
 

-    JSValueRef (*RuntimeProperty)(JSContextRef, CYUTF8String);

     void (*CallFunction)(JSContextRef, ffi_cif *, void (*)(), uint8_t *, void **);
 
     void (*Initialize)();
     void (*CallFunction)(JSContextRef, ffi_cif *, void (*)(), uint8_t *, void **);
 
     void (*Initialize)();


@@ -137,6 +128,10 @@ JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, si
 
 void CYFinalize(JSObjectRef object);
 
 
 void CYFinalize(JSObjectRef object);
 

+size_t CYArrayLength(JSContextRef context, JSObjectRef array);
+JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index);
+void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value);
+

 const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value);
 
 JSStringRef CYCopyJSString(const char *value);
 const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value);
 
 JSStringRef CYCopyJSString(const char *value);