Manually unify CYLocal<CYPool>::key_ into Library.

[cycript.git] / ObjectiveC / Replace.cpp

diff --git a/ObjectiveC/Replace.cpp b/ObjectiveC/Replace.cpp
index c3a885cf2b716ae6089ac7909c70ad8d6d148257..9de4c093d72db6995c4cf5ab8c8da591f430817a 100644 (file)
--- a/ObjectiveC/Replace.cpp
+++ b/ObjectiveC/Replace.cpp
@@ -82,18 +82,18 @@ CYStatement *CYField::Replace(CYContext &context) const { $T(NULL)
     CYVariable *cyn($V("$cyn"));
     CYVariable *cyt($V("$cyt"));
 
-    CYExpression *type($C0($M(type_, $S("toString"))));
+    CYExpression *type($C0($M(typed_->Replace(context), $S("toString"))));
 
     return $ CYBlock($$->*
-        next_->Replace(context)->*
         $E($ CYAssign(cyt, type))->*
         $E($ CYAssign(cyn, $N1($V("Type"), cyt)))->*
-        $E($C5($V("class_addIvar"), $V("$cyc"), $S(name_->Word()), $M(cyn, $S("size")), $M(cyn, $S("alignment")), 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 $ CYVar($L1($L(module_->part_->Word(), $C1($V("require"), module_->Replace(context, "/")))));
+CYExpression *CYInstanceLiteral::Replace(CYContext &context) {
+    return $N1($V("Instance"), number_);
 }
 
 CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NULL)
@@ -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)), $$->*
-                $ 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
@@ -142,12 +142,6 @@ CYExpression *CYMessageParameter::TypeSignature(CYContext &context) const {
     return MessageType(context, type_, next_);
 }
 
-CYString *CYModule::Replace(CYContext &context, const char *separator) const {
-    if (next_ == NULL)
-        return $ CYString(part_);
-    return $ CYString($pool.strcat(next_->Replace(context, separator)->Value(), separator, part_->Word(), NULL));
-}
-
 CYExpression *CYBox::Replace(CYContext &context) {
     return $C1($M($V("Instance"), $S("box")), value_);
 }
@@ -202,7 +196,7 @@ 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) {