Remove nil from bridge: it is a runtime property.

[cycript.git] / ObjectiveC / Output.mm

diff --git a/ObjectiveC/Output.mm b/ObjectiveC/Output.mm
index 3f360a8d589c7d8fc2a014933602814fe7341d0c..e406493cf4662b413ce5e587f0941976950f357e 100644 (file)
--- a/ObjectiveC/Output.mm
+++ b/ObjectiveC/Output.mm
@@ -61,7 +61,7 @@ void CYClass::Output(CYOutput &out, CYFlags flags) const {
     out << "return $cyc;";
     out << "}(";
     if (super_ != NULL)
     out << "return $cyc;";
     out << "}(";
     if (super_ != NULL)

-        super_->Output(out, CYPA, CYNoFlags);
+        super_->Output(out, CYAssign::Precedence_, CYNoFlags);

     else
         out << "null";
     out << "))";
     else
         out << "null";
     out << "))";


@@ -85,7 +85,7 @@ void CYImport::Output(CYOutput &out, CYFlags flags) const {
 void CYMessage::Output(CYOutput &out, bool replace) const {
     out << (instance_ ? '-' : '+');
 
 void CYMessage::Output(CYOutput &out, bool replace) const {
     out << (instance_ ? '-' : '+');
 

-    for (CYMessageParameter *parameter(parameters_); parameter != NULL; parameter = parameter->next_)
+    CYForEach (parameter, parameters_)

         if (parameter->tag_ != NULL) {
             out << ' ' << *parameter->tag_;
             if (parameter->name_ != NULL)
         if (parameter->tag_ != NULL) {
             out << ' ' << *parameter->tag_;
             if (parameter->name_ != NULL)


@@ -96,7 +96,7 @@ void CYMessage::Output(CYOutput &out, bool replace) const {
 }
 
 void CYProtocol::Output(CYOutput &out) const {
 }
 
 void CYProtocol::Output(CYOutput &out) const {

-    name_->Output(out, CYPA, CYNoFlags);
+    name_->Output(out, CYAssign::Precedence_, CYNoFlags);

     if (next_ != NULL)
         out << ',' << ' ' << *next_;
 }
     if (next_ != NULL)
         out << ',' << ' ' << *next_;
 }


@@ -113,7 +113,7 @@ void CYSelectorPart::Output(CYOutput &out) const {
 }
 
 void CYSend::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYSend::Output(CYOutput &out, CYFlags flags) const {

-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
+    CYForEach (argument, arguments_)

         if (argument->name_ != NULL) {
             out << ' ' << *argument->name_;
             if (argument->value_ != NULL)
         if (argument->name_ != NULL) {
             out << ' ' << *argument->name_;
             if (argument->value_ != NULL)


@@ -123,7 +123,7 @@ void CYSend::Output(CYOutput &out, CYFlags flags) const {
 
 void CYSendDirect::Output(CYOutput &out, CYFlags flags) const {
     out << '[';
 
 void CYSendDirect::Output(CYOutput &out, CYFlags flags) const {
     out << '[';

-    self_->Output(out, CYPA, CYNoFlags);
+    self_->Output(out, CYAssign::Precedence_, CYNoFlags);

     CYSend::Output(out, flags);
     out << ']';
 }
     CYSend::Output(out, flags);
     out << ']';
 }