X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/a5662a5364816f852acb056d5c2b2fc94e0c0a5c..4e3c905634abeaeea78747ce2be0adce06cc777a:/Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 50d513c..fbc96d9 100644
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -29,30 +29,43 @@
 #include <vector>
 
 #include "Location.hpp"
-#include "Parser.hpp"
+#include "Options.hpp"
+#include "Pooling.hpp"
+#include "Standard.hpp"
+
+struct CYExpression;
+struct CYScript;
+struct CYWord;
+
+enum CYMark {
+    CYMarkIgnore,
+    CYMarkScript,
+    CYMarkModule,
+};
 
 class _visible CYDriver {
   public:
     CYPool &pool_;
     void *scanner_;
 
+    std::vector<char> buffer_;
+    bool tail_;
+
     std::stack<bool> in_;
+    std::stack<bool> return_;
+    std::stack<bool> template_;
+    std::stack<bool> yield_;
 
     bool newline_;
     bool last_;
-
-    struct {
-        bool AtImplementation;
-        bool Function;
-        bool OpenBrace;
-        bool NewLine;
-    } no_;
+    bool next_;
 
     std::istream &data_;
+    CYMark mark_;
 
     int debug_;
     bool strict_;
-    bool commented_;
+    bool highlight_;
 
     enum Condition {
         RegExpCondition,
@@ -70,7 +83,7 @@ class _visible CYDriver {
 
     typedef std::vector<Error> Errors;
 
-    CYProgram *program_;
+    CYScript *script_;
     Errors errors_;
 
     bool auto_;
@@ -108,10 +121,9 @@ class _visible CYDriver {
     CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
     ~CYDriver();
 
-    bool Parse();
+    bool Parse(CYMark mark = CYMarkScript);
     void Replace(CYOptions &options);
 
-    Condition GetCondition();
     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);