Avoid crashing when the user types a mismatched }.

[cycript.git] / Driver.cpp

diff --git a/Driver.cpp b/Driver.cpp
index e529cbc07a86be8f426dc7f7bdac5958d2b848bb..df31a036935f95f033f1617fa5c83f948854a3fb 100644 (file)
--- a/Driver.cpp
+++ b/Driver.cpp
@@ -19,23 +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),
+    next_(false),

     data_(data),
     debug_(0),
     strict_(false),
     data_(data),
     debug_(0),
     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);
+    template_.push(false);
+    yield_.push(false);
+

     ScannerInit();
 }
 
     ScannerInit();
 }
 


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

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

     CYContext context(options);
     CYContext context(options);

-    program_->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);
+    script_->Replace(context);

 }
 }