Correctly handle "high bytes" in "native" strings.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index c6686587eb87345dedb17cbca06b77f078a20863..3daf4cfa66c6218943ea7890f63e4a7caf53e4e0 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -1,93 +1,211 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */

 /*
 /*

- *        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.
-*/
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 /* }}} */
 

-#include "cycript.hpp"
-#include "Parser.hpp"
-
+#include <cmath>
+#include <iomanip>

 #include <sstream>
 
 #include <sstream>
 

-_finline CYFlags operator ~(CYFlags rhs) {
-    return static_cast<CYFlags>(~static_cast<unsigned>(rhs));
-}
+#include "Syntax.hpp"

 
 

-_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
-    return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
-}
+enum CYStringType {
+    CYStringTypeSingle,
+    CYStringTypeDouble,
+    CYStringTypeTemplate,
+};

 
 

-_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) {
-    return static_cast<CYFlags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs));
-}
+void CYStringify(std::ostringstream &str, const char *data, size_t size, CYStringifyMode mode) {
+    if (size == 0) {
+        str << "\"\"";
+        return;
+    }

 
 

-_finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
-    return lhs = lhs | rhs;
-}
+    unsigned quot(0), apos(0), tick(0), line(0);
+    for (const char *value(data), *end(data + size); value != end; ++value)
+        switch (*value) {
+            case '"': ++quot; break;
+            case '\'': ++apos; break;
+            case '`': ++tick; break;
+            case '$': ++tick; break;
+            case '\n': ++line; break;
+        }

 
 

-_finline CYFlags CYLeft(CYFlags flags) {
-    return flags & ~(CYNoDangle | CYNoInteger);
-}
+    bool split;
+    if (mode != CYStringifyModeCycript)
+        split = false;
+    else {
+        double ratio(double(line) / size);
+        split = size > 10 && line > 2 && ratio > 0.005 && ratio < 0.10;
+    }

 
 

-_finline CYFlags CYRight(CYFlags flags) {
-    return flags & ~CYNoBF;
-}
+    CYStringType type;
+    if (mode == CYStringifyModeNative)
+        type = CYStringTypeDouble;
+    else if (split)
+        type = CYStringTypeTemplate;
+    else if (quot > apos)
+        type = CYStringTypeSingle;
+    else
+        type = CYStringTypeDouble;
+
+    bool parens(split && mode != CYStringifyModeNative && type != CYStringTypeTemplate);
+    if (parens)
+        str << '(';
+
+    char border;
+    switch (type) {
+        case CYStringTypeSingle: border = '\''; break;
+        case CYStringTypeDouble: border = '"'; break;
+        case CYStringTypeTemplate: border = '`'; break;
+    }
+
+    str << border;
+
+    bool space(false);
+
+    for (const char *value(data), *end(data + size); value != end; ++value)
+        if (*value == ' ') {
+            space = true;
+            str << ' ';
+        } else { switch (uint8_t next = *value) {
+            case '\\': str << "\\\\"; break;
+            case '\b': str << "\\b"; break;
+            case '\f': str << "\\f"; break;
+            case '\r': str << "\\r"; break;
+            case '\t': str << "\\t"; break;
+            case '\v': str << "\\v"; break;
+
+            case '\a':
+                if (mode == CYStringifyModeNative)
+                    str << "\\a";
+                else goto simple;
+            break;
+
+            case '\n':
+                if (!split)
+                    str << "\\n";
+                /*else if (mode == CYStringifyModeNative)
+                    str << border << "\\\n" << border;*/
+                else if (type != CYStringTypeTemplate)
+                    str << border << '+' << border;
+                else if (!space)
+                    str << '\n';
+                else
+                    str << "\\n\\\n";
+            break;
+
+            case '$':
+                if (type == CYStringTypeTemplate)
+                    str << "\\$";
+                else goto simple;
+            break;
+
+            case '`':
+                if (type == CYStringTypeTemplate)
+                    str << "\\`";
+                else goto simple;
+            break;
+
+            case '"':
+                if (type == CYStringTypeDouble)
+                    str << "\\\"";
+                else goto simple;
+            break;
+
+            case '\'':
+                if (type == CYStringTypeSingle)
+                    str << "\\'";
+                else goto simple;
+            break;
+
+            case '\0':
+                if (mode != CYStringifyModeNative && value[1] >= '0' && value[1] <= '9')
+                    str << "\\x00";
+                else
+                    str << "\\0";
+            break;
+
+            default:
+                if (next >= 0x20 && next < 0x7f) simple:
+                    str << *value;
+                else if (mode == CYStringifyModeNative)
+                    str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value & 0xff);
+                else {
+                    unsigned levels(1);
+                    if ((next & 0x80) != 0)
+                        while ((next & 0x80 >> ++levels) != 0);
+
+                    unsigned point(next & 0xff >> levels);
+                    while (--levels != 0)
+                        point = point << 6 | uint8_t(*++value) & 0x3f;
+
+                    if (point < 0x100)
+                        str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << point;
+                    else if (point < 0x10000)
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << point;
+                    else {
+                        point -= 0x10000;
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << (0xd800 | point >> 0x0a);
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << (0xdc00 | point & 0x3ff);
+                    }
+                }
+        } space = false; }
+
+    str << border;
+
+    if (parens)
+        str << ')';
+}
+
+void CYNumerify(std::ostringstream &str, double value) {
+    if (std::isinf(value)) {
+        if (value < 0)
+            str << '-';
+        str << "Infinity";
+        return;
+    }

 
 

-_finline CYFlags CYCenter(CYFlags flags) {
-    return CYLeft(CYRight(flags));
+    char string[32];
+    // XXX: I want this to print 1e3 rather than 1000
+    sprintf(string, "%.17g", value);
+    str << string;

 }
 
 void CYOutput::Terminate() {
 }
 
 void CYOutput::Terminate() {

-    out_ << ';';
+    operator ()(';');

     mode_ = NoMode;
 }
 
 CYOutput &CYOutput::operator <<(char rhs) {
     if (rhs == ' ' || rhs == '\n')
         if (pretty_)
     mode_ = NoMode;
 }
 
 CYOutput &CYOutput::operator <<(char rhs) {
     if (rhs == ' ' || rhs == '\n')
         if (pretty_)

-            out_ << rhs;
+            operator ()(rhs);

         else goto done;
     else if (rhs == '\t')
         if (pretty_)
             for (unsigned i(0); i != indent_; ++i)
         else goto done;
     else if (rhs == '\t')
         if (pretty_)
             for (unsigned i(0); i != indent_; ++i)

-                out_ << "    ";
+                operator ()("    ", 4);

         else goto done;
     else if (rhs == '\r') {
         if (right_) {
         else goto done;
     else if (rhs == '\r') {
         if (right_) {

-            out_ << '\n';
+            operator ()('\n');

             right_ = false;
         } goto done;
     } else goto work;
             right_ = false;
         } goto done;
     } else goto work;


@@ -99,7 +217,7 @@ CYOutput &CYOutput::operator <<(char rhs) {
   work:
     if (mode_ == Terminated && rhs != '}') {
         right_ = true;
   work:
     if (mode_ == Terminated && rhs != '}') {
         right_ = true;

-        out_ << ';';
+        operator ()(';');

     }
 
     if (rhs == ';') {
     }
 
     if (rhs == ';') {


@@ -111,21 +229,21 @@ CYOutput &CYOutput::operator <<(char rhs) {
         }
     } else if (rhs == '+') {
         if (mode_ == NoPlus)
         }
     } else if (rhs == '+') {
         if (mode_ == NoPlus)

-            out_ << ' ';
+            operator ()(' ');

         mode_ = NoPlus;
     } else if (rhs == '-') {
         if (mode_ == NoHyphen)
         mode_ = NoPlus;
     } else if (rhs == '-') {
         if (mode_ == NoHyphen)

-            out_ << ' ';
+            operator ()(' ');

         mode_ = NoHyphen;
     } else if (WordEndRange_[rhs]) {
         if (mode_ == NoLetter)
         mode_ = NoHyphen;
     } else if (WordEndRange_[rhs]) {
         if (mode_ == NoLetter)

-            out_ << ' ';
+            operator ()(' ');

         mode_ = NoLetter;
     } else none:
         mode_ = NoMode;
 
     right_ = true;
         mode_ = NoLetter;
     } else none:
         mode_ = NoMode;
 
     right_ = true;

-    out_ << rhs;
+    operator ()(rhs);

   done:
     return *this;
 }
   done:
     return *this;
 }


