Fixed serialization of function w/ CYNoLeader and implemented line tokenization for...

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 25f624efb3bf8426660fcacfae29897cfe72bf05..d938217b353dd33797902784b70c3b28a96db8e8 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -72,7 +72,7 @@ static void sigint(int) {
     longjmp(ctrlc_, 1);
 }
 
-void Run(int socket, const char *data, size_t size, FILE *fout, bool expand = false) {
+void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
     CYPool pool;
 
     const char *json;
@@ -120,7 +120,7 @@ void Run(int socket, const char *data, size_t size, FILE *fout, bool expand = fa
     }
 }
 
-void Run(int socket, std::string &code, FILE *fout, bool expand = false) {
+void Run(int socket, std::string &code, FILE *fout = NULL, bool expand = false) {
     Run(socket, code.c_str(), code.size(), fout, expand);
 }
 
@@ -179,8 +179,9 @@ static void Console(int socket) {
             }
         }
 
-        lines.push_back(line);
         command += line;
+        for (char *state, *token(apr_strtok(line, "\n", &state)); token != NULL; token = apr_strtok(NULL, "\n", &state))
+            lines.push_back(token);
         free(line);
 
         std::string code;
@@ -199,20 +200,24 @@ static void Console(int socket) {
                     cy::position begin(error->location_.begin);
                     if (begin.line != lines.size() || begin.column - 1 != lines.back().size()) {
                         cy::position end(error->location_.end);
+
                         if (begin.line != lines.size()) {
                             std::cerr << "  | ";
                             std::cerr << lines[begin.line - 1] << std::endl;
                         }
+
                         std::cerr << "  | ";
                         for (size_t i(0); i != begin.column - 1; ++i)
                             std::cerr << '.';
-                        if (begin.line != end.line)
+                        if (begin.line != end.line || begin.column == end.column)
                             std::cerr << '^';
                         else for (size_t i(0), e(end.column - begin.column); i != e; ++i)
                             std::cerr << '^';
                         std::cerr << std::endl;
+
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
+
                         add_history(command.c_str());
                         goto restart;
                     }
@@ -267,6 +272,7 @@ 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));
 
     for (;;) switch (getopt(argc, argv, "p:")) {
@@ -304,6 +310,11 @@ int main(int argc, char *argv[]) {
             script = NULL;
     }
 
+    if (script == NULL && !tty && pid != _not(pid_t)) {
+        fprintf(stderr, "non-terminal attaching to remove console\n");
+        return 1;
+    }
+
     int socket;
 
     if (pid == _not(pid_t))
@@ -319,27 +330,36 @@ int main(int argc, char *argv[]) {
         _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
     }
 
-    if (script == NULL)
+    if (script == NULL && tty)
         Console(socket);
     else {
-        CYDriver driver(script);
+        CYDriver driver(script ?: "<stdin>");
         cy::parser parser(driver);
 
-        size_t size;
-        char *start(reinterpret_cast<char *>(Map(script, &size)));
-        char *end(start + size);
+        char *start, *end;
 
-        if (size >= 2 && start[0] == '#' && start[1] == '!') {
-            start += 2;
+        if (script == NULL) {
+            start = NULL;
+            end = NULL;
 
-            if (void *line = memchr(start, '\n', end - start))
-                start = reinterpret_cast<char *>(line);
-            else
-                start = end;
-        }
+            driver.file_ = stdin;
+        } else {
+            size_t size;
+            start = reinterpret_cast<char *>(Map(script, &size));
+            end = start + size;
+
+            if (size >= 2 && start[0] == '#' && start[1] == '!') {
+                start += 2;
 
-        driver.data_ = start;
-        driver.size_ = end - start;
+                if (void *line = memchr(start, '\n', end - start))
+                    start = reinterpret_cast<char *>(line);
+                else
+                    start = end;
+            }
+
+            driver.data_ = start;
+            driver.size_ = end - start;
+        }
 
         if (parser.parse() != 0 || !driver.errors_.empty()) {
             for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i)
@@ -351,7 +371,7 @@ int main(int argc, char *argv[]) {
                 std::ostringstream str;
                 driver.source_->Show(str);
                 std::string code(str.str());
-                Run(socket, code, stdout);
+                Run(socket, code);
             }
     }