Accept initializers when allocating Type with new.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index c8205e5c05ebd106b1f222d0abbe876741d0395c..06b60b22bbfa20eef73774a299a04e77f6379b9a 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -19,12 +19,99 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

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

 #include <sstream>
 
 #include "Syntax.hpp"
 
 #include <sstream>
 
 #include "Syntax.hpp"
 

+void CYStringify(std::ostringstream &str, const char *data, size_t size, bool c) {
+    bool single;
+    if (c)
+        single = false;
+    else {
+        unsigned quot(0), apos(0);
+        for (const char *value(data), *end(data + size); value != end; ++value)
+            if (*value == '"')
+                ++quot;
+            else if (*value == '\'')
+                ++apos;
+
+        single = quot > apos;
+    }
+
+    str << (single ? '\'' : '"');
+
+    for (const char *value(data), *end(data + size); value != end; ++value)
+        switch (uint8_t next = *value) {
+            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)
+                    str << "\\\"";
+                else goto simple;
+            break;
+
+            case '\'':
+                if (single)
+                    str << "\\'";
+                else goto simple;
+            break;
+
+            case '\0':
+                if (value[1] >= '0' && value[1] <= '9')
+                    str << "\\x00";
+                else
+                    str << "\\0";
+            break;
+
+            default:
+                if (next >= 0x20 && next < 0x7f) simple:
+                    str << *value;
+                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);
+                    }
+                }
+        }
+
+    str << (single ? '\'' : '"');
+}
+
+void CYNumerify(std::ostringstream &str, double value) {
+    if (std::isinf(value)) {
+        if (value < 0)
+            str << '-';
+        str << "Infinity";
+        return;
+    }
+
+    char string[32];
+    // XXX: I want this to print 1e3 rather than 1000
+    sprintf(string, "%.17g", value);
+    str << string;
+}
+

 void CYOutput::Terminate() {
     operator ()(';');
     mode_ = NoMode;
 void CYOutput::Terminate() {
     operator ()(';');
     mode_ = NoMode;


@@ -184,6 +271,41 @@ void Catch::Output(CYOutput &out) const {
 
 } }
 
 
 } }
 

+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 {
     if (next_ == NULL)
         expression_->Output(out, flags);
 void CYCompound::Output(CYOutput &out, CYFlags flags) const {
     if (next_ == NULL)
         expression_->Output(out, flags);


@@ -194,11 +316,17 @@ void CYCompound::Output(CYOutput &out, CYFlags flags) const {
     }
 }
 
     }
 }
 

+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, CYAssign::Precedence_, CYNoFlags);
+        true_->Output(out, CYAssign::Precedence_, CYNoColon);

     out << ' ' << ':' << ' ';
     false_->Output(out, CYAssign::Precedence_, CYRight(flags));
 }
     out << ' ' << ':' << ' ';
     false_->Output(out, CYAssign::Precedence_, CYRight(flags));
 }


@@ -212,10 +340,12 @@ void CYContinue::Output(CYOutput &out, CYFlags flags) const {
 
 void CYClause::Output(CYOutput &out) const {
     out << '\t';
 
 void CYClause::Output(CYOutput &out) const {
     out << '\t';

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

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

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

     out << ':' << '\n';
     ++out.indent_;
     out << code_;
     out << ':' << '\n';
     ++out.indent_;
     out << code_;


@@ -227,45 +357,35 @@ void CYDebugger::Output(CYOutput &out, CYFlags flags) const {
     out << "debugger" << ';';
 }
 
     out << "debugger" << ';';
 }
 

-void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
-    out << "var" << ' ';
-    Output(out, CYRight(flags));
-}
-
-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, CYAssign::Precedence_, CYRight(flags));
+        initializer_->Output(out, CYAssign::Precedence_, CYRight(flags));

     }
 }
 
     }
 }
 

-void CYForDeclarations::Output(CYOutput &out, CYFlags flags) const {
-    out << "var" << ' ';
-    declarations_->Output(out, CYRight(flags));
-}
-
-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);
 
     for (;;) {
     bool first(true);
 
     for (;;) {

-        CYDeclarations *next(declaration->next_);
+        CYBindings *next(binding->next_);

 
         CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
         first = false;
 
         CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
         first = false;

-        declaration->declaration_->Output(out, jacks);
+        binding->binding_->Output(out, jacks);

 
         if (next == NULL)
             break;
 
         out << ',' << ' ';
 
         if (next == NULL)
             break;
 
         out << ',' << ' ';

-        declaration = next;
+        binding = next;

     }
 }
 
     }
 }
 