@@ -137,21 +255,22 @@ CYOutput &CYOutput::operator <<(const char *rhs) {
         return *this << *rhs;
 
     if (mode_ == Terminated)
         return *this << *rhs;
 
     if (mode_ == Terminated)

-        out_ << ';';
+        operator ()(';');

     else if (
         mode_ == NoPlus && *rhs == '+' ||
         mode_ == NoHyphen && *rhs == '-' ||
         mode_ == NoLetter && WordEndRange_[*rhs]
     )
     else if (
         mode_ == NoPlus && *rhs == '+' ||
         mode_ == NoHyphen && *rhs == '-' ||
         mode_ == NoLetter && WordEndRange_[*rhs]
     )

-        out_ << ' ';
+        operator ()(' ');

 
 

-    if (WordEndRange_[rhs[size - 1]])
+    char last(rhs[size - 1]);
+    if (WordEndRange_[last] || last == '/')

         mode_ = NoLetter;
     else
         mode_ = NoMode;
 
     right_ = true;
         mode_ = NoLetter;
     else
         mode_ = NoMode;
 
     right_ = true;

-    out_ << rhs;
+    operator ()(rhs, size);

     return *this;
 }
 
     return *this;
 }
 


@@ -162,10 +281,9 @@ void CYArgument::Output(CYOutput &out) const {
             out << ':' << ' ';
     }
     if (value_ != NULL)
             out << ':' << ' ';
     }
     if (value_ != NULL)

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

     if (next_ != NULL) {
     if (next_ != NULL) {

-        if (next_->name_ == NULL)
-            out << ',';
+        out << ',';

         out << ' ' << *next_;
     }
 }
         out << ' ' << *next_;
     }
 }


@@ -184,26 +302,18 @@ void CYAssignment::Output(CYOutput &out, CYFlags flags) const {
     rhs_->Output(out, Precedence(), CYRight(flags));
 }
 
     rhs_->Output(out, Precedence(), CYRight(flags));
 }
 

