Make Type inherit Functin and build placement new.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 2a0955ac60325b6839440006046575dddb9ed49b..b4f1c1bd4e324c36f4d3640b2d5a23a2bb798637 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -29,7 +29,20 @@
 #include <vector>
 
 #include "Location.hpp"
-#include "Parser.hpp"
+#include "Options.hpp"
+#include "Pooling.hpp"
+#include "Standard.hpp"
+
+struct CYClassTail;
+struct CYExpression;
+struct CYScript;
+struct CYWord;
+
+enum CYMark {
+    CYMarkScript,
+    CYMarkModule,
+    CYMarkExpression,
+};
 
 class _visible CYDriver {
   public:
@@ -40,20 +53,25 @@ class _visible CYDriver {
     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_;
 
+    CYMark mark_;
+    int hold_;
     bool newline_;
     bool last_;
-    bool next_;
 
-    std::istream &data_;
+    std::streambuf &data_;
 
     int debug_;
     bool strict_;
     bool highlight_;
 
     enum Condition {
-        RegExpCondition,
         XMLContentCondition,
         XMLTagCondition,
     };
@@ -95,7 +113,10 @@ class _visible CYDriver {
         AutoPrimary,
         AutoDirect,
         AutoIndirect,
-        AutoMessage
+        AutoMessage,
+        AutoResolve,
+        AutoStruct,
+        AutoEnum,
     } mode_;
 
   private:
@@ -103,12 +124,13 @@ class _visible CYDriver {
     void ScannerDestroy();
 
   public:
-    CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
+    CYDriver(CYPool &pool, std::streambuf &data, const std::string &filename = "");
     ~CYDriver();
 
-    bool Parse();
+    bool Parse(CYMark mark = CYMarkModule);
     void Replace(CYOptions &options);
 
+    void SetRegEx(bool equal);
     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);