Ported back to the iPhone.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index d938217b353dd33797902784b70c3b28a96db8e8..503a3e8c811fd80ab11291c4232e812d6d3dc469 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -37,9 +37,6 @@
 */
 /* }}} */
 
 */
 /* }}} */
 

-#define _GNU_SOURCE
-
-#include <substrate.h>

 #include "cycript.hpp"
 
 #include <cstdio>
 #include "cycript.hpp"
 
 #include <cstdio>


@@ -66,10 +63,51 @@
 #include <netinet/in.h>
 #include <sys/un.h>
 
 #include <netinet/in.h>
 #include <sys/un.h>
 

+static volatile enum {
+    Working,
+    Parsing,
+    Running,
+    Sending,
+    Waiting,
+} mode_;
+

 static jmp_buf ctrlc_;
 
 static void sigint(int) {
 static jmp_buf ctrlc_;
 
 static void sigint(int) {

-    longjmp(ctrlc_, 1);
+    switch (mode_) {
+        case Working:
+            return;
+        case Parsing:
+            longjmp(ctrlc_, 1);
+        case Running:
+            throw "*** Ctrl-C";
+        case Sending:
+            return;
+        case Waiting:
+            return;
+    }
+}
+
+#if YYDEBUG
+static bool bison_;
+#endif
+static bool strict_;
+static bool pretty_;
+
+void Setup(CYDriver &driver, cy::parser &parser) {
+#if YYDEBUG
+    if (bison_)
+        parser.set_debug_level(1);
+#endif
+    if (strict_)
+        driver.strict_ = true;
+}
+
+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) {
 }
 
 void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {


@@ -77,12 +115,20 @@ void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expa
 
     const char *json;
     if (socket == -1) {
 
     const char *json;
     if (socket == -1) {

+        mode_ = Running;
+#ifdef CY_EXECUTE

         json = CYExecute(pool, data);
         json = CYExecute(pool, data);

+#else
+        json = NULL;
+#endif
+        mode_ = Working;

         if (json != NULL)
             size = strlen(json);
     } else {
         if (json != NULL)
             size = strlen(json);
     } else {

+        mode_ = Sending;

         CYSendAll(socket, &size, sizeof(size));
         CYSendAll(socket, data, size);
         CYSendAll(socket, &size, sizeof(size));
         CYSendAll(socket, data, size);

+        mode_ = Waiting;

         CYRecvAll(socket, &size, sizeof(size));
         if (size == _not(size_t))
             json = NULL;
         CYRecvAll(socket, &size, sizeof(size));
         if (size == _not(size_t))
             json = NULL;


@@ -92,6 +138,7 @@ void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expa
             temp[size] = '\0';
             json = temp;
         }
             temp[size] = '\0';
             json = temp;
         }

+        mode_ = Working;

     }
 
     if (json != NULL && fout != NULL) {
     }
 
     if (json != NULL && fout != NULL) {


@@ -147,13 +194,16 @@ static void Console(int socket) {
         const char *prompt("cy# ");
 
         if (setjmp(ctrlc_) != 0) {
         const char *prompt("cy# ");
 
         if (setjmp(ctrlc_) != 0) {

+            mode_ = Working;

             fputs("\n", fout);
             fflush(fout);
             goto restart;
         }
 
       read:
             fputs("\n", fout);
             fflush(fout);
             goto restart;
         }
 
       read:

+        mode_ = Parsing;

         char *line(readline(prompt));
         char *line(readline(prompt));

+        mode_ = Working;

         if (line == NULL)
             break;
 
         if (line == NULL)
             break;
 


@@ -180,8 +230,16 @@ static void Console(int socket) {
         }
 
         command += line;
         }
 
         command += line;

-        for (char *state, *token(apr_strtok(line, "\n", &state)); token != NULL; token = apr_strtok(NULL, "\n", &state))
-            lines.push_back(token);
+
+        char *begin(line), *end(line + strlen(line));
+        while (char *nl = reinterpret_cast<char *>(memchr(begin, '\n', end - begin))) {
+            *nl = '\0';
+            lines.push_back(begin);
+            begin = nl + 1;
+        }
+
+        lines.push_back(begin);
+

         free(line);
 
         std::string code;
         free(line);
 
         std::string code;


@@ -191,6 +249,7 @@ static void Console(int socket) {
         else {
             CYDriver driver("");
             cy::parser parser(driver);
         else {
             CYDriver driver("");
             cy::parser parser(driver);

+            Setup(driver, parser);

 
             driver.data_ = command.c_str();
             driver.size_ = command.size();
 
             driver.data_ = command.c_str();
             driver.size_ = command.size();


@@ -198,7 +257,7 @@ static void Console(int socket) {
             if (parser.parse() != 0 || !driver.errors_.empty()) {
                 for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) {
                     cy::position begin(error->location_.begin);
             if (parser.parse() != 0 || !driver.errors_.empty()) {
                 for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) {
                     cy::position begin(error->location_.begin);

-                    if (begin.line != lines.size() || begin.column - 1 != lines.back().size()) {
+                    if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) {

                         cy::position end(error->location_.end);
 
                         if (begin.line != lines.size()) {
                         cy::position end(error->location_.end);
 
                         if (begin.line != lines.size()) {


@@ -206,7 +265,7 @@ static void Console(int socket) {
                             std::cerr << lines[begin.line - 1] << std::endl;
                         }
 
                             std::cerr << lines[begin.line - 1] << std::endl;
                         }
 

-                        std::cerr << "  | ";
+                        std::cerr << "....";

                         for (size_t i(0); i != begin.column - 1; ++i)
                             std::cerr << '.';
                         if (begin.line != end.line || begin.column == end.column)
                         for (size_t i(0); i != begin.column - 1; ++i)
                             std::cerr << '.';
                         if (begin.line != end.line || begin.column == end.column)


@@ -230,14 +289,16 @@ static void Console(int socket) {
                 goto read;
             }
 
                 goto read;
             }
 

-            if (driver.source_ == NULL)
+            if (driver.program_ == NULL)

                 goto restart;
 
             if (socket != -1)
                 code = command;
             else {
                 std::ostringstream str;
                 goto restart;
 
             if (socket != -1)
                 code = command;
             else {
                 std::ostringstream str;

-                driver.source_->Show(str);
+                CYOutput out(str);
+                Setup(out, driver);
+                out << *driver.program_;

                 code = str.str();
             }
         }
                 code = str.str();
             }
         }


@@ -273,15 +334,56 @@ static void *Map(const char *path, size_t *psize) {
 
 int main(int argc, char *argv[]) {
     bool tty(isatty(STDIN_FILENO));
 
 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, "p:")) {
+#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 '?':
         case -1:
             goto getopt;
         case '?':

-            fprintf(stderr, "usage: cycript [-p <pid>] [<script> [<arg>...]]\n");
+            fprintf(stderr, "usage: cycript [-c]"
+#ifdef CY_ATTACH
+            " [-p <pid>]"
+#endif
+            " [<script> [<arg>...]]\n");

             return 1;
 
             return 1;
 

+        case 'c':
+            compile = true;
+        break;
+
+        case 'g':
+            if (false);
+#if YYDEBUG
+            else if (strcmp(optarg, "bison") == 0)
+                bison_ = true;
+#endif
+            else {
+                fprintf(stderr, "invalid name for -g\n");
+                return 1;
+            }
+        break;
+
+        case 'n':
+            if (false);
+            else if (strcmp(optarg, "minify") == 0)
+                pretty_ = true;
+            else {
+                fprintf(stderr, "invalid name for -n\n");
+                return 1;
+            }
+        break;
+
+#ifdef CY_ATTACH

         case 'p': {
             size_t size(strlen(optarg));
             char *end;
         case 'p': {
             size_t size(strlen(optarg));
             char *end;


@@ -291,32 +393,49 @@ int main(int argc, char *argv[]) {
                 return 1;
             }
         } break;
                 return 1;
             }
         } break;

+#endif
+
+        case 's':
+            strict_ = true;
+        break;

     } getopt:;
 
     const char *script;
 
     } getopt:;
 
     const char *script;
 

-    if (optind < argc - 1 && pid != _not(pid_t)) {
+#ifdef CY_ATTACH
+    if (pid != _not(pid_t) && optind < argc - 1) {

         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
 
         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 (optind == argc)
         script = NULL;
     else {
     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));
         // 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;
     }
 
         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;
     }
         return 1;
     }

+#endif

 
     int socket;
 
 
     int socket;
 

+#ifdef CY_ATTACH

     if (pid == _not(pid_t))
         socket = -1;
     else {
     if (pid == _not(pid_t))
         socket = -1;
     else {


@@ -329,12 +448,16 @@ int main(int argc, char *argv[]) {
 
         _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
     }
 
         _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
     }

+#else
+    socket = -1;
+#endif

 
     if (script == NULL && tty)
         Console(socket);
     else {
         CYDriver driver(script ?: "<stdin>");
         cy::parser parser(driver);
 
     if (script == NULL && tty)
         Console(socket);
     else {
         CYDriver driver(script ?: "<stdin>");
         cy::parser parser(driver);

+        Setup(driver, parser);

 
         char *start, *end;
 
 
         char *start, *end;
 


@@ -364,14 +487,19 @@ int main(int argc, char *argv[]) {
         if (parser.parse() != 0 || !driver.errors_.empty()) {
             for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i)
                 std::cerr << i->location_.begin << ": " << i->message_ << std::endl;
         if (parser.parse() != 0 || !driver.errors_.empty()) {
             for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i)
                 std::cerr << i->location_.begin << ": " << i->message_ << std::endl;

-        } else if (driver.source_ != NULL)
+        } else if (driver.program_ != NULL)

             if (socket != -1)
                 Run(socket, start, end - start, stdout);
             else {
                 std::ostringstream str;
             if (socket != -1)
                 Run(socket, start, end - start, stdout);
             else {
                 std::ostringstream str;

-                driver.source_->Show(str);
+                CYOutput out(str);
+                Setup(out, driver);
+                out << *driver.program_;

                 std::string code(str.str());
                 std::string code(str.str());

-                Run(socket, code);
+                if (compile)
+                    std::cout << code;
+                else
+                    Run(socket, code, stdout);

             }
     }
 
             }
     }