Renamed Application.cpp to Console.cpp.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 3d11cc1aa2d414be1d56b24c92c3f1e7d510cf86..a10705a61854f11d6b32b18b9164b6218ac6ab4e 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -46,7 +46,7 @@ bool CYTrue::Value() const {
 
 void CYAddressOf::Output(std::ostream &out, CYFlags flags) const {
     rhs_->Output(out, 1, CYLeft(flags));
 
 void CYAddressOf::Output(std::ostream &out, CYFlags flags) const {
     rhs_->Output(out, 1, CYLeft(flags));

-    out << ".addressOf()";
+    out << ".$cya()";

 }
 
 void CYArgument::Output(std::ostream &out) const {
 }
 
 void CYArgument::Output(std::ostream &out) const {


@@ -214,6 +214,17 @@ void CYDeclarations::Output(std::ostream &out) const {
     out << ';';
 }
 
     out << ';';
 }
 

+void CYDirectMember::Output(std::ostream &out, CYFlags flags) const {
+    object_->Output(out, Precedence(), CYLeft(flags));
+    if (const char *word = property_->Word())
+        out << '.' << word;
+    else {
+        out << '[';
+        property_->Output(out, CYNoFlags);
+        out << ']';
+    }
+}
+

 void CYDoWhile::Output(std::ostream &out) const {
     // XXX: extra space character!
     out << "do ";
 void CYDoWhile::Output(std::ostream &out) const {
     // XXX: extra space character!
     out << "do ";


@@ -320,7 +331,19 @@ void CYIf::Output(std::ostream &out) const {
 
 void CYIndirect::Output(std::ostream &out, CYFlags flags) const {
     rhs_->Output(out, 1, CYLeft(flags));
 
 void CYIndirect::Output(std::ostream &out, CYFlags flags) const {
     rhs_->Output(out, 1, CYLeft(flags));

-    out << "[0]";
+    out << ".$cyi";
+}
+
+void CYIndirectMember::Output(std::ostream &out, CYFlags flags) const {
+    object_->Output(out, Precedence(), CYLeft(flags));
+    out << ".$cyi";
+    if (const char *word = property_->Word())
+        out << '.' << word;
+    else {
+        out << '[';
+        property_->Output(out, CYNoFlags);
+        out << ']';
+    }

 }
 
 void CYInfix::Output(std::ostream &out, CYFlags flags) const {
 }
 
 void CYInfix::Output(std::ostream &out, CYFlags flags) const {


@@ -360,17 +383,6 @@ void CYLambda::Output(std::ostream &out, CYFlags flags) const {
         out << ')';
 }
 
         out << ')';
 }
 

-void CYMember::Output(std::ostream &out, CYFlags flags) const {
-    object_->Output(out, Precedence(), CYLeft(flags));
-    if (const char *word = property_->Word())
-        out << '.' << word;
-    else {
-        out << '[';
-        property_->Output(out, CYNoFlags);
-        out << ']';
-    }
-}
-

 void CYMessage::Output(std::ostream &out, bool replace) const {
     if (next_ != NULL)
         next_->Output(out, replace);
 void CYMessage::Output(std::ostream &out, bool replace) const {
     if (next_ != NULL)
         next_->Output(out, replace);


@@ -601,7 +613,7 @@ void CYTry::Output(std::ostream &out) const {
     out << "try";
     try_->Output(out, true);
     if (catch_ != NULL)
     out << "try";
     try_->Output(out, true);
     if (catch_ != NULL)

-        out << catch_;
+        catch_->Output(out);

     if (finally_ != NULL) {
         out << "finally";
         finally_->Output(out, true);
     if (finally_ != NULL) {
         out << "finally";
         finally_->Output(out, true);