Move uses of super/return stack next to Lex rules.

[cycript.git] / Driver.cpp

diff --git a/Driver.cpp b/Driver.cpp
index 6501fbf14144142da38850134923f3fdbe738b09..788afee05c58a8546c93c16fcd4cdc73b2e2f35e 100644 (file)
--- a/Driver.cpp
+++ b/Driver.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* 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 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -19,22 +19,31 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "Cycript.tab.hh"

 #include "Driver.hpp"
 #include "Driver.hpp"

+#include "Syntax.hpp"

 
 

-CYDriver::CYDriver(std::istream &data, const std::string &filename) :
-    state_(CYClear),
+bool CYParser(CYPool &pool, bool debug);
+
+CYDriver::CYDriver(CYPool &pool, std::istream &data, const std::string &filename) :
+    pool_(pool),
+    newline_(false),
+    last_(false),

     data_(data),
     data_(data),

+    debug_(0),

     strict_(false),
     strict_(false),

-    commented_(false),
+    highlight_(false),

     filename_(filename),
     filename_(filename),

-    program_(NULL),
+    script_(NULL),

     auto_(false),
     context_(NULL),
     mode_(AutoNone)
 {
     auto_(false),
     context_(NULL),
     mode_(AutoNone)
 {

-    memset(&no_, 0, sizeof(no_));

     in_.push(false);
     in_.push(false);

+    return_.push(false);
+    super_.push(false);
+    template_.push(false);
+    yield_.push(false);
+

     ScannerInit();
 }
 
     ScannerInit();
 }
 


@@ -42,21 +51,8 @@ CYDriver::~CYDriver() {
     ScannerDestroy();
 }
 
     ScannerDestroy();
 }
 

-void CYDriver::Warning(const cy::location &location, const char *message) {
-    if (!strict_)
-        return;
-
-    CYDriver::Error error;
-    error.warning_ = true;
-    error.location_ = location;
-    error.message_ = message;
-    errors_.push_back(error);
-}
-
-void cy::parser::error(const cy::parser::location_type &location, const std::string &message) {
-    CYDriver::Error error;
-    error.warning_ = false;
-    error.location_ = location;
-    error.message_ = message;
-    driver.errors_.push_back(error);
+void CYDriver::Replace(CYOptions &options) {
+    CYLocal<CYPool> local(&pool_);
+    CYContext context(options);
+    script_->Replace(context);

 }
 }