Support -p and <script> at the same time.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index b45703f1ebe9fd685282b7a799783b71e65038c4..389948aafa86b36e6f2b6776da670c3c58dfa029 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -3,33 +3,88 @@
 #include <iostream>
 #include <iomanip>
 
 #include <iostream>
 #include <iomanip>
 

-void CYAddressOf::Output(std::ostream &out) const {
-    out << *rhs_ << ".$()";
+#include <objc/runtime.h>
+#include <sstream>
+
+_finline CYFlags operator ~(CYFlags rhs) {
+    return static_cast<CYFlags>(~static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
+    return lhs = lhs | rhs;
+}
+
+_finline CYFlags CYLeft(CYFlags flags) {
+    return flags & ~CYNoTrailer;
+}
+
+_finline CYFlags CYCenter(CYFlags flags) {
+    return flags & CYNoIn;
+}
+
+_finline CYFlags CYRight(CYFlags flags) {
+    return flags & (CYNoIn | CYNoTrailer);
+}
+
+bool CYFalse::Value() const {
+    return false;
+}
+
+bool CYTrue::Value() const {
+    return true;
+}
+
+#define CYPA 16
+
+void CYAddressOf::Output(std::ostream &out, CYFlags flags) const {
+    rhs_->Output(out, 1, CYLeft(flags));
+    out << ".addressOf()";

 }
 
 }
 

-void CYArgument::Output(std::ostream &out, bool send) const {
-    if (!send && name_ != NULL) {
+void CYArgument::Output(std::ostream &out) const {
+    if (name_ != NULL) {

         out << *name_;
         if (value_ != NULL)
             out << ":";
     }
         out << *name_;
         if (value_ != NULL)
             out << ":";
     }

-    if (value_ != NULL) {
-        if (send)
-            out << ',';
-        value_->Output(out, true);
-    }
+    if (value_ != NULL)
+        value_->Output(out, CYPA, CYNoFlags);

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

-        if (!send)
-            if (next_->name_ != NULL)
-                out << ',';
-            else
-                out << ' ';
-        next_->Output(out, send);
+        if (next_->name_ == NULL)
+            out << ',';
+        else
+            out << ' ';
+        next_->Output(out);

     }
 }
 
     }
 }
 

-void CYBoolean::Output(std::ostream &out) const {
+void CYArray::Output(std::ostream &out, CYFlags flags) const {
+    out << '[';
+    if (elements_ != NULL)
+        elements_->Output(out);
+    out << ']';
+}
+
+void CYAssignment::Output(std::ostream &out, CYFlags flags) const {
+    lhs_->Output(out, Precedence() - 1, CYLeft(flags));
+    out << Operator();
+    rhs_->Output(out, Precedence(), CYRight(flags));
+}
+
+void CYBoolean::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';

     out << (Value() ? "true" : "false");
     out << (Value() ? "true" : "false");

+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';

 }
 
 void CYBreak::Output(std::ostream &out) const {
 }
 
 void CYBreak::Output(std::ostream &out) const {


@@ -39,10 +94,11 @@ void CYBreak::Output(std::ostream &out) const {
     out << ';';
 }
 
     out << ';';
 }
 

