Forgot to include license header in libcycript.cy.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index f0d27322877133ec4e548be4eda98e1359c9c4b6..adb03f20f612c9e864e3a677fbb9d78fed1ac4c2 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -39,7 +39,6 @@ struct CYScript;
 struct CYWord;
 
 enum CYMark {
-    CYMarkIgnore,
     CYMarkScript,
     CYMarkModule,
 };
@@ -60,17 +59,12 @@ class _visible CYDriver {
 
     std::stack<CYClassTail *> class_;
 
-    enum {
-        NewLineNone,
-        NewLineLast,
-        NewLineHere,
-    } newline_;
-
+    CYMark mark_;
+    int hold_;
+    bool newline_;
     bool last_;
-    bool next_;
 
-    std::istream &data_;
-    CYMark mark_;
+    std::streambuf &data_;
 
     int debug_;
     bool strict_;
@@ -126,10 +120,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);