X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/0df6a201bcded42c2e96ed5d2826fba49b162491..f6fa3c2112ee8b0aa26ab0765674601a9800db77:/Console.cpp?ds=sidebyside diff --git a/Console.cpp b/Console.cpp index 35aa586..0840ca5 100644 --- 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 @@ -226,11 +227,14 @@ static CYExpression *ParseExpression(CYUTF8String code) { CYOptions options; CYContext context(options); - // XXX: this could be replaced with a CYStatement::Primitive() - if (CYExpress *express = dynamic_cast<CYExpress *>(driver.program_->statements_)) - return express->expression_->Primitive(context); + CYStatement *statement(driver.program_->statements_); + _assert(statement != NULL); + _assert(statement->next_ == NULL); + + CYExpress *express(dynamic_cast<CYExpress *>(driver.program_->statements_)); + _assert(express != NULL); - return NULL; + return express->expression_; } static int client_; @@ -294,7 +298,7 @@ static char **Complete(const char *word, int start, int end) { " var before = prefix.length;\n" " prefix += word;\n" " var entire = prefix.length;\n" - " for (name in object)\n" + " for (var name in object)\n" " if (name.substring(0, entire) == prefix)\n" " names.push(name.substr(before));\n" " return names;\n" @@ -315,8 +319,7 @@ static char **Complete(const char *word, int start, int end) { if (result == NULL) return NULL; - CYArray *array(dynamic_cast<CYArray *>(result)); - + CYArray *array(dynamic_cast<CYArray *>(result->Primitive(context))); if (array == NULL) { *out_ << '\n'; Output(false, json, out_); @@ -436,6 +439,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 +473,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; @@ -500,9 +499,20 @@ static void Console(CYOptions &options) { } else if (data == "debug") { debug = !debug; *out_ << "debug == " << (debug ? "true" : "false") << std::endl; + } else if (data == "destroy") { + CYDestroyContext(); + } else if (data == "gc") { + *out_ << "collecting... " << std::flush; + CYGarbageCollect(CYGetJSContext()); + *out_ << "done." << std::endl; + } else if (data == "exit") { + return; } 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 +589,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(); } @@ -587,6 +597,7 @@ static void Console(CYOptions &options) { history += command_; if (debug) { + std::cout << "cy= "; Write(syntax, code.c_str(), code.size(), std::cout); std::cout << std::endl; } @@ -605,6 +616,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { bool tty(isatty(STDIN_FILENO)); bool compile(false); + bool target(false); CYOptions options; append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history")); @@ -620,17 +632,19 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { _aprcall(apr_getopt_init(&state, pool, argc, argv)); for (;;) { - char opt; + int opt; const char *arg; - apr_status_t status(apr_getopt(state, - "cg:n:" + apr_status_t status(apr_getopt_long(state, (apr_getopt_option_t[]) { + {NULL, 'c', false, NULL}, + {NULL, 'g', true, NULL}, + {NULL, 'n', true, NULL}, #ifdef CY_ATTACH - "p:" + {NULL, 'p', true, NULL}, #endif - "r:" - "s" - , &opt, &arg)); + {NULL, 'r', true, NULL}, + {NULL, 's', false, NULL}, + {0, 0, 0, 0}}, &opt, &arg)); switch (status) { case APR_EOF: @@ -651,9 +665,22 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { } switch (opt) { + target: + if (!target) + target = true; + else { + fprintf(stderr, "only one of -[c" +#ifdef CY_ATTACH + "p" +#endif + "r] may be used at a time\n"); + return 1; + } + break; + case 'c': compile = true; - break; + goto target; case 'g': if (false); @@ -699,10 +726,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { break; else { size += read; - if (size == sizeof(value)) { - pid = _not(pid_t); + if (size == sizeof(value)) goto fail; - } } } @@ -723,11 +748,11 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { } if (pid == _not(pid_t)) { - fprintf(stderr, "invalid pid for -p\n"); + fprintf(stderr, "unable to find process `%s' using ps\n", arg); return 1; } } - } break; + } goto target; #endif case 'r': { @@ -749,7 +774,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { host = arg; *colon = '\0'; port = colon + 1; - } break; + } goto target; case 's': strict_ = true; @@ -765,11 +790,6 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { fprintf(stderr, "-p cannot set argv\n"); return 1; } - - if (pid != _not(pid_t) && compile) { - fprintf(stderr, "-p conflicts with -c\n"); - return 1; - } #endif if (ind == argc) @@ -784,40 +804,53 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { script = NULL; } -#ifdef CY_ATTACH - if (pid != _not(pid_t) && script == NULL && !tty) { - fprintf(stderr, "non-terminal attaching to remote console\n"); - return 1; - } -#endif - #ifdef CY_ATTACH if (pid == _not(pid_t)) client_ = -1; else { - int server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0))); try { - struct sockaddr_un address; - memset(&address, 0, sizeof(address)); - address.sun_family = AF_UNIX; - - sprintf(address.sun_path, "/tmp/.s.cy.%u", getpid()); - - _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address))); - _syscall(chmod(address.sun_path, 0777)); - - try { - _syscall(listen(server, 1)); - InjectLibrary(pid); - client_ = _syscall(accept(server, NULL, NULL)); - } catch (...) { - // XXX: exception? - unlink(address.sun_path); - throw; + struct Socket { + int fd_; + + Socket(int fd) : + fd_(fd) + { } - } catch (...) { - _syscall(close(server)); - throw; - } + + ~Socket() { + close(fd_); + } + + operator int() { + return fd_; + } + } server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0))); + + struct sockaddr_un address; + memset(&address, 0, sizeof(address)); + address.sun_family = AF_UNIX; + + sprintf(address.sun_path, "/tmp/.s.cy.%u", getpid()); + unlink(address.sun_path); + + struct File { + const char *path_; + + File(const char *path) : + path_(path) + { + } + + ~File() { + unlink(path_); + } + } file(address.sun_path); + + _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address))); + _syscall(chmod(address.sun_path, 0777)); + + _syscall(listen(server, 1)); + InjectLibrary(pid); + client_ = _syscall(accept(server, NULL, NULL)); } #else client_ = -1; @@ -875,7 +908,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)