Added a CYOutput object between std::ostream and the actual mechanism.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index fc5abf185ad3dee0fee8fcceda820dc53feaa96c..cab829ab5b69b710f9507e3afc5724a0d60502d0 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -67,13 +67,32 @@ struct CYNext {
 };
 
 struct CYThing {
-    virtual void Output(std::ostream &out) const = 0;
+    virtual void Output(struct CYOutput &out) const = 0;
 };
 
-_finline std::ostream &operator <<(std::ostream &out, const CYThing &rhs) {
-    rhs.Output(out);
-    return out;
-}
+struct CYOutput {
+    std::ostream &out_;
+
+    CYOutput(std::ostream &out) :
+        out_(out)
+    {
+    }
+
+    _finline CYOutput &operator <<(char rhs) {
+        out_ << rhs;
+        return *this;
+    }
+
+    _finline CYOutput &operator <<(const char *rhs) {
+        out_ << rhs;
+        return *this;
+    }
+
+    _finline CYOutput &operator <<(const CYThing &rhs) {
+        rhs.Output(*this);
+        return *this;
+    }
+};
 
 struct CYSource :
     CYNext<CYSource>
@@ -82,18 +101,18 @@ struct CYSource :
         return next_ != NULL;
     }
 
-    virtual void Show(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const = 0;
-    virtual void Output(std::ostream &out, bool block) const;
-    virtual void Output_(std::ostream &out) const;
+    virtual void Show(CYOutput &out) const;
+    virtual void Output(CYOutput &out) const = 0;
+    virtual void Output(CYOutput &out, bool block) const;
+    virtual void Output_(CYOutput &out) const;
 };
 
 struct CYPropertyName {
-    virtual void PropertyName(std::ostream &out) const = 0;
+    virtual void PropertyName(CYOutput &out) const = 0;
 };
 
 struct CYClassName {
-    virtual void ClassName(std::ostream &out) const = 0;
+    virtual void ClassName(CYOutput &out, bool object) const = 0;
 };
 
 struct CYWord :
@@ -112,12 +131,16 @@ struct CYWord :
         return word_;
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 
-    virtual void ClassName(std::ostream &out) const;
-    virtual void PropertyName(std::ostream &out) const;
+    virtual void ClassName(CYOutput &out, bool object) const;
+    virtual void PropertyName(CYOutput &out) const;
 };
 
+_finline std::ostream &operator <<(std::ostream &lhs, const CYWord &rhs) {
+    return lhs << rhs.Value();
+}
+
 struct CYIdentifier :
     CYWord
 {
@@ -153,7 +176,7 @@ struct CYStatement :
         labels_ = new CYLabel(identifier, labels_);
     }
 
-    virtual void Output_(std::ostream &out) const;
+    virtual void Output_(CYOutput &out) const;
 };
 
 struct CYBlock :
