Rename Super to objc_super to better future-proof.

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 0e863fab868ee4dfb3880982606e2395f2ec490b..3cf9e8a0d5122a60e36a1d89ea8eac50711cad9c 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -2493,7 +2493,7 @@ static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef objec
 
 static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 2)
 
 static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 2)

-        throw CYJSError(context, "incorrect number of arguments to Super constructor");
+        throw CYJSError(context, "incorrect number of arguments to objc_super constructor");

     CYPool pool;
     id self(CYCastNSObject(&pool, context, arguments[0]));
     Class _class(CYCastClass(pool, context, arguments[1]));
     CYPool pool;
     id self(CYCastNSObject(&pool, context, arguments[0]));
     Class _class(CYCastClass(pool, context, arguments[1]));


@@ -2960,7 +2960,7 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
 
     CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
     CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
 
     CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
     CYSetProperty(context, cycript, CYJSString("Selector"), Selector);

-    CYSetProperty(context, cycript, CYJSString("Super"), Super);
+    CYSetProperty(context, cycript, CYJSString("objc_super"), Super);

 
     JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction));
     CYSetProperty(context, Instance, CYJSString("box"), box);
 
     JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction));
     CYSetProperty(context, Instance, CYJSString("box"), box);

diff --git a/ObjectiveC/Replace.cpp b/ObjectiveC/Replace.cpp
index c3a885cf2b716ae6089ac7909c70ad8d6d148257..a2a4c114a5c7f43cc941dd07cecdf8cdb9bc4b55 100644 (file)
--- a/ObjectiveC/Replace.cpp
+++ b/ObjectiveC/Replace.cpp
@@ -112,7 +112,7 @@ CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NUL
             $V(instance_ ? "$cyc" : "$cym"),
             cyn,
             $N2($V("Functor"), $F(NULL, $P2($L("self"), $L("_cmd"), parameters_->Parameters(context)), $$->*
             $V(instance_ ? "$cyc" : "$cym"),
             cyn,
             $N2($V("Functor"), $F(NULL, $P2($L("self"), $L("_cmd"), parameters_->Parameters(context)), $$->*

-                $ CYVar($L1($L("$cyr", $N2($V("Super"), self, _class))))->*
+                $ CYVar($L1($L("$cyr", $N2($V("objc_super"), self, _class))))->*

                 $ CYReturn($C1($M($F(NULL, NULL, code_), $S("call")), self))
             ), cyt),
             cyt
                 $ CYReturn($C1($M($F(NULL, NULL, code_), $S("call")), self))
             ), cyt),
             cyt