Move message parameter name into typed identifier.

[cycript.git] / ObjectiveC / Replace.cpp

diff --git a/ObjectiveC/Replace.cpp b/ObjectiveC/Replace.cpp
index f500bd8cda4381f73e4ca6c5e4b10de0cb9ab93e..15361f2260a09dda14e565ef8425227632ad9d34 100644 (file)
--- a/ObjectiveC/Replace.cpp
+++ b/ObjectiveC/Replace.cpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* 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/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 


@@ -24,10 +24,25 @@
 
 #include <sstream>
 
 
 #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"));
 
 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($L("$cys"), $L("$cyp"), $L("$cyc"), $L("$cyn"), $L("$cyt"), $L("$cym")), $$->*

         $E($ CYAssign($V("$cyp"), $C1($V("object_getClass"), cys)))->*
         $E($ CYAssign(cyc, cys))->*
         $E($ CYAssign($V("$cym"), $C1($V("object_getClass"), cyc)))->*
         $E($ CYAssign($V("$cyp"), $C1($V("object_getClass"), cys)))->*
         $E($ CYAssign(cyc, cys))->*
         $E($ CYAssign($V("$cym"), $C1($V("object_getClass"), cyc)))->*


@@ -60,12 +75,22 @@ CYStatement *CYClassStatement::Replace(CYContext &context) {
     return $E(Replace_(context));
 }
 
     return $E(Replace_(context));
 }
 

-CYStatement *CYField::Replace(CYContext &context) const {
-    return NULL;
+CYStatement *CYField::Replace(CYContext &context) const { $T(NULL)
+    CYVariable *cyn($V("$cyn"));
+    CYVariable *cyt($V("$cyt"));
+
+    CYExpression *type($C0($M(typed_->Replace(context), $S("toString"))));
+
+    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;
+CYExpression *CYInstanceLiteral::Replace(CYContext &context) {
+    return $N1($V("Instance"), number_);

 }
 
 CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NULL)
 }
 
 CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NULL)


@@ -77,12 +102,12 @@ CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NUL
     return $ CYBlock($$->*
         next_->Replace(context, replace)->*
         $E($ CYAssign(cyn, parameters_->Selector(context)))->*
     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)), $$->*
         $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))))->*
+                $ 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


@@ -90,9 +115,13 @@ CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NUL
     );
 }
 
     );
 }
 

+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));
 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($ CYDeclaration(type_->identifier_), next);

 }
 
 CYSelector *CYMessageParameter::Selector(CYContext &context) const {
 }
 
 CYSelector *CYMessageParameter::Selector(CYContext &context) const {


@@ -101,13 +130,21 @@ CYSelector *CYMessageParameter::Selector(CYContext &context) const {
 
 CYSelectorPart *CYMessageParameter::SelectorPart(CYContext &context) const { $T(NULL)
     CYSelectorPart *next(next_->SelectorPart(context));
 
 CYSelectorPart *CYMessageParameter::SelectorPart(CYContext &context) const { $T(NULL)
     CYSelectorPart *next(next_->SelectorPart(context));

-    return tag_ == NULL ? next : $ CYSelectorPart(tag_, name_ != NULL, next);
+    return tag_ == NULL ? next : $ CYSelectorPart(tag_, type_ != NULL, next);
+}
+
+CYExpression *CYMessageParameter::TypeSignature(CYContext &context) const {
+    return MessageType(context, type_, next_);

 }
 
 CYExpression *CYBox::Replace(CYContext &context) {
     return $C1($M($V("Instance"), $S("box")), value_);
 }
 
 }
 
 CYExpression *CYBox::Replace(CYContext &context) {
     return $C1($M($V("Instance"), $S("box")), value_);
 }
 

+CYExpression *CYObjCBlock::Replace(CYContext &context) {
+    return $C1($ CYEncodedType(($ CYTypedIdentifier(*typed_))->Modify($ CYTypeBlockWith(parameters_))), $ CYFunctionExpression(NULL, parameters_->Parameters(context), statements_));
+}
+

 CYStatement *CYProtocol::Replace(CYContext &context) const { $T(NULL)
     return $ CYBlock($$->*
         next_->Replace(context)->*
 CYStatement *CYProtocol::Replace(CYContext &context) const { $T(NULL)
     return $ CYBlock($$->*
         next_->Replace(context)->*


@@ -118,7 +155,7 @@ CYStatement *CYProtocol::Replace(CYContext &context) const { $T(NULL)
 }
 
 CYExpression *CYSelector::Replace(CYContext &context) {
 }
 
 CYExpression *CYSelector::Replace(CYContext &context) {

-    return $N1($V("Selector"), name_->Replace(context));
+    return $C1($V("sel_registerName"), name_->Replace(context));

 }
 
 CYString *CYSelectorPart::Replace(CYContext &context) {
 }
 
 CYString *CYSelectorPart::Replace(CYContext &context) {


@@ -129,7 +166,7 @@ CYString *CYSelectorPart::Replace(CYContext &context) {
         if (part->value_)
             str << ':';
     }
         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) {
 }
 
 CYExpression *CYSendDirect::Replace(CYContext &context) {


@@ -154,7 +191,7 @@ CYExpression *CYSendDirect::Replace(CYContext &context) {
             argument = &(*argument)->next_;
     }
 
             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) {
 }
 
 CYExpression *CYSendSuper::Replace(CYContext &context) {