@@ -312,17 +432,13 @@ void CYEmpty::Output(CYOutput &out, CYFlags flags) const {
     out.Terminate();
 }
 
     out.Terminate();
 }
 

-void CYExpress::Output(CYOutput &out, CYFlags flags) const {
-    expression_->Output(out, flags | CYNoBF);
-    out << ';';
-}
-
-void CYExpression::ClassName(CYOutput &out, bool object) const {
-    Output(out, CYAssign::Precedence_, CYNoFlags);
+void CYEval::Output(CYOutput &out, CYFlags flags) const {
+    _assert(false);

 }
 
 }
 

-void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
-    Output(out, flags | CYNoRightHand);
+void CYExpress::Output(CYOutput &out, CYFlags flags) const {
+    expression_->Output(out, flags | CYNoBFC);
+    out << ';';

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


@@ -336,8 +452,18 @@ void CYExpression::Output(CYOutput &out, int precedence, CYFlags flags) const {
         Output(out, flags);
 }
 
         Output(out, flags);
 }
 

-void CYExternal::Output(CYOutput &out, CYFlags flags) const {
-    out << "extern" << abi_ << typed_ << ';';
+void CYExtend::Output(CYOutput &out, CYFlags flags) const {
+    lhs_->Output(out, CYLeft(flags));
+    out << ' ' << object_;
+}
+
+void CYExternalDefinition::Output(CYOutput &out, CYFlags flags) const {
+    out << "extern" << ' ' << abi_ << ' ' << typed_;
+    out.Terminate();
+}
+
+void CYExternalExpression::Output(CYOutput &out, CYFlags flags) const {
+    out << '(' << "extern" << ' ' << abi_ << ' ' << typed_ << ')';

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


@@ -355,8 +481,8 @@ void CYFinally::Output(CYOutput &out) const {
 
 void CYFor::Output(CYOutput &out, CYFlags flags) const {
     out << "for" << ' ' << '(';
 
 void CYFor::Output(CYOutput &out, CYFlags flags) const {
     out << "for" << ' ' << '(';

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

     out.Terminate();
     if (test_ != NULL)
         out << ' ';
     out.Terminate();
     if (test_ != NULL)
         out << ' ';


@@ -369,63 +495,84 @@ void CYFor::Output(CYOutput &out, CYFlags flags) const {
     code_->Single(out, CYRight(flags), CYCompactShort);
 }
 
     code_->Single(out, CYRight(flags), CYCompactShort);
 }
 

-void CYForOf::Output(CYOutput &out, CYFlags flags) const {
-    out << "for" << ' ' << "each" << ' ' << '(';
-    initialiser_->ForIn(out, CYNoIn);
-    out << ' ' << "in" << ' ' << *set_ << ')';
+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" << ' ' << '(';
+    initializer_->Output(out, CYNoIn | CYNoRightHand);
+    out << ' ' << "in" << ' ' << *iterable_ << ')';

     code_->Single(out, CYRight(flags), CYCompactShort);
 }
 
     code_->Single(out, CYRight(flags), CYCompactShort);
 }
 

-void CYForOfComprehension::Output(CYOutput &out) const {
-    out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;
+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 CYForIn::Output(CYOutput &out, CYFlags flags) const {
+void CYForInComprehension::Output(CYOutput &out) const {
+    out << "for" << ' ' << '(';
+    binding_->Output(out, CYNoIn | CYNoRightHand);
+    out << ' ' << "in" << ' ' << *iterable_ << ')';
+}
+
+void CYForOf::Output(CYOutput &out, CYFlags flags) const {

     out << "for" << ' ' << '(';
     out << "for" << ' ' << '(';

-    if (initialiser_ != NULL)
-        initialiser_->ForIn(out, CYNoIn);
-    out << ' ' << "in" << ' ' << *set_ << ')';
+    initializer_->Output(out, CYNoRightHand);
+    out << ' ' << "of" << ' ' << *iterable_ << ')';

     code_->Single(out, CYRight(flags), CYCompactShort);
 }
 
     code_->Single(out, CYRight(flags), CYCompactShort);
 }
 

-void CYForInComprehension::Output(CYOutput &out) const {
-    out << "for" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')';
+void CYForOfComprehension::Output(CYOutput &out) const {
+    out << "for" << ' ' << '(';
+    binding_->Output(out, CYNoRightHand);
+    out << ' ' << "of" << ' ' << *iterable_ << ')' << next_;

 }
 
 }
 

-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_;
+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' << '}';
     out << '(' << parameters_ << ')' << ' ';
     out << '{' << '\n';
     ++out.indent_;
     out << code_;
     --out.indent_;
     out << '\t' << '}';

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

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

-    CYFunction::Output(out, flags);
+    // 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_;
+    CYFunction::Output(out);
+    if (protect)
+        out << ')';

 }
 
 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 {

-    initialiser_->Output(out, CYNoFlags);
+    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 {


@@ -471,6 +618,15 @@ void CYImport::Output(CYOutput &out, CYFlags flags) const {
     out << "@import";
 }
 
     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,7 +669,7 @@ void CYTemplate::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {
 }
 
 void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {

-    next_->Output(out, Precedence(), identifier);
+    next_->Output(out, Precedence(), identifier, false);

     out << '[';
     out << size_;
     out << ']';
     out << '[';
     out << size_;
     out << ']';


@@ -521,31 +677,42 @@ void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {
 
 void CYTypeBlockWith::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << '(' << '^';
 
 void CYTypeBlockWith::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << '(' << '^';

-    next_->Output(out, Precedence(), identifier);
+    next_->Output(out, Precedence(), identifier, false);

     out << ')' << '(' << parameters_ << ')';
 }
 
 void CYTypeConstant::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << ')' << '(' << parameters_ << ')';
 }
 
 void CYTypeConstant::Output(CYOutput &out, CYIdentifier *identifier) const {

-    out << "const" << ' ';
-    next_->Output(out, Precedence(), identifier);
+    out << "const";
+    next_->Output(out, Precedence(), identifier, false);

 }
 
 void CYTypeFunctionWith::Output(CYOutput &out, CYIdentifier *identifier) const {
 }
 
 void CYTypeFunctionWith::Output(CYOutput &out, CYIdentifier *identifier) const {

-    next_->Output(out, Precedence(), identifier);
-    out << '(' << parameters_ << ')';
+    next_->Output(out, Precedence(), identifier, false);
+    out << '(' << parameters_;
+    if (variadic_) {
+        if (parameters_ != NULL)
+            out << ',' << ' ';
+        out << "...";
+    }
+    out << ')';

 }
 
 void CYTypePointerTo::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << '*';
 }
 
 void CYTypePointerTo::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << '*';

-    next_->Output(out, Precedence(), identifier);
+    next_->Output(out, Precedence(), identifier, false);

 }
 
 void CYTypeVolatile::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << "volatile";
 }
 
 void CYTypeVolatile::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << "volatile";

-    next_->Output(out, Precedence(), identifier);
+    next_->Output(out, Precedence(), identifier, true);

 }
 
 }
 

