Instance's toPointer() should return as CFTypeRef.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 1297e14b8ba93ca183ca4e8cdb909ed655dfab97..b4f1c1bd4e324c36f4d3640b2d5a23a2bb798637 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -29,34 +29,49 @@
 #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 CYClassTail;
+struct CYExpression;
+struct CYScript;
+struct CYWord;
+
+enum CYMark {
+    CYMarkScript,
+    CYMarkModule,
+    CYMarkExpression,

 };
 
 };
 

-class CYDriver {
+class _visible CYDriver {

   public:
   public:

+    CYPool &pool_;

     void *scanner_;
 
     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> super_;
+    std::stack<bool> template_;
+    std::stack<bool> yield_;

 
 

-    struct {
-        bool AtImplementation;
-        bool Function;
-        bool OpenBrace;
-    } no_;
+    std::stack<CYClassTail *> class_;

 
 

-    std::istream &data_;
+    CYMark mark_;
+    int hold_;
+    bool newline_;
+    bool last_;

 
 

+    std::streambuf &data_;
+
+    int debug_;

     bool strict_;
     bool strict_;

-    bool commented_;
+    bool highlight_;

 
     enum Condition {
 
     enum Condition {

-        RegExpCondition,

         XMLContentCondition,
         XMLTagCondition,
     };
         XMLContentCondition,
         XMLTagCondition,
     };


@@ -71,7 +86,7 @@ class CYDriver {
 
     typedef std::vector<Error> Errors;
 
 
     typedef std::vector<Error> Errors;
 

-    CYProgram *program_;
+    CYScript *script_;

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


@@ -98,7 +113,10 @@ class CYDriver {
         AutoPrimary,
         AutoDirect,
         AutoIndirect,
         AutoPrimary,
         AutoDirect,
         AutoIndirect,

-        AutoMessage
+        AutoMessage,
+        AutoResolve,
+        AutoStruct,
+        AutoEnum,

     } mode_;
 
   private:
     } mode_;
 
   private:


@@ -106,10 +124,13 @@ class CYDriver {
     void ScannerDestroy();
 
   public:
     void ScannerDestroy();
 
   public:

-    CYDriver(std::istream &data, const std::string &filename = "");
+    CYDriver(CYPool &pool, std::streambuf &data, const std::string &filename = "");

     ~CYDriver();
 
     ~CYDriver();
 

-    Condition GetCondition();
+    bool Parse(CYMark mark = CYMarkModule);
+    void Replace(CYOptions &options);
+
+    void SetRegEx(bool equal);

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