-void CYBlock::Output(CYOutput &out) const {
+void CYBlock::Output(CYOutput &out, CYFlags flags) const {

     out << '{' << '\n';
     ++out.indent_;
     out << '{' << '\n';
     ++out.indent_;

-    if (statements_ != NULL)
-        statements_->Multiple(out);
+    out << code_;

     --out.indent_;
     out << '\t' << '}';
 }
 
     --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(CYOutput &out, CYFlags flags) const {
 void CYBoolean::Output(CYOutput &out, CYFlags flags) const {

-    out << (Value() ? "true" : "false");
+    out << '!' << (Value() ? "0" : "1");
+    if ((flags & CYNoInteger) != 0)
+        out << '.';

 }
 
 void CYBreak::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYBreak::Output(CYOutput &out, CYFlags flags) const {


@@ -227,41 +337,74 @@ namespace cy {
 namespace Syntax {
 
 void Catch::Output(CYOutput &out) const {
 namespace Syntax {
 
 void Catch::Output(CYOutput &out) const {

-    out << ' ' << "catch" << ' ' << '(' << *name_ << ')' << ' ' << code_;
+    out << ' ' << "catch" << ' ' << '(' << *name_ << ')' << ' ';
+    out << '{' << '\n';
+    ++out.indent_;
+    out << code_;
+    --out.indent_;
+    out << '\t' << '}';

 }
 
 } }
 
 }
 
 } }
 

-void CYComment::Output(CYOutput &out, CYFlags flags) const {
-    out << '\r';
-    out.out_ << value_;
-    out.right_ = true;
-    out << '\r';
+void CYClassExpression::Output(CYOutput &out, CYFlags flags) const {
+    bool protect((flags & CYNoClass) != 0);
+    if (protect)
+        out << '(';
+    out << "class";
+    if (name_ != NULL)
+        out << ' ' << *name_;
+    out << *tail_;;
+    if (protect)
+        out << ')';
+}
+
+void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
+    out << "class" << ' ' << *name_  << *tail_;
+}
+
+void CYClassTail::Output(CYOutput &out) const {
+    if (extends_ == NULL)
+        out << ' ';
+    else {
+        out << '\n';
+        ++out.indent_;
+        out << "extends" << ' ';
+        extends_->Output(out, CYAssign::Precedence_ - 1, CYNoFlags);
+        out << '\n';
+        --out.indent_;
+    }
+
+    out << '{' << '\n';
+    ++out.indent_;
+
+    --out.indent_;
+    out << '}';

 }
 
 void CYCompound::Output(CYOutput &out, CYFlags flags) const {
 }
 
 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);
+    if (next_ == NULL)
+        expression_->Output(out, flags);
+    else {
+        expression_->Output(out, CYLeft(flags));
+        out << ',' << ' ';
+        next_->Output(out, CYRight(flags));
+    }
+}
+
+void CYComputed::PropertyName(CYOutput &out) const {
+    out << '[';
+    expression_->Output(out, CYAssign::Precedence_, CYNoFlags);
+    out << ']';

 }
 
 void CYCondition::Output(CYOutput &out, CYFlags flags) const {
     test_->Output(out, Precedence() - 1, CYLeft(flags));
     out << ' ' << '?' << ' ';
     if (true_ != NULL)
 }
 
 void CYCondition::Output(CYOutput &out, CYFlags flags) const {
     test_->Output(out, Precedence() - 1, CYLeft(flags));
     out << ' ' << '?' << ' ';
     if (true_ != NULL)

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

     out << ' ' << ':' << ' ';
     out << ' ' << ':' << ' ';

-    false_->Output(out, CYPA, CYRight(flags));
+    false_->Output(out, CYAssign::Precedence_, CYRight(flags));

 }
 
 void CYContinue::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYContinue::Output(CYOutput &out, CYFlags flags) const {


@@ -272,56 +415,53 @@ void CYContinue::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYClause::Output(CYOutput &out) const {
 }
 
 void CYClause::Output(CYOutput &out) const {

-    if (case_ != NULL)
-        out << "case" << ' ' << *case_;
-    else
+    out << '\t';
+    if (value_ == NULL)

         out << "default";
         out << "default";

+    else {
+        out << "case" << ' ';
+        value_->Output(out, CYNoColon);
+    }

     out << ':' << '\n';
     out << ':' << '\n';

-    if (statements_ != NULL)
-        statements_->Multiple(out);
+    ++out.indent_;
+    out << code_;
+    --out.indent_;

     out << next_;
 }
 
     out << next_;
 }
 

-const char *CYDeclaration::ForEachIn() const {
-    return identifier_->Word();
-}
-
-void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
-    out << "var";
-    Output(out, CYRight(flags));
+void CYDebugger::Output(CYOutput &out, CYFlags flags) const {
+    out << "debugger" << ';';

 }
 
 }
 

-void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
+void CYBinding::Output(CYOutput &out, CYFlags flags) const {

     out << *identifier_;
     //out.out_ << ':' << identifier_->usage_ << '#' << identifier_->offset_;
     out << *identifier_;
     //out.out_ << ':' << identifier_->usage_ << '#' << identifier_->offset_;

-    if (initialiser_ != NULL) {
+    if (initializer_ != NULL) {

         out << ' ' << '=' << ' ';
         out << ' ' << '=' << ' ';

-        initialiser_->Output(out, CYPA, CYRight(flags));
+        initializer_->Output(out, CYAssign::Precedence_, CYRight(flags));

     }
 }
 
     }
 }
 

-void CYDeclarations::For(CYOutput &out) const {
-    out << "var";
-    Output(out, CYNoIn);
-}
-
-void CYDeclarations::Output(CYOutput &out) const {
+void CYBindings::Output(CYOutput &out) const {

     Output(out, CYNoFlags);
 }
 
     Output(out, CYNoFlags);
 }
 

-void CYDeclarations::Output(CYOutput &out, CYFlags flags) const {
-    const CYDeclarations *declaration(this);
+void CYBindings::Output(CYOutput &out, CYFlags flags) const {
+    const CYBindings *binding(this);

     bool first(true);
     bool first(true);

-  output:
-    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) {
+    for (;;) {
+        CYBindings *next(binding->next_);
+
+        CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
+        first = false;
+        binding->binding_->Output(out, jacks);
+
+        if (next == NULL)
+            break;
+

         out << ',' << ' ';
         out << ',' << ' ';

-        declaration = next;
-        goto output;
+        binding = next;

     }
 }
 
     }
 }
 


@@ -335,16 +475,29 @@ void CYDirectMember::Output(CYOutput &out, CYFlags flags) const {
 
 void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
     out << "do";
 
 void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
     out << "do";

-    code_->Single(out, CYCenter(flags));
+
+    unsigned line(out.position_.line);
+    unsigned indent(out.indent_);
+    code_->Single(out, CYCenter(flags), CYCompactLong);
+
+    if (out.position_.line != line && out.recent_ == indent)
+        out << ' ';
+    else
+        out << '\n' << '\t';
+

     out << "while" << ' ' << '(' << *test_ << ')';
 }
 
     out << "while" << ' ' << '(' << *test_ << ')';
 }
 

