Fix support for multiple "block lambda" arguments.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index cd39cfb922370369bebb0fcf7b29f21c78312a85..fbc96d931a53a672fae24c799f7fa2397992c519 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -29,32 +29,43 @@
 #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 {
   public:
+    CYPool &pool_;
     void *scanner_;
 
-    CYState state_;
+    std::vector<char> buffer_;
+    bool tail_;
+
     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_;
+    CYMark mark_;
 
     int debug_;
     bool strict_;
-    bool commented_;
+    bool highlight_;
 
     enum Condition {
         RegExpCondition,
@@ -72,7 +83,7 @@ class _visible CYDriver {
 
     typedef std::vector<Error> Errors;
 
-    CYProgram *program_;
+    CYScript *script_;
     Errors errors_;
 
     bool auto_;
@@ -107,13 +118,12 @@ class _visible CYDriver {
     void ScannerDestroy();
 
   public:
-    CYDriver(std::istream &data, const std::string &filename = "");
+    CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
     ~CYDriver();
 
-    bool Parse(CYPool &pool);
-    void Replace(CYPool &pool, CYOptions &options);
+    bool Parse(CYMark mark = CYMarkScript);
+    void Replace(CYOptions &options);
 
-    Condition GetCondition();
     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);