Find JVM with dlopen and register Android natives.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 31a2dbbc6fc4eb348b7862dbabf786979c34d965..43012acb96712a988c6d781104e4eeac20a803c7 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -68,6 +68,7 @@
 #include <mach/mach_time.h>
 #endif
 
 #include <mach/mach_time.h>
 #endif
 

+#include "Code.hpp"

 #include "Driver.hpp"
 #include "Error.hpp"
 #include "Highlight.hpp"
 #include "Driver.hpp"
 #include "Error.hpp"
 #include "Highlight.hpp"


@@ -291,7 +292,25 @@ static CYUTF8String Run(CYPool &pool, int client, const std::string &code) {
 
 static std::ostream *out_;
 
 
 static std::ostream *out_;
 

-static void Output(CYUTF8String json, std::ostream *out, bool expand = false) {
+static void Output(CYUTF8String json, std::ostream *out, bool expand = false, bool reparse = false) {
+    CYPool pool;
+
+    if (reparse) do {
+        CYStream stream(json.data, json.data + json.size);
+        CYDriver driver(pool, stream);
+        if (driver.Parse(CYMarkExpression))
+            break;
+        std::stringbuf str;
+        CYOptions options;
+        CYOutput out(str, options);
+        out.pretty_ = true;
+        out << *driver.context_;
+        std::string data(str.str());
+        json = CYPoolUTF8String(pool, data);
+        if (json.size == 0)
+            json.data = NULL;
+    } while (false);
+

     const char *data(json.data);
     size_t size(json.size);
 
     const char *data(json.data);
     size_t size(json.size);
 


@@ -363,7 +382,7 @@ class History {
                 if (*character == '\x01') *character = '\n';
     }
 
                 if (*character == '\x01') *character = '\n';
     }
 

-    ~History() {
+    ~History() { try {

         for (HIST_ENTRY *history((history_set_pos(0), current_history())); history; history = next_history())
             for (char *character(history->line); *character; ++character)
                 if (*character == '\n') *character = '\x01';
         for (HIST_ENTRY *history((history_set_pos(0), current_history())); history; history = next_history())
             for (char *character(history->line); *character; ++character)
                 if (*character == '\n') *character = '\x01';


@@ -375,7 +394,10 @@ class History {
         } else {
             _assert(write_history(histfile_.c_str()) == 0);
         }
         } else {
             _assert(write_history(histfile_.c_str()) == 0);
         }

-    }
+    } catch (const CYException &error) {
+        CYPool pool;
+        std::cout << error.PoolCString(pool) << std::endl;
+    } }

 
     void operator +=(std::string command) {
         add_history(command.c_str());
 
     void operator +=(std::string command) {
         add_history(command.c_str());


@@ -604,8 +626,16 @@ static void CYConsolePrepTerm(int meta) {
     CYConsoleRemapKeys(vi_movement_keymap);
 }
 
     CYConsoleRemapKeys(vi_movement_keymap);
 }
 

+static void CYOutputRun(const std::string &code, bool expand = false, bool reparse = false) {
+    CYPool pool;
+    Output(Run(pool, client_, code), &std::cout, expand, reparse);
+}
+

 static void Console(CYOptions &options) {
     std::string basedir;
 static void Console(CYOptions &options) {
     std::string basedir;

+#ifdef __ANDROID__
+    basedir = "/data/local/tmp";
+#else

     if (const char *home = getenv("HOME"))
         basedir = home;
     else {
     if (const char *home = getenv("HOME"))
         basedir = home;
     else {


@@ -616,6 +646,7 @@ static void Console(CYOptions &options) {
             passwd = getpwuid(getuid());
         basedir = passwd->pw_dir;
     }
             passwd = getpwuid(getuid());
         basedir = passwd->pw_dir;
     }

+#endif

 
     basedir += "/.cycript";
     mkdir(basedir.c_str(), 0700);
 
     basedir += "/.cycript";
     mkdir(basedir.c_str(), 0700);


@@ -629,14 +660,19 @@ static void Console(CYOptions &options) {
     bool debug(false);
     bool expand(false);
     bool lower(true);
     bool debug(false);
     bool expand(false);
     bool lower(true);

+    bool reparse(false);

 
     out_ = &std::cout;
 
     rl_completer_word_break_characters = break_;
     rl_attempted_completion_function = &Complete;
 
 
     out_ = &std::cout;
 
     rl_completer_word_break_characters = break_;
     rl_attempted_completion_function = &Complete;
 

-    rl_redisplay_function = CYDisplayUpdate;
-    rl_prep_term_function = CYConsolePrepTerm;
+    if (cur_term != NULL) {
+        rl_redisplay_function = CYDisplayUpdate;
+        rl_prep_term_function = CYConsolePrepTerm;
+    }
+
+    CYOutputRun("");

 
     struct sigaction action;
     sigemptyset(&action.sa_mask);
 
     struct sigaction action;
     sigemptyset(&action.sa_mask);


@@ -696,6 +732,9 @@ static void Console(CYOptions &options) {
             } else if (data == "lower") {
                 lower = !lower;
                 *out_ << "lower == " << (lower ? "true" : "false") << std::endl;
             } else if (data == "lower") {
                 lower = !lower;
                 *out_ << "lower == " << (lower ? "true" : "false") << std::endl;

+            } else if (data == "reparse") {
+                reparse = !reparse;
+                *out_ << "reparse == " << (reparse ? "true" : "false") << std::endl;

             }
 
             continue;
             }
 
             continue;


@@ -759,8 +798,7 @@ static void Console(CYOptions &options) {
             std::cout << std::endl;
         }
 
             std::cout << std::endl;
         }
 

-        CYPool pool;
-        Output(Run(pool, client_, code), &std::cout, expand);
+        CYOutputRun(code, expand, reparse);

     }
 }
 
     }
 }
 


@@ -1148,7 +1186,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
     return 0;
 }
 
     return 0;
 }
 

-int main(int argc, char * const argv[], char const * const envp[]) {
+_visible int main(int argc, char * const argv[], char const * const envp[]) {

     try {
         return Main(argc, argv, envp);
     } catch (const CYException &error) {
     try {
         return Main(argc, argv, envp);
     } catch (const CYException &error) {