X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b10bd496b85e6ef23d311e5caec6cf1c954a63ce..d29365ce73593f996986f65adfa8f494b8143e37:/Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 09ee163..f888524 100644
--- a/Output.cpp
+++ b/Output.cpp
@@ -23,26 +23,97 @@ _finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
 }
 
 _finline CYFlags CYLeft(CYFlags flags) {
-    return flags & ~CYNoTrailer;
-}
-
-_finline CYFlags CYCenter(CYFlags flags) {
-    return flags & CYNoIn;
+    return flags & ~CYNoDangle;
 }
 
 _finline CYFlags CYRight(CYFlags flags) {
-    return flags & (CYNoIn | CYNoTrailer);
+    return flags & ~CYNoBF;
 }
 
-bool CYFalse::Value() const {
-    return false;
+_finline CYFlags CYCenter(CYFlags flags) {
+    return CYLeft(CYRight(flags));
 }
 
-bool CYTrue::Value() const {
-    return true;
+#define CYPA 16
+
+void CYOutput::Terminate() {
+    out_ << ';';
+    mode_ = NoMode;
+}
+
+CYOutput &CYOutput::operator <<(char rhs) {
+    if (rhs == ' ' || rhs == '\n')
+        if (pretty_)
+            out_ << rhs;
+        else goto done;
+    else if (rhs == '\t')
+        if (pretty_)
+            for (unsigned i(0); i != indent_; ++i)
+                out_ << "    ";
+        else goto done;
+    else goto work;
+
+    mode_ = NoMode;
+    goto done;
+
+  work:
+    if (mode_ == Terminated && rhs != '}')
+        out_ << ';';
+
+    if (rhs == ';') {
+        if (pretty_)
+            goto none;
+        else {
+            mode_ = Terminated;
+            goto done;
+        }
+    } else if (rhs == '-') {
+        if (mode_ == NoHyphen)
+            out_ << ' ';
+        mode_ = NoHyphen;
+    } else if (WordEndRange_[rhs]) {
+        if (mode_ == NoLetter)
+            out_ << ' ';
+        mode_ = NoLetter;
+    } else none:
+        mode_ = NoMode;
+
+    out_ << rhs;
+  done:
+    return *this;
+}
+
+CYOutput &CYOutput::operator <<(const char *rhs) {
+    size_t size(strlen(rhs));
+
+    if (size == 1)
+        return *this << *rhs;
+
+    if (mode_ == Terminated)
+        out_ << ';';
+    else if (
+        mode_ == NoHyphen && *rhs == '-' ||
+        mode_ == NoLetter && WordEndRange_[*rhs]
+    )
+        out_ << ' ';
+
+    if (WordEndRange_[rhs[size - 1]])
+        mode_ = NoLetter;
+    else
+        mode_ = NoMode;
+
+    out_ << rhs;
+    return *this;
 }
 
-#define CYPA 16
+void OutputBody(CYOutput &out, CYStatement *body) {
+    out << ' ' << '{' << '\n';
+    ++out.indent_;
+    if (body != NULL)
+        body->Multiple(out);
+    --out.indent_;
+    out << '\t' << '}';
+}
 
 void CYAddressOf::Output(CYOutput &out, CYFlags flags) const {
     rhs_->Output(out, 1, CYLeft(flags));
@@ -53,24 +124,19 @@ void CYArgument::Output(CYOutput &out) const {
     if (name_ != NULL) {
         out << *name_;
         if (value_ != NULL)
-            out << ":";
+            out << ':' << ' ';
     }
     if (value_ != NULL)
         value_->Output(out, CYPA, CYNoFlags);
     if (next_ != NULL) {
         if (next_->name_ == NULL)
             out << ',';
-        else
-            out << ' ';
-        next_->Output(out);
+        out << ' ' << *next_;
     }
 }
 
 void CYArray::Output(CYOutput &out, CYFlags flags) const {
-    out << '[';
-    if (elements_ != NULL)
-        elements_->Output(out);
-    out << ']';
+    out << '[' << elements_ << ']';
 }
 
 void CYArrayComprehension::Output(CYOutput &out, CYFlags flags) const {
@@ -92,25 +158,20 @@ void CYArrayComprehension::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYAssignment::Output(CYOutput &out, CYFlags flags) const {
-    lhs_->Output(out, Precedence() - 1, CYLeft(flags));
-    out << Operator();
+    lhs_->Output(out, Precedence() - 1, CYLeft(flags) | CYNoRightHand);
+    out << ' ' << Operator() << ' ';
     rhs_->Output(out, Precedence(), CYRight(flags));
 }
 
-void CYBlock::Output(CYOutput &out) const {
-    for (CYStatement *statement(statements_); statement != NULL; statement = statement->next_)
-        statement->Output(out);
+void CYBlock::Output(CYOutput &out, CYFlags flags) const {
+    statements_->Single(out, flags);
 }
 
 void CYBoolean::Output(CYOutput &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
-        out << ' ';
     out << (Value() ? "true" : "false");
-    if ((flags & CYNoTrailer) != 0)
-        out << ' ';
 }
 
-void CYBreak::Output(CYOutput &out) const {
+void CYBreak::Output(CYOutput &out, CYFlags flags) const {
     out << "break";
     if (label_ != NULL)
         out << ' ' << *label_;
@@ -118,21 +179,23 @@ void CYBreak::Output(CYOutput &out) const {
 }
 
 void CYCall::Output(CYOutput &out, CYFlags flags) const {
-    function_->Output(out, Precedence(), CYLeft(flags));
-    out << '(';
-    if (arguments_ != NULL)
-        arguments_->Output(out);
-    out << ')';
+    bool protect((flags & CYNoCall) != 0);
+    if (protect)
+        out << '(';
+    function_->Output(out, Precedence(), protect ? CYNoFlags : flags);
+    out << '(' << arguments_ << ')';
+    if (protect)
+        out << ')';
 }
 
 void CYCatch::Output(CYOutput &out) const {
-    out << "catch(" << *name_ << "){";
+    out << "catch" << ' ' << '(' << *name_ << ')' << ' ' << '{';
     if (code_ != NULL)
-        code_->Show(out);
-    out << "}";
+        code_->Multiple(out);
+    out << '}';
 }
 
-void CYCategory::Output(CYOutput &out) const {
+void CYCategory::Output(CYOutput &out, CYFlags flags) const {
     out << "(function($cys,$cyp,$cyc,$cyn,$cyt){";
     out << "$cyp=object_getClass($cys);";
     out << "$cyc=$cys;";
@@ -140,12 +203,8 @@ void CYCategory::Output(CYOutput &out) const {
         messages_->Output(out, true);
     out << "})(";
     name_->ClassName(out, true);
-    out << ");";
-}
-
-void CYClass::Output(CYOutput &out) const {
-    Output(out, CYNoBF);
-    out << ";";
+    out << ')';
+    out << ';';
 }
 
 void CYClass::Output(CYOutput &out, CYFlags flags) const {
@@ -173,6 +232,14 @@ void CYClass::Output(CYOutput &out, CYFlags flags) const {
     out << "))";
 }
 
+void CYClassExpression::Output(CYOutput &out, CYFlags flags) const {
+    CYClass::Output(out, flags);
+}
+
+void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
+    CYClass::Output(out, flags);
+}
+
 void CYCompound::Output(CYOutput &out, CYFlags flags) const {
     if (CYExpression *expression = expressions_)
         if (CYExpression *next = expression->next_) {
@@ -180,7 +247,7 @@ void CYCompound::Output(CYOutput &out, CYFlags flags) const {
             CYFlags center(CYCenter(flags));
             while (next != NULL) {
                 expression = next;
-                out << ',';
+                out << ',' << ' ';
                 next = expression->next_;
                 CYFlags right(next != NULL ? center : CYRight(flags));
                 expression->Output(out, right);
@@ -191,20 +258,19 @@ void CYCompound::Output(CYOutput &out, CYFlags flags) const {
 
 void CYComprehension::Output(CYOutput &out) const {
     Begin_(out);
-    if (next_ != NULL)
-        next_->Output(out);
+    out << next_;
 }
 
 void CYCondition::Output(CYOutput &out, CYFlags flags) const {
     test_->Output(out, Precedence() - 1, CYLeft(flags));
-    out << '?';
+    out << ' ' << '?' << ' ';
     if (true_ != NULL)
         true_->Output(out, CYPA, CYNoFlags);
-    out << ':';
+    out << ' ' << ':' << ' ';
     false_->Output(out, CYPA, CYRight(flags));
 }
 
-void CYContinue::Output(CYOutput &out) const {
+void CYContinue::Output(CYOutput &out, CYFlags flags) const {
     out << "continue";
     if (label_ != NULL)
         out << ' ' << *label_;
@@ -212,16 +278,14 @@ void CYContinue::Output(CYOutput &out) const {
 }
 
 void CYClause::Output(CYOutput &out) const {
-    if (case_ != NULL) {
-        out << "case";
-        case_->Output(out, CYNoLeader);
-    } else
+    if (case_ != NULL)
+        out << "case" << ' ' << *case_;
+    else
         out << "default";
-    out << ':';
+    out << ':' << '\n';
     if (code_ != NULL)
-        code_->Output(out, false);
-    if (next_ != NULL)
-        out << *next_;
+        code_->Multiple(out, CYNoFlags);
+    out << next_;
 }
 
 const char *CYDeclaration::ForEachIn() const {
@@ -229,9 +293,7 @@ const char *CYDeclaration::ForEachIn() const {
 }
 
 void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
-        out << ' ';
-    out << "var ";
+    out << "var";
     Output(out, CYRight(flags));
 }
 
@@ -242,26 +304,31 @@ void CYDeclaration::ForEachIn(CYOutput &out) const {
 void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
     out << *identifier_;
     if (initialiser_ != NULL) {
-        out << '=';
+        out << ' ' << '=' << ' ';
         initialiser_->Output(out, CYPA, CYRight(flags));
-    } else if ((flags & CYNoTrailer) != 0)
-        out << ' ';
+    }
 }
 
 void CYDeclarations::For(CYOutput &out) const {
-    out << "var ";
+    out << "var";
     Output(out, CYNoIn);
 }
 
+void CYDeclarations::Output(CYOutput &out) const {
+    Output(out, CYNoFlags);
+}
+
 void CYDeclarations::Output(CYOutput &out, CYFlags flags) const {
     const CYDeclarations *declaration(this);
+    bool first(true);
   output:
     CYDeclarations *next(declaration->next_);
-    CYFlags right(next == NULL ? CYRight(flags) : CYCenter(flags));
-    declaration->declaration_->Output(out, right);
+    CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
+    first = false;
+    declaration->declaration_->Output(out, jacks);
 
     if (next != NULL) {
-        out << ',';
+        out << ',' << ' ';
         declaration = next;
         goto output;
     }
@@ -271,44 +338,34 @@ void CYDirectMember::Output(CYOutput &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 << ']';
-    }
+    else
+        out << '[' << *property_ << ']';
 }
 
-void CYDoWhile::Output(CYOutput &out) const {
-    // XXX: extra space character!
-    out << "do ";
-    code_->Output(out, false);
-    out << "while(";
-    test_->Output(out, CYNoFlags);
-    out << ')';
+void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
+    out << "do";
+    code_->Single(out, CYCenter(flags));
+    out << "while" << ' ' << '(' << *test_ << ')';
 }
 
 void CYElement::Output(CYOutput &out) const {
     if (value_ != NULL)
         value_->Output(out, CYPA, CYNoFlags);
-    if (next_ != NULL || value_ == NULL)
+    if (next_ != NULL || value_ == NULL) {
         out << ',';
+        if (next_ != NULL && next_->value_ != NULL)
+            out << ' ';
+    }
     if (next_ != NULL)
         next_->Output(out);
 }
 
-void CYEmpty::Output(CYOutput &out) const {
-    out << ';';
-}
-
-void CYEmpty::Output(CYOutput &out, bool block) const {
-    if (next_ != NULL)
-        CYStatement::Output(out, block);
-    else
-        out << "{}";
+void CYEmpty::Output(CYOutput &out, CYFlags flags) const {
+    out.Terminate();
 }
 
-void CYExpress::Output(CYOutput &out) const {
-    expression_->Output(out, CYNoBF);
+void CYExpress::Output(CYOutput &out, CYFlags flags) const {
+    expression_->Output(out, flags | CYNoBF);
     out << ';';
 }
 
@@ -325,21 +382,21 @@ void CYExpression::For(CYOutput &out) const {
 }
 
 void CYExpression::ForEachIn(CYOutput &out) const {
-    // XXX: this should handle LeftHandSideExpression
-    Output(out, CYPA, CYNoFlags);
+    Output(out, CYPA, CYNoRightHand);
 }
 
 void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
-    // XXX: this should handle LeftHandSideExpression
-    Output(out, flags);
+    Output(out, flags | CYNoRightHand);
+}
+
+void CYExpression::Output(CYOutput &out) const {
+    Output(out, CYNoFlags);
 }
 
 void CYExpression::Output(CYOutput &out, unsigned precedence, CYFlags flags) const {
-    if (precedence < Precedence()) {
-        out << '(';
-        Output(out, CYNoFlags);
-        out << ')';
-    } else
+    if (precedence < Precedence() || (flags & CYNoRightHand) != 0 && RightHand())
+        out << '(' << *this << ')';
+    else
         Output(out, flags);
 }
 
@@ -348,39 +405,37 @@ void CYField::Output(CYOutput &out) const {
 }
 
 void CYFinally::Output(CYOutput &out) const {
-    out << "finally{";
+    out << "finally" << ' ' << '{';
     if (code_ != NULL)
-        code_->Show(out);
-    out << "}";
+        code_->Multiple(out);
+    out << '}';
 }
 
-void CYFor::Output(CYOutput &out) const {
-    out << "for(";
+void CYFor::Output(CYOutput &out, CYFlags flags) const {
+    out << "for" << ' ' << '(';
     if (initialiser_ != NULL)
         initialiser_->For(out);
-    out << ';';
-    if (test_ != NULL)
-        test_->Output(out, CYNoFlags);
-    out << ';';
-    if (increment_ != NULL)
-        increment_->Output(out, CYNoFlags);
+    out.Terminate();
+    out << test_;
+    out.Terminate();
+    out << increment_;
     out << ')';
-    code_->Output(out, false);
+    code_->Single(out, CYRight(flags));
 }
 
-void CYForEachIn::Output(CYOutput &out) const {
+void CYForEachIn::Output(CYOutput &out, CYFlags flags) const {
     out << "with({$cys:0,$cyt:0}){";
 
     out << "$cys=";
     set_->Output(out, CYPA, CYNoFlags);
-    out << ";";
+    out << ';';
 
     out << "for($cyt in $cys){";
 
     initialiser_->ForEachIn(out);
     out << "=$cys[$cyt];";
 
-    code_->Show(out);
+    code_->Multiple(out);
 
     out << '}';
 
@@ -391,7 +446,7 @@ void CYForEachInComprehension::Begin_(CYOutput &out) const {
     out << "(function($cys){";
     out << "$cys=";
     set_->Output(out, CYPA, CYNoFlags);
-    out << ";";
+    out << ';';
 
     out << "for(" << *name_ << " in $cys){";
     out << *name_ << "=$cys[" << *name_ << "];";
@@ -401,48 +456,76 @@ void CYForEachInComprehension::End_(CYOutput &out) const {
     out << "}}());";
 }
 
-void CYForIn::Output(CYOutput &out) const {
-    out << "for(";
-    initialiser_->ForIn(out, CYNoIn | CYNoTrailer);
-    out << "in";
-    set_->Output(out, CYNoLeader);
-    out << ')';
-    code_->Output(out, false);
+void CYForIn::Output(CYOutput &out, CYFlags flags) const {
+    out << "for" << ' ' << '(';
+    initialiser_->ForIn(out, CYNoIn);
+    out << "in" << *set_ << ')';
+    code_->Single(out, CYRight(flags));
 }
 
 void CYForInComprehension::Begin_(CYOutput &out) const {
-    out << "for(" << *name_ << " in";
-    set_->Output(out, CYNoLeader);
-    out << ')';
+    out << "for" << ' ' << '(' << *name_ << "in" << *set_ << ')';
+}
+
+void CYFunction::Output(CYOutput &out, CYFlags flags) const {
+    // XXX: one could imagine using + here to save a byte
+    bool protect((flags & CYNoFunction) != 0);
+    if (protect)
+        out << '(';
+    out << "function";
+    if (name_ != NULL)
+        out << ' ' << *name_;
+    out << '(' << parameters_ << ')';
+    OutputBody(out, body_);
+    if (protect)
+        out << ')';
+}
+
+void CYFunctionExpression::Output(CYOutput &out, CYFlags flags) const {
+    CYFunction::Output(out, flags);
 }
 
-void CYFunction::Output(CYOutput &out) const {
-    CYLambda::Output(out, CYNoFlags);
+void CYFunctionStatement::Output(CYOutput &out, CYFlags flags) const {
+    CYFunction::Output(out, flags);
 }
 
 void CYFunctionParameter::Output(CYOutput &out) const {
     out << *name_;
-    if (next_ != NULL) {
-        out << ',';
-        out << *next_;
-    }
+    if (next_ != NULL)
+        out << ',' << ' ' << *next_;
 }
 
-void CYIf::Output(CYOutput &out) const {
-    out << "if(";
-    test_->Output(out, CYNoFlags);
-    out << ')';
-    true_->Output(out, true);
+void CYIf::Output(CYOutput &out, CYFlags flags) const {
+    bool protect(false);
+    if (false_ == NULL && (flags & CYNoDangle) != 0) {
+        protect = true;
+        out << '{';
+    }
+
+    out << "if" << ' ' << '(' << *test_ << ')';
+
+    CYFlags right(protect ? CYNoFlags : CYRight(flags));
+
+    CYFlags jacks(CYNoDangle);
+    if (false_ == NULL)
+        jacks |= right;
+    else
+        jacks |= protect ? CYNoFlags : CYCenter(flags);
+
+    bool single(true_->Single(out, jacks));
+
     if (false_ != NULL) {
-        out << "else ";
-        false_->Output(out, false);
+        out << (single ? '\t' : ' ');
+        out << "else";
+        false_->Single(out, right);
     }
+
+    if (protect)
+        out << '}';
 }
 
 void CYIfComprehension::Begin_(CYOutput &out) const {
-    out << "if(";
-    test_->Output(out, CYNoFlags);
-    out << ')';
+    out << "if" << '(' << *test_ << ')';
 }
 
 void CYIndirect::Output(CYOutput &out, CYFlags flags) const {
@@ -455,11 +538,8 @@ void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
     out << ".$cyi";
     if (const char *word = property_->Word())
         out << '.' << word;
-    else {
-        out << '[';
-        property_->Output(out, CYNoFlags);
-        out << ']';
-    }
+    else
+        out << '[' << *property_ << ']';
 }
 
 void CYInfix::Output(CYOutput &out, CYFlags flags) const {
@@ -467,49 +547,20 @@ void CYInfix::Output(CYOutput &out, CYFlags flags) const {
     bool protect((flags & CYNoIn) != 0 && strcmp(name, "in"));
     if (protect)
         out << '(';
-    bool alphabetic(Alphabetic());
     CYFlags left(protect ? CYNoFlags : CYLeft(flags));
-    if (alphabetic)
-        left |= CYNoTrailer;
     lhs_->Output(out, Precedence(), left);
-    out << name;
+    out << ' ' << name << ' ';
     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 << ')';
 }
 
-void CYLambda::Output(CYOutput &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_;
-    out << '(';
-    if (parameters_ != NULL)
-        out << *parameters_;
-    out << "){";
-    if (body_ != NULL)
-        body_->Show(out);
-    out << '}';
-    if (protect)
-        out << ')';
-}
-
-void CYLet::Output(CYOutput &out) const {
-    out << "let(";
-    declarations_->Output(out, CYNoFlags);
-    out << "){";
+void CYLet::Output(CYOutput &out, CYFlags flags) const {
+    out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << '{';
     if (statements_ != NULL)
-        statements_->Show(out);
-    out << "}";
+        statements_->Multiple(out);
+    out << '}';
 }
 
 void CYMessage::Output(CYOutput &out, bool replace) const {
@@ -531,41 +582,30 @@ void CYMessage::Output(CYOutput &out, bool replace) const {
             out << ',' << *parameter->name_;
     out << "){return function(){";
     if (body_ != NULL)
-        body_->Show(out);
+        body_->Multiple(out);
     out << "}.call(self);},$cyt),$cyt);";
 }
 
 void CYNew::Output(CYOutput &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
-        out << ' ';
-    out << "new";
-    constructor_->Output(out, Precedence(), CYCenter(flags) | CYNoLeader);
-    out << '(';
+    out << "new" << ' ';
+    CYFlags jacks(CYNoCall | CYCenter(flags));
+    constructor_->Output(out, Precedence(), jacks);
     if (arguments_ != NULL)
-        arguments_->Output(out);
-    out << ')';
+        out << '(' << *arguments_ << ')';
 }
 
 void CYNull::Output(CYOutput &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
-        out << ' ';
     CYWord::Output(out);
-    if ((flags & CYNoTrailer) != 0)
-        out << ' ';
 }
 
 void CYNumber::Output(CYOutput &out, CYFlags flags) const {
-    double value(Value());
-    if ((flags & CYNoLeader) != 0 || value < 0 && (flags & CYNoHyphen) != 0)
-        out << ' ';
-    // XXX: decide on correct precision
-    out.out_ << std::setprecision(9) << value;
-    if ((flags & CYNoTrailer) != 0)
-        out << ' ';
+    char value[32];
+    sprintf(value, "%.17g", Value());
+    out << value;
 }
 
 void CYNumber::PropertyName(CYOutput &out) const {
-    Output(out);
+    Output(out, CYNoFlags);
 }
 
 void CYObject::Output(CYOutput &out, CYFlags flags) const {
@@ -573,8 +613,7 @@ void CYObject::Output(CYOutput &out, CYFlags flags) const {
     if (protect)
         out << '(';
     out << '{';
-    if (property_ != NULL)
-        property_->Output(out);
+    out << property_;
     out << '}';
     if (protect)
         out << ')';
@@ -587,42 +626,29 @@ void CYPostfix::Output(CYOutput &out, CYFlags flags) const {
 
 void CYPrefix::Output(CYOutput &out, CYFlags flags) const {
     const char *name(Operator());
-    bool alphabetic(Alphabetic());
-    if (alphabetic && (flags & CYNoLeader) != 0 || name[0] == '-' && (flags & CYNoHyphen) != 0)
-        out << ' ';
     out << name;
-    CYFlags right(CYRight(flags));
-    if (alphabetic)
-        right |= CYNoLeader;
-    rhs_->Output(out, Precedence(), right);
+    if (Alphabetic())
+        out << ' ';
+    rhs_->Output(out, Precedence(), CYRight(flags));
 }
 
 void CYProperty::Output(CYOutput &out) const {
     name_->PropertyName(out);
-    out << ':';
+    out << ':' << ' ';
     value_->Output(out, CYPA, CYNoFlags);
-    if (next_ != NULL) {
-        out << ',';
-        next_->Output(out);
-    }
+    if (next_ != NULL)
+        out << ',' << ' ' << *next_;
 }
 
 void CYRegEx::Output(CYOutput &out, CYFlags flags) const {
     out << Value();
-    if ((flags & CYNoTrailer) != 0)
-        out << ' ';
 }
 
-void CYReturn::Output(CYOutput &out) const {
-    out << "return";
-    if (value_ != NULL)
-        value_->Output(out, CYNoLeader);
-    out << ';';
+void CYReturn::Output(CYOutput &out, CYFlags flags) const {
+    out << "return" << value_ << ';';
 }
 
 void CYSelector::Output(CYOutput &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
-        out << ' ';
     out << "new Selector(\"";
     if (name_ != NULL)
         name_->Output(out);
@@ -630,20 +656,16 @@ void CYSelector::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYSelectorPart::Output(CYOutput &out) const {
-    if (name_ != NULL)
-        out << *name_;
+    out << name_;
     if (value_)
         out << ':';
-    if (next_ != NULL)
-        next_->Output(out);
+    out << next_;
 }
 
 void CYSend::Output(CYOutput &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
-        out << ' ';
     out << "objc_msgSend(";
     self_->Output(out, CYPA, CYNoFlags);
-    out << ",";
+    out << ',';
     std::ostringstream name;
     for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
         if (argument->name_ != NULL) {
@@ -654,31 +676,43 @@ void CYSend::Output(CYOutput &out, CYFlags flags) const {
     out.out_ << reinterpret_cast<void *>(sel_registerName(name.str().c_str()));
     for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
         if (argument->value_ != NULL) {
-            out << ",";
+            out << ',';
             argument->value_->Output(out, CYPA, CYNoFlags);
         }
     out << ')';
 }
 
-void CYStatement::Show(CYOutput &out) const {
-    for (const CYStatement *next(this); next != NULL; next = next->next_)
-        next->Output_(out);
-}
-
-void CYStatement::Output(CYOutput &out, bool block) const {
-    if (!block && !IsBlock())
-        Output(out);
-    else {
-        out << '{';
-        Show(out);
-        out << '}';
+void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
+    bool first(true);
+    for (const CYStatement *next(this); next != NULL; next = next->next_) {
+        bool last(next->next_ == NULL);
+        CYFlags jacks(first ? last ? flags : CYLeft(flags) : last ? CYCenter(flags) : CYRight(flags));
+        first = false;
+        out << '\t';
+        next->Output(out, jacks);
+        out << '\n';
     }
 }
 
-void CYStatement::Output_(CYOutput &out) const {
-    for (CYLabel *label(labels_); label != NULL; label = label->next_)
-        out << *label->name_ << ':';
-    Output(out);
+bool CYStatement::Single(CYOutput &out, CYFlags flags) const {
+    if (next_ != NULL) {
+        out << ' ' << '{' << '\n';
+        ++out.indent_;
+        Multiple(out);
+        --out.indent_;
+        out << '\t' << '}';
+        return false;
+    } else {
+        for (CYLabel *label(labels_); label != NULL; label = label->next_)
+            out << ' ' << *label->name_ << ':';
+        out << '\n';
+        ++out.indent_;
+        out << '\t';
+        Output(out, flags);
+        out << '\n';
+        --out.indent_;
+        return true;
+    }
 }
 
 void CYString::Output(CYOutput &out, CYFlags flags) const {
@@ -691,106 +725,105 @@ void CYString::Output(CYOutput &out, CYFlags flags) const {
 
     bool single(quot > apos);
 
-    out << (single ? '\'' : '"');
+    std::ostringstream str;
+
+    str << (single ? '\'' : '"');
     for (const char *value(value_), *end(value_ + size_); value != end; ++value)
         switch (*value) {
-            case '\\': out << "\\\\"; break;
-            case '\b': out << "\\b"; break;
-            case '\f': out << "\\f"; break;
-            case '\n': out << "\\n"; break;
-            case '\r': out << "\\r"; break;
-            case '\t': out << "\\t"; break;
-            case '\v': out << "\\v"; break;
+            case '\\': str << "\\\\"; break;
+            case '\b': str << "\\b"; break;
+            case '\f': str << "\\f"; break;
+            case '\n': str << "\\n"; break;
+            case '\r': str << "\\r"; break;
+            case '\t': str << "\\t"; break;
+            case '\v': str << "\\v"; break;
 
             case '"':
                 if (!single)
-                    out << "\\\"";
+                    str << "\\\"";
                 else goto simple;
             break;
 
             case '\'':
                 if (single)
-                    out << "\\'";
+                    str << "\\'";
                 else goto simple;
             break;
 
             default:
                 if (*value < 0x20 || *value >= 0x7f)
-                    out.out_ << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
+                    str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
                 else simple:
-                    out << *value;
+                    str << *value;
         }
-    out << (single ? '\'' : '"');
+    str << (single ? '\'' : '"');
+
+    out << str.str().c_str();
 }
 
 void CYString::PropertyName(CYOutput &out) const {
     if (const char *word = Word())
         out << word;
     else
-        Output(out);
-}
-
-void CYSwitch::Output(CYOutput &out) const {
-    out << "switch(";
-    value_->Output(out, CYNoFlags);
-    out << "){";
-    if (clauses_ != NULL)
-        out << *clauses_;
+        out << *this;
+}
+
+const char *CYString::Word() const {
+    if (size_ == 0 || !WordStartRange_[value_[0]])
+        return NULL;
+    for (size_t i(1); i != size_; ++i)
+        if (!WordEndRange_[value_[i]])
+            return NULL;
+    const char *value(Value());
+    // XXX: we should probably include the full ECMAScript3+5 list.
+    static const char *reserveds[] = {"class", "const", "enum", "export", "extends", "import", "super", NULL};
+    for (const char **reserved(reserveds); *reserved != NULL; ++reserved)
+        if (strcmp(*reserved, value) == 0)
+            return NULL;
+    return value;
+}
+
+void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
+    out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{';
+    out << clauses_;
     out << '}';
 }
 
 void CYThis::Output(CYOutput &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
-        out << ' ';
     CYWord::Output(out);
-    if ((flags & CYNoTrailer) != 0)
-        out << ' ';
 }
 
-void CYThrow::Output(CYOutput &out) const {
-    out << "throw";
-    if (value_ != NULL)
-        value_->Output(out, CYNoLeader);
-    out << ';';
+void CYThrow::Output(CYOutput &out, CYFlags flags) const {
+    out << "throw" << value_ << ';';
 }
 
-void CYTry::Output(CYOutput &out) const {
-    out << "try{";
+void CYTry::Output(CYOutput &out, CYFlags flags) const {
+    out << "try" << ' ' << '{';
     if (code_ != NULL)
-        code_->Show(out);
-    out << "}";
-    if (catch_ != NULL)
-        catch_->Output(out);
-    if (finally_ != NULL)
-        finally_->Output(out);
+        code_->Multiple(out);
+    out << '}';
+    out << catch_;
+    out << finally_;
 }
 
-void CYVar::Output(CYOutput &out) const {
-    out << "var ";
-    declarations_->Output(out, CYNoFlags);
+void CYVar::Output(CYOutput &out, CYFlags flags) const {
+    out << "var";
+    declarations_->Output(out, flags);
     out << ';';
 }
 
 void CYVariable::Output(CYOutput &out, CYFlags flags) const {
-    if ((flags & CYNoLeader) != 0)
-        out << ' ';
     out << *name_;
-    if ((flags & CYNoTrailer) != 0)
-        out << ' ';
 }
 
-void CYWhile::Output(CYOutput &out) const {
-    out << "while(";
-    test_->Output(out, CYNoFlags);
-    out << ')';
-    code_->Output(out, false);
+void CYWhile::Output(CYOutput &out, CYFlags flags) const {
+    out << "while" << '(' << *test_ << ')';
+    code_->Single(out, CYRight(flags));
 }
 
-void CYWith::Output(CYOutput &out) const {
-    out << "with(";
-    scope_->Output(out, CYNoFlags);
-    out << ')';
-    code_->Output(out, false);
+void CYWith::Output(CYOutput &out, CYFlags flags) const {
+    out << "with" << '(' << *scope_ << ')';
+    code_->Single(out, CYRight(flags));
 }
 
 void CYWord::ClassName(CYOutput &out, bool object) const {