Make Type inherit Functin and build placement new.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index bbce9fd4ac1bee3572d3c312fa60528f00c14b93..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 {{{ */
@@ -41,6 +41,7 @@ struct CYWord;
 enum CYMark {
     CYMarkScript,
     CYMarkModule,
+    CYMarkExpression,
 };
 
 class _visible CYDriver {
@@ -64,7 +65,7 @@ class _visible CYDriver {
     bool newline_;
     bool last_;
 
-    std::istream &data_;
+    std::streambuf &data_;
 
     int debug_;
     bool strict_;
@@ -112,7 +113,10 @@ class _visible CYDriver {
         AutoPrimary,
         AutoDirect,
         AutoIndirect,
-        AutoMessage
+        AutoMessage,
+        AutoResolve,
+        AutoStruct,
+        AutoEnum,
     } mode_;
 
   private:
@@ -120,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);