Updated todo, license, and title.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 86b7d17a70494cd4624afe3d18a1ee902fea88af..2dc89ce848f0d9c37eac79ec220841360f8d8524 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)
 */
 


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

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

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


@@ -335,8 +336,12 @@ 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);
 };
 
     void Warning(const cy::location &location, const char *message);
 };
 


@@ -1085,22 +1090,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
 {


@@ -1363,14 +1352,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)


@@ -1381,12 +1389,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)
     {
     }


@@ -1395,6 +1403,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
 {


@@ -1473,7 +1483,7 @@ struct CYIndirect :
     }
 
     virtual const char *Operator() const {
     }
 
     virtual const char *Operator() const {

-        return "*";
+        return "^";

     }
 
     CYAlphabetic(false)
     }
 
     CYAlphabetic(false)