"Lazy" Java initialization resets signal handlers.

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 08020fee8a682833d2504eb7fedccb9b4ce2b936..8b5802413c54054429e51ca073a6fa2ab628c327 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -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 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -23,6 +23,7 @@
 #define CYCRIPT_JAVASCRIPT_HPP
 
 #include <set>
 #define CYCRIPT_JAVASCRIPT_HPP
 
 #include <set>

+#include <string>

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


@@ -40,8 +41,10 @@
 #include "String.hpp"
 
 extern JSStringRef Array_s;
 #include "String.hpp"
 
 extern JSStringRef Array_s;

+extern JSStringRef constructor_s;

 extern JSStringRef cy_s;
 extern JSStringRef cyi_s;
 extern JSStringRef cy_s;
 extern JSStringRef cyi_s;

+extern JSStringRef cyt_s;

 extern JSStringRef length_s;
 extern JSStringRef message_s;
 extern JSStringRef name_s;
 extern JSStringRef length_s;
 extern JSStringRef message_s;
 extern JSStringRef name_s;


@@ -61,9 +64,12 @@ JSObjectRef CYGetGlobalObject(JSContextRef context);
 
 extern "C" void CYSetupContext(JSGlobalContextRef context);
 const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code);
 
 extern "C" void CYSetupContext(JSGlobalContextRef context);
 const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code);

+
+#ifndef __ANDROID__

 void CYCancel();
 void CYCancel();

+#endif

 
 

-void CYSetArgs(int argc, const char *argv[]);
+void CYSetArgs(const char *argv0, const char *script, int argc, const char *argv[]);

 
 bool CYCastBool(JSContextRef context, JSValueRef value);
 double CYCastDouble(JSContextRef context, JSValueRef value);
 
 bool CYCastBool(JSContextRef context, JSValueRef value);
 double CYCastDouble(JSContextRef context, JSValueRef value);


@@ -71,6 +77,7 @@ double CYCastDouble(JSContextRef context, JSValueRef value);
 bool CYIsEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs);
 bool CYIsStrictEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs);
 
 bool CYIsEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs);
 bool CYIsStrictEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs);
 

+CYUTF16String CYCastUTF16String(JSStringRef value);

 CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value);
 const char *CYPoolCString(CYPool &pool, JSContextRef context, JSStringRef value);
 
 CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value);
 const char *CYPoolCString(CYPool &pool, JSContextRef context, JSStringRef value);
 


@@ -82,6 +89,7 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, size_t index, JSVal
 void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value, JSPropertyAttributes attributes = kJSPropertyAttributeNone);
 void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef (*callback)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *), JSPropertyAttributes attributes = kJSPropertyAttributeNone);
 
 void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value, JSPropertyAttributes attributes = kJSPropertyAttributeNone);
 void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef (*callback)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *), JSPropertyAttributes attributes = kJSPropertyAttributeNone);
 

+JSObjectRef CYGetPrototype(JSContextRef context, JSObjectRef object);

 void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef prototype);
 
 JSValueRef CYGetCachedValue(JSContextRef context, JSStringRef name);
 void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef prototype);
 
 JSValueRef CYGetCachedValue(JSContextRef context, JSStringRef name);


@@ -89,12 +97,15 @@ JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name);
 
 JSValueRef CYCastJSValue(JSContextRef context, bool value);
 JSValueRef CYCastJSValue(JSContextRef context, double value);
 
 JSValueRef CYCastJSValue(JSContextRef context, bool value);
 JSValueRef CYCastJSValue(JSContextRef context, double value);

-JSValueRef CYCastJSValue(JSContextRef context, int value);
+
+JSValueRef CYCastJSValue(JSContextRef context, signed short int value);
+JSValueRef CYCastJSValue(JSContextRef context, unsigned short int value);
+JSValueRef CYCastJSValue(JSContextRef context, signed int value);

 JSValueRef CYCastJSValue(JSContextRef context, unsigned int value);
 JSValueRef CYCastJSValue(JSContextRef context, unsigned int value);

-JSValueRef CYCastJSValue(JSContextRef context, long int value);
-JSValueRef CYCastJSValue(JSContextRef context, long unsigned int value);
-JSValueRef CYCastJSValue(JSContextRef context, long long int value);
-JSValueRef CYCastJSValue(JSContextRef context, long long unsigned int value);
+JSValueRef CYCastJSValue(JSContextRef context, signed long int value);
+JSValueRef CYCastJSValue(JSContextRef context, unsigned long int value);
+JSValueRef CYCastJSValue(JSContextRef context, signed long long int value);
+JSValueRef CYCastJSValue(JSContextRef context, unsigned long long int value);

 
 JSValueRef CYCastJSValue(JSContextRef context, JSStringRef value);
 JSValueRef CYCastJSValue(JSContextRef context, const char *value);
 
 JSValueRef CYCastJSValue(JSContextRef context, JSStringRef value);
 JSValueRef CYCastJSValue(JSContextRef context, const char *value);


