Further drastic simplications of the output mechanism.

diff --git a/Output.cpp b/Output.cpp
index aeb56993ddbb7d6af0c4b350e5f89876bf051cfb..f648a575d35a55fea68369205210a189b20921d7 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -36,15 +36,27 @@ _finline CYFlags CYCenter(CYFlags flags) {
 
 #define CYPA 16
 
 
 #define CYPA 16
 

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

 CYOutput &CYOutput::operator <<(char rhs) {
 CYOutput &CYOutput::operator <<(char rhs) {

-    if (rhs == ' ') {
-        if (pretty_) {
-            out_ << ' ';
-            mode_ = NoMode;
-        }
-        goto done;
-    }
+    if (rhs == ' ' || rhs == '\n')
+        if (pretty_)
+            out_ << rhs;
+        else goto done;
+    else if (rhs == '\t')
+        if (pretty_)
+            for (unsigned i(0); i != indent_; ++i)
+                out_ << "    ";
+        else goto done;
+    else goto work;
+
+    mode_ = NoMode;
+    goto done;

 
 

+  work:

     if (mode_ == Terminated && rhs != '}')
         out_ << ';';
 
     if (mode_ == Terminated && rhs != '}')
         out_ << ';';
 


@@ -94,24 +106,13 @@ CYOutput &CYOutput::operator <<(const char *rhs) {
     return *this;
 }
 
     return *this;
 }
 

-void CYOutput::Indent() {
-    if (!pretty_)
-        return;
-    for (unsigned i(0); i != indent_; ++i)
-        out_ << "    ";
-    mode_ = NoMode;
-}
-

 void OutputBody(CYOutput &out, CYStatement *body) {
 void OutputBody(CYOutput &out, CYStatement *body) {

-    out << ' ' << '{';
-    if (out.pretty_)
-        out << '\n';
+    out << ' ' << '{' << '\n';

     ++out.indent_;
     if (body != NULL)
         body->Multiple(out);
     --out.indent_;
     ++out.indent_;
     if (body != NULL)
         body->Multiple(out);
     --out.indent_;

-    out.Indent();
-    out << '}';
+    out << '\t' << '}';

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


@@ -281,9 +282,7 @@ void CYClause::Output(CYOutput &out) const {
         out << "case" << ' ' << *case_;
     else
         out << "default";
         out << "case" << ' ' << *case_;
     else
         out << "default";

-    out << ':';
-    if (out.pretty_)
-        out << '\n';
+    out << ':' << '\n';

     if (code_ != NULL)
         code_->Multiple(out, CYNoFlags);
     out << next_;
     if (code_ != NULL)
         code_->Multiple(out, CYNoFlags);
     out << next_;


@@ -362,7 +361,7 @@ void CYElement::Output(CYOutput &out) const {
 }
 
 void CYEmpty::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYEmpty::Output(CYOutput &out, CYFlags flags) const {

-    out.out_ << ';';
+    out.Terminate();

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


@@ -416,9 +415,9 @@ void CYFor::Output(CYOutput &out, CYFlags flags) const {
     out << "for" << ' ' << '(';
     if (initialiser_ != NULL)
         initialiser_->For(out);
     out << "for" << ' ' << '(';
     if (initialiser_ != NULL)
         initialiser_->For(out);

-    out.out_ << ';';
+    out.Terminate();

     out << test_;
     out << test_;

-    out.out_ << ';';
+    out.Terminate();

     out << increment_;
     out << ')';
     code_->Single(out, CYNoFlags);
     out << increment_;
     out << ')';
     code_->Single(out, CYNoFlags);


@@ -469,16 +468,14 @@ void CYForInComprehension::Begin_(CYOutput &out) const {
 }
 
 void CYFunction::Output(CYOutput &out, CYFlags flags) const {
 }
 
 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_;
     bool protect((flags & CYNoFunction) != 0);
     if (protect)
         out << '(';
     out << "function";
     if (name_ != NULL)
         out << ' ' << *name_;

-    out << '(';
-    if (parameters_ != NULL)
-        out << *parameters_;
-    out << ')';
+    out << '(' << parameters_ << ')';

     OutputBody(out, body_);
     if (protect)
         out << ')';
     OutputBody(out, body_);
     if (protect)
         out << ')';


@@ -504,18 +501,22 @@ void CYIf::Output(CYOutput &out, CYFlags flags) const {
         protect = true;
         out << '{';
     }
         protect = true;
         out << '{';
     }

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

     CYFlags right(protect ? CYNoFlags : CYRight(flags));
     CYFlags jacks(CYNoDangle);
     if (false_ == NULL)
         jacks |= right;
     CYFlags right(protect ? CYNoFlags : CYRight(flags));
     CYFlags jacks(CYNoDangle);
     if (false_ == NULL)
         jacks |= right;

-    true_->Single(out, jacks);
+
+    bool single(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);
     }

+

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


@@ -684,34 +685,30 @@ void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
         bool last(next->next_ == NULL);
         CYFlags jacks(first ? last ? flags : CYLeft(flags) : last ? CYCenter(flags) : CYRight(flags));
         first = false;
         bool last(next->next_ == NULL);
         CYFlags jacks(first ? last ? flags : CYLeft(flags) : last ? CYCenter(flags) : CYRight(flags));
         first = false;

-        out.Indent();
+        out << '\t';

         next->Output(out, jacks);
         next->Output(out, jacks);

-        if (out.pretty_)
-            out << '\n';
+        out << '\n';

     }
 }
 
     }
 }
 

-void CYStatement::Single(CYOutput &out, CYFlags flags) const {
+bool CYStatement::Single(CYOutput &out, CYFlags flags) const {

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

-        out << ' ' << '{';
-        if (out.pretty_)
-            out << '\n';
+        out << ' ' << '{' << '\n';

         ++out.indent_;
         Multiple(out);
         --out.indent_;
         ++out.indent_;
         Multiple(out);
         --out.indent_;

-        out.Indent();
-        out << '}';
+        out << '\t' << '}';
+        return false;

     } else {
     } else {

-        if (out.pretty_)
-            out << '\n';

         for (CYLabel *label(labels_); label != NULL; label = label->next_)
         for (CYLabel *label(labels_); label != NULL; label = label->next_)

-            out << *label->name_ << ':' << ' ';
+            out << ' ' << *label->name_ << ':';
+        out << '\n';

         ++out.indent_;
         ++out.indent_;

-        out.Indent();
+        out << '\t';

         Output(out, flags);
         Output(out, flags);

+        out << '\n';

         --out.indent_;
         --out.indent_;

-        if (out.pretty_)
-            out << '\n';
+        return true;

     }
 }
 
     }
 }
 

