Started working on variable name replacement strategies and generally improved compiler.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 44cadc7ad470bb9c3584f26d8fc967ded222a752..0ed0bfe220d03421f63e1471d50f4e3e20ca62ba 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -38,6 +38,7 @@
 /* }}} */
 
 #include "cycript.hpp"
 /* }}} */
 
 #include "cycript.hpp"

+#include "Context.hpp"

 
 #ifdef CY_EXECUTE
 #include "JavaScript.hpp"
 
 #ifdef CY_EXECUTE
 #include "JavaScript.hpp"


@@ -115,7 +116,8 @@ void Setup(CYDriver &driver, cy::parser &parser) {
 void Setup(CYOutput &out, CYDriver &driver) {
     out.pretty_ = pretty_;
 
 void Setup(CYOutput &out, CYDriver &driver) {
     out.pretty_ = pretty_;
 

-    CYContext context(driver.pool_);
+    CYOptions options;
+    CYContext context(driver.pool_, options);

     driver.program_->Replace(context);
 }
 
     driver.program_->Replace(context);
 }
 


@@ -324,7 +326,8 @@ static void Console(apr_pool_t *pool, int client) {
                 code = command;
             else {
                 std::ostringstream str;
                 code = command;
             else {
                 std::ostringstream str;

-                CYOutput out(str);
+                CYOptions options;
+                CYOutput out(str, options);

                 Setup(out, driver);
                 out << *driver.program_;
                 code = str.str();
                 Setup(out, driver);
                 out << *driver.program_;
                 code = str.str();


@@ -606,7 +609,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                 Run(client, code, stdout);
             } else {
                 std::ostringstream str;
                 Run(client, code, stdout);
             } else {
                 std::ostringstream str;

-                CYOutput out(str);
+                CYOptions options;
+                CYOutput out(str, options);

                 Setup(out, driver);
                 out << *driver.program_;
                 std::string code(str.str());
                 Setup(out, driver);
                 out << *driver.program_;
                 std::string code(str.str());