Desktop Mac seems to use ^{_objc_class=...} instead of #.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 63aa17ad93f2c36dd84498c6ddae4bf334552b04..616d0dd025efd64ee7934b33714b5bd6d81c2021 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,4 +1,4 @@
-/* Cycript - Remote 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;
 };


@@ -311,6 +323,8 @@ class CYDriver {
 
     enum Condition {
         RegExpCondition,
 
     enum Condition {
         RegExpCondition,

+        XMLContentCondition,
+        XMLTagCondition,

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


@@ -334,16 +348,26 @@ class CYDriver {
     CYDriver(const std::string &filename);
     ~CYDriver();
 
     CYDriver(const std::string &filename);
     ~CYDriver();
 

-    void BeginCondition(Condition condition);
+    Condition GetCondition();
+    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 CYExpression *ForEachIn(CYContext &out) = 0;
     virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
     virtual const char *ForEachIn() const = 0;
     virtual CYExpression *ForEachIn(CYContext &out) = 0;


@@ -923,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)
     {


@@ -961,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;


@@ -1052,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
 {


@@ -1084,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
 {


@@ -1252,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;
 };


@@ -1362,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)


@@ -1380,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)
     {
     }


@@ -1394,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
 {