-void CYTypeModifier::Output(CYOutput &out, int precedence, CYIdentifier *identifier) const {
+void CYTypeModifier::Output(CYOutput &out, int precedence, CYIdentifier *identifier, bool space) const {
+    if (this == NULL && identifier == NULL)
+        return;
+    else if (space)
+        out << ' ';
+

     if (this == NULL) {
         out << identifier;
         return;
     if (this == NULL) {
         out << identifier;
         return;


@@ -562,7 +729,7 @@ void CYTypeModifier::Output(CYOutput &out, int precedence, CYIdentifier *identif
 
 void CYTypedIdentifier::Output(CYOutput &out) const {
     specifier_->Output(out);
 
 void CYTypedIdentifier::Output(CYOutput &out) const {
     specifier_->Output(out);

-    modifier_->Output(out, 0, identifier_);
+    modifier_->Output(out, 0, identifier_, true);

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


@@ -585,11 +752,17 @@ void CYLambda::Output(CYOutput &out, CYFlags flags) const {
 
 void CYTypeDefinition::Output(CYOutput &out, CYFlags flags) const {
     out << "typedef" << ' ' << *typed_;
 
 void CYTypeDefinition::Output(CYOutput &out, CYFlags flags) const {
     out << "typedef" << ' ' << *typed_;

+    out.Terminate();

 }
 
 }
 

-void CYLetStatement::Output(CYOutput &out, CYFlags flags) const {
-    out << "let" << ' ' << '(' << *declarations_ << ')';
-    code_->Single(out, CYRight(flags), CYCompactShort);
+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 {
 }
 
 void CYModule::Output(CYOutput &out) const {


@@ -660,20 +833,51 @@ void CYScript::Output(CYOutput &out) const {
 }
 
 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 << ':' << ' ';
     value_->Output(out, CYAssign::Precedence_, CYNoFlags);
     out << '\t';
     name_->PropertyName(out);
     out << ':' << ' ';
     value_->Output(out, CYAssign::Precedence_, CYNoFlags);

-    if (next_ != NULL)
-        out << ',' << '\n' << *next_;
-    else
-        out << '\n';
+    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)


@@ -682,7 +886,7 @@ 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));
 }
     out << ' ';
     proc_->Output(out, CYRight(flags));
 }


@@ -695,6 +899,11 @@ void CYRubyProc::Output(CYOutput &out, CYFlags flags) const {
     out << '\t' << '}';
 }
 
     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);
     CYForEach (next, this) {
 void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
     bool first(true);
     CYForEach (next, this) {


@@ -777,6 +986,34 @@ 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->typed_;
+        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 {
     out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{' << '\n';
     ++out.indent_;
 void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
     out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{' << '\n';
     ++out.indent_;


@@ -785,6 +1022,15 @@ void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
     out << '\t' << '}';
 }
 
     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 {
     out << "this";
 }
 void CYThis::Output(CYOutput &out, CYFlags flags) const {
     out << "this";
 }


@@ -811,24 +1057,42 @@ void Try::Output(CYOutput &out, CYFlags flags) const {
 
 } }
 
 
 } }
 

-void CYTypeError::Output(CYOutput &out) const {
-    out << "@error";
+void CYTypeCharacter::Output(CYOutput &out) const {
+    switch (signing_) {
+        case CYTypeNeutral: break;
+        case CYTypeSigned: out << "signed" << ' '; break;
+        case CYTypeUnsigned: out << "unsigned" << ' '; break;
+    }
+
+    out << "char";

 }
 
 }
 

-void CYTypeLong::Output(CYOutput &out) const {
-    out << "long" << specifier_;
+void CYTypeError::Output(CYOutput &out) const {
+    out << "@error";

 }
 
 }
 

-void CYTypeShort::Output(CYOutput &out) const {
-    out << "short" << specifier_;
+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 CYTypeSigned::Output(CYOutput &out) const {
-    out << "signed" << specifier_;
+void CYTypeStruct::Output(CYOutput &out) const {
+    out << "struct";
+    if (name_ != NULL)
+        out << ' ' << *name_;
+    else
+        out << *tail_;

 }
 
 }
 

-void CYTypeUnsigned::Output(CYOutput &out) const {
-    out << "unsigned" << specifier_;
+void CYTypeReference::Output(CYOutput &out) const {
+    out << "struct" << ' ' << *name_;

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


@@ -841,7 +1105,7 @@ void CYTypeVoid::Output(CYOutput &out) const {
 
 void CYVar::Output(CYOutput &out, CYFlags flags) const {
     out << "var" << ' ';
 
 void CYVar::Output(CYOutput &out, CYFlags flags) const {
     out << "var" << ' ';

-    declarations_->Output(out, flags);
+    bindings_->Output(out, flags); // XXX: flags

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


@@ -859,14 +1123,6 @@ void CYWith::Output(CYOutput &out, CYFlags flags) const {
     code_->Single(out, CYRight(flags), CYCompactShort);
 }
 
     code_->Single(out, CYRight(flags), CYCompactShort);
 }
 

-void CYWord::ClassName(CYOutput &out, bool object) const {
-    if (object)
-        out << "objc_getClass(";
-    out << '"' << Word() << '"';
-    if (object)
-        out << ')';
-}
-

 void CYWord::Output(CYOutput &out) const {
     out << Word();
     if (out.options_.verbose_) {
 void CYWord::Output(CYOutput &out) const {
     out << Word();
     if (out.options_.verbose_) {