X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/8d7447c170dd11c91d0a07768f32a2699177fa54..140fd60d6b7a9b922098ee5c408169573f94e33e:/ObjectiveC/Replace.cpp

diff --git a/ObjectiveC/Replace.cpp b/ObjectiveC/Replace.cpp
index f500bd8..ab16675 100644
--- a/ObjectiveC/Replace.cpp
+++ b/ObjectiveC/Replace.cpp
@@ -1,71 +1,87 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * 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 Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
+#include <sstream>
+
 #include "Replace.hpp"
+
 #include "ObjectiveC/Syntax.hpp"
 
-#include <sstream>
+static CYExpression *MessageType(CYContext &context, CYTypedIdentifier *type, CYMessageParameter *next, CYExpression *extra = NULL) {
+    CYExpression *left($C0($M(type->Replace(context), $S("toString"))));
+    if (extra != NULL)
+        left = $ CYAdd(left, extra);
+
+    if (next == NULL || next->type_ == NULL)
+        return left;
+
+    CYExpression *right(next->TypeSignature(context));
+    if (right == NULL)
+        return NULL;
+
+    return $ CYAdd(left, right);
+}
 
 CYStatement *CYCategory::Replace(CYContext &context) {
     CYVariable *cyc($V("$cyc")), *cys($V("$cys"));
 
-    return $E($C1($F(NULL, $P5($L("$cys"), $L("$cyp"), $L("$cyc"), $L("$cyn"), $L("$cyt")), $$->*
+    return $E($C1($F(NULL, $P6($B($I("$cys")), $B($I("$cyp")), $B($I("$cyc")), $B($I("$cyn")), $B($I("$cyt")), $B($I("$cym"))), $$->*
         $E($ CYAssign($V("$cyp"), $C1($V("object_getClass"), cys)))->*
         $E($ CYAssign(cyc, cys))->*
         $E($ CYAssign($V("$cym"), $C1($V("object_getClass"), cyc)))->*
         messages_->Replace(context, true)
-    ), name_->ClassName(context, true)));
+    ), $C1($V("objc_getClass"), $S(name_))));
 }
 
-CYExpression *CYClass::Replace_(CYContext &context) {
+CYStatement *CYImplementation::Replace(CYContext &context) {
     CYVariable *cyc($V("$cyc")), *cys($V("$cys"));
 
-    CYExpression *name(name_ != NULL ? name_->ClassName(context, false) : $C1($V("$cyq"), $S("CY$")));
-
-    return $C1($F(NULL, $P6($L("$cys"), $L("$cyp"), $L("$cyc"), $L("$cyn"), $L("$cyt"), $L("$cym")), $$->*
+    return $E($C1($F(NULL, $P6($B($I("$cys")), $B($I("$cyp")), $B($I("$cyc")), $B($I("$cyn")), $B($I("$cyt")), $B($I("$cym"))), $$->*
         $E($ CYAssign($V("$cyp"), $C1($V("object_getClass"), cys)))->*
-        $E($ CYAssign(cyc, $C3($V("objc_allocateClassPair"), cys, name, $D(0))))->*
+        $E($ CYAssign(cyc, $C3($V("objc_allocateClassPair"), cys, $S(name_), $D(0))))->*
         $E($ CYAssign($V("$cym"), $C1($V("object_getClass"), cyc)))->*
         protocols_->Replace(context)->*
         fields_->Replace(context)->*
         messages_->Replace(context, false)->*
         $E($C1($V("objc_registerClassPair"), cyc))->*
         $ CYReturn(cyc)
-    ), super_ == NULL ? $ CYNull() : super_);
+    ), extends_ == NULL ? $ CYNull() : extends_));
 }
 
-CYExpression *CYClassExpression::Replace(CYContext &context) {
-    return Replace_(context);
-}
+CYStatement *CYImplementationField::Replace(CYContext &context) const { $T(NULL)
+    CYVariable *cyn($V("$cyn"));
+    CYVariable *cyt($V("$cyt"));
 
-CYStatement *CYClassStatement::Replace(CYContext &context) {
-    return $E(Replace_(context));
-}
+    CYExpression *type($C0($M(typed_->Replace(context), $S("toString"))));
 
-CYStatement *CYField::Replace(CYContext &context) const {
-    return NULL;
+    return $ CYBlock($$->*
+        $E($ CYAssign(cyt, type))->*
+        $E($ CYAssign(cyn, $N1($V("Type"), cyt)))->*
+        $E($C5($V("class_addIvar"), $V("$cyc"), $S(typed_->identifier_->Word()), $M(cyn, $S("size")), $M(cyn, $S("alignment")), cyt))->*
+        next_->Replace(context)
+    );
 }
 
-CYStatement *CYImport::Replace(CYContext &context) {
-    return this;
+CYTarget *CYInstanceLiteral::Replace(CYContext &context) {
+    return $N1($V("Instance"), number_);
 }
 
 CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NULL)
@@ -77,22 +93,26 @@ CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NUL
     return $ CYBlock($$->*
         next_->Replace(context, replace)->*
         $E($ CYAssign(cyn, parameters_->Selector(context)))->*
-        $E($ CYAssign(cyt, $C1($M(cyn, $S("type")), _class)))->*
+        $E($ CYAssign(cyt, TypeSignature(context)))->*
         $E($C4($V(replace ? "class_replaceMethod" : "class_addMethod"),
             $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))))->*
-                $ CYReturn($C1($M($F(NULL, NULL, code_), $S("call")), self))
+            $N2($V("Functor"), $F(NULL, $P2($B($I("self")), $B($I("_cmd")), parameters_->Parameters(context)), $$->*
+                $ CYVar($B1($B($I("$cyr"), $N2($V("objc_super"), self, _class))))->*
+                $ CYReturn($C1($M($F(NULL, NULL, code_.code_), $S("call")), self))
             ), cyt),
             cyt
         ))
     );
 }
 
