Flex drove me crazy with "you just got jammed" :/.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index b04f2caecff5e6eb99ad37f27a67f630e395714b..e8e70d6599eaacaaf9d7a2ade647beab36f0dbb1 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -34,14 +34,12 @@
 #include <sstream>
 #include <cmath>
 
 #include <sstream>
 #include <cmath>
 

+#include "Driver.hpp"

 #include "Error.hpp"
 #include "Execute.hpp"
 #include "Parser.hpp"
 #include "String.hpp"
 
 #include "Error.hpp"
 #include "Execute.hpp"
 #include "Parser.hpp"
 #include "String.hpp"
 

-#include "Cycript.tab.hh"
-#include "Driver.hpp"
-

 #include "ConvertUTF.h"
 
 template <>
 #include "ConvertUTF.h"
 
 template <>


@@ -219,19 +217,17 @@ double CYCastDouble(const char *value) {
 
 CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {
     CYLocalPool local;
 
 CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {
     CYLocalPool local;

-    CYDriver driver(stream);
-
-    cy::parser parser(driver);
-    _assert(parser.parse() == 0);
+    CYDriver driver(local, stream);
+    _assert(!driver.Parse());

     _assert(driver.errors_.empty());
 
     CYOptions options;
     CYContext context(options);
     _assert(driver.errors_.empty());
 
     CYOptions options;
     CYContext context(options);

-    driver.program_->Replace(context);
+    driver.script_->Replace(context);

 
     std::stringbuf str;
     CYOutput out(str, options);
 
     std::stringbuf str;
     CYOutput out(str, options);

-    out << *driver.program_;
+    out << *driver.script_;

     return $pool.strdup(str.str().c_str());
 }
 
     return $pool.strdup(str.str().c_str());
 }