Added cyrver to make clean, fixed GC protection for CYJS*, implemented array comprehe...

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 389948aafa86b36e6f2b6776da670c3c58dfa029..1d4a510e36a4090751f39c34eed89bf361654634 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));
-    out << ".addressOf()";
+    out << ".$cya()";
 }
 
 void CYArgument::Output(std::ostream &out) const {
@@ -73,12 +73,35 @@ void CYArray::Output(std::ostream &out, CYFlags flags) const {
     out << ']';
 }
 
+void CYArrayComprehension::Output(std::ostream &out, CYFlags flags) const {
+    // XXX: I don't necc. need the ()s
+    out << "(function($cyv";
+    for (CYComprehension *comprehension(comprehensions_); comprehension != NULL; comprehension = comprehension->next_)
+        if (const char *name = comprehension->Name())
+            out << ',' << name;
+    out << "){";
+    out << "$cyt=[];";
+    comprehensions_->Output(out);
+    out << "$cyt.push(";
+    expression_->Output(out, CYPA, CYNoFlags);
+    out << ");";
+    for (CYComprehension *comprehension(comprehensions_); comprehension != NULL; comprehension = comprehension->next_)
+        comprehension->End_(out);
+    out << "return $cyt;";
+    out << "}())";
+}
+
 void CYAssignment::Output(std::ostream &out, CYFlags flags) const {
     lhs_->Output(out, Precedence() - 1, CYLeft(flags));
     out << Operator();
     rhs_->Output(out, Precedence(), CYRight(flags));
 }
 
+void CYBlock::Output(std::ostream &out) const {
+    for (CYSource *statement(statements_); statement != NULL; statement = statement->next_)
+        statement->Output(out);
+}
+
 void CYBoolean::Output(std::ostream &out, CYFlags flags) const {
     if ((flags & CYNoLeader) != 0)
         out << ' ';
@@ -114,26 +137,38 @@ void CYCategory::Output(std::ostream &out) const {
     if (messages_ != NULL)
         messages_->Output(out, true);
     out << "})(";
-    name_->ClassName(out);
+    name_->ClassName(out, true);
     out << ");";
 }
 
 void CYClass::Output(std::ostream &out) const {
+    Output(out, CYNoBF);
+    out << ";";
+}
+
+void CYClass::Output(std::ostream &out, CYFlags flags) const {
+    // XXX: I don't necc. need the ()s
     out << "(function($cys,$cyp,$cyc,$cyn,$cyt,$cym){";
     out << "$cyp=object_getClass($cys);";
-    out << "$cyc=objc_allocateClassPair($cys,\"" << *name_ << "\",0);";
+    out << "$cyc=objc_allocateClassPair($cys,";
+    if (name_ != NULL)
+        name_->ClassName(out, false);
+    else
+        out << "$cyq(\"CY$\")";
+    out << ",0);";
     out << "$cym=object_getClass($cyc);";
     if (fields_ != NULL)
         fields_->Output(out);
     if (messages_ != NULL)
         messages_->Output(out, false);
     out << "objc_registerClassPair($cyc);";
-    out << "})(";
+    out << "return $cyc;";
+    out << "}(";
     if (super_ != NULL)
         super_->Output(out, CYPA, CYNoFlags);
     else
         out << "null";
-    out << ");";
+    out << "))";
 }
 
 void CYCompound::Output(std::ostream &out, CYFlags flags) const {
@@ -152,6 +187,12 @@ void CYCompound::Output(std::ostream &out, CYFlags flags) const {
             expression->Output(out, flags);
 }
 
+void CYComprehension::Output(std::ostream &out) const {
+    Begin_(out);
+    if (next_ != NULL)
+        next_->Output(out);
+}
+
 void CYCondition::Output(std::ostream &out, CYFlags flags) const {
     test_->Output(out, Precedence() - 1, CYLeft(flags));
     out << '?';
@@ -180,40 +221,60 @@ void CYClause::Output(std::ostream &out) const {
     out << *next_;
 }
 
-// XXX: deal with NoIn
-void CYDeclaration::Part(std::ostream &out) const {
+void CYDeclaration::Part(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
     out << "var ";
-    Output(out);
+    Output(out, CYRight(flags));
 }
 
-void CYDeclaration::Output(std::ostream &out) const {
+void CYDeclaration::ForEachIn(std::ostream &out) const {
+    out << *identifier_;
+}
+
+void CYDeclaration::Output(std::ostream &out, CYFlags flags) const {
     out << *identifier_;
     if (initialiser_ != NULL) {
         out << '=';
-        initialiser_->Output(out, CYPA, CYNoFlags);
-    }
+        initialiser_->Output(out, CYPA, CYRight(flags));
+    } else if ((flags & CYNoTrailer) != 0)
+        out << ' ';
 }
 
-// XXX: deal with NoIn
-void CYDeclarations::Part(std::ostream &out) const {
+void CYDeclarations::Part(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
     out << "var ";
 
     const CYDeclarations *declaration(this);
   output:
-    out << *declaration->declaration_;
-    declaration = declaration->next_;
+    CYDeclarations *next(declaration->next_);
+    CYFlags right(next == NULL ? CYRight(flags) : CYCenter(flags));
+    declaration->declaration_->Output(out, right);
 
-    if (declaration != NULL) {
+    if (next != NULL) {
         out << ',';
+        declaration = next;
         goto output;
     }
 }
 
 void CYDeclarations::Output(std::ostream &out) const {
-    Part(out);
+    Part(out, CYNoFlags);
     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 ";
@@ -244,17 +305,22 @@ void CYEmpty::Output(std::ostream &out, bool block) const {
 }
 
 void CYExpress::Output(std::ostream &out) const {
-    expression_->Output(out, CYNoFunction | CYNoBrace);
+    expression_->Output(out, CYNoBF);
     out << ';';
 }
 
-void CYExpression::ClassName(std::ostream &out) const {
+void CYExpression::ClassName(std::ostream &out, bool object) const {
     Output(out, CYPA, CYNoFlags);
 }
 
-void CYExpression::Part(std::ostream &out) const {
+void CYExpression::ForEachIn(std::ostream &out) const {
     // XXX: this should handle LeftHandSideExpression
-    Output(out, CYNoIn);
+    Output(out, CYPA, CYNoFlags);
+}
+
+void CYExpression::Part(std::ostream &out, CYFlags flags) const {
+    // XXX: this should handle LeftHandSideExpression
+    Output(out, flags);
 }
 
 void CYExpression::Output(std::ostream &out, unsigned precedence, CYFlags flags) const {
@@ -273,7 +339,7 @@ void CYField::Output(std::ostream &out) const {
 void CYFor::Output(std::ostream &out) const {
     out << "for(";
     if (initialiser_ != NULL)
-        initialiser_->Part(out);
+        initialiser_->Part(out, CYNoFlags);
     out << ';';
     if (test_ != NULL)
         test_->Output(out, CYNoFlags);
@@ -284,17 +350,61 @@ void CYFor::Output(std::ostream &out) const {
     code_->Output(out, false);
 }
 
+void CYForEachIn::Output(std::ostream &out) const {
+    const char *name(initialiser_->ForEachIn());
+
+    if (name != NULL) {
+        out << '{';
+        out << "var " << name << ';';
+    }
+
+    out << "(function($cys,$cyt){";
+    out << "$cys=";
+    set_->Output(out, CYPA, CYNoFlags);
+    out << ";";
+
+    out << "for($cyt in $cys){";
+
+    initialiser_->ForEachIn(out);
+    out << "=$cys[$cyt];";
+
+    code_->Show(out);
+
+    out << "}}());";
+
+    if (name != NULL)
+        out << '}';
+}
+
+void CYForEachInComprehension::Begin_(std::ostream &out) const {
+    out << "(function($cys){";
+    out << "$cys=";
+    set_->Output(out, CYPA, CYNoFlags);
+    out << ";";
+
+    out << "for(" << *name_ << " in $cys){";
+    out << *name_ << "=$cys[" << *name_ << "];";
+}
+
+void CYForEachInComprehension::End_(std::ostream &out) const {
+    out << "}}());";
+}
+
 void CYForIn::Output(std::ostream &out) const {
     out << "for(";
-    initialiser_->Part(out);
-    // XXX: deal with this space character!
-    out << ' ';
+    initialiser_->Part(out, CYNoIn | CYNoTrailer);
     out << "in";
     set_->Output(out, CYNoLeader);
     out << ')';
     code_->Output(out, false);
 }
 
+void CYForInComprehension::Begin_(std::ostream &out) const {
+    out << "for(" << *name_ << " in";
+    set_->Output(out, CYNoLeader);
+    out << ')';
+}
+
 void CYFunction::Output(std::ostream &out) const {
     CYLambda::Output(out, CYNoFlags);
 }
@@ -318,9 +428,27 @@ void CYIf::Output(std::ostream &out) const {
     }
 }
 
+void CYIfComprehension::Begin_(std::ostream &out) const {
+    out << "if(";
+    test_->Output(out, CYNoFlags);
+    out << ')';
+}
+
 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 {
@@ -337,6 +465,8 @@ void CYInfix::Output(std::ostream &out, CYFlags flags) const {
     CYFlags right(protect ? CYNoFlags : CYRight(flags));
     if (alphabetic)
         right |= CYNoLeader;
+    if (strcmp(name, "-") == 0)
+        right |= CYNoHyphen;
     rhs_->Output(out, Precedence() - 1, right);
     if (protect)
         out << ')';
@@ -346,6 +476,8 @@ void CYLambda::Output(std::ostream &out, CYFlags flags) const {
     bool protect((flags & CYNoFunction) != 0);
     if (protect)
         out << '(';
+    else if ((flags & CYNoLeader) != 0)
+        out << ' ';
     out << "function";
     if (name_ != NULL)
         out << ' ' << *name_;
@@ -360,17 +492,6 @@ void CYLambda::Output(std::ostream &out, CYFlags flags) const {
         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);
@@ -414,10 +535,11 @@ void CYNull::Output(std::ostream &out, CYFlags flags) const {
 }
 
 void CYNumber::Output(std::ostream &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
+    double value(Value());
+    if ((flags & CYNoLeader) != 0 || value < 0 && (flags & CYNoHyphen) != 0)
         out << ' ';
     // XXX: decide on correct precision
-    out << std::setprecision(9) << Value();
+    out << std::setprecision(9) << value;
     if ((flags & CYNoTrailer) != 0)
         out << ' ';
 }
@@ -444,8 +566,11 @@ void CYPostfix::Output(std::ostream &out, CYFlags flags) const {
 }
 
 void CYPrefix::Output(std::ostream &out, CYFlags flags) const {
+    const char *name(Operator());
     bool alphabetic(Alphabetic());
-    out << Operator();
+    if (alphabetic && (flags & CYNoLeader) != 0 || name[0] == '-' && (flags & CYNoHyphen) != 0)
+        out << ' ';
+    out << name;
     CYFlags right(CYRight(flags));
     if (alphabetic)
         right |= CYNoLeader;
@@ -488,6 +613,8 @@ void CYSelectorPart::Output(std::ostream &out) const {
 }
 
 void CYSend::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
     out << "objc_msgSend(";
     self_->Output(out, CYPA, CYNoFlags);
     out << ",";
@@ -509,11 +636,11 @@ void CYSend::Output(std::ostream &out, CYFlags flags) const {
 
 void CYSource::Show(std::ostream &out) const {
     for (const CYSource *next(this); next != NULL; next = next->next_)
-        next->Output(out);
+        next->Output_(out);
 }
 
 void CYSource::Output(std::ostream &out, bool block) const {
-    if (!block && next_ == NULL)
+    if (!block && !IsBlock())
         Output(out);
     else {
         out << '{';
@@ -522,6 +649,16 @@ void CYSource::Output(std::ostream &out, bool block) const {
     }
 }
 
+void CYSource::Output_(std::ostream &out) const {
+    Output(out);
+}
+
+void CYStatement::Output_(std::ostream &out) const {
+    for (CYLabel *label(labels_); label != NULL; label = label->next_)
+        out << *label->name_ << ':';
+    Output(out);
+}
+
 void CYString::Output(std::ostream &out, CYFlags flags) const {
     unsigned quot(0), apos(0);
     for (const char *value(value_), *end(value_ + size_); value != end; ++value)
@@ -599,7 +736,7 @@ void CYTry::Output(std::ostream &out) const {
     out << "try";
     try_->Output(out, true);
     if (catch_ != NULL)
-        out << catch_;
+        catch_->Output(out);
     if (finally_ != NULL) {
         out << "finally";
         finally_->Output(out, true);
@@ -628,8 +765,12 @@ void CYWith::Output(std::ostream &out) const {
     code_->Output(out, false);
 }
 
-void CYWord::ClassName(std::ostream &out) const {
-    out << "objc_getClass(\"" << Value() << "\")";
+void CYWord::ClassName(std::ostream &out, bool object) const {
+    if (object)
+        out << "objc_getClass(";
+    out << '"' << Value() << '"';
+    if (object)
+        out << ')';
 }
 
 void CYWord::Output(std::ostream &out) const {