Remove e: debugging NSLog.

[cycript.git] / Application.mm

diff --git a/Application.mm b/Application.mm
index d5478a3609bf513ca25baa4b2e860c90b18fb067..31b7a45679166f05977763526d87724ee6c91b84 100644 (file)
--- a/Application.mm
+++ b/Application.mm
@@ -11,6 +11,15 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
 #include <readline/readline.h>
 #include <readline/history.h>
 

+#include <sys/mman.h>
+
+#include <errno.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+

 #include "Cycript.tab.hh"
 
 static jmp_buf ctrlc_;
 #include "Cycript.tab.hh"
 
 static jmp_buf ctrlc_;


@@ -19,7 +28,40 @@ void sigint(int) {
     longjmp(ctrlc_, 1);
 }
 
     longjmp(ctrlc_, 1);
 }
 

-int main(int argc, const char *argv[]) {
+void Run(const char *code, FILE *fout) { _pooled
+    JSStringRef script(JSStringCreateWithUTF8CString(code));
+
+    JSContextRef context(CYGetJSContext());
+
+    JSValueRef exception(NULL);
+    JSValueRef result(JSEvaluateScript(context, script, NULL, NULL, 0, &exception));
+    JSStringRelease(script);
+
+    if (exception != NULL) { error:
+        result = exception;
+        exception = NULL;
+    }
+
+    if (!JSValueIsUndefined(context, result)) {
+        CYPool pool;
+        const char *json;
+
+        json = CYPoolJSONString(pool, context, result, &exception);
+        if (exception != NULL)
+            goto error;
+
+        if (fout != NULL) {
+            fputs(json, fout);
+            fputs("\n", fout);
+            fflush(fout);
+        }
+    }
+}
+
+void Console() {
+    bool bypass(false);
+    bool debug(false);
+

     FILE *fout(stdout);
 
     rl_bind_key('\t', rl_insert);
     FILE *fout(stdout);
 
     rl_bind_key('\t', rl_insert);


@@ -51,6 +93,16 @@ int main(int argc, const char *argv[]) {
         if (!extra) {
             extra = true;
             if (line[0] == '\\') {
         if (!extra) {
             extra = true;
             if (line[0] == '\\') {

+                std::string data(line + 1);
+                if (data == "bypass") {
+                    bypass = !bypass;
+                    fprintf(fout, "bypass == %s\n", bypass ? "true" : "false");
+                    fflush(fout);
+                } else if (data == "debug") {
+                    debug = !debug;
+                    fprintf(fout, "debug == %s\n", debug ? "true" : "false");
+                    fflush(fout);
+                }

                 add_history(line);
                 goto restart;
             }
                 add_history(line);
                 goto restart;
             }


@@ -60,74 +112,110 @@ int main(int argc, const char *argv[]) {
         command += line;
         free(line);
 
         command += line;
         free(line);
 

-        CYDriver driver("");
-        cy::parser parser(driver);
+        std::string code;
+
+        if (bypass)
+            code = command;
+        else {
+            CYDriver driver("");
+            cy::parser parser(driver);
+
+            driver.data_ = command.c_str();
+            driver.size_ = command.size();
+
+            if (parser.parse() != 0 || !driver.errors_.empty()) {
+                for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i) {
+                    cy::position begin(i->location_.begin);
+                    if (begin.line != lines.size() || begin.column - 1 != lines.back().size()) {
+                        std::cerr << i->message_ << std::endl;
+                        add_history(command.c_str());
+                        goto restart;
+                    }
+                }

 
 

-        driver.data_ = command.c_str();
-        driver.size_ = command.size();
+                driver.errors_.clear();

 
 

-        if (parser.parse() != 0 || !driver.errors_.empty()) {
-            for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i) {
-                cy::position begin(i->location_.begin);
-                if (begin.line != lines.size() || begin.column - 1 != lines.back().size()) {
-                    std::cerr << i->message_ << std::endl;
-                    add_history(command.c_str());
-                    goto restart;
-                }
+                command += '\n';
+                prompt = "cy> ";
+                goto read;

             }
 
             }
 

-            driver.errors_.clear();
+            if (driver.source_ == NULL)
+                goto restart;

 
 

-            command += '\n';
-            prompt = "cy> ";
-            goto read;
+            std::ostringstream str;
+            driver.source_->Show(str);
+            code = str.str();

         }
 
         }
 

-        if (driver.source_ == NULL)
-            goto restart;
-

         add_history(command.c_str());
 
         add_history(command.c_str());
 

-        std::ostringstream str;
-        driver.source_->Show(str);
+        if (debug)
+            std::cout << code << std::endl;

 
 

-        std::string code(str.str());
-        std::cout << code << std::endl;
+        Run(code.c_str(), fout);
+    }

 
 

-        _pooled
+    fputs("\n", fout);
+    fflush(fout);
+}

 
 

-        JSStringRef script(JSStringCreateWithUTF8CString(code.c_str()));
+void *Map(const char *path, size_t *psize) {
+    int fd;
+    _syscall(fd = open(path, O_RDONLY));

 
 

-        JSContextRef context(CYGetJSContext());
+    struct stat stat;
+    _syscall(fstat(fd, &stat));
+    size_t size(stat.st_size);

 
 

-        JSValueRef exception(NULL);
-        JSValueRef result(JSEvaluateScript(context, script, NULL, NULL, 0, &exception));
-        JSStringRelease(script);
+    *psize = size;

 
 

-        if (exception != NULL)
-            result = exception;
+    void *base;
+    _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0));

 
 

-        if (JSValueIsUndefined(context, result))
-            goto restart;
+    _syscall(close(fd));
+    return base;
+}

 
 

-        CFStringRef json;
+int main(int argc, const char *argv[]) {
+    const char *script;
+
+    if (argc == 1)
+        script = NULL;
+    else {
+        CYSetArgs(argc - 1, argv + 1);
+        script = argv[1];
+    }
+
+    if (script == NULL || strcmp(script, "-") == 0)
+        Console();
+    else {
+        CYDriver driver(script);
+        cy::parser parser(driver);
+
+        size_t size;
+        char *start(reinterpret_cast<char *>(Map(script, &size)));
+        char *end(start + size);

 
 

-        @try { json:
-            json = CYCopyJSONString(context, result);
-        } @catch (id error) {
-            CYThrow(context, error, &result);
-            goto json;
+        if (size >= 2 && start[0] == '#' && start[1] == '!') {
+            start += 2;
+            while (start != end && *start++ != '\n');

         }
 
         }
 

-        fputs([reinterpret_cast<const NSString *>(json) UTF8String], fout);
-        CFRelease(json);
+        driver.data_ = start;
+        driver.size_ = end - start;

 
 

-        fputs("\n", fout);
-        fflush(fout);
+        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) {
+            std::ostringstream str;
+            driver.source_->Show(str);
+            std::string code(str.str());
+            std::cout << code << std::endl;
+            Run(code.c_str(), stdout);
+        }

     }
 
     }
 

-    fputs("\n", fout);
-    fflush(fout);
-

     return 0;
 }
     return 0;
 }