Flex drove me crazy with "you just got jammed" :/.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 88956fb12bdcdfbb0c3a2214f9e9deab609b7b1d..fbc96d931a53a672fae24c799f7fa2397992c519 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -29,12 +29,18 @@
 #include <vector>
 
 #include "Location.hpp"
 #include <vector>
 
 #include "Location.hpp"

-#include "Parser.hpp"
-
-enum CYState {
-    CYClear,
-    CYRestricted,
-    CYNewLine
+#include "Options.hpp"
+#include "Pooling.hpp"
+#include "Standard.hpp"
+
+struct CYExpression;
+struct CYScript;
+struct CYWord;
+
+enum CYMark {
+    CYMarkIgnore,
+    CYMarkScript,
+    CYMarkModule,

 };
 
 class _visible CYDriver {
 };
 
 class _visible CYDriver {


@@ -42,20 +48,24 @@ class _visible CYDriver {
     CYPool &pool_;
     void *scanner_;
 
     CYPool &pool_;
     void *scanner_;
 

-    CYState state_;
+    std::vector<char> buffer_;
+    bool tail_;
+

     std::stack<bool> in_;
     std::stack<bool> in_;

+    std::stack<bool> return_;
+    std::stack<bool> template_;
+    std::stack<bool> yield_;

 
 

-    struct {
-        bool AtImplementation;
-        bool Function;
-        bool OpenBrace;
-    } no_;
+    bool newline_;
+    bool last_;
+    bool next_;

 
     std::istream &data_;
 
     std::istream &data_;

+    CYMark mark_;

 
     int debug_;
     bool strict_;
 
     int debug_;
     bool strict_;

-    bool commented_;
+    bool highlight_;

 
     enum Condition {
         RegExpCondition,
 
     enum Condition {
         RegExpCondition,


@@ -73,7 +83,7 @@ class _visible CYDriver {
 
     typedef std::vector<Error> Errors;
 
 
     typedef std::vector<Error> Errors;
 

-    CYProgram *program_;
+    CYScript *script_;

     Errors errors_;
 
     bool auto_;
     Errors errors_;
 
     bool auto_;


@@ -111,10 +121,9 @@ class _visible CYDriver {
     CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
     ~CYDriver();
 
     CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
     ~CYDriver();
 

-    bool Parse();
+    bool Parse(CYMark mark = CYMarkScript);

     void Replace(CYOptions &options);
 
     void Replace(CYOptions &options);
 

-    Condition GetCondition();

     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);
     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);