-void CYElement::Output(CYOutput &out) const {
+void CYElementSpread::Output(CYOutput &out) const {
+    out << "..." << value_;
+}
+
+void CYElementValue::Output(CYOutput &out) const {

     if (value_ != NULL)
     if (value_ != NULL)

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

     if (next_ != NULL || value_ == NULL) {
         out << ',';
     if (next_ != NULL || value_ == NULL) {
         out << ',';

-        if (next_ != NULL && next_->value_ != NULL)
+        if (next_ != NULL && !next_->Elision())

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


@@ -355,78 +508,125 @@ void CYEmpty::Output(CYOutput &out, CYFlags flags) const {
     out.Terminate();
 }
 
     out.Terminate();
 }
 

+void CYEval::Output(CYOutput &out, CYFlags flags) const {
+    _assert(false);
+}
+

 void CYExpress::Output(CYOutput &out, CYFlags flags) const {
 void CYExpress::Output(CYOutput &out, CYFlags flags) const {

-    expression_->Output(out, flags | CYNoBF);
+    expression_->Output(out, flags | CYNoBFC);

     out << ';';
 }
 
     out << ';';
 }
 

-void CYExpression::ClassName(CYOutput &out, bool object) const {
-    Output(out, CYPA, CYNoFlags);
+void CYExpression::Output(CYOutput &out) const {
+    Output(out, CYNoFlags);

 }
 
 }
 

-const char *CYExpression::ForEachIn() const {
-    return NULL;
+void CYExpression::Output(CYOutput &out, int precedence, CYFlags flags) const {
+    if (precedence < Precedence() || (flags & CYNoRightHand) != 0 && RightHand())
+        out << '(' << *this << ')';
+    else
+        Output(out, flags);

 }
 
 }
 

-void CYExpression::For(CYOutput &out) const {
-    Output(out, CYNoIn);
+void CYExtend::Output(CYOutput &out, CYFlags flags) const {
+    lhs_->Output(out, CYLeft(flags));
+    out << ' ' << object_;

 }
 
 }
 

-void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
-    Output(out, flags | CYNoRightHand);
+void CYExternalDefinition::Output(CYOutput &out, CYFlags flags) const {
+    out << "extern" << ' ' << abi_ << ' ';
+    type_->Output(out, name_);
+    out.Terminate();

 }
 
 }
 

-void CYExpression::Output(CYOutput &out) const {
-    Output(out, CYNoFlags);
+void CYExternalExpression::Output(CYOutput &out, CYFlags flags) const {
+    out << '(' << "extern" << ' ' << abi_ << ' ';
+    type_->Output(out, name_);
+    out << ')';

 }
 
 }
 

-void CYExpression::Output(CYOutput &out, unsigned precedence, CYFlags flags) const {
-    if (precedence < Precedence() || (flags & CYNoRightHand) != 0 && RightHand())
-        out << '(' << *this << ')';
-    else
-        Output(out, flags);
+void CYFatArrow::Output(CYOutput &out, CYFlags flags) const {
+    out << '(' << parameters_ << ')' << ' ' << "=>" << ' ' << '{' << code_ << '}';

 }
 
 void CYFinally::Output(CYOutput &out) const {
 }
 
 void CYFinally::Output(CYOutput &out) const {

-    out << ' ' << "finally" << ' ' << code_;
+    out << ' ' << "finally" << ' ';
+    out << '{' << '\n';
+    ++out.indent_;
+    out << code_;
+    --out.indent_;
+    out << '\t' << '}';

 }
 
 void CYFor::Output(CYOutput &out, CYFlags flags) const {
     out << "for" << ' ' << '(';
 }
 
 void CYFor::Output(CYOutput &out, CYFlags flags) const {
     out << "for" << ' ' << '(';

-    if (initialiser_ != NULL)
-        initialiser_->For(out);
+    if (initializer_ != NULL)
+        initializer_->Output(out, CYNoIn);

     out.Terminate();
     out.Terminate();

+    if (test_ != NULL)
+        out << ' ';

     out << test_;
     out.Terminate();
     out << test_;
     out.Terminate();

+    if (increment_ != NULL)
+        out << ' ';

     out << increment_;
     out << ')';
     out << increment_;
     out << ')';

-    code_->Single(out, CYRight(flags));
-}
-
-void CYForEachIn::Output(CYOutput &out, CYFlags flags) const {
-    out << "for" << ' ' << "each" << ' ' << '(';
-    initialiser_->ForIn(out, CYNoIn);
-    out << "in" << *set_ << ')';
-    code_->Single(out, CYRight(flags));
+    code_->Single(out, CYRight(flags), CYCompactShort);

 }
 
 }
 

-void CYForEachInComprehension::Output(CYOutput &out) const {
-    out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;
+void CYForLexical::Output(CYOutput &out, CYFlags flags) const {
+    out << (constant_ ? "const" : "let") << ' ';
+    binding_->Output(out, CYRight(flags));

 }
 
 void CYForIn::Output(CYOutput &out, CYFlags flags) const {
     out << "for" << ' ' << '(';
 }
 
 void CYForIn::Output(CYOutput &out, CYFlags flags) const {
     out << "for" << ' ' << '(';

-    if (initialiser_ != NULL)
-        initialiser_->ForIn(out, CYNoIn);
-    out << "in" << *set_ << ')';
-    code_->Single(out, CYRight(flags));
+    initializer_->Output(out, CYNoIn | CYNoRightHand);
+    out << ' ' << "in" << ' ' << *iterable_ << ')';
+    code_->Single(out, CYRight(flags), CYCompactShort);
+}
+
+void CYForInitialized::Output(CYOutput &out, CYFlags flags) const {
+    out << "for" << ' ' << '(' << "var" << ' ';
+    binding_->Output(out, CYNoIn | CYNoRightHand);
+    out << ' ' << "in" << ' ' << *iterable_ << ')';
+    code_->Single(out, CYRight(flags), CYCompactShort);

 }
 
 void CYForInComprehension::Output(CYOutput &out) const {
 }
 
 void CYForInComprehension::Output(CYOutput &out) const {

-    out << "for" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')';
+    out << "for" << ' ' << '(';
+    binding_->Output(out, CYNoIn | CYNoRightHand);
+    out << ' ' << "in" << ' ' << *iterable_ << ')';

 }
 
 }
 

-void CYFunction::Output(CYOutput &out, CYFlags flags) const {
+void CYForOf::Output(CYOutput &out, CYFlags flags) const {
+    out << "for" << ' ' << '(';
+    initializer_->Output(out, CYNoRightHand);
+    out << ' ' << "of" << ' ' << *iterable_ << ')';
+    code_->Single(out, CYRight(flags), CYCompactShort);
+}
+
+void CYForOfComprehension::Output(CYOutput &out) const {
+    out << "for" << ' ' << '(';
+    binding_->Output(out, CYNoRightHand);
+    out << ' ' << "of" << ' ' << *iterable_ << ')' << next_;
+}
+
+void CYForVariable::Output(CYOutput &out, CYFlags flags) const {
+    out << "var" << ' ';
+    binding_->Output(out, CYRight(flags));
+}
+
+void CYFunction::Output(CYOutput &out) const {
+    out << '(' << parameters_ << ')' << ' ';
+    out << '{' << '\n';
+    ++out.indent_;
+    out << code_;
+    --out.indent_;
+    out << '\t' << '}';
+}
+
+void CYFunctionExpression::Output(CYOutput &out, CYFlags flags) const {

     // XXX: one could imagine using + here to save a byte
     bool protect((flags & CYNoFunction) != 0);
     if (protect)
     // XXX: one could imagine using + here to save a byte
     bool protect((flags & CYNoFunction) != 0);
     if (protect)


@@ -434,28 +634,24 @@ void CYFunction::Output(CYOutput &out, CYFlags flags) const {
     out << "function";
     if (name_ != NULL)
         out << ' ' << *name_;
     out << "function";
     if (name_ != NULL)
         out << ' ' << *name_;

-    out << '(' << parameters_ << ')';
-    out << ' ' << code_;
+    CYFunction::Output(out);

     if (protect)
         out << ')';
 }
 
     if (protect)
         out << ')';
 }
 

-void CYFunctionExpression::Output(CYOutput &out, CYFlags flags) const {
-    CYFunction::Output(out, flags);
-}
-

 void CYFunctionStatement::Output(CYOutput &out, CYFlags flags) const {
 void CYFunctionStatement::Output(CYOutput &out, CYFlags flags) const {

-    CYFunction::Output(out, flags);
+    out << "function" << ' ' << *name_;
+    CYFunction::Output(out);

 }
 
 void CYFunctionParameter::Output(CYOutput &out) const {
 }
 
 void CYFunctionParameter::Output(CYOutput &out) const {

-    out << *name_;
+    binding_->Output(out, CYNoFlags);

     if (next_ != NULL)
         out << ',' << ' ' << *next_;
 }
 
 const char *CYIdentifier::Word() const {
     if (next_ != NULL)
         out << ',' << ' ' << *next_;
 }
 
 const char *CYIdentifier::Word() const {

-    return replace_ == NULL || replace_ == this ? CYWord::Word() : replace_->Word();
+    return next_ == NULL || next_ == this ? CYWord::Word() : next_->Word();

 }
 
 void CYIf::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYIf::Output(CYOutput &out, CYFlags flags) const {


@@ -475,11 +671,18 @@ void CYIf::Output(CYOutput &out, CYFlags flags) const {
     else
         jacks |= protect ? CYNoFlags : CYCenter(flags);
 
     else
         jacks |= protect ? CYNoFlags : CYCenter(flags);
 

-    true_->Single(out, jacks);
+    unsigned line(out.position_.line);
+    unsigned indent(out.indent_);
+    true_->Single(out, jacks, CYCompactShort);

 
     if (false_ != NULL) {
 
     if (false_ != NULL) {

+        if (out.position_.line != line && out.recent_ == indent)
+            out << ' ';
+        else
+            out << '\n' << '\t';
+

         out << "else";
         out << "else";

-        false_->Single(out, right);
+        false_->Single(out, right, CYCompactLong);

     }
 
     if (protect)
     }
 
     if (protect)


@@ -490,6 +693,19 @@ void CYIfComprehension::Output(CYOutput &out) const {
     out << "if" << ' ' << '(' << *test_ << ')' << next_;
 }
 
     out << "if" << ' ' << '(' << *test_ << ')' << next_;
 }
 

+void CYImport::Output(CYOutput &out, CYFlags flags) const {
+    out << "@import";
+}
+
+void CYImportDeclaration::Output(CYOutput &out, CYFlags flags) const {
+    _assert(false);
+}
+
+void CYIndirect::Output(CYOutput &out, CYFlags flags) const {
+    out << "*";
+    rhs_->Output(out, Precedence(), CYRight(flags));
+}
+

 void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
     object_->Output(out, Precedence(), CYLeft(flags));
     if (const char *word = property_->Word())
 void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
     object_->Output(out, Precedence(), CYLeft(flags));
     if (const char *word = property_->Word())


@@ -513,15 +729,136 @@ void CYInfix::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYLabel::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYLabel::Output(CYOutput &out, CYFlags flags) const {

-    out << *name_ << ':' << ' ';
-    statement_->Single(out, CYRight(flags));
+    out << *name_ << ':';
+    statement_->Single(out, CYRight(flags), CYCompactShort);
+}
+
+void CYParenthetical::Output(CYOutput &out, CYFlags flags) const {
+    out << '(';
+    expression_->Output(out, CYCompound::Precedence_, CYNoFlags);
+    out << ')';
+}
+
+void CYStatement::Output(CYOutput &out) const {
+    Multiple(out);
+}
+
+void CYTemplate::Output(CYOutput &out, CYFlags flags) const {
+    _assert(false);
+}
+
+void CYTypeArrayOf::Output(CYOutput &out, CYPropertyName *name) const {
+    next_->Output(out, Precedence(), name, false);
+    out << '[';
+    out << size_;
+    out << ']';
+}
+
+void CYTypeBlockWith::Output(CYOutput &out, CYPropertyName *name) const {
+    out << '(' << '^';
+    next_->Output(out, Precedence(), name, false);
+    out << ')' << '(' << parameters_ << ')';
+}
+
+void CYTypeConstant::Output(CYOutput &out, CYPropertyName *name) const {
+    out << "const";
+    next_->Output(out, Precedence(), name, false);
+}
+
+void CYTypeFunctionWith::Output(CYOutput &out, CYPropertyName *name) const {
+    next_->Output(out, Precedence(), name, false);
+    out << '(' << parameters_;
+    if (variadic_) {
+        if (parameters_ != NULL)
+            out << ',' << ' ';
+        out << "...";
+    }
+    out << ')';
+}
+
+void CYTypePointerTo::Output(CYOutput &out, CYPropertyName *name) const {
+    out << '*';
+    next_->Output(out, Precedence(), name, false);
+}
+
+void CYTypeVolatile::Output(CYOutput &out, CYPropertyName *name) const {
+    out << "volatile";
+    next_->Output(out, Precedence(), name, true);
+}
+
+void CYTypeModifier::Output(CYOutput &out, int precedence, CYPropertyName *name, bool space) const {
+    if (this == NULL && name == NULL)
+        return;
+    else if (space)
+        out << ' ';
+
+    if (this == NULL) {
+        name->PropertyName(out);
+        return;
+    }
+
+    bool protect(precedence > Precedence());
+
+    if (protect)
+        out << '(';
+    Output(out, name);
+    if (protect)
+        out << ')';
+}
+
+void CYType::Output(CYOutput &out, CYPropertyName *name) const {
+    out << *specifier_;
+    modifier_->Output(out, 0, name, true);
+}
+
+void CYType::Output(CYOutput &out) const {
+    Output(out, NULL);

 }
 
 }
 

-void CYLet::Output(CYOutput &out, CYFlags flags) const {
-    out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << code_;
+void CYEncodedType::Output(CYOutput &out, CYFlags flags) const {
+    out << "@encode(" << typed_ << ")";

 }
 
 }
 

-void CYNew::Output(CYOutput &out, CYFlags flags) const {
+void CYTypedParameter::Output(CYOutput &out) const {
+    type_->Output(out, name_);
+    if (next_ != NULL)
+        out << ',' << ' ' << next_;
+}
+
+void CYLambda::Output(CYOutput &out, CYFlags flags) const {
+    // XXX: this is seriously wrong
+    out << "[](";
+    out << ")->";
+    out << "{";
+    out << "}";
+}
+
+void CYTypeDefinition::Output(CYOutput &out, CYFlags flags) const {
+    out << "typedef" << ' ';
+    type_->Output(out, name_);
+    out.Terminate();
+}
+
+void CYTypeExpression::Output(CYOutput &out, CYFlags flags) const {
+    out << '(' << "typedef" << ' ' << *typed_ << ')';
+}
+
+void CYLexical::Output(CYOutput &out, CYFlags flags) const {
+    out << "let" << ' ';
+    bindings_->Output(out, flags); // XXX: flags
+    out << ';';
+}
+
+void CYModule::Output(CYOutput &out) const {
+    out << part_;
+    if (next_ != NULL)
+        out << '.' << next_;
+}
+
+namespace cy {
+namespace Syntax {
+
+void New::Output(CYOutput &out, CYFlags flags) const {

     out << "new" << ' ';
     CYFlags jacks(CYNoCall | CYCenter(flags));
     constructor_->Output(out, Precedence(), jacks);
     out << "new" << ' ';
     CYFlags jacks(CYNoCall | CYCenter(flags));
     constructor_->Output(out, Precedence(), jacks);


@@ -529,8 +866,10 @@ void CYNew::Output(CYOutput &out, CYFlags flags) const {
         out << '(' << *arguments_ << ')';
 }
 
         out << '(' << *arguments_ << ')';
 }
 

+} }
+

 void CYNull::Output(CYOutput &out, CYFlags flags) const {
 void CYNull::Output(CYOutput &out, CYFlags flags) const {

-    CYWord::Output(out);
+    out << "null";

 }
 
 void CYNumber::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYNumber::Output(CYOutput &out, CYFlags flags) const {


@@ -560,13 +899,6 @@ void CYObject::Output(CYOutput &out, CYFlags flags) const {
         out << ')';
 }
 
         out << ')';
 }
 

-void CYOptionalFunctionParameter::Output(CYOutput &out) const {
-    out << *name_ << '=';
-    initializer_->Output(out, CYPA, CYNoFlags);
-    if (next_ != NULL)
-        out << ',' << ' ' << *next_;
-}
-

 void CYPostfix::Output(CYOutput &out, CYFlags flags) const {
     lhs_->Output(out, Precedence(), CYLeft(flags));
     out << Operator();
 void CYPostfix::Output(CYOutput &out, CYFlags flags) const {
     lhs_->Output(out, Precedence(), CYLeft(flags));
     out << Operator();


@@ -580,26 +912,56 @@ void CYPrefix::Output(CYOutput &out, CYFlags flags) const {
     rhs_->Output(out, Precedence(), CYRight(flags));
 }
 
     rhs_->Output(out, Precedence(), CYRight(flags));
 }
 

-void CYProgram::Output(CYOutput &out) const {
-    if (statements_ != NULL)
-        statements_->Multiple(out);
+void CYScript::Output(CYOutput &out) const {
+    out << code_;

 }
 
 void CYProperty::Output(CYOutput &out) const {
 }
 
 void CYProperty::Output(CYOutput &out) const {

+    if (next_ != NULL || out.pretty_)
+        out << ',';
+    out << '\n' <<  next_;
+}
+
+void CYPropertyGetter::Output(CYOutput &out) const {
+    out << "get" << ' ';
+    name_->PropertyName(out);
+    CYFunction::Output(out);
+    CYProperty::Output(out);
+}
+
+void CYPropertyMethod::Output(CYOutput &out) const {
+    name_->PropertyName(out);
+    CYFunction::Output(out);
+    CYProperty::Output(out);
+}
+
+void CYPropertySetter::Output(CYOutput &out) const {
+    out << "set" << ' ';
+    name_->PropertyName(out);
+    CYFunction::Output(out);
+    CYProperty::Output(out);
+}
+
+void CYPropertyValue::Output(CYOutput &out) const {

     out << '\t';
     name_->PropertyName(out);
     out << ':' << ' ';
     out << '\t';
     name_->PropertyName(out);
     out << ':' << ' ';

-    value_->Output(out, CYPA, CYNoFlags);
-    if (next_ != NULL)
-        out << ',' << '\n' << *next_;
-    else
-        out << '\n';
+    value_->Output(out, CYAssign::Precedence_, CYNoFlags);
+    CYProperty::Output(out);

 }
 
 void CYRegEx::Output(CYOutput &out, CYFlags flags) const {
     out << Value();
 }
 
 }
 
 void CYRegEx::Output(CYOutput &out, CYFlags flags) const {
     out << Value();
 }
 

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

 void CYReturn::Output(CYOutput &out, CYFlags flags) const {
     out << "return";
     if (value_ != NULL)
 void CYReturn::Output(CYOutput &out, CYFlags flags) const {
     out << "return";
     if (value_ != NULL)


@@ -608,21 +970,29 @@ void CYReturn::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYRubyBlock::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYRubyBlock::Output(CYOutput &out, CYFlags flags) const {

-    call_->Output(out, CYLeft(flags));
+    lhs_->Output(out, CYLeft(flags));

     out << ' ';
     proc_->Output(out, CYRight(flags));
 }
 
 void CYRubyProc::Output(CYOutput &out, CYFlags flags) const {
     out << ' ';
     proc_->Output(out, CYRight(flags));
 }
 
 void CYRubyProc::Output(CYOutput &out, CYFlags flags) const {

-    // XXX: this is not outputting the parameters
+    out << '{' << ' ' << '|' << parameters_ << '|' << '\n';
+    ++out.indent_;

     out << code_;
     out << code_;

+    --out.indent_;
+    out << '\t' << '}';
+}
+
+void CYSubscriptMember::Output(CYOutput &out, CYFlags flags) const {
+    object_->Output(out, Precedence(), CYLeft(flags));
+    out << "." << '[' << *property_ << ']';

 }
 
 void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
     bool first(true);
 }
 
 void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
     bool first(true);

-    for (const CYStatement *next(this); next != NULL; next = next->next_) {
+    CYForEach (next, this) {

         bool last(next->next_ == NULL);
         bool last(next->next_ == NULL);

-        CYFlags jacks(first ? last ? flags : CYLeft(flags) : last ? CYCenter(flags) : CYRight(flags));
+        CYFlags jacks(first ? last ? flags : CYLeft(flags) : last ? CYRight(flags) : CYCenter(flags));

         first = false;
         out << '\t';
         next->Output(out, jacks);
         first = false;
         out << '\t';
         next->Output(out, jacks);


@@ -630,19 +1000,31 @@ void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
     }
 }
 
     }
 }
 

-void CYStatement::Single(CYOutput &out, CYFlags flags) const {
+void CYStatement::Single(CYOutput &out, CYFlags flags, CYCompactType request) const {
+    if (this == NULL)
+        return out.Terminate();
+

     _assert(next_ == NULL);
     _assert(next_ == NULL);

-    out << '\n';
-    ++out.indent_;
-    out << '\t';
+
+    CYCompactType compact(Compact());
+
+    if (compact >= request)
+        out << ' ';
+    else {
+        out << '\n';
+        ++out.indent_;
+        out << '\t';
+    }
+

     Output(out, flags);
     Output(out, flags);

-    out << '\n';
-    --out.indent_;
+
+    if (compact < request)
+        --out.indent_;

 }
 
 void CYString::Output(CYOutput &out, CYFlags flags) const {
     std::ostringstream str;
 }
 
 void CYString::Output(CYOutput &out, CYFlags flags) const {
     std::ostringstream str;

-    CYStringify(str, value_, size_);
+    CYStringify(str, value_, size_, CYStringifyModeLegacy);

     out << str.str().c_str();
 }
 
     out << str.str().c_str();
 }
 


@@ -688,14 +1070,54 @@ const char *CYString::Word() const {
     return value;
 }
 
     return value;
 }
 

+void CYStructDefinition::Output(CYOutput &out, CYFlags flags) const {
+    out << "struct" << ' ' << *name_ << *tail_;
+}
+
+void CYStructTail::Output(CYOutput &out) const {
+    out << ' ' << '{' << '\n';
+    ++out.indent_;
+    CYForEach (field, fields_) {
+        out << '\t';
+        field->type_->Output(out, field->name_);
+        out.Terminate();
+        out << '\n';
+    }
+    --out.indent_;
+    out << '\t' << '}';
+}
+
+void CYSuperAccess::Output(CYOutput &out, CYFlags flags) const {
+    out << "super";
+    if (const char *word = property_->Word())
+        out << '.' << word;
+    else
+        out << '[' << *property_ << ']';
+}
+
+void CYSuperCall::Output(CYOutput &out, CYFlags flags) const {
+    out << "super" << '(' << arguments_ << ')';
+}
+

 void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
 void CYSwitch::Output(CYOutput &out, CYFlags flags) const {

-    out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{';
+    out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{' << '\n';
+    ++out.indent_;

     out << clauses_;
     out << clauses_;

-    out << '}';
+    --out.indent_;
+    out << '\t' << '}';
+}
+
+void CYSymbol::Output(CYOutput &out, CYFlags flags) const {
+    bool protect((flags & CYNoColon) != 0);
+    if (protect)
+        out << '(';
+    out << ':' << name_;
+    if (protect)
+        out << ')';

 }
 
 void CYThis::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYThis::Output(CYOutput &out, CYFlags flags) const {

-    CYWord::Output(out);
+    out << "this";

 }
 
 namespace cy {
 }
 
 namespace cy {


@@ -709,14 +1131,111 @@ void Throw::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void Try::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void Try::Output(CYOutput &out, CYFlags flags) const {

-    out << "try" << ' ' << code_ << catch_ << finally_;
+    out << "try" << ' ';
+    out << '{' << '\n';
+    ++out.indent_;
+    out << code_;
+    --out.indent_;
+    out << '\t' << '}';
+    out << catch_ << finally_;

 }
 
 } }
 
 }
 
 } }
 

+void CYTypeCharacter::Output(CYOutput &out) const {
+    switch (signing_) {
+        case CYTypeNeutral: break;
+        case CYTypeSigned: out << "signed" << ' '; break;
+        case CYTypeUnsigned: out << "unsigned" << ' '; break;
+    }
+
+    out << "char";
+}
+
+void CYTypeEnum::Output(CYOutput &out) const {
+    out << "enum" << ' ';
+    if (name_ != NULL)
+        out << *name_;
+    else {
+        if (specifier_ != NULL)
+            out << ':' << ' ' << *specifier_ << ' ';
+
+        out << '{' << '\n';
+        ++out.indent_;
+        bool comma(false);
+
+        CYForEach (constant, constants_) {
+            if (comma)
+                out << ',' << '\n';
+            else
+                comma = true;
+            out << '\t' << constant->name_;
+            out << ' ' << '=' << ' ' << constant->value_;
+        }
+
+        if (out.pretty_)
+            out << ',';
+        out << '\n';
+        --out.indent_;
+        out << '\t' << '}';
+    }
+}
+
+void CYTypeError::Output(CYOutput &out) const {
+    out << "@error";
+}
+
+void CYTypeInt128::Output(CYOutput &out) const {
+    switch (signing_) {
+        case CYTypeNeutral: break;
+        case CYTypeSigned: out << "signed" << ' '; break;
+        case CYTypeUnsigned: out << "unsigned" << ' '; break;
+    }
+
+    out << "__int128";
+}
+
+void CYTypeIntegral::Output(CYOutput &out) const {
+    if (signing_ == CYTypeUnsigned)
+        out << "unsigned" << ' ';
+    switch (length_) {
+        case 0: out << "short"; break;
+        case 1: out << "int"; break;
+        case 2: out << "long"; break;
+        case 3: out << "long" << ' ' << "long"; break;
+        default: _assert(false);
+    }
+}
+
+void CYTypeStruct::Output(CYOutput &out) const {
+    out << "struct";
+    if (name_ != NULL)
+        out << ' ' << *name_;
+    else
+        out << *tail_;
+}
+
+void CYTypeReference::Output(CYOutput &out) const {
+    switch (kind_) {
+        case CYTypeReferenceStruct: out << "struct"; break;
+        case CYTypeReferenceEnum: out << "enum"; break;
+        default: _assert(false);
+    }
+
+    out << ' ' << *name_;
+}
+
+void CYTypeVariable::Output(CYOutput &out) const {
+    out << *name_;
+}
+
+void CYTypeVoid::Output(CYOutput &out) const {
+    out << "void";
+}
+

 void CYVar::Output(CYOutput &out, CYFlags flags) const {
 void CYVar::Output(CYOutput &out, CYFlags flags) const {

-    out << "var";
-    declarations_->Output(out, flags);
+    out << "var" << ' ';
+    bindings_->Output(out, flags); // XXX: flags

     out << ';';
 }
 
     out << ';';
 }
 


@@ -725,27 +1244,23 @@ void CYVariable::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYWhile::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYWhile::Output(CYOutput &out, CYFlags flags) const {

-    out << "while" << '(' << *test_ << ')';
-    code_->Single(out, CYRight(flags));
+    out << "while" << ' ' << '(' << *test_ << ')';
+    code_->Single(out, CYRight(flags), CYCompactShort);

 }
 
 void CYWith::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYWith::Output(CYOutput &out, CYFlags flags) const {

-    out << "with" << '(' << *scope_ << ')';
-    code_->Single(out, CYRight(flags));
-}
-
-void CYWord::ClassName(CYOutput &out, bool object) const {
-    if (object)
-        out << "objc_getClass(";
-    out << '"' << Word() << '"';
-    if (object)
-        out << ')';
+    out << "with" << ' ' << '(' << *scope_ << ')';
+    code_->Single(out, CYRight(flags), CYCompactShort);

 }
 
 void CYWord::Output(CYOutput &out) const {
     out << Word();
 }
 
 void CYWord::Output(CYOutput &out) const {
     out << Word();

-    if (out.options_.verbose_)
-        out.out_ << '@' << this;
+    if (out.options_.verbose_) {
+        out('@');
+        char number[32];
+        sprintf(number, "%p", this);
+        out(number);
+    }

 }
 
 void CYWord::PropertyName(CYOutput &out) const {
 }
 
 void CYWord::PropertyName(CYOutput &out) const {