Replace \n-tokens with LexNewLine and held tokens.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index f0d27322877133ec4e548be4eda98e1359c9c4b6..bbce9fd4ac1bee3572d3c312fa60528f00c14b93 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_;
 
     int debug_;
     bool strict_;