Re-added final output to script execution, implemented unary affirmation operator...

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index cab829ab5b69b710f9507e3afc5724a0d60502d0..a9a881296312c5dc9b520601c428861ed10ac2ab 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -72,19 +72,34 @@ struct CYThing {
 
 struct CYOutput {
     std::ostream &out_;
+    bool pretty_;
+    unsigned indent_;
+
+    enum {
+        NoMode,
+        NoLetter,
+        NoPlus,
+        NoHyphen,
+        Terminated
+    } mode_;
 
     CYOutput(std::ostream &out) :
-        out_(out)
+        out_(out),
+        pretty_(false),
+        indent_(0),
+        mode_(NoMode)
     {
     }
 
-    _finline CYOutput &operator <<(char rhs) {
-        out_ << rhs;
-        return *this;
-    }
+    void Check(char value);
+    void Terminate();
 
-    _finline CYOutput &operator <<(const char *rhs) {
-        out_ << rhs;
+    CYOutput &operator <<(char rhs);
+    CYOutput &operator <<(const char *rhs);
+
+    _finline CYOutput &operator <<(const CYThing *rhs) {
+        if (rhs != NULL)
+            rhs->Output(*this);
         return *this;
     }
 
@@ -94,19 +109,6 @@ struct CYOutput {
     }
 };
 
-struct CYSource :
-    CYNext<CYSource>
-{
-    virtual bool IsBlock() const {
-        return next_ != NULL;
-    }
-
-    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(CYOutput &out) const = 0;
 };
@@ -162,8 +164,25 @@ struct CYLabel :
     }
 };
 
+enum CYNeeded {
+    CYNever     = -1,
+    CYSometimes =  0,
+    CYAlways    =  1,
+};
+
+enum CYFlags {
+    CYNoFlags =      0,
+    CYNoBrace =      (1 << 0),
+    CYNoFunction =   (1 << 1),
+    CYNoIn =         (1 << 2),
+    CYNoCall =       (1 << 3),
+    CYNoRightHand =  (1 << 4),
+    CYNoDangle =     (1 << 5),
+    CYNoBF =         (CYNoBrace | CYNoFunction),
+};
+
 struct CYStatement :
-    CYSource
+    CYNext<CYStatement>
 {
     CYLabel *labels_;
 
@@ -176,7 +195,11 @@ struct CYStatement :
         labels_ = new CYLabel(identifier, labels_);
     }
 
-    virtual void Output_(CYOutput &out) 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;
 };
 
 struct CYBlock :
@@ -189,11 +212,7 @@ struct CYBlock :
     {
     }
 