@@ -111,7 +122,7 @@ _finline Type_ CYCastPointer(JSContextRef context, JSValueRef value, bool *guess
 }
 
 void CYCallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values);
 }
 
 void CYCallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values);

-JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)());
+JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, bool variadic, const sig::Signature &signature, ffi_cif *cif, void (*function)());

 
 bool CYIsCallable(JSContextRef context, JSValueRef value);
 JSValueRef CYCallAsFunction(JSContextRef context, JSObjectRef function, JSObjectRef _this, size_t count, const JSValueRef arguments[]);
 
 bool CYIsCallable(JSContextRef context, JSValueRef value);
 JSValueRef CYCallAsFunction(JSContextRef context, JSObjectRef function, JSObjectRef _this, size_t count, const JSValueRef arguments[]);


@@ -138,21 +149,25 @@ struct CYRegisterHook {
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner);
 
 JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type);
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner);
 
 JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type);

-JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature);

 
 void CYFinalize(JSObjectRef object);
 
 
 void CYFinalize(JSObjectRef object);
 

+JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]);
+

 size_t CYArrayLength(JSContextRef context, JSObjectRef array);
 JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index);
 
 void CYArrayPush(JSContextRef context, JSObjectRef array, size_t length, const JSValueRef arguments[]);
 void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value);
 
 size_t CYArrayLength(JSContextRef context, JSObjectRef array);
 JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index);
 
 void CYArrayPush(JSContextRef context, JSObjectRef array, size_t length, const JSValueRef arguments[]);
 void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value);
 

+bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index);
+

 const char *CYPoolCString(CYPool &pool, JSContextRef context, JSValueRef value);
 
 JSStringRef CYCopyJSString(const char *value);
 JSStringRef CYCopyJSString(JSStringRef value);
 JSStringRef CYCopyJSString(CYUTF8String value);
 const char *CYPoolCString(CYPool &pool, JSContextRef context, JSValueRef value);
 
 JSStringRef CYCopyJSString(const char *value);
 JSStringRef CYCopyJSString(JSStringRef value);
 JSStringRef CYCopyJSString(CYUTF8String value);

+JSStringRef CYCopyJSString(const std::string &value);

 JSStringRef CYCopyJSString(CYUTF16String value);
 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value);
 
 JSStringRef CYCopyJSString(CYUTF16String value);
 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value);
 


@@ -169,6 +184,11 @@ class CYJSString {
     }
 
   public:
     }
 
   public:

+    CYJSString() :
+        string_(NULL)
+    {
+    }
+

     CYJSString(const CYJSString &rhs) :
         string_(CYCopyJSString(rhs.string_))
     {
     CYJSString(const CYJSString &rhs) :
         string_(CYCopyJSString(rhs.string_))
     {


@@ -192,6 +212,11 @@ class CYJSString {
         return *this;
     }
 
         return *this;
     }
 

+    CYJSString &operator =(CYJSString &&rhs) {
+        std::swap(string_, rhs.string_);
+        return *this;
+    }
+

     ~CYJSString() {
         Clear_();
     }
     ~CYJSString() {
         Clear_();
     }


@@ -206,6 +231,43 @@ class CYJSString {
     }
 };
 
     }
 };
 

+template <size_t Size_>
+class CYArrayBuilder {
+  private:
+    JSContextRef context_;
+    JSObjectRef &array_;
+    size_t size_;
+    JSValueRef values_[Size_];
+
+    void flush() {
+        if (array_ == NULL)
+            array_ = CYObjectMakeArray(context_, size_, values_);
+        else
+            CYArrayPush(context_, array_, size_, values_);
+    }
+
+  public:
+    CYArrayBuilder(JSContextRef context, JSObjectRef &array) :
+        context_(context),
+        array_(array),
+        size_(0)
+    {
+    }
+
+    ~CYArrayBuilder() {
+        flush();
+    }
+
+    void operator ()(JSValueRef value) {
+        if (size_ == Size_) {
+            flush();
+            size_ = 0;
+        }
+
+        values_[size_++] = value;
+    }
+};
+

 #ifdef __APPLE__
 #define _weak __attribute__((__weak_import__));
 #else
 #ifdef __APPLE__
 #define _weak __attribute__((__weak_import__));
 #else