Support Void::PoolFFI when the value is undefined.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index f0d27322877133ec4e548be4eda98e1359c9c4b6..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 {{{ */
@@ -39,9 +39,9 @@ struct CYScript;
 struct CYWord;
 
 enum CYMark {
-    CYMarkIgnore,
     CYMarkScript,
     CYMarkModule,
+    CYMarkExpression,
 };
 
 class _visible CYDriver {
@@ -60,17 +60,12 @@ class _visible CYDriver {
 
     std::stack<CYClassTail *> class_;
 
-    enum {
-        NewLineNone,
-        NewLineLast,
-        NewLineHere,
-    } newline_;
-
+    CYMark mark_;
+    int hold_;
+    bool newline_;
     bool last_;
-    bool next_;
 
-    std::istream &data_;
-    CYMark mark_;
+    std::streambuf &data_;
 
     int debug_;
     bool strict_;
@@ -118,7 +113,10 @@ class _visible CYDriver {
         AutoPrimary,
         AutoDirect,
         AutoIndirect,
-        AutoMessage
+        AutoMessage,
+        AutoResolve,
+        AutoStruct,
+        AutoEnum,
     } mode_;
 
   private:
@@ -126,10 +124,10 @@ 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(CYMark mark = CYMarkScript);
+    bool Parse(CYMark mark = CYMarkModule);
     void Replace(CYOptions &options);
 
     void SetRegEx(bool equal);