Allow multi-line editing and drop libedit support.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 2ff5ad784c299bd1b894ea8cb4f017bf8032ae9f..e43d038e8d64388a025a9d6b7d18e2b67d25a11d 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -20,10 +20,11 @@
 /* }}} */
 
 #include "cycript.hpp"
 /* }}} */
 
 #include "cycript.hpp"

-#include "Parser.hpp"

 
 #include <sstream>
 
 
 #include <sstream>
 

+#include "Syntax.hpp"
+

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


@@ -183,6 +184,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);


@@ -193,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 << ' ' << '?' << ' ';
 void CYCondition::Output(CYOutput &out, CYFlags flags) const {
     test_->Output(out, Precedence() - 1, CYLeft(flags));
     out << ' ' << '?' << ' ';


@@ -312,14 +354,10 @@ void CYEmpty::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYExpress::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYExpress::Output(CYOutput &out, CYFlags flags) const {

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

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

-void CYExpression::ClassName(CYOutput &out, bool object) const {
-    Output(out, CYAssign::Precedence_, CYNoFlags);
-}
-

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


@@ -376,7 +414,9 @@ void CYForOf::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYForOfComprehension::Output(CYOutput &out) const {
 }
 
 void CYForOfComprehension::Output(CYOutput &out) const {

-    out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;
+    out << "for" << ' ' << "each" << ' ' << '(';
+    declaration_->Output(out, CYNoIn);
+    out << ' ' << "in" << ' ' << *set_ << ')' << next_;

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


@@ -388,33 +428,36 @@ void CYForIn::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYForInComprehension::Output(CYOutput &out) const {
 }
 
 void CYForInComprehension::Output(CYOutput &out) const {

-    out << "for" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')';
+    out << "for" << ' ' << '(';
+    declaration_->Output(out, CYNoIn);
+    out << ' ' << "in" << ' ' << *set_ << ')';

 }
 
 }
 

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


@@ -586,9 +629,10 @@ void CYTypeDefinition::Output(CYOutput &out, CYFlags flags) const {
     out << "typedef" << ' ' << *typed_;
 }
 
     out << "typedef" << ' ' << *typed_;
 }
 

-void CYLetStatement::Output(CYOutput &out, CYFlags flags) const {
-    out << "let" << ' ' << '(' << *declarations_ << ')';
-    code_->Single(out, CYRight(flags), CYCompactShort);
+void CYLet::Output(CYOutput &out, CYFlags flags) const {
+    out << "let" << ' ';
+    declarations_->Output(out, flags); // XXX: flags
+    out << ';';

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


@@ -659,14 +703,37 @@ 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 {
 }
 
 void CYRegEx::Output(CYOutput &out, CYFlags flags) const {


@@ -776,6 +843,18 @@ const char *CYString::Word() const {
     return value;
 }
 
     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_;
 void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
     out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{' << '\n';
     ++out.indent_;


@@ -840,7 +919,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);
+    declarations_->Output(out, flags); // XXX: flags

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


@@ -858,14 +937,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_) {