+CYExpression *CYMessage::TypeSignature(CYContext &context) const {
+    return MessageType(context, type_, parameters_, $S("@:"));
+}
+
 CYFunctionParameter *CYMessageParameter::Parameters(CYContext &context) const { $T(NULL)
     CYFunctionParameter *next(next_->Parameters(context));
-    return name_ == NULL ? next : $ CYFunctionParameter($ CYDeclaration(name_), next);
+    return type_ == NULL ? next : $ CYFunctionParameter($B(type_->identifier_), next);
 }
 
 CYSelector *CYMessageParameter::Selector(CYContext &context) const {
@@ -101,13 +121,42 @@ CYSelector *CYMessageParameter::Selector(CYContext &context) const {
 
 CYSelectorPart *CYMessageParameter::SelectorPart(CYContext &context) const { $T(NULL)
     CYSelectorPart *next(next_->SelectorPart(context));
-    return tag_ == NULL ? next : $ CYSelectorPart(tag_, name_ != NULL, next);
+    return name_ == NULL ? next : $ CYSelectorPart(name_, type_ != NULL, next);
 }
 
-CYExpression *CYBox::Replace(CYContext &context) {
+CYExpression *CYMessageParameter::TypeSignature(CYContext &context) const {
+    return MessageType(context, type_, next_);
+}
+
+CYTarget *CYBox::Replace(CYContext &context) {
     return $C1($M($V("Instance"), $S("box")), value_);
 }
 
+CYTarget *CYObjCArray::Replace(CYContext &context) {
+    size_t count(0);
+    CYForEach (element, elements_)
+        ++count;
+    return $ CYSendDirect($V("NSArray"), $C_($ CYWord("arrayWithObjects"), $ CYArray(elements_), $C_($ CYWord("count"), $D(count))));
+}
+
+CYTarget *CYObjCDictionary::Replace(CYContext &context) {
+    CYList<CYElement> keys;
+    CYList<CYElement> values;
+    size_t count(0);
+
+    CYForEach (pair, pairs_) {
+        keys->*$ CYElementValue(pair->key_);
+        values->*$ CYElementValue(pair->value_);
+        ++count;
+    }
+
+    return $ CYSendDirect($V("NSDictionary"), $C_($ CYWord("dictionaryWithObjects"), $ CYArray(values), $C_($ CYWord("forKeys"), $ CYArray(keys), $C_($ CYWord("count"), $D(count)))));
+}
+
+CYTarget *CYObjCBlock::Replace(CYContext &context) {
+    return $C1($ CYTypeExpression(($ CYTypedIdentifier(*typed_))->Modify($ CYTypeBlockWith(parameters_))), $ CYFunctionExpression(NULL, parameters_->Parameters(context), code_));
+}
+
 CYStatement *CYProtocol::Replace(CYContext &context) const { $T(NULL)
     return $ CYBlock($$->*
         next_->Replace(context)->*
@@ -117,8 +166,8 @@ CYStatement *CYProtocol::Replace(CYContext &context) const { $T(NULL)
     );
 }
 
-CYExpression *CYSelector::Replace(CYContext &context) {
-    return $N1($V("Selector"), name_->Replace(context));
+CYTarget *CYSelector::Replace(CYContext &context) {
+    return $C1($V("sel_registerName"), parts_->Replace(context));
 }
 
 CYString *CYSelectorPart::Replace(CYContext &context) {
@@ -129,10 +178,10 @@ CYString *CYSelectorPart::Replace(CYContext &context) {
         if (part->value_)
             str << ':';
     }
-    return $S(apr_pstrdup($pool, str.str().c_str()));
+    return $S($pool.strdup(str.str().c_str()));
 }
 
-CYExpression *CYSendDirect::Replace(CYContext &context) {
+CYTarget *CYSendDirect::Replace(CYContext &context) {
     std::ostringstream name;
     CYArgument **argument(&arguments_);
     CYSelectorPart *selector(NULL), *current(NULL);
@@ -154,9 +203,9 @@ CYExpression *CYSendDirect::Replace(CYContext &context) {
             argument = &(*argument)->next_;
     }
 
-    return $C2($V("objc_msgSend"), self_, ($ CYSelector(selector))->Replace(context), arguments_);
+    return $C2($V("objc_msgSend"), self_, selector->Replace(context), arguments_);
 }
 
-CYExpression *CYSendSuper::Replace(CYContext &context) {
+CYTarget *CYSendSuper::Replace(CYContext &context) {
     return $ CYSendDirect($V("$cyr"), arguments_);
 }