Ported back to the iPhone.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 3a911cd2e0d5b013488eee85493029947aa93969..503a3e8c811fd80ab11291c4232e812d6d3dc469 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -37,9 +37,6 @@
 */
 /* }}} */
 
-#define _GNU_SOURCE
-
-#include <substrate.h>
 #include "cycript.hpp"
 
 #include <cstdio>
@@ -106,8 +103,11 @@ void Setup(CYDriver &driver, cy::parser &parser) {
         driver.strict_ = true;
 }
 
-void Setup(CYOutput &out) {
+void Setup(CYOutput &out, CYDriver &driver) {
     out.pretty_ = pretty_;
+
+    CYContext context(driver.pool_);
+    driver.program_->Replace(context);
 }
 
 void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
@@ -116,7 +116,11 @@ void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expa
     const char *json;
     if (socket == -1) {
         mode_ = Running;
+#ifdef CY_EXECUTE
         json = CYExecute(pool, data);
+#else
+        json = NULL;
+#endif
         mode_ = Working;
         if (json != NULL)
             size = strlen(json);
@@ -293,8 +297,8 @@ static void Console(int socket) {
             else {
                 std::ostringstream str;
                 CYOutput out(str);
-                Setup(out);
-                driver.program_->Multiple(out);
+                Setup(out, driver);
+                out << *driver.program_;
                 code = str.str();
             }
         }
@@ -330,14 +334,27 @@ static void *Map(const char *path, size_t *psize) {
 
 int main(int argc, char *argv[]) {
     bool tty(isatty(STDIN_FILENO));
-    pid_t pid(_not(pid_t));
     bool compile(false);
 
-    for (;;) switch (getopt(argc, argv, "cg:n:p:s")) {
+#ifdef CY_ATTACH
+    pid_t pid(_not(pid_t));
+#endif
+
+    for (;;) switch (getopt(argc, argv,
+        "cg:n:"
+#ifdef CY_ATTACH
+        "p:"
+#endif
+        "s"
+    )) {
         case -1:
             goto getopt;
         case '?':
-            fprintf(stderr, "usage: cycript [-c] [-p <pid>] [<script> [<arg>...]]\n");
+            fprintf(stderr, "usage: cycript [-c]"
+#ifdef CY_ATTACH
+            " [-p <pid>]"
+#endif
+            " [<script> [<arg>...]]\n");
             return 1;
 
         case 'c':
@@ -366,6 +383,7 @@ int main(int argc, char *argv[]) {
             }
         break;
 
+#ifdef CY_ATTACH
         case 'p': {
             size_t size(strlen(optarg));
             char *end;
@@ -375,6 +393,7 @@ int main(int argc, char *argv[]) {
                 return 1;
             }
         } break;
+#endif
 
         case 's':
             strict_ = true;
@@ -383,6 +402,7 @@ int main(int argc, char *argv[]) {
 
     const char *script;
 
+#ifdef CY_ATTACH
     if (pid != _not(pid_t) && optind < argc - 1) {
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
@@ -392,24 +412,30 @@ int main(int argc, char *argv[]) {
         fprintf(stderr, "-p conflicts with -c\n");
         return 1;
     }
+#endif
 
     if (optind == argc)
         script = NULL;
     else {
+#ifdef CY_EXECUTE
         // XXX: const_cast?! wtf gcc :(
         CYSetArgs(argc - optind - 1, const_cast<const char **>(argv + optind + 1));
+#endif
         script = argv[optind];
         if (strcmp(script, "-") == 0)
             script = NULL;
     }
 
-    if (script == NULL && !tty && pid != _not(pid_t)) {
-        fprintf(stderr, "non-terminal attaching to remove console\n");
+#ifdef CY_ATTACH
+    if (pid != _not(pid_t) && script == NULL && !tty) {
+        fprintf(stderr, "non-terminal attaching to remote console\n");
         return 1;
     }
+#endif
 
     int socket;
 
+#ifdef CY_ATTACH
     if (pid == _not(pid_t))
         socket = -1;
     else {
@@ -422,6 +448,9 @@ int main(int argc, char *argv[]) {
 
         _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
     }
+#else
+    socket = -1;
+#endif
 
     if (script == NULL && tty)
         Console(socket);
@@ -464,8 +493,8 @@ int main(int argc, char *argv[]) {
             else {
                 std::ostringstream str;
                 CYOutput out(str);
-                Setup(out);
-                driver.program_->Multiple(out);
+                Setup(out, driver);
+                out << *driver.program_;
                 std::string code(str.str());
                 if (compile)
                     std::cout << code;