diff --git a/Parser.hpp b/Parser.hpp
index 95c282a00d4fa46d3d52c5a6035600375f4e6e3d..33de680e2b7df771b7f6f0098d6650baab643f41 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -91,6 +91,7 @@ struct CYOutput {
     }
 
     void Check(char value);
     }
 
     void Check(char value);

+    void Terminate();

 
     CYOutput &operator <<(char rhs);
     CYOutput &operator <<(const char *rhs);
 
     CYOutput &operator <<(char rhs);
     CYOutput &operator <<(const char *rhs);


@@ -105,9 +106,6 @@ struct CYOutput {
         rhs.Output(*this);
         return *this;
     }
         rhs.Output(*this);
         return *this;
     }

-
-    void Indent();
-    void Space();

 };
 
 struct CYPropertyName {
 };
 
 struct CYPropertyName {


@@ -196,12 +194,8 @@ struct CYStatement :
         labels_ = new CYLabel(identifier, labels_);
     }
 
         labels_ = new CYLabel(identifier, labels_);
     }
 

-    virtual bool IsBlock() const {
-        return next_ != NULL;
-    }
-
-    virtual void Single(CYOutput &out, CYFlags flags) const;
-    virtual void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
+    bool Single(CYOutput &out, CYFlags flags) const;
+    void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;

 
   private:
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;
 
   private:
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;


@@ -217,10 +211,6 @@ struct CYBlock :
     {
     }
 
     {
     }
 

-    virtual bool IsBlock() const {
-        return true;
-    }
-

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };