Got true JS booleans working in GNUstep.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 4fe121e099a8ec0079e5ec6d436cc98534fd3188..616d0dd025efd64ee7934b33714b5bd6d81c2021 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,4 +1,4 @@
-/* Cycript - Remove Execution Server and Disassembler
+/* Cycript - Error.hppution Server and Disassembler

  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 


@@ -73,6 +73,9 @@ struct CYNext {
 };
 
 struct CYThing {
 };
 
 struct CYThing {

+    virtual ~CYThing() {
+    }
+

     virtual void Output(struct CYOutput &out) const = 0;
 };
 
     virtual void Output(struct CYOutput &out) const = 0;
 };
 


@@ -117,6 +120,9 @@ struct CYOutput {
 
 struct CYPropertyName {
     virtual void PropertyName(CYOutput &out) const = 0;
 
 struct CYPropertyName {
     virtual void PropertyName(CYOutput &out) const = 0;

+
+    virtual ~CYPropertyName() {
+    }

 };
 
 struct CYExpression;
 };
 
 struct CYExpression;


@@ -157,6 +163,9 @@ struct CYContext {
 struct CYStatement :
     CYNext<CYStatement>
 {
 struct CYStatement :
     CYNext<CYStatement>
 {

+    virtual ~CYStatement() {
+    }
+

     void Single(CYOutput &out, CYFlags flags) const;
     void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
 
     void Single(CYOutput &out, CYFlags flags) const;
     void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
 


@@ -198,6 +207,9 @@ struct CYStatements {
 };
 
 struct CYClassName {
 };
 
 struct CYClassName {

+    virtual ~CYClassName() {
+    }
+

     virtual CYExpression *ClassName(CYContext &context, bool object) = 0;
     virtual void ClassName(CYOutput &out, bool object) const = 0;
 };
     virtual CYExpression *ClassName(CYContext &context, bool object) = 0;
     virtual void ClassName(CYOutput &out, bool object) const = 0;
 };


@@ -280,6 +292,10 @@ struct CYBlock :
     {
     }
 
     {
     }
 

+    operator CYStatement *() const {
+        return statements_;
+    }
+

     virtual CYStatement *Replace(CYContext &context);
 
     virtual void Output(CYOutput &out) const;
     virtual CYStatement *Replace(CYContext &context);
 
     virtual void Output(CYOutput &out) const;


@@ -306,8 +322,9 @@ class CYDriver {
     bool strict_;
 
     enum Condition {
     bool strict_;
 
     enum Condition {

-        RegExStart,
-        RegExRest
+        RegExpCondition,
+        XMLContentCondition,
+        XMLTagCondition,

     };
 
     std::string filename_;
     };
 
     std::string filename_;


@@ -331,22 +348,34 @@ class CYDriver {
     CYDriver(const std::string &filename);
     ~CYDriver();
 
     CYDriver(const std::string &filename);
     ~CYDriver();
 

+    Condition GetCondition();

     void SetCondition(Condition condition);
 
     void SetCondition(Condition condition);
 

+    void PushCondition(Condition condition);
+    void PopCondition();
+

     void Warning(const cy::location &location, const char *message);
 };
 
 struct CYForInitialiser {
     void Warning(const cy::location &location, const char *message);
 };
 
 struct CYForInitialiser {

+    virtual ~CYForInitialiser() {
+    }
+

     virtual void For(CYOutput &out) const = 0;
 };
 
 struct CYForInInitialiser {
     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 void ForIn(CYOutput &out, CYFlags flags) const = 0;
     virtual const char *ForEachIn() const = 0;

-    virtual void ForEachIn(CYOutput &out) const = 0;

     virtual CYExpression *ForEachIn(CYContext &out) = 0;
 };
 
     virtual CYExpression *ForEachIn(CYContext &out) = 0;
 };
 

+struct CYNumber;
+struct CYString;
+

 struct CYExpression :
     CYNext<CYExpression>,
     CYForInitialiser,
 struct CYExpression :
     CYNext<CYExpression>,
     CYForInitialiser,


@@ -364,7 +393,6 @@ struct CYExpression :
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
 
     virtual const char *ForEachIn() const;
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
 
     virtual const char *ForEachIn() const;

-    virtual void ForEachIn(CYOutput &out) const;

     virtual CYExpression *ForEachIn(CYContext &out);
 
     virtual void Output(CYOutput &out) const;
     virtual CYExpression *ForEachIn(CYContext &out);
 
     virtual void Output(CYOutput &out) const;


@@ -378,6 +406,18 @@ struct CYExpression :
 
     virtual CYExpression *Replace(CYContext &context) = 0;
 
 
     virtual CYExpression *Replace(CYContext &context) = 0;
 

+    virtual CYExpression *Primitive(CYContext &context) {
+        return this;
+    }
+
+    virtual CYNumber *Number(CYContext &context) {
+        return NULL;
+    }
+
+    virtual CYString *String(CYContext &context) {
+        return NULL;
+    }
+

     virtual const char *Word() const {
         return NULL;
     }
     virtual const char *Word() const {
         return NULL;
     }


@@ -441,17 +481,12 @@ struct CYComprehension :
     CYNext<CYComprehension>,
     CYThing
 {
     CYNext<CYComprehension>,
     CYThing
 {

-    void Output(CYOutput &out) const;

     virtual const char *Name() const = 0;
 
     virtual const char *Name() const = 0;
 

-    virtual void Begin_(CYOutput &out) const = 0;
-
-    virtual void End_(CYOutput &out) const {
-    }
-

     virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;
     CYFunctionParameter *Parameters(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;
     CYFunctionParameter *Parameters(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;

+    virtual void Output(CYOutput &out) const = 0;

 };
 
 struct CYForInComprehension :
 };
 
 struct CYForInComprehension :


@@ -470,10 +505,9 @@ struct CYForInComprehension :
         return name_->Value();
     }
 
         return name_->Value();
     }
 

-    virtual void Begin_(CYOutput &out) const;
-

     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;

+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYForEachInComprehension :
 };
 
 struct CYForEachInComprehension :


@@ -492,11 +526,9 @@ struct CYForEachInComprehension :
         return name_->Value();
     }
 
         return name_->Value();
     }
 

-    virtual void Begin_(CYOutput &out) const;
-    virtual void End_(CYOutput &out) const;
-

     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;

+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYIfComprehension :
 };
 
 struct CYIfComprehension :


@@ -513,10 +545,9 @@ struct CYIfComprehension :
         return NULL;
     }
 
         return NULL;
     }
 

-    virtual void Begin_(CYOutput &out) const;
-

     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;

+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYArrayComprehension :
 };
 
 struct CYArrayComprehension :


@@ -618,6 +649,10 @@ struct CYString :
 
     virtual const char *Word() const;
 
 
     virtual const char *Word() const;
 

+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
+
+    virtual CYString *Concat(CYContext &out, CYString *rhs) const;

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


@@ -637,6 +672,9 @@ struct CYNumber :
         return value_;
     }
 
         return value_;
     }
 

+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
+

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


@@ -667,6 +705,9 @@ struct CYNull :
     {
     }
 
     {
     }
 

+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
+

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


@@ -702,6 +743,9 @@ struct CYFalse :
     virtual bool Value() const {
         return false;
     }
     virtual bool Value() const {
         return false;
     }

+
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);

 };
 
 struct CYTrue :
 };
 
 struct CYTrue :


@@ -716,6 +760,9 @@ struct CYTrue :
     virtual bool Value() const {
         return true;
     }
     virtual bool Value() const {
         return true;
     }

+
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);

 };
 
 struct CYVariable :
 };
 
 struct CYVariable :


@@ -866,7 +913,7 @@ struct CYClause :
     {
     }
 
     {
     }
 

-    virtual void Replace(CYContext &context);
+    void Replace(CYContext &context);

     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 


@@ -900,13 +947,31 @@ struct CYArray :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     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_;
 
 struct CYDeclaration :
     CYForInInitialiser
 {
     CYIdentifier *identifier_;
     CYExpression *initialiser_;
 

-    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser) :
+    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser = NULL) :

         identifier_(identifier),
         initialiser_(initialiser)
     {
         identifier_(identifier),
         initialiser_(initialiser)
     {


@@ -915,7 +980,6 @@ struct CYDeclaration :
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
 
     virtual const char *ForEachIn() const;
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
 
     virtual const char *ForEachIn() const;

-    virtual void ForEachIn(CYOutput &out) const;

     virtual CYExpression *ForEachIn(CYContext &out);
 
     void Replace(CYContext &context);
     virtual CYExpression *ForEachIn(CYContext &out);
 
     void Replace(CYContext &context);


@@ -930,7 +994,7 @@ struct CYDeclarations :
 {
     CYDeclaration *declaration_;
 
 {
     CYDeclaration *declaration_;
 

-    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
+    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) :

         CYNext<CYDeclarations>(next),
         declaration_(declaration)
     {
         CYNext<CYDeclarations>(next),
         declaration_(declaration)
     {


@@ -939,6 +1003,7 @@ struct CYDeclarations :
     virtual void For(CYOutput &out) const;
 
     void Replace(CYContext &context);
     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;
 
     virtual void Output(CYOutput &out) const;
     virtual void Output(CYOutput &out, CYFlags flags) const;


@@ -1030,24 +1095,6 @@ struct CYForEachIn :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     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
 {
 struct CYObject :
     CYLiteral
 {


@@ -1062,22 +1109,6 @@ struct CYObject :
     void Output(CYOutput &out, CYFlags flags) const;
 };
 
     void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYCatch :
-    CYThing
-{
-    CYIdentifier *name_;
-    CYBlock code_;
-
-    CYCatch(CYIdentifier *name, CYStatement *statements) :
-        name_(name),
-        code_(statements)
-    {
-    }
-
-    void Replace(CYContext &context);
-    virtual void Output(CYOutput &out) const;
-};
-

 struct CYMember :
     CYExpression
 {
 struct CYMember :
     CYExpression
 {


@@ -1230,6 +1261,9 @@ struct CYFunction {
     {
     }
 
     {
     }
 

+    virtual ~CYFunction() {
+    }
+

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


@@ -1340,14 +1374,33 @@ struct CYFinally :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTry :
+namespace cy {
+namespace Syntax {
+
+struct Catch :
+    CYThing
+{
+    CYIdentifier *name_;
+    CYBlock code_;
+
+    Catch(CYIdentifier *name, CYStatement *statements) :
+        name_(name),
+        code_(statements)
+    {
+    }
+
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct Try :

     CYStatement
 {
     CYBlock code_;
     CYStatement
 {
     CYBlock code_;

-    CYCatch *catch_;
+    Catch *catch_;

     CYFinally *finally_;
 
     CYFinally *finally_;
 

-    CYTry(CYStatement *statements, CYCatch *_catch, CYFinally *finally) :
+    Try(CYStatement *statements, Catch *_catch, CYFinally *finally) :

         code_(statements),
         catch_(_catch),
         finally_(finally)
         code_(statements),
         catch_(_catch),
         finally_(finally)


@@ -1358,12 +1411,12 @@ struct CYTry :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYThrow :
+struct Throw :

     CYStatement
 {
     CYExpression *value_;
 
     CYStatement
 {
     CYExpression *value_;
 

-    CYThrow(CYExpression *value) :
+    Throw(CYExpression *value) :

         value_(value)
     {
     }
         value_(value)
     {
     }


@@ -1372,6 +1425,8 @@ struct CYThrow :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+} }
+

 struct CYWith :
     CYStatement
 {
 struct CYWith :
     CYStatement
 {


@@ -1458,10 +1513,13 @@ struct CYIndirect :
     virtual CYExpression *Replace(CYContext &context);
 };
 
     virtual CYExpression *Replace(CYContext &context);
 };
 

-#define CYPostfix_(op, name) \
+#define CYReplace \
+    virtual CYExpression *Replace(CYContext &context);
+
+#define CYPostfix_(op, name, args...) \

     struct CY ## name : \
         CYPostfix \
     struct CY ## name : \
         CYPostfix \

-    { \
+    { args \

         CY ## name(CYExpression *lhs) : \
             CYPostfix(lhs) \
         { \
         CY ## name(CYExpression *lhs) : \
             CYPostfix(lhs) \
         { \


@@ -1472,10 +1530,10 @@ struct CYIndirect :
         } \
     };
 
         } \
     };
 

-#define CYPrefix_(alphabetic, op, name) \
+#define CYPrefix_(alphabetic, op, name, args...) \

     struct CY ## name : \
         CYPrefix \
     struct CY ## name : \
         CYPrefix \

-    { \
+    { args \

         CY ## name(CYExpression *rhs) : \
             CYPrefix(rhs) \
         { \
         CY ## name(CYExpression *rhs) : \
             CYPrefix(rhs) \
         { \


@@ -1488,10 +1546,10 @@ struct CYIndirect :
         } \
     };
 
         } \
     };
 

-#define CYInfix_(alphabetic, precedence, op, name) \
+#define CYInfix_(alphabetic, precedence, op, name, args...) \

     struct CY ## name : \
         CYInfix \
     struct CY ## name : \
         CYInfix \

-    { \
+    { args \

         CY ## name(CYExpression *lhs, CYExpression *rhs) : \
             CYInfix(lhs, rhs) \
         { \
         CY ## name(CYExpression *lhs, CYExpression *rhs) : \
             CYInfix(lhs, rhs) \
         { \


@@ -1505,10 +1563,10 @@ struct CYIndirect :
         } \
     };
 
         } \
     };
 

-#define CYAssignment_(op, name) \
+#define CYAssignment_(op, name, args...) \

     struct CY ## name ## Assign : \
         CYAssignment \
     struct CY ## name ## Assign : \
         CYAssignment \

-    { \
+    { args \

         CY ## name ## Assign(CYExpression *lhs, CYExpression *rhs) : \
             CYAssignment(lhs, rhs) \
         { \
         CY ## name ## Assign(CYExpression *lhs, CYExpression *rhs) : \
             CYAssignment(lhs, rhs) \
         { \


@@ -1535,7 +1593,7 @@ CYPrefix_(false, "!", LogicalNot)
 CYInfix_(false, 5, "*", Multiply)
 CYInfix_(false, 5, "/", Divide)
 CYInfix_(false, 5, "%", Modulus)
 CYInfix_(false, 5, "*", Multiply)
 CYInfix_(false, 5, "/", Divide)
 CYInfix_(false, 5, "%", Modulus)

-CYInfix_(false, 6, "+", Add)
+CYInfix_(false, 6, "+", Add, CYReplace)

 CYInfix_(false, 6, "-", Subtract)
 CYInfix_(false, 7, "<<", ShiftLeft)
 CYInfix_(false, 7, ">>", ShiftRightSigned)
 CYInfix_(false, 6, "-", Subtract)
 CYInfix_(false, 7, "<<", ShiftLeft)
 CYInfix_(false, 7, ">>", ShiftRightSigned)