CYInjectRemote should also be in #ifdef CY_ATTACH.

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 04c1e2f3260107b2b93ed30e7a43bdf782b34abe..3265b2ef5596f92d32ec238dbcdcd85460515051 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -39,11 +39,14 @@
 
 #include "Pooling.hpp"
 #include "String.hpp"
 
 #include "Pooling.hpp"
 #include "String.hpp"

+#include "Utility.hpp"

 
 extern JSStringRef Array_s;
 
 extern JSStringRef Array_s;

+extern JSStringRef constructor_s;

 extern JSStringRef cy_s;
 extern JSStringRef cyi_s;
 extern JSStringRef cyt_s;
 extern JSStringRef cy_s;
 extern JSStringRef cyi_s;
 extern JSStringRef cyt_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;


@@ -68,7 +71,7 @@ const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code);
 void CYCancel();
 #endif
 
 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);


@@ -113,6 +116,13 @@ JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value);
 JSValueRef CYJSUndefined(JSContextRef context);
 JSValueRef CYJSNull(JSContextRef context);
 
 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_>
 void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess = NULL);
 
 template <typename Type_>


@@ -183,20 +193,19 @@ class CYJSString {
     }
 
   public:
     }
 
   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)...))

     {
     }
 
     {
     }
 


@@ -206,6 +215,11 @@ class CYJSString {
         return *this;
     }
 
         return *this;
     }
 

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

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