Forgot to include license header in libcycript.cy.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index fbc96d931a53a672fae24c799f7fa2397992c519..adb03f20f612c9e864e3a677fbb9d78fed1ac4c2 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -33,12 +33,12 @@
 #include "Pooling.hpp"
 #include "Standard.hpp"
 
+struct CYClassTail;
 struct CYExpression;
 struct CYScript;
 struct CYWord;
 
 enum CYMark {
-    CYMarkIgnore,
     CYMarkScript,
     CYMarkModule,
 };
@@ -53,22 +53,24 @@ 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_;
+
+    CYMark mark_;
+    int hold_;
     bool newline_;
     bool last_;
-    bool next_;
 
-    std::istream &data_;
-    CYMark mark_;
+    std::streambuf &data_;
 
     int debug_;
     bool strict_;
     bool highlight_;
 
     enum Condition {
-        RegExpCondition,
         XMLContentCondition,
         XMLTagCondition,
     };
@@ -118,12 +120,13 @@ class _visible CYDriver {
     void ScannerDestroy();
 
   public:
-    CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
+    CYDriver(CYPool &pool, std::streambuf &data, const std::string &filename = "");
     ~CYDriver();
 
-    bool Parse(CYMark mark = CYMarkScript);
+    bool Parse(CYMark mark = CYMarkModule);
     void Replace(CYOptions &options);
 
+    void SetRegEx(bool equal);
     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);