-    virtual bool IsBlock() const {
-        return true;
-    }
-
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 enum CYState {
@@ -213,16 +232,24 @@ class CYDriver {
     size_t size_;
     FILE *file_;
 
+    bool strict_;
+
+    enum Condition {
+        RegExStart,
+        RegExRest
+    };
+
     std::string filename_;
 
     struct Error {
+        bool warning_;
         cy::location location_;
         std::string message_;
     };
 
     typedef std::vector<Error> Errors;
 
-    CYSource *source_;
+    CYStatement *program_;
     Errors errors_;
 
   private:
@@ -232,17 +259,10 @@ class CYDriver {
   public:
     CYDriver(const std::string &filename);
     ~CYDriver();
-};
 
-enum CYFlags {
-    CYNoFlags =    0,
-    CYNoBrace =    (1 << 0),
-    CYNoFunction = (1 << 1),
-    CYNoLeader =   (1 << 2),
-    CYNoTrailer =  (1 << 3),
-    CYNoIn =       (1 << 4),
-    CYNoHyphen =   (1 << 5),
-    CYNoBF =       (CYNoBrace | CYNoFunction),
+    void SetCondition(Condition condition);
+
+    void Warning(const cy::location &location, const char *message);
 };
 
 struct CYForInitialiser {
@@ -259,16 +279,22 @@ struct CYExpression :
     CYNext<CYExpression>,
     CYForInitialiser,
     CYForInInitialiser,
-    CYClassName
+    CYClassName,
+    CYThing
 {
     virtual unsigned Precedence() const = 0;
 
+    virtual bool RightHand() const {
+        return true;
+    }
+
     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) const;
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;
     void Output(CYOutput &out, unsigned precedence, CYFlags flags) const;
 
@@ -289,6 +315,11 @@ struct CYExpression :
         return value; \
     }
 
+#define CYRightHand(value) \
+    virtual bool RightHand() const { \
+        return value; \
+    }
+
 struct CYCompound :
     CYExpression
 {
@@ -313,7 +344,8 @@ struct CYCompound :
 };
 
 struct CYComprehension :
-    CYNext<CYComprehension>
+    CYNext<CYComprehension>,
+    CYThing
 {
     void Output(CYOutput &out) const;
     virtual const char *Name() const = 0;
@@ -401,16 +433,19 @@ struct CYLiteral :
     CYExpression
 {
     CYPrecedence(0)
+    CYRightHand(false)
 };
 
 struct CYMagic :
     CYExpression
 {
     CYPrecedence(0)
+    CYRightHand(false)
 };
 
 struct CYSelectorPart :
-    CYNext<CYSelectorPart>
+    CYNext<CYSelectorPart>,
+    CYThing
 {
     CYWord *name_;
     bool value_;
@@ -487,18 +522,7 @@ struct CYString :
         return value_;
     }
 
-    virtual const char *Word() const {
-        if (size_ == 0 || !WordStartRange_[value_[0]])
-            return NULL;
-        for (size_t i(1); i != size_; ++i)
-            if (!WordEndRange_[value_[i]])
-                return NULL;
-        return Value();
-    }
-
-    virtual void Output(CYOutput &out) const {
-        return Output(out, CYNoFlags);
-    }
+    virtual const char *Word() const;
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
     virtual void PropertyName(CYOutput &out) const;
@@ -519,12 +543,25 @@ struct CYNumber :
         return value_;
     }
 
-    virtual void Output(CYOutput &out) const {
-        return Output(out, CYNoFlags);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual void PropertyName(CYOutput &out) const;
+};
+
+struct CYRegEx :
+    CYLiteral
+{
+    const char *value_;
+
+    CYRegEx(const char *value) :
+        value_(value)
+    {
+    }
+
+    const char *Value() const {
+        return value_;
     }
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
-    virtual void PropertyName(CYOutput &out) const;
 };
 
 struct CYNull :
@@ -567,7 +604,9 @@ struct CYFalse :
     {
     }
 
-    virtual bool Value() const;
+    virtual bool Value() const {
+        return false;
+    }
 };
 
 struct CYTrue :
@@ -579,7 +618,9 @@ struct CYTrue :
     {
     }
 
-    virtual bool Value() const;
+    virtual bool Value() const {
+        return true;
+    }
 };
 
 struct CYVariable :
@@ -593,6 +634,7 @@ struct CYVariable :
     }
 
     CYPrecedence(0)
+    CYRightHand(false)
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
@@ -672,7 +714,8 @@ struct CYAssignment :
 };
 
 struct CYArgument :
-    CYNext<CYArgument>
+    CYNext<CYArgument>,
+    CYThing
 {
     CYWord *name_;
     CYExpression *value_;
@@ -713,7 +756,8 @@ struct CYClause :
 };
 
 struct CYElement :
-    CYNext<CYElement>
+    CYNext<CYElement>,
+    CYThing
 {
     CYExpression *value_;
 
@@ -761,7 +805,8 @@ struct CYDeclaration :
 
 struct CYDeclarations :
     CYNext<CYDeclarations>,
-    CYForInitialiser
+    CYForInitialiser,
+    CYThing
 {
     CYDeclaration *declaration_;
 
@@ -772,6 +817,8 @@ struct CYDeclarations :
     }
 
     virtual void For(CYOutput &out) const;
+
+    virtual void Output(CYOutput &out) const;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -785,7 +832,7 @@ struct CYVar :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYLet :
@@ -800,7 +847,7 @@ struct CYLet :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYField :
@@ -830,9 +877,9 @@ struct CYMessage :
     bool instance_;
     CYExpression *type_;
     CYMessageParameter *parameter_;
-    CYSource *body_;
+    CYStatement *body_;
 
-    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYSource *body) :
+    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYStatement *body) :
         instance_(instance),
         type_(type),
         parameter_(parameter),
@@ -843,10 +890,7 @@ struct CYMessage :
     virtual void Output(CYOutput &out, bool replace) const;
 };
 
