Support round trip of signed char through typedef.

[cycript.git] / ObjectiveC / Replace.cpp

diff --git a/ObjectiveC/Replace.cpp b/ObjectiveC/Replace.cpp
index 1b71e02db0d18cb766dfcd2543ba9a3a86cee87f..6dd8e5500dc16cdd5c536df9aa3550750dd9029d 100644 (file)
--- a/ObjectiveC/Replace.cpp
+++ b/ObjectiveC/Replace.cpp
@@ -19,10 +19,11 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include <sstream>
+

 #include "Replace.hpp"
 #include "Replace.hpp"

-#include "ObjectiveC/Syntax.hpp"

 
 

-#include <sstream>
+#include "ObjectiveC/Syntax.hpp"

 
 static CYExpression *MessageType(CYContext &context, CYTypedIdentifier *type, CYMessageParameter *next, CYExpression *extra = NULL) {
     CYExpression *left($C0($M(type->Replace(context), $S("toString"))));
 
 static CYExpression *MessageType(CYContext &context, CYTypedIdentifier *type, CYMessageParameter *next, CYExpression *extra = NULL) {
     CYExpression *left($C0($M(type->Replace(context), $S("toString"))));


@@ -42,32 +43,30 @@ static CYExpression *MessageType(CYContext &context, CYTypedIdentifier *type, CY
 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, $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, cys))->*
         $E($ CYAssign($V("$cym"), $C1($V("object_getClass"), cyc)))->*
         messages_->Replace(context, true)
         $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_))));

 }
 
 }
 

-CYStatement *CYClassStatement::Replace(CYContext &context) {
+CYStatement *CYImplementation::Replace(CYContext &context) {

     CYVariable *cyc($V("$cyc")), *cys($V("$cys"));
 
     CYVariable *cyc($V("$cyc")), *cys($V("$cys"));
 

-    CYExpression *name(name_->ClassName(context, false));
-
-    return $E($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($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)
         $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_));

 }
 
 }
 

-CYStatement *CYClassField::Replace(CYContext &context) const { $T(NULL)
+CYStatement *CYImplementationField::Replace(CYContext &context) const { $T(NULL)

     CYVariable *cyn($V("$cyn"));
     CYVariable *cyt($V("$cyt"));
 
     CYVariable *cyn($V("$cyn"));
     CYVariable *cyt($V("$cyt"));
 


@@ -81,7 +80,7 @@ CYStatement *CYClassField::Replace(CYContext &context) const { $T(NULL)
     );
 }
 
     );
 }
 

-CYExpression *CYInstanceLiteral::Replace(CYContext &context) {
+CYTarget *CYInstanceLiteral::Replace(CYContext &context) {

     return $N1($V("Instance"), number_);
 }
 
     return $N1($V("Instance"), number_);
 }
 


@@ -98,8 +97,8 @@ CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NUL
         $E($C4($V(replace ? "class_replaceMethod" : "class_addMethod"),
             $V(instance_ ? "$cyc" : "$cym"),
             cyn,
         $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("objc_super"), self, _class))))->*
+            $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
                 $ CYReturn($C1($M($F(NULL, NULL, code_.code_), $S("call")), self))
             ), cyt),
             cyt


@@ -113,7 +112,7 @@ CYExpression *CYMessage::TypeSignature(CYContext &context) const {
 
 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 type_ == NULL ? next : $ CYFunctionParameter($ CYDeclaration(type_->identifier_), next);
+    return type_ == NULL ? next : $ CYFunctionParameter($B(type_->identifier_), next);

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


@@ -122,19 +121,19 @@ 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_, type_ != NULL, next);
+    return name_ == NULL ? next : $ CYSelectorPart(name_, type_ != NULL, next);

 }
 
 CYExpression *CYMessageParameter::TypeSignature(CYContext &context) const {
     return MessageType(context, type_, next_);
 }
 
 }
 
 CYExpression *CYMessageParameter::TypeSignature(CYContext &context) const {
     return MessageType(context, type_, next_);
 }
 

-CYExpression *CYBox::Replace(CYContext &context) {
+CYTarget *CYBox::Replace(CYContext &context) {

     return $C1($M($V("Instance"), $S("box")), value_);
 }
 
     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), code_));
+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)
 }
 
 CYStatement *CYProtocol::Replace(CYContext &context) const { $T(NULL)


@@ -146,8 +145,8 @@ CYStatement *CYProtocol::Replace(CYContext &context) const { $T(NULL)
     );
 }
 
     );
 }
 

-CYExpression *CYSelector::Replace(CYContext &context) {
-    return $C1($V("sel_registerName"), name_->Replace(context));
+CYTarget *CYSelector::Replace(CYContext &context) {
+    return $C1($V("sel_registerName"), parts_->Replace(context));

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


@@ -161,7 +160,7 @@ CYString *CYSelectorPart::Replace(CYContext &context) {
     return $S($pool.strdup(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);
     std::ostringstream name;
     CYArgument **argument(&arguments_);
     CYSelectorPart *selector(NULL), *current(NULL);


@@ -186,6 +185,6 @@ CYExpression *CYSendDirect::Replace(CYContext &context) {
     return $C2($V("objc_msgSend"), self_, 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_);
 }
     return $ CYSendDirect($V("$cyr"), arguments_);
 }