Use variadic templates to better organize Classes.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index efd2bc63ec6a28db9ca7230cf1afaeb01f38a68e..9625ed852948e882b3969ac170433a92bd308b8d 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -39,7 +39,6 @@ struct CYScript;
 struct CYWord;
 
 enum CYMark {
-    CYMarkIgnore,
     CYMarkScript,
     CYMarkModule,
 };
@@ -60,12 +59,12 @@ class _visible CYDriver {
 
     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_;
@@ -113,7 +112,8 @@ class _visible CYDriver {
         AutoPrimary,
         AutoDirect,
         AutoIndirect,
-        AutoMessage
+        AutoMessage,
+        AutoResolve,
     } mode_;
 
   private:
@@ -121,10 +121,10 @@ 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);