Finally managed to target iOS 2.0 fully correctly.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 35aa5868f1bfadb9aae1a5a3891ec7f10633c880..cedd1501ea3e14f1f84a984680f6c13b737ae72d 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -110,10 +110,11 @@ void Setup(CYDriver &driver, cy::parser &parser) {
         driver.strict_ = true;
 }
 
-void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
+void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) {
     out.pretty_ = pretty_;
     CYContext context(options);
-    driver.program_->Replace(context);
+    if (lower)
+        driver.program_->Replace(context);
 }
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
@@ -123,7 +124,7 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
-        json = CYExecute(pool, code);
+        json = CYExecute(CYGetJSContext(), pool, code);
 #else
         json = NULL;
 #endif
@@ -436,6 +437,7 @@ static void Console(CYOptions &options) {
     bool bypass(false);
     bool debug(false);
     bool expand(false);
+    bool lower(true);
     bool syntax(true);
 
     out_ = &std::cout;
@@ -469,15 +471,10 @@ static void Console(CYOptions &options) {
       read:
 
 #if RL_READLINE_VERSION >= 0x0600
-        if (syntax) {
-            rl_prep_term_function = CYDisplayStart;
+        if (syntax)
             rl_redisplay_function = CYDisplayUpdate;
-            rl_deprep_term_function = CYDisplayFinish;
-        } else {
-            rl_prep_term_function = rl_prep_terminal;
+        else
             rl_redisplay_function = rl_redisplay;
-            rl_deprep_term_function = rl_deprep_terminal;
-        }
 #endif
 
         mode_ = Parsing;
@@ -503,6 +500,9 @@ static void Console(CYOptions &options) {
                 } else if (data == "expand") {
                     expand = !expand;
                     *out_ << "expand == " << (expand ? "true" : "false") << std::endl;
+                } else if (data == "lower") {
+                    lower = !lower;
+                    *out_ << "lower == " << (lower ? "true" : "false") << std::endl;
                 } else if (data == "syntax") {
                     syntax = !syntax;
                     *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
@@ -579,7 +579,7 @@ static void Console(CYOptions &options) {
 
             std::ostringstream str;
             CYOutput out(str, options);
-            Setup(out, driver, options);
+            Setup(out, driver, options, lower);
             out << *driver.program_;
             code = str.str();
         }
@@ -875,7 +875,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         } else if (driver.program_ != NULL) {
             std::ostringstream str;
             CYOutput out(str, options);
-            Setup(out, driver, options);
+            Setup(out, driver, options, true);
             out << *driver.program_;
             std::string code(str.str());
             if (compile)