@@ -170,7 +193,7 @@ struct CYBlock :
         return true;
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 enum CYState {
@@ -211,20 +234,6 @@ class CYDriver {
     ~CYDriver();
 };
 
-struct CYPart {
-    virtual void Part(std::ostream &out) const = 0;
-};
-
-struct CYForInitialiser :
-    CYPart
-{
-};
-
-struct CYForInInitialiser :
-    CYPart
-{
-};
-
 enum CYFlags {
     CYNoFlags =    0,
     CYNoBrace =    (1 << 0),
@@ -233,6 +242,17 @@ enum CYFlags {
     CYNoTrailer =  (1 << 3),
     CYNoIn =       (1 << 4),
     CYNoHyphen =   (1 << 5),
+    CYNoBF =       (CYNoBrace | CYNoFunction),
+};
+
+struct CYForInitialiser {
+    virtual void For(CYOutput &out) const = 0;
+};
+
+struct CYForInInitialiser {
+    virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
+    virtual const char *ForEachIn() const = 0;
+    virtual void ForEachIn(CYOutput &out) const = 0;
 };
 
 struct CYExpression :
@@ -242,11 +262,17 @@ struct CYExpression :
     CYClassName
 {
     virtual unsigned Precedence() const = 0;
-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out, CYFlags flags) const = 0;
-    void Output(std::ostream &out, unsigned precedence, CYFlags flags) const;
 
-    virtual void ClassName(std::ostream &out) const;
+    virtual void For(CYOutput &out) const;
+    virtual void ForIn(CYOutput &out, CYFlags flags) const;
+
+    virtual const char *ForEachIn() const;
+    virtual void ForEachIn(CYOutput &out) const;
+
+    virtual void Output(CYOutput &out, CYFlags flags) const = 0;
+    void Output(CYOutput &out, unsigned precedence, CYFlags flags) const;
+
+    virtual void ClassName(CYOutput &out, bool object) const;
 
     virtual const char *Word() const {
         return NULL;
@@ -283,7 +309,92 @@ struct CYCompound :
 
     CYPrecedence(17)
 
-    void Output(std::ostream &out, CYFlags flags) const;
+    void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYComprehension :
+    CYNext<CYComprehension>
+{
+    void Output(CYOutput &out) const;
+    virtual const char *Name() const = 0;
+
+    virtual void Begin_(CYOutput &out) const = 0;
+
+    virtual void End_(CYOutput &out) const {
+    }
+};
+
+struct CYForInComprehension :
+    CYComprehension
+{
+    CYIdentifier *name_;
+    CYExpression *set_;
+
+    CYForInComprehension(CYIdentifier *name, CYExpression *set) :
+        name_(name),
+        set_(set)
+    {
+    }
+
+    virtual const char *Name() const {
+        return name_->Value();
+    }
+
+    virtual void Begin_(CYOutput &out) const;
+};
+
+struct CYForEachInComprehension :
+    CYComprehension
+{
+    CYIdentifier *name_;
+    CYExpression *set_;
+
+    CYForEachInComprehension(CYIdentifier *name, CYExpression *set) :
+        name_(name),
+        set_(set)
+    {
+    }
+
+    virtual const char *Name() const {
+        return name_->Value();
+    }
+
+    virtual void Begin_(CYOutput &out) const;
+    virtual void End_(CYOutput &out) const;
+};
+
+struct CYIfComprehension :
+    CYComprehension
+{
+    CYExpression *test_;
+
+    CYIfComprehension(CYExpression *test) :
+        test_(test)
+    {
+    }
+
+    virtual const char *Name() const {
+        return NULL;
+    }
+
+    virtual void Begin_(CYOutput &out) const;
+};
+
+struct CYArrayComprehension :
+    CYExpression
+{
+    CYExpression *expression_;
+    CYComprehension *comprehensions_;
+
+    CYArrayComprehension(CYExpression *expression, CYComprehension *comprehensions) :
+        expression_(expression),
+        comprehensions_(comprehensions)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYLiteral :
@@ -311,7 +422,7 @@ struct CYSelectorPart :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYSelector :
@@ -326,7 +437,7 @@ struct CYSelector :
 
     CYPrecedence(1)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYRange {
@@ -385,12 +496,12 @@ struct CYString :
         return Value();
     }
 
-    virtual void Output(std::ostream &out) const {
+    virtual void Output(CYOutput &out) const {
         return Output(out, CYNoFlags);
     }
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
-    virtual void PropertyName(std::ostream &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual void PropertyName(CYOutput &out) const;
 };
 
 struct CYNumber :
@@ -408,12 +519,12 @@ struct CYNumber :
         return value_;
     }
 
-    virtual void Output(std::ostream &out) const {
+    virtual void Output(CYOutput &out) const {
         return Output(out, CYNoFlags);
     }
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
-    virtual void PropertyName(std::ostream &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual void PropertyName(CYOutput &out) const;
 };
 
 struct CYNull :
@@ -425,7 +536,7 @@ struct CYNull :
     {
     }
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYThis :
@@ -437,14 +548,14 @@ struct CYThis :
     {
     }
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYBoolean :
     CYLiteral
 {
     virtual bool Value() const = 0;
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYFalse :
@@ -483,7 +594,7 @@ struct CYVariable :
 
     CYPrecedence(0)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYPrefix :
@@ -499,7 +610,7 @@ struct CYPrefix :
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYInfix :
@@ -521,7 +632,7 @@ struct CYInfix :
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYPostfix :
@@ -536,7 +647,7 @@ struct CYPostfix :
 
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYAssignment :
@@ -557,7 +668,7 @@ struct CYAssignment :
 
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYArgument :
@@ -573,7 +684,7 @@ struct CYArgument :
     {
     }
 
-    void Output(std::ostream &out) const;
+    void Output(CYOutput &out) const;
 };
 
 struct CYBlank :
@@ -598,7 +709,7 @@ struct CYClause :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYElement :
@@ -612,7 +723,7 @@ struct CYElement :
     {
     }
 
-    void Output(std::ostream &out) const;
+    void Output(CYOutput &out) const;
 };
 
 struct CYArray :
@@ -625,11 +736,10 @@ struct CYArray :
     {
     }
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYDeclaration :
-    CYThing,
     CYForInInitialiser
 {
     CYIdentifier *identifier_;
@@ -641,31 +751,62 @@ struct CYDeclaration :
     {
     }
 
-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const;
+    virtual void ForIn(CYOutput &out, CYFlags flags) const;
+
+    virtual const char *ForEachIn() const;
+    virtual void ForEachIn(CYOutput &out) const;
+
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYDeclarations :
-    CYStatement,
+    CYNext<CYDeclarations>,
     CYForInitialiser
 {
     CYDeclaration *declaration_;
-    CYDeclarations *next_;
 
     CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
-        declaration_(declaration),
-        next_(next)
+        CYNext<CYDeclarations>(next),
+        declaration_(declaration)
+    {
+    }
+
+    virtual void For(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYVar :
+    CYStatement
+{
+    CYDeclarations *declarations_;
+
+    CYVar(CYDeclarations *declarations) :
+        declarations_(declarations)
+    {
+    }
+
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYLet :
+    CYStatement
+{
+    CYDeclarations *declarations_;
+    CYStatement *statements_;
+
+    CYLet(CYDeclarations *declarations, CYStatement *statements) :
+        declarations_(declarations),
+        statements_(statements)
     {
     }
 
-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYField :
     CYNext<CYField>
 {
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYMessageParameter :
@@ -699,18 +840,19 @@ struct CYMessage :
     {
     }
 
-    virtual void Output(std::ostream &out, bool replace) const;
+    virtual void Output(CYOutput &out, bool replace) const;
 };
 
 struct CYClass :
-    CYSource
+    CYExpression,
+    CYStatement
 {
-    CYIdentifier *name_;
+    CYClassName *name_;
     CYExpression *super_;
     CYField *fields_;
     CYMessage *messages_;
 
-    CYClass(CYIdentifier *name, CYExpression *super, CYField *fields, CYMessage *messages) :
+    CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
         name_(name),
         super_(super),
         fields_(fields),
@@ -718,11 +860,14 @@ struct CYClass :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(0)
+
+    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYCategory :
-    CYSource
+    CYStatement
 {
     CYClassName *name_;
     CYMessage *messages_;
@@ -733,7 +878,7 @@ struct CYCategory :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYFunctionParameter :
@@ -748,7 +893,7 @@ struct CYFunctionParameter :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYFor :
@@ -767,7 +912,7 @@ struct CYFor :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYForIn :
@@ -784,7 +929,24 @@ struct CYForIn :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYForEachIn :
+    CYStatement
+{
+    CYForInInitialiser *initialiser_;
+    CYExpression *set_;
+    CYStatement *code_;
+
+    CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+        initialiser_(initialiser),
+        set_(set),
+        code_(code)
+    {
+    }
+
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYProperty :
@@ -800,7 +962,7 @@ struct CYProperty :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYObject :
@@ -813,7 +975,7 @@ struct CYObject :
     {
     }
 
-    void Output(std::ostream &out, CYFlags flags) const;
+    void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYCatch :
@@ -828,7 +990,7 @@ struct CYCatch :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYSend :
@@ -845,7 +1007,7 @@ struct CYSend :
 
     CYPrecedence(0)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYMember :
@@ -875,7 +1037,7 @@ struct CYDirectMember :
 
     CYPrecedence(1)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYIndirectMember :
@@ -888,7 +1050,7 @@ struct CYIndirectMember :
 
     CYPrecedence(1)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYNew :
@@ -905,7 +1067,7 @@ struct CYNew :
 
     CYPrecedence(1)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYCall :
@@ -922,7 +1084,7 @@ struct CYCall :
 
     CYPrecedence(2)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYIf :
@@ -939,7 +1101,7 @@ struct CYIf :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYDoWhile :
@@ -954,7 +1116,7 @@ struct CYDoWhile :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYWhile :
@@ -969,7 +1131,7 @@ struct CYWhile :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYLambda :
@@ -988,7 +1150,7 @@ struct CYLambda :
 
     CYPrecedence(0)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYFunction :
@@ -1000,7 +1162,7 @@ struct CYFunction :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYExpress :
@@ -1013,7 +1175,7 @@ struct CYExpress :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYContinue :
@@ -1026,7 +1188,7 @@ struct CYContinue :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYBreak :
@@ -1039,7 +1201,7 @@ struct CYBreak :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYReturn :
@@ -1052,14 +1214,14 @@ struct CYReturn :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYEmpty :
     CYStatement
 {
-    virtual void Output(std::ostream &out) const;
-    virtual void Output(std::ostream &out, bool block) const;
+    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, bool block) const;
 };
 
 struct CYTry :
@@ -1076,7 +1238,7 @@ struct CYTry :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYThrow :
@@ -1089,7 +1251,7 @@ struct CYThrow :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYWith :
@@ -1104,7 +1266,7 @@ struct CYWith :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYSwitch :
@@ -1119,7 +1281,7 @@ struct CYSwitch :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYCondition :
@@ -1138,7 +1300,7 @@ struct CYCondition :
 
     CYPrecedence(15)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYAddressOf :
@@ -1156,7 +1318,7 @@ struct CYAddressOf :
     CYAlphabetic(false)
     CYPrecedence(2)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYIndirect :
@@ -1174,7 +1336,7 @@ struct CYIndirect :
     CYAlphabetic(false)
     CYPrecedence(1)
 
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 #define CYPostfix_(op, name) \