X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/dea834b05466e2e8894197360ec38b84ff206f23..7f0a9220982e73064c2aac5d4da3c3fc9705a027:/Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 5471620..82156a0 100644
--- a/Output.cpp
+++ b/Output.cpp
@@ -1,445 +1,699 @@
+/* Cycript - Remove Execution Server and Disassembler
+ * Copyright (C) 2009  Jay Freeman (saurik)
+*/
+
+/* Modified BSD License {{{ */
+/*
+ *        Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer in the documentation
+ *    and/or other materials provided with the
+ *    distribution.
+ * 3. The name of the author may not be used to endorse
+ *    or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* }}} */
+
+#include "cycript.hpp"
 #include "Parser.hpp"
 
-#include <iostream>
-#include <iomanip>
+#include <sstream>
 
-#define CYPA 16
+_finline CYFlags operator ~(CYFlags rhs) {
+    return static_cast<CYFlags>(~static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
+    return lhs = lhs | rhs;
+}
+
+_finline CYFlags CYLeft(CYFlags flags) {
+    return flags & ~CYNoDangle;
+}
 
-void CYAddressOf::Output(std::ostream &out) const {
-    rhs_->Output(out, 1);
-    out << ".$()";
+_finline CYFlags CYRight(CYFlags flags) {
+    return flags & ~CYNoBF;
 }
 
-void CYArgument::Output(std::ostream &out) const {
+_finline CYFlags CYCenter(CYFlags flags) {
+    return CYLeft(CYRight(flags));
+}
+
+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_ == NoPlus)
+            out_ << ' ';
+        mode_ = NoPlus;
+    } 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_ == NoPlus && *rhs == '+' ||
+        mode_ == NoHyphen && *rhs == '-' ||
+        mode_ == NoLetter && WordEndRange_[*rhs]
+    )
+        out_ << ' ';
+
+    if (WordEndRange_[rhs[size - 1]])
+        mode_ = NoLetter;
+    else
+        mode_ = NoMode;
+
+    out_ << rhs;
+    return *this;
+}
+
+void CYArgument::Output(CYOutput &out) const {
     if (name_ != NULL) {
         out << *name_;
         if (value_ != NULL)
-            out << ":";
+            out << ':' << ' ';
     }
     if (value_ != NULL)
-        value_->Output(out, false);
+        value_->Output(out, CYPA, CYNoFlags);
     if (next_ != NULL) {
         if (next_->name_ == NULL)
             out << ',';
-        else
-            out << ' ';
-        next_->Output(out);
+        out << ' ' << *next_;
     }
 }
 
