Factored out the execution engine from the compiler.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 30fa1eacfbb7c80de01bf4ba16037d9284248290..8f42bc367582e792cfaf608a7498b2b8752dbfad 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,4 +1,4 @@
-/* Cycript - Remote Execution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
@@ -73,6 +73,9 @@ struct CYNext {
 };
 
 struct CYThing {
+    virtual ~CYThing() {
+    }
+
     virtual void Output(struct CYOutput &out) const = 0;
 };
 
@@ -80,6 +83,7 @@ struct CYOutput {
     std::ostream &out_;
     bool pretty_;
     unsigned indent_;
+    bool right_;
 
     enum {
         NoMode,
@@ -93,6 +97,7 @@ struct CYOutput {
         out_(out),
         pretty_(false),
         indent_(0),
+        right_(false),
         mode_(NoMode)
     {
     }
@@ -117,6 +122,9 @@ struct CYOutput {
 
 struct CYPropertyName {
     virtual void PropertyName(CYOutput &out) const = 0;
+
+    virtual ~CYPropertyName() {
+    }
 };
 
 struct CYExpression;
@@ -135,6 +143,7 @@ enum CYFlags {
     CYNoCall =       (1 << 3),
     CYNoRightHand =  (1 << 4),
     CYNoDangle =     (1 << 5),
+    CYNoInteger =    (1 << 6),
     CYNoBF =         (CYNoBrace | CYNoFunction),
 };
 
@@ -157,6 +166,9 @@ struct CYContext {
 struct CYStatement :
     CYNext<CYStatement>
 {
+    virtual ~CYStatement() {
+    }
+
     void Single(CYOutput &out, CYFlags flags) const;
     void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
 
@@ -198,6 +210,9 @@ struct CYStatements {
 };
 
 struct CYClassName {
+    virtual ~CYClassName() {
+    }
+
     virtual CYExpression *ClassName(CYContext &context, bool object) = 0;
     virtual void ClassName(CYOutput &out, bool object) const = 0;
 };
@@ -238,6 +253,20 @@ struct CYIdentifier :
     }
 };
 
+struct CYComment :
+    CYStatement
+{
+    const char *value_;
+
+    CYComment(const char *value) :
+        value_(value)
+    {
+    }
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
 struct CYLabel :
     CYStatement
 {
@@ -346,10 +375,16 @@ class CYDriver {
 };
 
 struct CYForInitialiser {
+    virtual ~CYForInitialiser() {
+    }
+
     virtual void For(CYOutput &out) const = 0;
 };
 
 struct CYForInInitialiser {
+    virtual ~CYForInInitialiser() {
+    }
+
     virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
     virtual const char *ForEachIn() const = 0;
     virtual CYExpression *ForEachIn(CYContext &out) = 0;
@@ -634,7 +669,7 @@ struct CYString :
     virtual CYNumber *Number(CYContext &context);
     virtual CYString *String(CYContext &context);
 
-    virtual CYString *Concat(CYContext &out, CYString *rhs) const;
+    CYString *Concat(CYContext &out, CYString *rhs) const;
     virtual void Output(CYOutput &out, CYFlags flags) const;
     virtual void PropertyName(CYOutput &out) const;
 };
@@ -929,13 +964,31 @@ struct CYArray :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
+struct CYProperty :
+    CYNext<CYProperty>,
+    CYThing
+{
+    CYPropertyName *name_;
+    CYExpression *value_;
+
+    CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next = NULL) :
+        CYNext<CYProperty>(next),
+        name_(name),
+        value_(value)
+    {
+    }
+
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
 struct CYDeclaration :
     CYForInInitialiser
 {
     CYIdentifier *identifier_;
     CYExpression *initialiser_;
 
-    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser) :
+    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser = NULL) :
         identifier_(identifier),
         initialiser_(initialiser)
     {
@@ -967,6 +1020,7 @@ struct CYDeclarations :
     virtual void For(CYOutput &out) const;
 
     void Replace(CYContext &context);
+    CYProperty *Property(CYContext &context);
 
     virtual void Output(CYOutput &out) const;
     virtual void Output(CYOutput &out, CYFlags flags) const;
@@ -1058,24 +1112,6 @@ struct CYForEachIn :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYProperty :
-    CYNext<CYProperty>,
-    CYThing
-{
-    CYPropertyName *name_;
-    CYExpression *value_;
-
-    CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next = NULL) :
-        CYNext<CYProperty>(next),
-        name_(name),
-        value_(value)
-    {
-    }
-
-    void Replace(CYContext &context);
-    virtual void Output(CYOutput &out) const;
-};
-
 struct CYObject :
     CYLiteral
 {
@@ -1242,6 +1278,9 @@ struct CYFunction {
     {
     }
 
+    virtual ~CYFunction() {
+    }
+
     virtual void Replace_(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
@@ -1483,7 +1522,7 @@ struct CYIndirect :
     }
 
     virtual const char *Operator() const {
-        return "^";
+        return "*";
     }
 
     CYAlphabetic(false)