Finally provide totally legit support for structs.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index c06f757d406b767913251ff570bfc93ef63ea630..6610ff20ac4ddc9b8b6d98af3e946e30bf4eab88 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -20,10 +20,11 @@
 /* }}} */
 
 #include "cycript.hpp"
-#include "Parser.hpp"
 
 #include <sstream>
 
+#include "Syntax.hpp"
+
 void CYOutput::Terminate() {
     operator ()(';');
     mode_ = NoMode;
@@ -183,11 +184,39 @@ void Catch::Output(CYOutput &out) const {
 
 } }
 
-void CYComment::Output(CYOutput &out, CYFlags flags) const {
-    out << '\r';
-    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 {
@@ -200,6 +229,12 @@ 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 << ' ' << '?' << ' ';
@@ -218,8 +253,8 @@ void CYContinue::Output(CYOutput &out, CYFlags flags) const {
 
 void CYClause::Output(CYOutput &out) const {
     out << '\t';
-    if (case_ != NULL)
-        out << "case" << ' ' << *case_;
+    if (value_ != NULL)
+        out << "case" << ' ' << *value_;
     else
         out << "default";
     out << ':' << '\n';
@@ -233,45 +268,35 @@ void CYDebugger::Output(CYOutput &out, CYFlags flags) const {
     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_;
-    if (initialiser_ != NULL) {
+    if (initializer_ != NULL) {
         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);
 }
 
-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 (;;) {
-        CYDeclarations *next(declaration->next_);
+        CYBindings *next(binding->next_);
 
         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 << ',' << ' ';
-        declaration = next;
+        binding = next;
     }
 }
 
@@ -298,12 +323,16 @@ void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
     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)
         value_->Output(out, CYAssign::Precedence_, CYNoFlags);
     if (next_ != NULL || value_ == NULL) {
         out << ',';
-        if (next_ != NULL && next_->value_ != NULL)
+        if (next_ != NULL && !next_->Elision())
             out << ' ';
     }
     if (next_ != NULL)
@@ -314,17 +343,13 @@ void CYEmpty::Output(CYOutput &out, CYFlags flags) const {
     out.Terminate();
 }
 
-void CYExpress::Output(CYOutput &out, CYFlags flags) const {
-    expression_->Output(out, flags | CYNoBF);
-    out << ';';
+void CYEval::Output(CYOutput &out, CYFlags flags) const {
+    _assert(false);
 }
 
-void CYExpression::ClassName(CYOutput &out, bool object) const {
-    Output(out, CYAssign::Precedence_, CYNoFlags);
-}
-
-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 {
@@ -357,8 +382,8 @@ void CYFinally::Output(CYOutput &out) const {
 
 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 << ' ';
@@ -371,63 +396,84 @@ void CYFor::Output(CYOutput &out, CYFlags flags) const {
     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);
 }
 
-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" << ' ' << '(';
-    if (initialiser_ != NULL)
-        initialiser_->ForIn(out, CYNoIn);
-    out << ' ' << "in" << ' ' << *set_ << ')';
+    binding_->Output(out, CYNoIn | CYNoRightHand);
+    out << ' ' << "in" << ' ' << *iterable_ << ')';
+}
+
+void CYForOf::Output(CYOutput &out, CYFlags flags) const {
+    out << "for" << ' ' << '(';
+    initializer_->Output(out, CYNoRightHand);
+    out << ' ' << "of" << ' ' << *iterable_ << ')';
     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' << '}';
-    if (protect)
-        out << ')';
 }
 
 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 {
-    CYFunction::Output(out, flags);
+    out << "function" << ' ' << *name_;
+    CYFunction::Output(out);
 }
 
 void CYFunctionParameter::Output(CYOutput &out) const {
-    initialiser_->Output(out, CYNoFlags);
+    binding_->Output(out, CYNoFlags);
     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 {
@@ -473,6 +519,11 @@ void CYImport::Output(CYOutput &out, CYFlags flags) const {
     out << "@import";
 }
 
+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())
@@ -510,6 +561,10 @@ void CYStatement::Output(CYOutput &out) const {
     Multiple(out);
 }
 
+void CYTemplate::Output(CYOutput &out, CYFlags flags) const {
+    _assert(false);
+}
+
 void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {
     next_->Output(out, Precedence(), identifier);
     out << '[';
@@ -585,9 +640,14 @@ void CYTypeDefinition::Output(CYOutput &out, CYFlags flags) const {
     out << "typedef" << ' ' << *typed_;
 }
 
-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 {
@@ -653,19 +713,42 @@ void CYPrefix::Output(CYOutput &out, CYFlags flags) const {
     rhs_->Output(out, Precedence(), CYRight(flags));
 }
 
-void CYProgram::Output(CYOutput &out) const {
+void CYScript::Output(CYOutput &out) const {
     out << code_;
 }
 
 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);
-    if (next_ != NULL)
-        out << ',' << '\n' << *next_;
-    else
-        out << '\n';
+    CYProperty::Output(out);
 }
 
 void CYRegEx::Output(CYOutput &out, CYFlags flags) const {
@@ -775,6 +858,18 @@ const char *CYString::Word() const {
     return value;
 }
 
+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_;
@@ -825,6 +920,21 @@ void CYTypeSigned::Output(CYOutput &out) const {
     out << "signed" << specifier_;
 }
 
+void CYTypeStruct::Output(CYOutput &out) const {
+    out << "struct" << ' ';
+    if (name_ != NULL)
+        out << *name_ << ' ';
+    out << '{' << '\n';
+    ++out.indent_;
+    CYForEach (field, fields_) {
+        out << '\t' << *field->typed_;
+        out.Terminate();
+        out << '\n';
+    }
+    --out.indent_;
+    out << '}';
+}
+
 void CYTypeUnsigned::Output(CYOutput &out) const {
     out << "unsigned" << specifier_;
 }
@@ -839,7 +949,7 @@ void CYTypeVoid::Output(CYOutput &out) const {
 
 void CYVar::Output(CYOutput &out, CYFlags flags) const {
     out << "var" << ' ';
-    declarations_->Output(out, flags);
+    bindings_->Output(out, flags); // XXX: flags
     out << ';';
 }
 
@@ -857,14 +967,6 @@ void CYWith::Output(CYOutput &out, CYFlags flags) const {
     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_) {