-void CYArray::Output(std::ostream &out) const {
-    out << '[';
-    if (elements_ != NULL)
-        elements_->Output(out);
-    out << ']';
+void CYArray::Output(CYOutput &out, CYFlags flags) const {
+    out << '[' << elements_ << ']';
 }
 
-void CYAssignment::Output(std::ostream &out) const {
-    lhs_->Output(out, Precedence() - 1);
-    out << Operator();
-    rhs_->Output(out, Precedence());
+void CYArrayComprehension::Output(CYOutput &out, CYFlags flags) const {
+    out << '[' << *expression_ << ' ' << *comprehensions_ << ']';
+}
+
+void CYAssignment::Output(CYOutput &out, CYFlags flags) const {
+    lhs_->Output(out, Precedence() - 1, CYLeft(flags) | CYNoRightHand);
+    out << ' ' << Operator() << ' ';
+    rhs_->Output(out, Precedence(), CYRight(flags));
+}
+
+void CYBlock::Output(CYOutput &out) const {
+    out << '{' << '\n';
+    ++out.indent_;
+    if (statements_ != NULL)
+        statements_->Multiple(out);
+    --out.indent_;
+    out << '\t' << '}';
+}
+
+void CYBlock::Output(CYOutput &out, CYFlags flags) const {
+    if (statements_ == NULL)
+        out.Terminate();
+    else if (statements_->next_ == NULL)
+        statements_->Single(out, flags);
+    else
+        Output(out);
 }
 
-void CYBoolean::Output(std::ostream &out) const {
+void CYBoolean::Output(CYOutput &out, CYFlags flags) const {
     out << (Value() ? "true" : "false");
 }
 
-void CYBreak::Output(std::ostream &out) const {
+void CYBreak::Output(CYOutput &out, CYFlags flags) const {
     out << "break";
     if (label_ != NULL)
         out << ' ' << *label_;
     out << ';';
 }
 
-void CYCall::Output(std::ostream &out) const {
-    function_->Output(out, Precedence());
-    out << '(';
-    if (arguments_ != NULL)
-        arguments_->Output(out);
-    out << ')';
+void CYCall::Output(CYOutput &out, CYFlags flags) const {
+    bool protect((flags & CYNoCall) != 0);
+    if (protect)
+        out << '(';
+    function_->Output(out, Precedence(), protect ? CYNoFlags : flags);
+    out << '(' << arguments_ << ')';
+    if (protect)
+        out << ')';
 }
 
-void CYCatch::Output(std::ostream &out) const {
-    out << "catch(" << *name_ << ')';
-    code_->Output(out, true);
+void CYCatch::Output(CYOutput &out) const {
+    out << ' ' << "catch" << ' ' << '(' << *name_ << ')' << ' ' << code_;
 }
 
-void CYCondition::Output(std::ostream &out) const {
-    test_->Output(out, Precedence() - 1);
-    out << '?';
+void CYCompound::Output(CYOutput &out, CYFlags flags) const {
+    if (CYExpression *expression = expressions_)
+        if (CYExpression *next = expression->next_) {
+            expression->Output(out, CYLeft(flags));
+            CYFlags center(CYCenter(flags));
+            while (next != NULL) {
+                expression = next;
+                out << ',' << ' ';
+                next = expression->next_;
+                CYFlags right(next != NULL ? center : CYRight(flags));
+                expression->Output(out, right);
+            }
+        } else
+            expression->Output(out, flags);
+}
+
+void CYCondition::Output(CYOutput &out, CYFlags flags) const {
+    test_->Output(out, Precedence() - 1, CYLeft(flags));
+    out << ' ' << '?' << ' ';
     if (true_ != NULL)
-        true_->Output(out, CYPA);
-    out << ':';
-    false_->Output(out, CYPA);
+        true_->Output(out, CYPA, CYNoFlags);
+    out << ' ' << ':' << ' ';
+    false_->Output(out, CYPA, CYRight(flags));
 }
 
-void CYContinue::Output(std::ostream &out) const {
+void CYContinue::Output(CYOutput &out, CYFlags flags) const {
     out << "continue";
     if (label_ != NULL)
         out << ' ' << *label_;
     out << ';';
 }
 
-void CYClause::Output(std::ostream &out) const {
-    if (case_ != NULL) {
-        out << "case";
-        case_->Output(out);
-    } else
+void CYClause::Output(CYOutput &out) const {
+    if (case_ != NULL)
+        out << "case" << ' ' << *case_;
+    else
         out << "default";
-    out << ':';
-    if (code_ != NULL)
-        code_->Output(out, false);
-    out << *next_;
+    out << ':' << '\n';
+    if (statements_ != NULL)
+        statements_->Multiple(out);
+    out << next_;
 }
 
-void CYDeclaration::Part(std::ostream &out) const {
-    out << "var ";
-    Output(out);
+const char *CYDeclaration::ForEachIn() const {
+    return identifier_->Value();
 }
 
-void CYDeclaration::Output(std::ostream &out) const {
+void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
+    out << "var";
+    Output(out, CYRight(flags));
+}
+
+void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
     out << *identifier_;
     if (initialiser_ != NULL) {
-        out << '=';
-        initialiser_->Output(out, CYPA);
+        out << ' ' << '=' << ' ';
+        initialiser_->Output(out, CYPA, CYRight(flags));
     }
 }
 
-void CYDeclarations::Part(std::ostream &out) const {
-    out << "var ";
+void CYDeclarations::For(CYOutput &out) const {
+    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:
-    out << *declaration->declaration_;
-    declaration = declaration->next_;
-
-    if (declaration != NULL) {
-        out << ',';
+    CYDeclarations *next(declaration->next_);
+    CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
+    first = false;
+    declaration->declaration_->Output(out, jacks);
+
+    if (next != NULL) {
+        out << ',' << ' ';
+        declaration = next;
         goto output;
     }
 }
 
-void CYDeclarations::Output(std::ostream &out) const {
-    Part(out);
-    out << ';';
+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_ << ']';
 }
 
-void CYDoWhile::Output(std::ostream &out) const {
-    out << "do ";
-    code_->Output(out, false);
-    out << "while(";
-    test_->Output(out);
-    out << ';';
+void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
+    out << "do";
+    code_->Single(out, CYCenter(flags));
+    out << "while" << ' ' << '(' << *test_ << ')';
 }
 
-void CYElement::Output(std::ostream &out) const {
+void CYElement::Output(CYOutput &out) const {
     if (value_ != NULL)
-        value_->Output(out, CYPA);
-    if (next_ != NULL || value_ == NULL)
+        value_->Output(out, CYPA, CYNoFlags);
+    if (next_ != NULL || value_ == NULL) {
         out << ',';
+        if (next_ != NULL && next_->value_ != NULL)
+            out << ' ';
+    }
     if (next_ != NULL)
         next_->Output(out);
 }
 
-void CYEmpty::Output(std::ostream &out) const {
+void CYEmpty::Output(CYOutput &out, CYFlags flags) const {
+    out.Terminate();
+}
+
+void CYExpress::Output(CYOutput &out, CYFlags flags) const {
+    expression_->Output(out, flags | CYNoBF);
     out << ';';
 }
 
-void CYEmpty::Output(std::ostream &out, bool block) const {
-    if (next_ != NULL)
-        CYSource::Output(out, block);
+void CYExpression::ClassName(CYOutput &out, bool object) const {
+    Output(out, CYPA, CYNoFlags);
+}
+
+const char *CYExpression::ForEachIn() const {
+    return NULL;
+}
+
+void CYExpression::For(CYOutput &out) const {
+    Output(out, CYNoIn);
+}
+
+void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
+    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() || (flags & CYNoRightHand) != 0 && RightHand())
+        out << '(' << *this << ')';
     else
-        out << "{}";
+        Output(out, flags);
 }
 
-void CYExpress::Output(std::ostream &out) const {
-    expression_->Output(out);
-    out << ';';
+void CYFinally::Output(CYOutput &out) const {
+    out << ' ' << "finally" << ' ' << code_;
 }
 
-void CYExpression::Part(std::ostream &out) const {
-    // XXX: this should notice "in" expressions
-    // XXX: this should handle LeftHandSideExpression
-    Output(out);
+void CYFor::Output(CYOutput &out, CYFlags flags) const {
+    out << "for" << ' ' << '(';
+    if (initialiser_ != NULL)
+        initialiser_->For(out);
+    out.Terminate();
+    out << test_;
+    out.Terminate();
+    out << increment_;
+    out << ')';
+    code_->Single(out, CYRight(flags));
 }
 
-void CYCompound::Output(std::ostream &out) const {
-    if (CYExpression *expression = expressions_)
-        for (;;) {
-            expression->Output(out);
-            expression = expression->next_;
-            if (expression == NULL)
-                break;
-            out << ',';
-        }
+void CYForEachIn::Output(CYOutput &out, CYFlags flags) const {
+    out << "for" << ' ' << "each" << ' ' << '(';
+    initialiser_->ForIn(out, CYNoIn);
+    out << "in" << *set_ << ')';
+    code_->Single(out, CYRight(flags));
+}
+
+void CYForEachInComprehension::Output(CYOutput &out) const {
+    out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;
+}
+
+void CYForIn::Output(CYOutput &out, CYFlags flags) const {
+    out << "for" << ' ' << '(';
+    initialiser_->ForIn(out, CYNoIn);
+    out << "in" << *set_ << ')';
+    code_->Single(out, CYRight(flags));
+}
+
+void CYForInComprehension::Output(CYOutput &out) const {
+    out << "for" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')';
 }
 
-void CYExpression::Output(std::ostream &out, unsigned precedence) const {
-    bool protect(precedence < Precedence());
+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 << '(';
-    Output(out);
+    out << "function";
+    if (name_ != NULL)
+        out << ' ' << *name_;
+    out << '(' << parameters_ << ')';
+    out << ' ' << code_;
     if (protect)
         out << ')';
 }
 
-void CYFor::Output(std::ostream &out) const {
-    out << "for(";
-    if (initialiser_ != NULL)
-        initialiser_->Part(out);
-    out << ';';
-    if (test_ != NULL)
-        test_->Output(out);
-    out << ';';
-    if (increment_ != NULL)
-        increment_->Output(out);
-    out << ')';
-    code_->Output(out, false);
+void CYFunctionExpression::Output(CYOutput &out, CYFlags flags) const {
+    CYFunction::Output(out, flags);
 }
 
-void CYForIn::Output(std::ostream &out) const {
-    out << "for(";
-    initialiser_->Part(out);
-    out << " in ";
-    set_->Output(out);
-    out << ')';
-    code_->Output(out, false);
+void CYFunctionStatement::Output(CYOutput &out, CYFlags flags) const {
+    CYFunction::Output(out, flags);
 }
 
-void CYFunction::Output(std::ostream &out) const {
-    CYLambda::Output(out);
+void CYFunctionParameter::Output(CYOutput &out) const {
+    out << *name_;
+    if (next_ != NULL)
+        out << ',' << ' ' << *next_;
 }
 
-void CYIf::Output(std::ostream &out) const {
-    out << "if(";
-    test_->Output(out);
-    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);
+
+    true_->Single(out, jacks);
+
     if (false_ != NULL) {
-        out << "else ";
-        false_->Output(out, false);
+        out << "else";
+        false_->Single(out, right);
     }
+
+    if (protect)
+        out << '}';
 }
 
-void CYIndirect::Output(std::ostream &out) const {
-    rhs_->Output(out, 1);
-    out << "[0]";
+void CYIfComprehension::Output(CYOutput &out) const {
+    out << "if" << ' ' << '(' << *test_ << ')' << next_;
 }
 
-void CYInfix::Output(std::ostream &out) const {
-    lhs_->Output(out, Precedence());
-    out << Operator();
-    rhs_->Output(out, Precedence() - 1);
+void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
+    object_->Output(out, Precedence(), CYLeft(flags));
+    if (const char *word = property_->Word())
+        out << "->" << word;
+    else
+        out << "->" << '[' << *property_ << ']';
 }
 
-void CYLambda::Output(std::ostream &out) const {
-    out << "function";
-    if (name_ != NULL)
-        out << ' ' << *name_;
-    out << '(';
-    if (parameters_ != NULL)
-        out << *parameters_;
-    out << ')';
-    body_->Output(out, true);
+void CYInfix::Output(CYOutput &out, CYFlags flags) const {
+    const char *name(Operator());
+    bool protect((flags & CYNoIn) != 0 && strcmp(name, "in") == 0);
+    if (protect)
+        out << '(';
+    CYFlags left(protect ? CYNoFlags : CYLeft(flags));
+    lhs_->Output(out, Precedence(), left);
+    out << ' ' << name << ' ';
+    CYFlags right(protect ? CYNoFlags : CYRight(flags));
+    rhs_->Output(out, Precedence() - 1, right);
+    if (protect)
+        out << ')';
 }
 
-void CYMember::Output(std::ostream &out) const {
-    object_->Output(out, Precedence());
-    if (const char *word = property_->Word())
-        out << '.' << word;
-    else {
-        out << '[';
-        property_->Output(out);
-        out << ']';
-    }
+void CYLabel::Output(CYOutput &out, CYFlags flags) const {
+    out << *name_ << ':' << ' ';
+    statement_->Single(out, CYRight(flags));
 }
 
-void CYMessage::Output(std::ostream &out) const {
-    out << "objc_msgSend(";
-    self_->Output(out, CYPA);
-    out << ",\"";
-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
-        if (argument->name_ != NULL) {
-            out << *argument->name_;
-            if (argument->value_ != NULL)
-                out << ':';
-        }
-    out << "\"";
-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
-        if (argument->value_ != NULL) {
-            out << ",";
-            argument->value_->Output(out, CYPA);
-        }
-    out << ')';
+void CYLet::Output(CYOutput &out, CYFlags flags) const {
+    out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << code_;
 }
 
-void CYNew::Output(std::ostream &out) const {
-    out << "new";
-    // XXX: I don't /always/ need this character
-    out << ' ';
-    constructor_->Output(out, Precedence());
-    out << '(';
+void CYNew::Output(CYOutput &out, CYFlags flags) const {
+    out << "new" << ' ';
+    CYFlags jacks(CYNoCall | CYCenter(flags));
+    constructor_->Output(out, Precedence(), jacks);
     if (arguments_ != NULL)
-        arguments_->Output(out);
-    out << ')';
+        out << '(' << *arguments_ << ')';
 }
 
-void CYNull::Output(std::ostream &out) const {
+void CYNull::Output(CYOutput &out, CYFlags flags) const {
     CYWord::Output(out);
 }
 
-void CYNumber::Output(std::ostream &out) const {
-    // XXX: this is not a useful formatting
-    out << Value();
+void CYNumber::Output(CYOutput &out, CYFlags flags) const {
+    char value[32];
+    // XXX: I want this to print 1e3 rather than 1000
+    sprintf(value, "%.17g", Value());
+    out << value;
 }
 
-void CYObject::Output(std::ostream &out) const {
-    out << '{';
-    if (property_ != NULL)
-        property_->Output(out);
-    out << '}';
+void CYNumber::PropertyName(CYOutput &out) const {
+    Output(out, CYNoFlags);
 }
 
-void CYParameter::Output(std::ostream &out) const {
-    out << *name_;
-    if (next_ != NULL) {
-        out << ',';
-        out << *next_;
-    }
+void CYObject::Output(CYOutput &out, CYFlags flags) const {
+    bool protect((flags & CYNoBrace) != 0);
+    if (protect)
+        out << '(';
+    out << '{' << '\n';
+    ++out.indent_;
+    out << properties_;
+    --out.indent_;
+    out << '\t' << '}';
+    if (protect)
+        out << ')';
 }
 
-void CYPostfix::Output(std::ostream &out) const {
-    lhs_->Output(out, Precedence());
+void CYPostfix::Output(CYOutput &out, CYFlags flags) const {
+    lhs_->Output(out, Precedence(), CYLeft(flags));
     out << Operator();
 }
 
-void CYPrefix::Output(std::ostream &out) const {
-    out << Operator();
-    rhs_->Output(out, Precedence());
+void CYPrefix::Output(CYOutput &out, CYFlags flags) const {
+    const char *name(Operator());
+    out << name;
+    if (Alphabetic())
+        out << ' ';
+    rhs_->Output(out, Precedence(), CYRight(flags));
 }
 
-void CYProperty::Output(std::ostream &out) const {
-    out << *name_ << ':';
-    value_->Output(out, CYPA);
-    if (next_ != NULL) {
-        out << ',';
-        next_->Output(out);
-    }
+void CYProgram::Output(CYOutput &out) const {
+    if (statements_ != NULL)
+        statements_->Multiple(out);
 }
 
-void CYReturn::Output(std::ostream &out) const {
+void CYProperty::Output(CYOutput &out) const {
+    out << '\t';
+    name_->PropertyName(out);
+    out << ':' << ' ';
+    value_->Output(out, CYPA, CYNoFlags);
+    if (next_ != NULL)
+        out << ',' << '\n' << *next_;
+    else
+        out << '\n';
+}
+
+void CYRegEx::Output(CYOutput &out, CYFlags flags) const {
+    out << Value();
+}
+
+void CYReturn::Output(CYOutput &out, CYFlags flags) const {
     out << "return";
-    if (value_ != NULL) {
-        out << ' ';
-        value_->Output(out);
-    }
+    if (value_ != NULL)
+        out << ' ' << *value_;
     out << ';';
 }
 
-void CYSelector::Output(std::ostream &out) const {
-    out << "new SEL(\"";
-    if (name_ != NULL)
-        name_->Output(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 CYSelectorPart::Output(std::ostream &out) const {
-    if (name_ != NULL)
-        out << *name_;
-    if (value_)
-        out << ':';
-    if (next_ != NULL)
-        next_->Output(out);
+void CYStatement::Single(CYOutput &out, CYFlags flags) const {
+    _assert(next_ == NULL);
+    out << '\n';
+    ++out.indent_;
+    out << '\t';
+    Output(out, flags);
+    out << '\n';
+    --out.indent_;
 }
 
-void CYSource::Show(std::ostream &out) const {
-    for (const CYSource *next(this); next != NULL; next = next->next_)
-        next->Output(out, false);
+void CYString::Output(CYOutput &out, CYFlags flags) const {
+    std::ostringstream str;
+    CYStringify(str, value_, size_);
+    out << str.str().c_str();
 }
 
-void CYSource::Output(std::ostream &out, bool block) const {
-    if (!block && next_ == NULL)
-        Output(out);
-    else {
-        out << '{';
-        Show(out);
-        out << '}';
-    }
+void CYString::PropertyName(CYOutput &out) const {
+    if (const char *word = Word())
+        out << word;
+    else
+        out << *this;
 }
 
-void CYString::Output(std::ostream &out) const {
-    out << '\"';
-    for (const char *value(value_), *end(value_ + size_); value != end; ++value)
-        switch (*value) {
-            case '"': out << "\\\""; break;
-            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;
-
-            default:
-                if (*value < 0x20 || *value >= 0x7f)
-                    out << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
-                else
-                    out << *value;
-        }
-    out << '\"';
+static const char *Reserved_[] = {
+    "false", "null", "true",
+
+    "break", "case", "catch", "continue", "default",
+    "delete", "do", "else", "finally", "for", "function",
+    "if", "in", "instanceof", "new", "return", "switch",
+    "this", "throw", "try", "typeof", "var", "void",
+    "while", "with",
+
+    "debugger", "const",
+
+    "class", "enum", "export", "extends", "import", "super",
+
+    "abstract", "boolean", "byte", "char", "double", "final",
+    "float", "goto", "int", "long", "native", "short",
+    "synchronized", "throws", "transient", "volatile",
+
+    "let", "yield",
+
+    "each",
+
+    NULL
+};
+
+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());
+    for (const char **reserved(Reserved_); *reserved != NULL; ++reserved)
+        if (strcmp(*reserved, value) == 0)
+            return NULL;
+    return value;
 }
 
-void CYSwitch::Output(std::ostream &out) const {
-    out << "switch(";
-    value_->Output(out);
-    out << "){";
-    if (clauses_ != NULL)
-        out << *clauses_;
+void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
+    out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{';
+    out << clauses_;
     out << '}';
 }
 
-void CYThis::Output(std::ostream &out) const {
+void CYThis::Output(CYOutput &out, CYFlags flags) const {
     CYWord::Output(out);
 }
 
-void CYThrow::Output(std::ostream &out) const {
+void CYThrow::Output(CYOutput &out, CYFlags flags) const {
     out << "throw";
-    if (value_ != NULL) {
-        out << ' ';
-        value_->Output(out);
-    }
+    if (value_ != NULL)
+        out << ' ' << *value_;
     out << ';';
 }
 
-void CYTry::Output(std::ostream &out) const {
-    out << "try";
-    try_->Output(out, true);
-    if (catch_ != NULL)
-        out << catch_;
-    if (finally_ != NULL) {
-        out << "finally";
-        finally_->Output(out, true);
-    }
+void CYTry::Output(CYOutput &out, CYFlags flags) const {
+    out << "try" << ' ' << code_ << catch_ << finally_;
 }
 
-void CYVariable::Output(std::ostream &out) const {
+void CYVar::Output(CYOutput &out, CYFlags flags) const {
+    out << "var";
+    declarations_->Output(out, flags);
+    out << ';';
+}
+
+void CYVariable::Output(CYOutput &out, CYFlags flags) const {
     out << *name_;
 }
 
-void CYWhile::Output(std::ostream &out) const {
-    out << "while(";
-    test_->Output(out);
-    out << ')';
-    code_->Output(out, false);
+void CYWhile::Output(CYOutput &out, CYFlags flags) const {
+    out << "while" << '(' << *test_ << ')';
+    code_->Single(out, CYRight(flags));
 }
 
-void CYWith::Output(std::ostream &out) const {
-    out << "with(";
-    scope_->Output(out);
-    out << ')';
-    code_->Output(out, false);
+void CYWith::Output(CYOutput &out, CYFlags flags) const {
+    out << "with" << '(' << *scope_ << ')';
+    code_->Single(out, CYRight(flags));
 }
 
-void CYWord::Output(std::ostream &out) const {
+void CYWord::ClassName(CYOutput &out, bool object) const {
+    if (object)
+        out << "objc_getClass(";
+    out << '"' << Value() << '"';
+    if (object)
+        out << ')';
+}
+
+void CYWord::Output(CYOutput &out) const {
     out << Value();
 }
+
+void CYWord::PropertyName(CYOutput &out) const {
+    Output(out);
+}