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

[cycript.git] / Driver.cpp

diff --git a/Driver.cpp b/Driver.cpp
index 1fd0d6fbd3c388d1530e60d6b5580ddd40a8ca78..788afee05c58a8546c93c16fcd4cdc73b2e2f35e 100644 (file)
--- a/Driver.cpp
+++ b/Driver.cpp
@@ -19,14 +19,15 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "Cycript.tab.hh"

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

+#include "Syntax.hpp"
+
+bool CYParser(CYPool &pool, bool debug);

 
 CYDriver::CYDriver(CYPool &pool, std::istream &data, const std::string &filename) :
     pool_(pool),
     newline_(false),
     last_(false),
 
 CYDriver::CYDriver(CYPool &pool, std::istream &data, const std::string &filename) :
     pool_(pool),
     newline_(false),
     last_(false),

-    next_(false),

     data_(data),
     debug_(0),
     strict_(false),
     data_(data),
     debug_(0),
     strict_(false),


@@ -38,7 +39,11 @@ CYDriver::CYDriver(CYPool &pool, std::istream &data, const std::string &filename
     mode_(AutoNone)
 {
     in_.push(false);
     mode_(AutoNone)
 {
     in_.push(false);

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

     template_.push(false);
     template_.push(false);

+    yield_.push(false);
+

     ScannerInit();
 }
 
     ScannerInit();
 }
 


@@ -46,36 +51,8 @@ CYDriver::~CYDriver() {
     ScannerDestroy();
 }
 
     ScannerDestroy();
 }
 

-bool CYDriver::Parse() {
-    CYLocal<CYPool> local(&pool_);
-    cy::parser parser(*this);
-#ifdef YYDEBUG
-    parser.set_debug_level(debug_);
-#endif
-    return parser.parse() != 0;
-}
-

 void CYDriver::Replace(CYOptions &options) {
     CYLocal<CYPool> local(&pool_);
     CYContext context(options);
     script_->Replace(context);
 }
 void CYDriver::Replace(CYOptions &options) {
     CYLocal<CYPool> local(&pool_);
     CYContext context(options);
     script_->Replace(context);
 }

-
-void CYDriver::Warning(const cy::parser::location_type &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);
-}