Support SO variable even when not Mach.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 7f77d65c15aca0912dba84bef99d8ac5a2304d72..ee58d06ecc8608da559df22e6839198538fef6ff 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -1,9 +1,27 @@
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010  Jay Freeman (saurik)
+*/
+
+/* GNU Lesser General Public License, Version 3 {{{ */
+/*
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Cycript 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+
+#include "cycript.hpp"

 #include "Parser.hpp"
 
 #include "Parser.hpp"
 

-#include <iostream>
-#include <iomanip>
-
-#include <objc/runtime.h>

 #include <sstream>
 
 _finline CYFlags operator ~(CYFlags rhs) {
 #include <sstream>
 
 _finline CYFlags operator ~(CYFlags rhs) {


@@ -23,7 +41,7 @@ _finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
 }
 
 _finline CYFlags CYLeft(CYFlags flags) {
 }
 
 _finline CYFlags CYLeft(CYFlags flags) {

-    return flags & ~CYNoDangle;
+    return flags & ~(CYNoDangle | CYNoInteger);

 }
 
 _finline CYFlags CYRight(CYFlags flags) {
 }
 
 _finline CYFlags CYRight(CYFlags flags) {


@@ -34,8 +52,6 @@ _finline CYFlags CYCenter(CYFlags flags) {
     return CYLeft(CYRight(flags));
 }
 
     return CYLeft(CYRight(flags));
 }
 

-#define CYPA 16
-

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


@@ -51,14 +67,22 @@ CYOutput &CYOutput::operator <<(char rhs) {
             for (unsigned i(0); i != indent_; ++i)
                 out_ << "    ";
         else goto done;
             for (unsigned i(0); i != indent_; ++i)
                 out_ << "    ";
         else goto done;

-    else goto work;
-
+    else if (rhs == '\r') {
+        if (right_) {
+            out_ << '\n';
+            right_ = false;
+        } goto done;
+    } else goto work;
+
+    right_ = true;

     mode_ = NoMode;
     goto done;
 
   work:
     mode_ = NoMode;
     goto done;
 
   work:

-    if (mode_ == Terminated && rhs != '}')
+    if (mode_ == Terminated && rhs != '}') {
+        right_ = true;

         out_ << ';';
         out_ << ';';

+    }

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


@@ -82,6 +106,7 @@ CYOutput &CYOutput::operator <<(char rhs) {
     } else none:
         mode_ = NoMode;
 
     } else none:
         mode_ = NoMode;
 

+    right_ = true;

     out_ << rhs;
   done:
     return *this;
     out_ << rhs;
   done:
     return *this;


@@ -107,24 +132,11 @@ CYOutput &CYOutput::operator <<(const char *rhs) {
     else
         mode_ = NoMode;
 
     else
         mode_ = NoMode;
 

+    right_ = true;

     out_ << rhs;
     return *this;
 }
 
     out_ << rhs;
     return *this;
 }
 

-void OutputBody(CYOutput &out, CYStatement *body) {
-    out << ' ' << '{' << '\n';
-    ++out.indent_;
-    if (body != NULL)
-        body->Multiple(out);
-    --out.indent_;
-    out << '\t' << '}';
-}
-
-void CYAddressOf::Output(CYOutput &out, CYFlags flags) const {
-    rhs_->Output(out, 1, CYLeft(flags));
-    out << ".$cya()";
-}
-

 void CYArgument::Output(CYOutput &out) const {
     if (name_ != NULL) {
         out << *name_;
 void CYArgument::Output(CYOutput &out) const {
     if (name_ != NULL) {
         out << *name_;


@@ -132,7 +144,7 @@ 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_->name_ == NULL)
             out << ',';
     if (next_ != NULL) {
         if (next_->name_ == NULL)
             out << ',';


@@ -145,21 +157,7 @@ void CYArray::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYArrayComprehension::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYArrayComprehension::Output(CYOutput &out, CYFlags flags) const {

-    // XXX: I don't necc. need the ()s
-    out << "(function($cyv";
-    for (CYComprehension *comprehension(comprehensions_); comprehension != NULL; comprehension = comprehension->next_)
-        if (const char *name = comprehension->Name())
-            out << ',' << name;
-    out << "){";
-    out << "$cyv=[];";
-    comprehensions_->Output(out);
-    out << "$cyv.push(";
-    expression_->Output(out, CYPA, CYNoFlags);
-    out << ");";
-    for (CYComprehension *comprehension(comprehensions_); comprehension != NULL; comprehension = comprehension->next_)
-        comprehension->End_(out);
-    out << "return $cyv;";
-    out << "}())";
+    out << '[' << *expression_ << ' ' << *comprehensions_ << ']';

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


@@ -168,8 +166,22 @@ 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 {
+    out << '{' << '\n';
+    ++out.indent_;
+    if (statements_ != NULL)
+        statements_->Multiple(out);
+    --out.indent_;
+    out << '\t' << '}';
+}
+

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

-    statements_->Single(out, flags);
+    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 {


@@ -193,56 +205,20 @@ void CYCall::Output(CYOutput &out, CYFlags flags) const {
         out << ')';
 }
 
         out << ')';
 }
 

-void CYCatch::Output(CYOutput &out) const {
-    out << "catch" << ' ' << '(' << *name_ << ')' << ' ' << '{';
-    if (code_ != NULL)
-        code_->Multiple(out);
-    out << '}';
-}
-
-void CYCategory::Output(CYOutput &out, CYFlags flags) const {
-    out << "(function($cys,$cyp,$cyc,$cyn,$cyt){";
-    out << "$cyp=object_getClass($cys);";
-    out << "$cyc=$cys;";
-    if (messages_ != NULL)
-        messages_->Output(out, true);
-    out << "})(";
-    name_->ClassName(out, true);
-    out << ')';
-    out << ';';
-}
+namespace cy {
+namespace Syntax {

 
 

-void CYClass::Output(CYOutput &out, CYFlags flags) const {
-    // XXX: I don't necc. need the ()s
-    out << "(function($cys,$cyp,$cyc,$cyn,$cyt,$cym){";
-    out << "$cyp=object_getClass($cys);";
-    out << "$cyc=objc_allocateClassPair($cys,";
-    if (name_ != NULL)
-        name_->ClassName(out, false);
-    else
-        out << "$cyq(\"CY$\")";
-    out << ",0);";
-    out << "$cym=object_getClass($cyc);";
-    if (fields_ != NULL)
-        fields_->Output(out);
-    if (messages_ != NULL)
-        messages_->Output(out, false);
-    out << "objc_registerClassPair($cyc);";
-    out << "return $cyc;";
-    out << "}(";
-    if (super_ != NULL)
-        super_->Output(out, CYPA, CYNoFlags);
-    else
-        out << "null";
-    out << "))";
+void Catch::Output(CYOutput &out) const {
+    out << ' ' << "catch" << ' ' << '(' << *name_ << ')' << ' ' << code_;

 }
 
 }
 

-void CYClassExpression::Output(CYOutput &out, CYFlags flags) const {
-    CYClass::Output(out, flags);
-}
+} }

 
 

-void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
-    CYClass::Output(out, flags);
+void CYComment::Output(CYOutput &out, CYFlags flags) const {
+    out << '\r';
+    out.out_ << value_;
+    out.right_ = true;
+    out << '\r';

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


@@ -261,18 +237,13 @@ void CYCompound::Output(CYOutput &out, CYFlags flags) const {
             expression->Output(out, flags);
 }
 
             expression->Output(out, flags);
 }
 

-void CYComprehension::Output(CYOutput &out) const {
-    Begin_(out);
-    out << next_;
-}
-

 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_, CYNoFlags);

     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 {


@@ -288,13 +259,13 @@ void CYClause::Output(CYOutput &out) const {
     else
         out << "default";
     out << ':' << '\n';
     else
         out << "default";
     out << ':' << '\n';

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

     out << next_;
 }
 
 const char *CYDeclaration::ForEachIn() const {
     out << next_;
 }
 
 const char *CYDeclaration::ForEachIn() const {

-    return identifier_->Value();
+    return identifier_->Word();

 }
 
 void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
 }
 
 void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {


@@ -302,15 +273,12 @@ void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
     Output(out, CYRight(flags));
 }
 
     Output(out, CYRight(flags));
 }
 

-void CYDeclaration::ForEachIn(CYOutput &out) const {
-    out << *identifier_;
-}
-

 void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
     out << *identifier_;
 void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
     out << *identifier_;

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

     if (initialiser_ != NULL) {
         out << ' ' << '=' << ' ';
     if (initialiser_ != NULL) {
         out << ' ' << '=' << ' ';

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

     }
 }
 
     }
 }
 


@@ -340,7 +308,7 @@ void CYDeclarations::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYDirectMember::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYDirectMember::Output(CYOutput &out, CYFlags flags) const {

-    object_->Output(out, Precedence(), CYLeft(flags));
+    object_->Output(out, Precedence(), CYLeft(flags) | CYNoInteger);

     if (const char *word = property_->Word())
         out << '.' << word;
     else
     if (const char *word = property_->Word())
         out << '.' << word;
     else


@@ -355,7 +323,7 @@ void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
 
 void CYElement::Output(CYOutput &out) const {
     if (value_ != NULL)
 
 void CYElement::Output(CYOutput &out) const {
     if (value_ != NULL)

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

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


@@ -375,7 +343,7 @@ void CYExpress::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYExpression::ClassName(CYOutput &out, bool object) const {
 }
 
 void CYExpression::ClassName(CYOutput &out, bool object) const {

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

 }
 
 const char *CYExpression::ForEachIn() const {
 }
 
 const char *CYExpression::ForEachIn() const {


@@ -386,10 +354,6 @@ void CYExpression::For(CYOutput &out) const {
     Output(out, CYNoIn);
 }
 
     Output(out, CYNoIn);
 }
 

-void CYExpression::ForEachIn(CYOutput &out) const {
-    Output(out, CYPA, CYNoRightHand);
-}
-

 void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
     Output(out, flags | CYNoRightHand);
 }
 void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
     Output(out, flags | CYNoRightHand);
 }


@@ -405,15 +369,8 @@ void CYExpression::Output(CYOutput &out, unsigned precedence, CYFlags flags) con
         Output(out, flags);
 }
 
         Output(out, flags);
 }
 

-void CYField::Output(CYOutput &out) const {
-    // XXX: implement!
-}
-

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

-    out << "finally" << ' ' << '{';
-    if (code_ != NULL)
-        code_->Multiple(out);
-    out << '}';
+    out << ' ' << "finally" << ' ' << code_;

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


@@ -429,47 +386,26 @@ void CYFor::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYForEachIn::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYForEachIn::Output(CYOutput &out, CYFlags flags) const {

-    out << "with({$cys:0,$cyt:0}){";
-
-    out << "$cys=";
-    set_->Output(out, CYPA, CYNoFlags);
-    out << ';';
-
-    out << "for($cyt in $cys){";
-
-    initialiser_->ForEachIn(out);
-    out << "=$cys[$cyt];";
-
-    code_->Multiple(out);
-
-    out << '}';
-
-    out << '}';
-}
-
-void CYForEachInComprehension::Begin_(CYOutput &out) const {
-    out << "(function($cys){";
-    out << "$cys=";
-    set_->Output(out, CYPA, CYNoFlags);
-    out << ';';
-
-    out << "for(" << *name_ << " in $cys){";
-    out << *name_ << "=$cys[" << *name_ << "];";
+    out << "for" << ' ' << "each" << ' ' << '(';
+    initialiser_->ForIn(out, CYNoIn);
+    out << "in" << *set_ << ')';
+    code_->Single(out, CYRight(flags));

 }
 
 }
 

-void CYForEachInComprehension::End_(CYOutput &out) const {
-    out << "}}());";
+void CYForEachInComprehension::Output(CYOutput &out) const {
+    out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;

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

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

     out << "in" << *set_ << ')';
     code_->Single(out, CYRight(flags));
 }
 
     out << "in" << *set_ << ')';
     code_->Single(out, CYRight(flags));
 }
 

-void CYForInComprehension::Begin_(CYOutput &out) const {
-    out << "for" << ' ' << '(' << *name_ << "in" << *set_ << ')';
+void CYForInComprehension::Output(CYOutput &out) const {
+    out << "for" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')';

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


@@ -481,7 +417,7 @@ void CYFunction::Output(CYOutput &out, CYFlags flags) const {
     if (name_ != NULL)
         out << ' ' << *name_;
     out << '(' << parameters_ << ')';
     if (name_ != NULL)
         out << ' ' << *name_;
     out << '(' << parameters_ << ')';

-    OutputBody(out, body_);
+    out << ' ' << code_;

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


@@ -500,6 +436,10 @@ void CYFunctionParameter::Output(CYOutput &out) const {
         out << ',' << ' ' << *next_;
 }
 
         out << ',' << ' ' << *next_;
 }
 

+const char *CYIdentifier::Word() const {
+    return replace_ == NULL || replace_ == this ? CYWord::Word() : replace_->Word();
+}
+

 void CYIf::Output(CYOutput &out, CYFlags flags) const {
     bool protect(false);
     if (false_ == NULL && (flags & CYNoDangle) != 0) {
 void CYIf::Output(CYOutput &out, CYFlags flags) const {
     bool protect(false);
     if (false_ == NULL && (flags & CYNoDangle) != 0) {


@@ -517,10 +457,9 @@ void CYIf::Output(CYOutput &out, CYFlags flags) const {
     else
         jacks |= protect ? CYNoFlags : CYCenter(flags);
 
     else
         jacks |= protect ? CYNoFlags : CYCenter(flags);
 

-    bool single(true_->Single(out, jacks));
+    true_->Single(out, jacks);

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

-        out << (single ? '\t' : ' ');

         out << "else";
         false_->Single(out, right);
     }
         out << "else";
         false_->Single(out, right);
     }


@@ -529,27 +468,21 @@ void CYIf::Output(CYOutput &out, CYFlags flags) const {
         out << '}';
 }
 
         out << '}';
 }
 

-void CYIfComprehension::Begin_(CYOutput &out) const {
-    out << "if" << '(' << *test_ << ')';
-}
-
-void CYIndirect::Output(CYOutput &out, CYFlags flags) const {
-    rhs_->Output(out, 1, CYLeft(flags));
-    out << ".$cyi";
+void CYIfComprehension::Output(CYOutput &out) const {
+    out << "if" << ' ' << '(' << *test_ << ')' << next_;

 }
 
 void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
     object_->Output(out, Precedence(), CYLeft(flags));
 }
 
 void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
     object_->Output(out, Precedence(), CYLeft(flags));

-    out << ".$cyi";

     if (const char *word = property_->Word())
     if (const char *word = property_->Word())

-        out << '.' << word;
+        out << "->" << word;

     else
     else

-        out << '[' << *property_ << ']';
+        out << "->" << '[' << *property_ << ']';

 }
 
 void CYInfix::Output(CYOutput &out, CYFlags flags) const {
     const char *name(Operator());
 }
 
 void CYInfix::Output(CYOutput &out, CYFlags flags) const {
     const char *name(Operator());

-    bool protect((flags & CYNoIn) != 0 && strcmp(name, "in"));
+    bool protect((flags & CYNoIn) != 0 && strcmp(name, "in") == 0);

     if (protect)
         out << '(';
     CYFlags left(protect ? CYNoFlags : CYLeft(flags));
     if (protect)
         out << '(';
     CYFlags left(protect ? CYNoFlags : CYLeft(flags));


@@ -561,37 +494,19 @@ void CYInfix::Output(CYOutput &out, CYFlags flags) const {
         out << ')';
 }
 
         out << ')';
 }
 

+void CYLabel::Output(CYOutput &out, CYFlags flags) const {
+    out << *name_ << ':' << ' ';
+    statement_->Single(out, CYRight(flags));
+}
+

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

-    out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << '{';
-    if (statements_ != NULL)
-        statements_->Multiple(out);
-    out << '}';
+    out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << code_;

 }
 
 }
 

-void CYMessage::Output(CYOutput &out, bool replace) const {
-    if (next_ != NULL)
-        next_->Output(out, replace);
-    out << "$cyn=new Selector(\"";
-    for (CYMessageParameter *parameter(parameter_); parameter != NULL; parameter = parameter->next_)
-        if (parameter->tag_ != NULL) {
-            out << *parameter->tag_;
-            if (parameter->name_ != NULL)
-                out << ':';
-        }
-    out << "\");";
-    out << "$cyt=$cyn.type($cy" << (instance_ ? 's' : 'p') << ");";
-    out << "class_" << (replace ? "replace" : "add") << "Method($cy" << (instance_ ? 'c' : 'm') << ",$cyn,";
-    out << "new Functor(function(self,_cmd";
-    for (CYMessageParameter *parameter(parameter_); parameter != NULL; parameter = parameter->next_)
-        if (parameter->name_ != NULL)
-            out << ',' << *parameter->name_;
-    out << "){return function(){";
-    if (body_ != NULL)
-        body_->Multiple(out);
-    out << "}.call(self);},$cyt),$cyt);";
-}
-
-void CYNew::Output(CYOutput &out, CYFlags flags) const {
+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);


@@ -599,14 +514,20 @@ void CYNew::Output(CYOutput &out, CYFlags flags) const {
         out << '(' << *arguments_ << ')';
 }
 
         out << '(' << *arguments_ << ')';
 }
 

+} }
+

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

-    char value[32];
-    sprintf(value, "%.17g", Value());
-    out << value;
+    std::ostringstream str;
+    CYNumerify(str, Value());
+    std::string value(str.str());
+    out << value.c_str();
+    // XXX: this should probably also handle hex conversions and exponents
+    if ((flags & CYNoInteger) != 0 && value.find('.') == std::string::npos)
+        out << '.';

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


@@ -619,13 +540,20 @@ void CYObject::Output(CYOutput &out, CYFlags flags) const {
         out << '(';
     out << '{' << '\n';
     ++out.indent_;
         out << '(';
     out << '{' << '\n';
     ++out.indent_;

-    out << property_;
+    out << properties_;

     --out.indent_;
     out << '\t' << '}';
     if (protect)
         out << ')';
 }
 
     --out.indent_;
     out << '\t' << '}';
     if (protect)
         out << ')';
 }
 

+void CYOptionalFunctionParameter::Output(CYOutput &out) const {
+    out << *name_ << '=';
+    initializer_->Output(out, CYAssign::Precedence_, 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();


@@ -639,11 +567,16 @@ 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 CYProperty::Output(CYOutput &out) const {
     out << '\t';
     name_->PropertyName(out);
     out << ':' << ' ';
 void CYProperty::Output(CYOutput &out) const {
     out << '\t';
     name_->PropertyName(out);
     out << ':' << ' ';

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

     if (next_ != NULL)
         out << ',' << '\n' << *next_;
     else
     if (next_ != NULL)
         out << ',' << '\n' << *next_;
     else


@@ -661,45 +594,22 @@ void CYReturn::Output(CYOutput &out, CYFlags flags) const {
     out << ';';
 }
 
     out << ';';
 }
 

-void CYSelector::Output(CYOutput &out, CYFlags flags) const {
-    out << "new Selector(\"";
-    if (name_ != NULL)
-        name_->Output(out);
-    out << "\")";
+void CYRubyBlock::Output(CYOutput &out, CYFlags flags) const {
+    call_->Output(out, CYLeft(flags));
+    out << ' ';
+    proc_->Output(out, CYRight(flags));

 }
 
 }
 

-void CYSelectorPart::Output(CYOutput &out) const {
-    out << name_;
-    if (value_)
-        out << ':';
-    out << next_;
-}
-
-void CYSend::Output(CYOutput &out, CYFlags flags) const {
-    out << "objc_msgSend(";
-    self_->Output(out, CYPA, CYNoFlags);
-    out << ',';
-    std::ostringstream name;
-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
-        if (argument->name_ != NULL) {
-            name << *argument->name_;
-            if (argument->value_ != NULL)
-                name << ':';
-        }
-    out.out_ << reinterpret_cast<void *>(sel_registerName(name.str().c_str()));
-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
-        if (argument->value_ != NULL) {
-            out << ',';
-            argument->value_->Output(out, CYPA, CYNoFlags);
-        }
-    out << ')';
+void CYRubyProc::Output(CYOutput &out, CYFlags flags) const {
+    // XXX: this is not outputting the parameters
+    out << code_;

 }
 
 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);


@@ -707,70 +617,19 @@ void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
     }
 }
 
     }
 }
 

-bool CYStatement::Single(CYOutput &out, CYFlags flags) const {
-    if (next_ != NULL) {
-        out << ' ' << '{' << '\n';
-        ++out.indent_;
-        Multiple(out);
-        --out.indent_;
-        out << '\t' << '}';
-        return false;
-    } else {
-        for (CYLabel *label(labels_); label != NULL; label = label->next_)
-            out << ' ' << *label->name_ << ':';
-        out << '\n';
-        ++out.indent_;
-        out << '\t';
-        Output(out, flags);
-        out << '\n';
-        --out.indent_;
-        return true;
-    }
+void CYStatement::Single(CYOutput &out, CYFlags flags) const {
+    _assert(next_ == NULL);
+    out << '\n';
+    ++out.indent_;
+    out << '\t';
+    Output(out, flags);
+    out << '\n';
+    --out.indent_;

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

-    unsigned quot(0), apos(0);
-    for (const char *value(value_), *end(value_ + size_); value != end; ++value)
-        if (*value == '"')
-            ++quot;
-        else if (*value == '\'')
-            ++apos;
-
-    bool single(quot > apos);
-

     std::ostringstream str;
     std::ostringstream str;

-
-    str << (single ? '\'' : '"');
-    for (const char *value(value_), *end(value_ + size_); value != end; ++value)
-        switch (*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;
-
-            default:
-                if (*value < 0x20 || *value >= 0x7f)
-                    str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
-                else simple:
-                    str << *value;
-        }
-    str << (single ? '\'' : '"');
-
+    CYStringify(str, value_, size_);

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


@@ -800,8 +659,6 @@ static const char *Reserved_[] = {
 
     "let", "yield",
 
 
     "let", "yield",
 

-    "each",
-

     NULL
 };
 
     NULL
 };
 


@@ -828,22 +685,22 @@ void CYThis::Output(CYOutput &out, CYFlags flags) const {
     CYWord::Output(out);
 }
 
     CYWord::Output(out);
 }
 

-void CYThrow::Output(CYOutput &out, CYFlags flags) const {
+namespace cy {
+namespace Syntax {
+
+void Throw::Output(CYOutput &out, CYFlags flags) const {

     out << "throw";
     if (value_ != NULL)
         out << ' ' << *value_;
     out << ';';
 }
 
     out << "throw";
     if (value_ != NULL)
         out << ' ' << *value_;
     out << ';';
 }
 

-void CYTry::Output(CYOutput &out, CYFlags flags) const {
-    out << "try" << ' ' << '{';
-    if (code_ != NULL)
-        code_->Multiple(out);
-    out << '}';
-    out << catch_;
-    out << finally_;
+void Try::Output(CYOutput &out, CYFlags flags) const {
+    out << "try" << ' ' << code_ << catch_ << finally_;

 }
 
 }
 

+} }
+

 void CYVar::Output(CYOutput &out, CYFlags flags) const {
     out << "var";
     declarations_->Output(out, flags);
 void CYVar::Output(CYOutput &out, CYFlags flags) const {
     out << "var";
     declarations_->Output(out, flags);


@@ -867,15 +724,21 @@ void CYWith::Output(CYOutput &out, CYFlags flags) const {
 void CYWord::ClassName(CYOutput &out, bool object) const {
     if (object)
         out << "objc_getClass(";
 void CYWord::ClassName(CYOutput &out, bool object) const {
     if (object)
         out << "objc_getClass(";

-    out << '"' << Value() << '"';
+    out << '"' << Word() << '"';

     if (object)
         out << ')';
 }
 
 void CYWord::Output(CYOutput &out) const {
     if (object)
         out << ')';
 }
 
 void CYWord::Output(CYOutput &out) const {

-    out << Value();
+    out << Word();
+    if (out.options_.verbose_)
+        out.out_ << '@' << this;

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

+
+const char *CYWord::Word() const {
+    return word_;
+}