-struct CYClass :
-    CYExpression,
-    CYStatement
-{
+struct CYClass {
     CYClassName *name_;
     CYExpression *super_;
     CYField *fields_;
@@ -860,9 +904,32 @@ struct CYClass :
     {
     }
 
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYClassExpression :
+    CYClass,
+    CYExpression
+{
+    CYClassExpression(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
+        CYClass(name, super, fields, messages)
+    {
+    }
+
     CYPrecedence(0)
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYClassStatement :
+    CYClass,
+    CYStatement
+{
+    CYClassStatement(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
+        CYClass(name, super, fields, messages)
+    {
+    }
+
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -878,7 +945,7 @@ struct CYCategory :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYFunctionParameter :
@@ -912,7 +979,7 @@ struct CYFor :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYForIn :
@@ -929,7 +996,7 @@ struct CYForIn :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYForEachIn :
@@ -946,11 +1013,12 @@ struct CYForEachIn :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYProperty :
-    CYNext<CYProperty>
+    CYNext<CYProperty>,
+    CYThing
 {
     CYPropertyName *name_;
     CYExpression *value_;
@@ -1036,6 +1104,7 @@ struct CYDirectMember :
     }
 
     CYPrecedence(1)
+    CYRightHand(false)
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
@@ -1049,6 +1118,7 @@ struct CYIndirectMember :
     }
 
     CYPrecedence(1)
+    CYRightHand(false)
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
@@ -1065,7 +1135,11 @@ struct CYNew :
     {
     }
 
-    CYPrecedence(1)
+    virtual unsigned Precedence() const {
+        return arguments_ == NULL ? 2 : 1;
+    }
+
+    CYRightHand(false)
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
@@ -1082,7 +1156,8 @@ struct CYCall :
     {
     }
 
-    CYPrecedence(2)
+    CYPrecedence(1)
+    CYRightHand(false)
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
@@ -1101,7 +1176,7 @@ struct CYIf :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYDoWhile :
@@ -1116,7 +1191,7 @@ struct CYDoWhile :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYWhile :
@@ -1131,38 +1206,49 @@ struct CYWhile :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYLambda :
-    CYExpression
-{
+struct CYFunction {
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
-    CYSource *body_;
+    CYStatement *body_;
 
-    CYLambda(CYIdentifier *name, CYFunctionParameter *parameters, CYSource *body) :
+    CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
         name_(name),
         parameters_(parameters),
         body_(body)
     {
     }
 
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYFunctionExpression :
+    CYFunction,
+    CYExpression
+{
+    CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
+        CYFunction(name, parameters, body)
+    {
+    }
+
     CYPrecedence(0)
+    CYRightHand(false)
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYFunction :
-    CYLambda,
-    CYSource
+struct CYFunctionStatement :
+    CYFunction,
+    CYStatement
 {
-    CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYSource *body) :
-        CYLambda(name, parameters, body)
+    CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
+        CYFunction(name, parameters, body)
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYExpress :
@@ -1175,7 +1261,7 @@ struct CYExpress :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYContinue :
@@ -1188,7 +1274,7 @@ struct CYContinue :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYBreak :
@@ -1201,7 +1287,7 @@ struct CYBreak :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYReturn :
@@ -1214,31 +1300,43 @@ struct CYReturn :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYEmpty :
     CYStatement
 {
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYFinally :
+    CYThing
+{
+    CYStatement *code_;
+
+    CYFinally(CYStatement *code) :
+        code_(code)
+    {
+    }
+
     virtual void Output(CYOutput &out) const;
-    virtual void Output(CYOutput &out, bool block) const;
 };
 
 struct CYTry :
     CYStatement
 {
-    CYStatement *try_;
+    CYStatement *code_;
     CYCatch *catch_;
-    CYStatement *finally_;
+    CYFinally *finally_;
 
-    CYTry(CYStatement *_try, CYCatch *_catch, CYStatement *finally) :
-        try_(_try),
+    CYTry(CYStatement *code, CYCatch *_catch, CYFinally *finally) :
+        code_(code),
         catch_(_catch),
         finally_(finally)
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYThrow :
@@ -1251,7 +1349,7 @@ struct CYThrow :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYWith :
@@ -1266,7 +1364,7 @@ struct CYWith :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYSwitch :
@@ -1281,7 +1379,7 @@ struct CYSwitch :
     {
     }
 
-    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYCondition :
@@ -1413,6 +1511,7 @@ CYPrefix_(true, "void", Void)
 CYPrefix_(true, "typeof", TypeOf)
 CYPrefix_(false, "++", PreIncrement)
 CYPrefix_(false, "--", PreDecrement)
+CYPrefix_(false, "+", Affirm)
 CYPrefix_(false, "-", Negate)
 CYPrefix_(false, "~", BitwiseNot)
 CYPrefix_(false, "!", LogicalNot)