Precedence and RightHand have to represent Output.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 2a0955ac60325b6839440006046575dddb9ed49b..efd2bc63ec6a28db9ca7230cf1afaeb01f38a68e 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -29,7 +29,20 @@
 #include <vector>
 
 #include "Location.hpp"
 #include <vector>
 
 #include "Location.hpp"

-#include "Parser.hpp"
+#include "Options.hpp"
+#include "Pooling.hpp"
+#include "Standard.hpp"
+
+struct CYClassTail;
+struct CYExpression;
+struct CYScript;
+struct CYWord;
+
+enum CYMark {
+    CYMarkIgnore,
+    CYMarkScript,
+    CYMarkModule,
+};

 
 class _visible CYDriver {
   public:
 
 class _visible CYDriver {
   public:


@@ -40,20 +53,25 @@ class _visible CYDriver {
     bool tail_;
 
     std::stack<bool> in_;
     bool tail_;
 
     std::stack<bool> in_;

+    std::stack<bool> return_;
+    std::stack<bool> super_;

     std::stack<bool> template_;
     std::stack<bool> template_;

+    std::stack<bool> yield_;
+
+    std::stack<CYClassTail *> class_;

 
     bool newline_;
     bool last_;
     bool next_;
 
     std::istream &data_;
 
     bool newline_;
     bool last_;
     bool next_;
 
     std::istream &data_;

+    CYMark mark_;

 
     int debug_;
     bool strict_;
     bool highlight_;
 
     enum Condition {
 
     int debug_;
     bool strict_;
     bool highlight_;
 
     enum Condition {

-        RegExpCondition,

         XMLContentCondition,
         XMLTagCondition,
     };
         XMLContentCondition,
         XMLTagCondition,
     };


@@ -106,9 +124,10 @@ class _visible CYDriver {
     CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
     ~CYDriver();
 
     CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
     ~CYDriver();
 

-    bool Parse();
+    bool Parse(CYMark mark = CYMarkScript);

     void Replace(CYOptions &options);
 
     void Replace(CYOptions &options);
 

+    void SetRegEx(bool equal);

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