Renamed some types for GNUstep.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index b3702ca386af74bd734ecf0c8e70566c735b9603..7f979633511ea6c9e6257af20e116cb6799aa7b1 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,6 +63,8 @@
 #include <netinet/in.h>
 #include <sys/un.h>
 
 #include <netinet/in.h>
 #include <sys/un.h>
 

+#include <apr_getopt.h>
+

 static volatile enum {
     Working,
     Parsing,
 static volatile enum {
     Working,
     Parsing,


@@ -91,13 +90,39 @@ static void sigint(int) {
     }
 }
 
     }
 }
 

+#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) {
     CYPool pool;
 
     const char *json;
     if (socket == -1) {
         mode_ = Running;
 void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
     CYPool pool;
 
     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);
         mode_ = Working;
         if (json != NULL)
             size = strlen(json);


@@ -207,8 +232,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;


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

-            //parser.set_debug_level(1);
+            Setup(driver, parser);

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


@@ -226,7 +259,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()) {


@@ -234,7 +267,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)


@@ -258,14 +291,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();
             }
         }


@@ -299,36 +334,99 @@ static void *Map(const char *path, size_t *psize) {
     return base;
 }
 
     return base;
 }
 

-int main(int argc, char *argv[]) {
+int main(int argc, char const * const argv[], char const * const envp[]) {
+    _aprcall(apr_app_initialize(&argc, &argv, &envp));
+

     bool tty(isatty(STDIN_FILENO));
     bool tty(isatty(STDIN_FILENO));

-    pid_t pid(_not(pid_t));

     bool compile(false);
 
     bool compile(false);
 

-    for (;;) switch (getopt(argc, argv, "cp:")) {
-        case -1:
-            goto getopt;
-        case '?':
-            fprintf(stderr, "usage: cycript [-c] [-p <pid>] [<script> [<arg>...]]\n");
-            return 1;
-
-        case 'c':
-            compile = true;
-        break;
-
-        case 'p': {
-            size_t size(strlen(optarg));
-            char *end;
-            pid = strtoul(optarg, &end, 0);
-            if (optarg + size != end) {
-                fprintf(stderr, "invalid pid for -p\n");
+#ifdef CY_ATTACH
+    pid_t pid(_not(pid_t));
+#endif
+
+    CYPool pool;
+    apr_getopt_t *state;
+    _aprcall(apr_getopt_init(&state, pool, argc, argv));
+
+    for (;;) {
+        char opt;
+        const char *arg;
+
+        apr_status_t status(apr_getopt(state,
+            "cg:n:"
+#ifdef CY_ATTACH
+            "p:"
+#endif
+            "s"
+        , &opt, &arg));
+
+        switch (status) {
+            case APR_EOF:
+                goto getopt;
+            case APR_BADCH:
+            case APR_BADARG:
+                fprintf(stderr,
+                    "usage: cycript [-c]"
+#ifdef CY_ATTACH
+                    " [-p <pid>]"
+#endif
+                    " [<script> [<arg>...]]\n"
+                );

                 return 1;
                 return 1;

-            }
-        } break;
+            default:
+                _aprcall(status);
+        }
+
+        switch (opt) {
+            case 'c':
+                compile = true;
+            break;
+
+            case 'g':
+                if (false);
+#if YYDEBUG
+                else if (strcmp(arg, "bison") == 0)
+                    bison_ = true;
+#endif
+                else {
+                    fprintf(stderr, "invalid name for -g\n");
+                    return 1;
+                }
+            break;
+
+            case 'n':
+                if (false);
+                else if (strcmp(arg, "minify") == 0)
+                    pretty_ = true;
+                else {
+                    fprintf(stderr, "invalid name for -n\n");
+                    return 1;
+                }
+            break;
+
+#ifdef CY_ATTACH
+            case 'p': {
+                size_t size(strlen(arg));
+                char *end;
+                pid = strtoul(arg, &end, 0);
+                if (arg + size != end) {
+                    fprintf(stderr, "invalid pid for -p\n");
+                    return 1;
+                }
+            } break;
+#endif
+
+            case 's':
+                strict_ = true;
+            break;
+        }

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

+    int ind(state->ind);

 
 

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

         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }


@@ -337,24 +435,30 @@ int main(int argc, char *argv[]) {
         fprintf(stderr, "-p conflicts with -c\n");
         return 1;
     }
         fprintf(stderr, "-p conflicts with -c\n");
         return 1;
     }

+#endif

 
 

-    if (optind == argc)
+    if (ind == argc)

         script = NULL;
     else {
         script = NULL;
     else {

+#ifdef CY_EXECUTE

         // XXX: const_cast?! wtf gcc :(
         // XXX: const_cast?! wtf gcc :(

-        CYSetArgs(argc - optind - 1, const_cast<const char **>(argv + optind + 1));
-        script = argv[optind];
+        CYSetArgs(argc - ind - 1, const_cast<const char **>(argv + ind + 1));
+#endif
+        script = argv[ind];

         if (strcmp(script, "-") == 0)
             script = NULL;
     }
 
         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 {


@@ -367,12 +471,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;
 


@@ -402,17 +510,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());
                 if (compile)
                     std::cout << code;
                 else
                 std::string code(str.str());
                 if (compile)
                     std::cout << code;
                 else

-                    Run(socket, code);
+                    Run(socket, code, stdout);

             }
     }
 
             }
     }