X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c9b965e40ad1ad73542865fb65990a8b59e3131b..b101f7547000aaa1354792aabc459de7cc9e91de:/JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 949d54e..64dcbac 100644
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -39,6 +39,7 @@
 
 #include "Pooling.hpp"
 #include "String.hpp"
+#include "Utility.hpp"
 
 extern JSStringRef Array_s;
 extern JSStringRef constructor_s;
@@ -69,7 +70,7 @@ const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code);
 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);
@@ -114,6 +115,13 @@ JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value);
 JSValueRef CYJSUndefined(JSContextRef context);
 JSValueRef CYJSNull(JSContextRef context);
 
+void *CYCastPointerEx_(JSContextRef context, JSObjectRef value);
+
+template <typename Type_>
+_finline Type_ CYCastPointerEx(JSContextRef context, JSObjectRef value) {
+    return reinterpret_cast<Type_>(CYCastPointerEx_(context, value));
+}
+
 void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess = NULL);
 
 template <typename Type_>
@@ -184,20 +192,19 @@ class CYJSString {
     }
 
   public:
-    CYJSString(const CYJSString &rhs) :
-        string_(CYCopyJSString(rhs.string_))
+    CYJSString() :
+        string_(NULL)
     {
     }
 
-    template <typename Arg0_>
-    CYJSString(Arg0_ arg0) :
-        string_(CYCopyJSString(arg0))
+    CYJSString(const CYJSString &rhs) :
+        string_(CYCopyJSString(rhs.string_))
     {
     }
 
-    template <typename Arg0_, typename Arg1_>
-    CYJSString(Arg0_ arg0, Arg1_ arg1) :
-        string_(CYCopyJSString(arg0, arg1))
+    template <typename ...Args_>
+    CYJSString(Args_ &&... args) :
+        string_(CYCopyJSString(cy::Forward<Args_>(args)...))
     {
     }
 
@@ -207,6 +214,11 @@ class CYJSString {
         return *this;
     }
 
+    CYJSString &operator =(CYJSString &&rhs) {
+        std::swap(string_, rhs.string_);
+        return *this;
+    }
+
     ~CYJSString() {
         Clear_();
     }