-void CYCall::Output(std::ostream &out) const {
-    out << *function_ << '(';
+void CYCall::Output(std::ostream &out, CYFlags flags) const {
+    function_->Output(out, Precedence(), CYLeft(flags));
+    out << '(';

     if (arguments_ != NULL)
     if (arguments_ != NULL)

-        arguments_->Output(out, false);
+        arguments_->Output(out);

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


@@ -51,11 +107,58 @@ void CYCatch::Output(std::ostream &out) const {
     code_->Output(out, true);
 }
 
     code_->Output(out, true);
 }
 

-void CYCondition::Output(std::ostream &out) const {
-    out << *test_ << '?';
+void CYCategory::Output(std::ostream &out) 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);
+    out << ");";
+}
+
+void CYClass::Output(std::ostream &out) const {
+    out << "(function($cys,$cyp,$cyc,$cyn,$cyt,$cym){";
+    out << "$cyp=object_getClass($cys);";
+    out << "$cyc=objc_allocateClassPair($cys,\"" << *name_ << "\",0);";
+    out << "$cym=object_getClass($cyc);";
+    if (fields_ != NULL)
+        fields_->Output(out);
+    if (messages_ != NULL)
+        messages_->Output(out, false);
+    out << "objc_registerClassPair($cyc);";
+    out << "})(";
+    if (super_ != NULL)
+        super_->Output(out, CYPA, CYNoFlags);
+    else
+        out << "null";
+    out << ");";
+}
+
+void CYCompound::Output(std::ostream &out, CYFlags flags) const {
+    if (CYExpression *expression = expressions_)
+        if (CYExpression *next = expression->next_) {
+            expression->Output(out, CYLeft(flags));
+            CYFlags center(CYCenter(flags));
+            while (next != NULL) {
+                expression = next;
+                out << ',';
+                next = expression->next_;
+                CYFlags right(next != NULL ? center : CYRight(flags));
+                expression->Output(out, right);
+            }
+        } else
+            expression->Output(out, flags);
+}
+
+void CYCondition::Output(std::ostream &out, CYFlags flags) const {
+    test_->Output(out, Precedence() - 1, CYLeft(flags));
+    out << '?';

     if (true_ != NULL)
     if (true_ != NULL)

-        out << *true_;
-    out << ':' << *false_;
+        true_->Output(out, CYPA, CYNoFlags);
+    out << ':';
+    false_->Output(out, CYPA, CYRight(flags));

 }
 
 void CYContinue::Output(std::ostream &out) const {
 }
 
 void CYContinue::Output(std::ostream &out) const {


@@ -66,9 +169,10 @@ void CYContinue::Output(std::ostream &out) const {
 }
 
 void CYClause::Output(std::ostream &out) const {
 }
 
 void CYClause::Output(std::ostream &out) const {

-    if (case_ != NULL)
-        out << "case" << *case_;
-    else
+    if (case_ != NULL) {
+        out << "case";
+        case_->Output(out, CYNoFlags);
+    } else

         out << "default";
     out << ':';
     if (code_ != NULL)
         out << "default";
     out << ':';
     if (code_ != NULL)


@@ -76,6 +180,7 @@ void CYClause::Output(std::ostream &out) const {
     out << *next_;
 }
 
     out << *next_;
 }
 

+// XXX: deal with NoIn

 void CYDeclaration::Part(std::ostream &out) const {
     out << "var ";
     Output(out);
 void CYDeclaration::Part(std::ostream &out) const {
     out << "var ";
     Output(out);


@@ -83,17 +188,25 @@ void CYDeclaration::Part(std::ostream &out) const {
 
 void CYDeclaration::Output(std::ostream &out) const {
     out << *identifier_;
 
 void CYDeclaration::Output(std::ostream &out) const {
     out << *identifier_;

-    if (initialiser_ != NULL)
-        out << '=' << *initialiser_;
+    if (initialiser_ != NULL) {
+        out << '=';
+        initialiser_->Output(out, CYPA, CYNoFlags);
+    }

 }
 
 }
 

+// XXX: deal with NoIn

 void CYDeclarations::Part(std::ostream &out) const {
     out << "var ";
 void CYDeclarations::Part(std::ostream &out) const {
     out << "var ";

+

     const CYDeclarations *declaration(this);
     const CYDeclarations *declaration(this);

-    do {
-        out << *declaration->declaration_;
-        declaration = declaration->next_;
-    } while (declaration != NULL);
+  output:
+    out << *declaration->declaration_;
+    declaration = declaration->next_;
+
+    if (declaration != NULL) {
+        out << ',';
+        goto output;
+    }

 }
 
 void CYDeclarations::Output(std::ostream &out) const {
 }
 
 void CYDeclarations::Output(std::ostream &out) const {


@@ -102,26 +215,21 @@ void CYDeclarations::Output(std::ostream &out) const {
 }
 
 void CYDoWhile::Output(std::ostream &out) const {
 }
 
 void CYDoWhile::Output(std::ostream &out) const {

+    // XXX: extra space character!

     out << "do ";
     code_->Output(out, false);
     out << "do ";
     code_->Output(out, false);

-    out << "while" << *test_ << ';';
+    out << "while(";
+    test_->Output(out, CYNoFlags);
+    out << ')';

 }
 
 }
 

-void CYElement::Output(std::ostream &out, bool raw) const {
-    if (!raw)
-        out << '[';
+void CYElement::Output(std::ostream &out) const {

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

-        value_->Output(out, true);
-    if (next_ != NULL) {
+        value_->Output(out, CYPA, CYNoFlags);
+    if (next_ != NULL || value_ == NULL)

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

-        next_->Output(out, true);
-    }
-    if (!raw)
-        out << ']';
-}
-
-void CYElement::Output(std::ostream &out) const {
-    Output(out, false);
+    if (next_ != NULL)
+        next_->Output(out);

 }
 
 void CYEmpty::Output(std::ostream &out) const {
 }
 
 void CYEmpty::Output(std::ostream &out) const {


@@ -136,24 +244,30 @@ void CYEmpty::Output(std::ostream &out, bool block) const {
 }
 
 void CYExpress::Output(std::ostream &out) const {
 }
 
 void CYExpress::Output(std::ostream &out) const {

-    expression_->Output(out, true);
+    expression_->Output(out, CYNoFunction | CYNoBrace);

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

+void CYExpression::ClassName(std::ostream &out) const {
+    Output(out, CYPA, CYNoFlags);
+}
+

 void CYExpression::Part(std::ostream &out) const {
 void CYExpression::Part(std::ostream &out) const {

-    Output(out, true);
+    // XXX: this should handle LeftHandSideExpression
+    Output(out, CYNoIn);

 }
 
 }
 

-void CYExpression::Output(std::ostream &out, bool raw) const {
-    if (!raw)
+void CYExpression::Output(std::ostream &out, unsigned precedence, CYFlags flags) const {
+    if (precedence < Precedence()) {

         out << '(';
         out << '(';

-    Output(out);
-    if (next_ != NULL) {
-        out << ',';
-        next_->Output(out, true);
-    }
-    if (!raw)
+        Output(out, CYNoFlags);

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

+    } else
+        Output(out, flags);
+}
+
+void CYField::Output(std::ostream &out) const {
+    // XXX: implement!

 }
 
 void CYFor::Output(std::ostream &out) const {
 }
 
 void CYFor::Output(std::ostream &out) const {


@@ -162,10 +276,10 @@ void CYFor::Output(std::ostream &out) const {
         initialiser_->Part(out);
     out << ';';
     if (test_ != NULL)
         initialiser_->Part(out);
     out << ';';
     if (test_ != NULL)

-        test_->Output(out, true);
+        test_->Output(out, CYNoFlags);

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

-        increment_->Output(out, true);
+        increment_->Output(out, CYNoFlags);

     out << ')';
     code_->Output(out, false);
 }
     out << ')';
     code_->Output(out, false);
 }


@@ -173,18 +287,30 @@ void CYFor::Output(std::ostream &out) const {
 void CYForIn::Output(std::ostream &out) const {
     out << "for(";
     initialiser_->Part(out);
 void CYForIn::Output(std::ostream &out) const {
     out << "for(";
     initialiser_->Part(out);

-    out << " in ";
-    set_->Output(out, true);
+    // XXX: deal with this space character!
+    out << ' ';
+    out << "in";
+    set_->Output(out, CYNoLeader);

     out << ')';
     code_->Output(out, false);
 }
 
 void CYFunction::Output(std::ostream &out) const {
     out << ')';
     code_->Output(out, false);
 }
 
 void CYFunction::Output(std::ostream &out) const {

-    CYLambda::Output(out);
+    CYLambda::Output(out, CYNoFlags);
+}
+
+void CYFunctionParameter::Output(std::ostream &out) const {
+    out << *name_;
+    if (next_ != NULL) {
+        out << ',';
+        out << *next_;
+    }

 }
 
 void CYIf::Output(std::ostream &out) const {
 }
 
 void CYIf::Output(std::ostream &out) const {

-    out << "if" << *test_;
+    out << "if(";
+    test_->Output(out, CYNoFlags);
+    out << ')';

     true_->Output(out, true);
     if (false_ != NULL) {
         out << "else ";
     true_->Output(out, true);
     if (false_ != NULL) {
         out << "else ";


@@ -192,103 +318,196 @@ void CYIf::Output(std::ostream &out) const {
     }
 }
 
     }
 }
 

-void CYIndirect::Output(std::ostream &out) const {
-    out << *rhs_ << "[0]";
+void CYIndirect::Output(std::ostream &out, CYFlags flags) const {
+    rhs_->Output(out, 1, CYLeft(flags));
+    out << "[0]";

 }
 
 }
 

-void CYInfix::Output(std::ostream &out) const {
-    out << *lhs_ << Operator() << *rhs_;
+void CYInfix::Output(std::ostream &out, CYFlags flags) const {
+    const char *name(Operator());
+    bool protect((flags & CYNoIn) != 0 && strcmp(name, "in"));
+    if (protect)
+        out << '(';
+    bool alphabetic(Alphabetic());
+    CYFlags left(protect ? CYNoFlags : CYLeft(flags));
+    if (alphabetic)
+        left |= CYNoTrailer;
+    lhs_->Output(out, Precedence(), left);
+    out << name;
+    CYFlags right(protect ? CYNoFlags : CYRight(flags));
+    if (alphabetic)
+        right |= CYNoLeader;
+    rhs_->Output(out, Precedence() - 1, right);
+    if (protect)
+        out << ')';

 }
 
 }
 

-void CYLambda::Output(std::ostream &out) const {
+void CYLambda::Output(std::ostream &out, CYFlags flags) const {
+    bool protect((flags & CYNoFunction) != 0);
+    if (protect)
+        out << '(';

     out << "function";
     if (name_ != NULL)
         out << ' ' << *name_;
     out << '(';
     if (parameters_ != NULL)
         out << *parameters_;
     out << "function";
     if (name_ != NULL)
         out << ' ' << *name_;
     out << '(';
     if (parameters_ != NULL)
         out << *parameters_;

-    out << ')';
-    body_->Output(out, true);
+    out << "){";
+    if (body_ != NULL)
+        body_->Show(out);
+    out << '}';
+    if (protect)
+        out << ')';

 }
 
 }
 

-void CYMember::Output(std::ostream &out) const {
-    out << *object_ << '[';
-    property_->Output(out, true);
-    out << ']';
+void CYMember::Output(std::ostream &out, CYFlags flags) const {
+    object_->Output(out, Precedence(), CYLeft(flags));
+    if (const char *word = property_->Word())
+        out << '.' << word;
+    else {
+        out << '[';
+        property_->Output(out, CYNoFlags);
+        out << ']';
+    }

 }
 
 }
 

-void CYMessage::Output(std::ostream &out) const {
-    out << "objc_msgSend(";
-    self_->Output(out, true);
-    out << ",\"";
-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
-        if (argument->name_ != NULL) {
-            out << *argument->name_;
-            if (argument->value_ != NULL)
+void CYMessage::Output(std::ostream &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 << "\"";
+    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_->Show(out);
+    out << "}.call(self);},$cyt),$cyt);";
+}
+
+void CYNew::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
+    out << "new";
+    constructor_->Output(out, Precedence(), CYCenter(flags) | CYNoLeader);
+    out << '(';

     if (arguments_ != NULL)
     if (arguments_ != NULL)

-        arguments_->Output(out, true);
+        arguments_->Output(out);

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

-void CYNew::Output(std::ostream &out) const {
-    out << "new " << *constructor_ << '(';
-    if (arguments_ != NULL)
-        arguments_->Output(out, false);
-    out << ')';
+void CYNull::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
+    CYWord::Output(out);
+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';

 }
 
 }
 

-void CYNull::Output(std::ostream &out) const {
-    CYWord::Output(out);
+void CYNumber::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
+    // XXX: decide on correct precision
+    out << std::setprecision(9) << Value();
+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';

 }
 
 }
 

-void CYNumber::Output(std::ostream &out) const {
-    // XXX: this is not a useful formatting
-    out << Value();
+void CYNumber::PropertyName(std::ostream &out) const {
+    Output(out);

 }
 
 }
 

-void CYParameter::Output(std::ostream &out) const {
-    out << *name_;
-    if (next_ != NULL) {
-        out << ',';
-        out << *next_;
-    }
+void CYObject::Output(std::ostream &out, CYFlags flags) const {
+    bool protect((flags & CYNoBrace) != 0);
+    if (protect)
+        out << '(';
+    out << '{';
+    if (property_ != NULL)
+        property_->Output(out);
+    out << '}';
+    if (protect)
+        out << ')';

 }
 
 }
 

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

 }
 
 }
 

-void CYPrefix::Output(std::ostream &out) const {
-    out << Operator() << *rhs_;
+void CYPrefix::Output(std::ostream &out, CYFlags flags) const {
+    bool alphabetic(Alphabetic());
+    out << Operator();
+    CYFlags right(CYRight(flags));
+    if (alphabetic)
+        right |= CYNoLeader;
+    rhs_->Output(out, Precedence(), right);

 }
 
 }
 

-void CYProperty::Output(std::ostream &out, bool raw) const {
-    if (!raw)
-        out << '{';
-    out << *name_ << ':' << *value_;
+void CYProperty::Output(std::ostream &out) const {
+    name_->PropertyName(out);
+    out << ':';
+    value_->Output(out, CYPA, CYNoFlags);

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

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

     }
     }

-    if (!raw)
-        out << '}';
-}
-
-void CYProperty::Output(std::ostream &out) const {
-    Output(out, false);

 }
 
 void CYReturn::Output(std::ostream &out) const {
     out << "return";
     if (value_ != NULL)
 }
 
 void CYReturn::Output(std::ostream &out) const {
     out << "return";
     if (value_ != NULL)

-        out << ' ' << *value_;
+        value_->Output(out, CYNoLeader);

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

-void CYSource::Part(std::ostream &out) const {
+void CYSelector::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
+    out << "new Selector(\"";
+    if (name_ != NULL)
+        name_->Output(out);
+    out << "\")";
+}
+
+void CYSelectorPart::Output(std::ostream &out) const {
+    if (name_ != NULL)
+        out << *name_;
+    if (value_)
+        out << ':';
+    if (next_ != NULL)
+        next_->Output(out);
+}
+
+void CYSend::Output(std::ostream &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 << 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 CYSource::Show(std::ostream &out) const {

     for (const CYSource *next(this); next != NULL; next = next->next_)
         next->Output(out);
 }
     for (const CYSource *next(this); next != NULL; next = next->next_)
         next->Output(out);
 }


@@ -298,16 +517,24 @@ void CYSource::Output(std::ostream &out, bool block) const {
         Output(out);
     else {
         out << '{';
         Output(out);
     else {
         out << '{';

-        Part(out);
+        Show(out);

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

-void CYString::Output(std::ostream &out) const {
-    out << '\"';
+void CYString::Output(std::ostream &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);
+
+    out << (single ? '\'' : '"');

     for (const char *value(value_), *end(value_ + size_); value != end; ++value)
         switch (*value) {
     for (const char *value(value_), *end(value_ + size_); value != end; ++value)
         switch (*value) {

-            case '"': out << "\\\""; break;

             case '\\': out << "\\\\"; break;
             case '\b': out << "\\b"; break;
             case '\f': out << "\\f"; break;
             case '\\': out << "\\\\"; break;
             case '\b': out << "\\b"; break;
             case '\f': out << "\\f"; break;


@@ -316,30 +543,55 @@ void CYString::Output(std::ostream &out) const {
             case '\t': out << "\\t"; break;
             case '\v': out << "\\v"; break;
 
             case '\t': out << "\\t"; break;
             case '\v': out << "\\v"; break;
 

+            case '"':
+                if (!single)
+                    out << "\\\"";
+                else goto simple;
+            break;
+
+            case '\'':
+                if (single)
+                    out << "\\'";
+                else goto simple;
+            break;
+

             default:
                 if (*value < 0x20 || *value >= 0x7f)
                     out << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
             default:
                 if (*value < 0x20 || *value >= 0x7f)
                     out << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);

-                else
+                else simple:

                     out << *value;
         }
                     out << *value;
         }

-    out << '\"';
+    out << (single ? '\'' : '"');
+}
+
+void CYString::PropertyName(std::ostream &out) const {
+    if (const char *word = Word())
+        out << word;
+    else
+        Output(out);

 }
 
 void CYSwitch::Output(std::ostream &out) const {
 }
 
 void CYSwitch::Output(std::ostream &out) const {

-    out << "switch" << *value_ << '{';
+    out << "switch(";
+    value_->Output(out, CYNoFlags);
+    out << "){";

     if (clauses_ != NULL)
         out << *clauses_;
     out << '}';
 }
 
     if (clauses_ != NULL)
         out << *clauses_;
     out << '}';
 }
 

-void CYThis::Output(std::ostream &out) const {
+void CYThis::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';

     CYWord::Output(out);
     CYWord::Output(out);

+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';

 }
 
 void CYThrow::Output(std::ostream &out) const {
 }
 
 void CYThrow::Output(std::ostream &out) const {

-    out << "return";
+    out << "throw";

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

-        out << ' ' << *value_;
+        value_->Output(out, CYNoLeader);

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


@@ -354,20 +606,36 @@ void CYTry::Output(std::ostream &out) const {
     }
 }
 
     }
 }
 

-void CYVariable::Output(std::ostream &out) const {
+void CYVariable::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';

     out << *name_;
     out << *name_;

+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';

 }
 
 void CYWhile::Output(std::ostream &out) const {
 }
 
 void CYWhile::Output(std::ostream &out) const {

-    out << "while" << *test_;
+    out << "while(";
+    test_->Output(out, CYNoFlags);
+    out << ')';

     code_->Output(out, false);
 }
 
 void CYWith::Output(std::ostream &out) const {
     code_->Output(out, false);
 }
 
 void CYWith::Output(std::ostream &out) const {

-    out << "with" << *scope_;
+    out << "with(";
+    scope_->Output(out, CYNoFlags);
+    out << ')';

     code_->Output(out, false);
 }
 
     code_->Output(out, false);
 }
 

+void CYWord::ClassName(std::ostream &out) const {
+    out << "objc_getClass(\"" << Value() << "\")";
+}
+

 void CYWord::Output(std::ostream &out) const {
     out << Value();
 }
 void CYWord::Output(std::ostream &out) const {
     out << Value();
 }

+
+void CYWord::PropertyName(std::ostream &out) const {
+    Output(out);
+}