Parse scope and symbol colon operators, from Ruby.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 3f0a9600c6276029823ef842bd536205679f043f..9625ed852948e882b3969ac170433a92bd308b8d 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -29,7 +29,19 @@
 #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,
+};
 
 class _visible CYDriver {
   public:
@@ -40,27 +52,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_;
 
-    struct {
-        bool AtImplementation;
-        bool Class;
-        bool Function;
-        bool OpenBrace;
-        bool NewLine;
-    } no_;
-
-    std::istream &data_;
+    std::streambuf &data_;
 
     int debug_;
     bool strict_;
     bool highlight_;
 
     enum Condition {
-        RegExpCondition,
         XMLContentCondition,
         XMLTagCondition,
     };
@@ -102,7 +112,8 @@ class _visible CYDriver {
         AutoPrimary,
         AutoDirect,
         AutoIndirect,
-        AutoMessage
+        AutoMessage,
+        AutoResolve,
     } mode_;
 
   private:
@@ -110,12 +121,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);