X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/f95d2598051e347460e028286ff2d33e5825e548..5f6902c29e9bba2538e729694ec7c8ced38bf9ec:/Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 769ba26..efd2bc6 100644
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -28,36 +28,50 @@
 #include <string>
 #include <vector>
 
-#include "location.hh"
+#include "Location.hpp"
+#include "Options.hpp"
+#include "Pooling.hpp"
+#include "Standard.hpp"
 
-#include "Parser.hpp"
+struct CYClassTail;
+struct CYExpression;
+struct CYScript;
+struct CYWord;
 
-enum CYState {
-    CYClear,
-    CYRestricted,
-    CYNewLine
+enum CYMark {
+    CYMarkIgnore,
+    CYMarkScript,
+    CYMarkModule,
 };
 
-class CYDriver {
+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> super_;
+    std::stack<bool> template_;
+    std::stack<bool> yield_;
+
+    std::stack<CYClassTail *> class_;
 
-    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,
         XMLContentCondition,
         XMLTagCondition,
     };
@@ -66,13 +80,13 @@ class CYDriver {
 
     struct Error {
         bool warning_;
-        cy::location location_;
+        CYLocation location_;
         std::string message_;
     };
 
     typedef std::vector<Error> Errors;
 
-    CYProgram *program_;
+    CYScript *script_;
     Errors errors_;
 
     bool auto_;
@@ -107,16 +121,19 @@ class CYDriver {
     void ScannerDestroy();
 
   public:
-    CYDriver(std::istream &data, const std::string &filename = "");
+    CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
     ~CYDriver();
 
-    Condition GetCondition();
+    bool Parse(CYMark mark = CYMarkScript);
+    void Replace(CYOptions &options);
+
+    void SetRegEx(bool equal);
     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);
     void PopCondition();
 
-    void Warning(const cy::location &location, const char *message);
+    void Warning(const CYLocation &location, const char *message);
 };
 
 #endif/*CYCRIPT_DRIVER_HPP*/