Allow multi-line editing and drop libedit support.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 0df39d7dd9242a49f2500b3930a2810daabf3753..efd2bc63ec6a28db9ca7230cf1afaeb01f38a68e 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -29,7 +29,14 @@
 #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,
@@ -47,9 +54,12 @@ class _visible CYDriver {
 
     std::stack<bool> in_;
     std::stack<bool> return_;
+    std::stack<bool> super_;
     std::stack<bool> template_;
     std::stack<bool> yield_;
 
+    std::stack<CYClassTail *> class_;
+
     bool newline_;
     bool last_;
     bool next_;
@@ -62,7 +72,6 @@ class _visible CYDriver {
     bool highlight_;
 
     enum Condition {
-        RegExpCondition,
         XMLContentCondition,
         XMLTagCondition,
     };
@@ -118,6 +127,7 @@ class _visible CYDriver {
     bool Parse(CYMark mark = CYMarkScript);
     void Replace(CYOptions &options);
 
+    void SetRegEx(bool equal);
     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);