Move tokens that aren't Words into IdentifierName.

[cycript.git] / Driver.hpp

diff --git a/Driver.hpp b/Driver.hpp
index 769ba26d24d1483b7de0ee6d6e15626b4baac0ac..a4458a237a4bca49f5dba063df0007af1fe90ca1 100644 (file)
--- a/Driver.hpp
+++ b/Driver.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -28,31 +28,30 @@
 #include <string>
 #include <vector>
 
-#include "location.hh"
-
+#include "Location.hpp"
 #include "Parser.hpp"
 
-enum CYState {
-    CYClear,
-    CYRestricted,
-    CYNewLine
-};
-
-class CYDriver {
+class _visible CYDriver {
   public:
+    CYPool &pool_;
     void *scanner_;
 
-    CYState state_;
     std::stack<bool> in_;
 
+    bool newline_;
+    bool last_;
+
     struct {
         bool AtImplementation;
+        bool Class;
         bool Function;
         bool OpenBrace;
+        bool NewLine;
     } no_;
 
     std::istream &data_;
 
+    int debug_;
     bool strict_;
     bool commented_;
 
@@ -66,13 +65,13 @@ class CYDriver {
 
     struct Error {
         bool warning_;
-        cy::location location_;
+        CYLocation location_;
         std::string message_;
     };
 
     typedef std::vector<Error> Errors;
 
-    CYProgram *program_;
+    CYScript *script_;
     Errors errors_;
 
     bool auto_;
@@ -107,16 +106,19 @@ class CYDriver {
     void ScannerDestroy();
 
   public:
-    CYDriver(std::istream &data, const std::string &filename = "");
+    CYDriver(CYPool &pool, std::istream &data, const std::string &filename = "");
     ~CYDriver();
 
+    bool Parse();
+    void Replace(CYOptions &options);
+
     Condition GetCondition();
     void SetCondition(Condition condition);
 
     void PushCondition(Condition condition);
     void PopCondition();
 
-    void Warning(const cy::location &location, const char *message);
+    void Warning(const CYLocation &location, const char *message);
 };
 
 #endif/*CYCRIPT_DRIVER_HPP*/