{Functor,Selector}.type should return @encode().

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index fe03c314090cff31b649fdcd23511e377e5a6c45..cedd1501ea3e14f1f84a984680f6c13b737ae72d 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include <cstdio>
 #endif
 
 #include <cstdio>

+#include <fstream>

 #include <sstream>
 
 #include <setjmp.h>
 #include <sstream>
 
 #include <setjmp.h>


@@ -42,8 +43,6 @@
 #include <readline/history.h>
 #endif
 
 #include <readline/history.h>
 #endif
 

-#include <sys/mman.h>
-

 #include <errno.h>
 #include <unistd.h>
 
 #include <errno.h>
 #include <unistd.h>
 


@@ -111,10 +110,11 @@ void Setup(CYDriver &driver, cy::parser &parser) {
         driver.strict_ = true;
 }
 
         driver.strict_ = true;
 }
 

-void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
+void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) {

     out.pretty_ = pretty_;
     CYContext context(options);
     out.pretty_ = pretty_;
     CYContext context(options);

-    driver.program_->Replace(context);
+    if (lower)
+        driver.program_->Replace(context);

 }
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
 }
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {


@@ -124,7 +124,7 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE

-        json = CYExecute(pool, code);
+        json = CYExecute(CYGetJSContext(), pool, code);

 #else
         json = NULL;
 #endif
 #else
         json = NULL;
 #endif


@@ -136,15 +136,15 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     } else {
         mode_ = Sending;
         size = code.size;
     } else {
         mode_ = Sending;
         size = code.size;

-        CYSendAll(client, &size, sizeof(size));
-        CYSendAll(client, code.data, code.size);
+        _assert(CYSendAll(client, &size, sizeof(size)));
+        _assert(CYSendAll(client, code.data, code.size));

         mode_ = Waiting;
         mode_ = Waiting;

-        CYRecvAll(client, &size, sizeof(size));
+        _assert(CYRecvAll(client, &size, sizeof(size)));

         if (size == _not(uint32_t))
             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);
         if (size == _not(uint32_t))
             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);

-            CYRecvAll(client, temp, size);
+            _assert(CYRecvAll(client, temp, size));

             temp[size] = '\0';
             json = temp;
         }
             temp[size] = '\0';
             json = temp;
         }


@@ -388,6 +388,34 @@ static char **Complete(const char *word, int start, int end) {
 static char name_[] = "cycript";
 static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
 
 static char name_[] = "cycript";
 static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
 

+class History {
+  private:
+    std::string histfile_;
+    size_t histlines_;
+
+  public:
+    History(std::string histfile) :
+        histfile_(histfile),
+        histlines_(0)
+    {
+        read_history(histfile_.c_str());
+    }
+
+    ~History() {
+        if (append_history$ != NULL) {
+            _syscall(close(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))));
+            _assert((*append_history$)(histlines_, histfile_.c_str()) == 0);
+        } else {
+            _assert(write_history(histfile_.c_str()) == 0);
+        }
+    }
+
+    void operator +=(const std::string &command) {
+        add_history(command_.c_str());
+        ++histlines_;
+    }
+};
+

 static void Console(CYOptions &options) {
     CYPool pool;
 
 static void Console(CYOptions &options) {
     CYPool pool;
 


@@ -397,19 +425,19 @@ static void Console(CYOptions &options) {
     else
         passwd = getpwuid(getuid());
 
     else
         passwd = getpwuid(getuid());
 

-    const char *basedir(pool.strcat(passwd->pw_dir, "/.cycript", NULL));
-    const char *histfile(pool.strcat(basedir, "/history", NULL));
-    size_t histlines(0);
+    std::string basedir(passwd->pw_dir);
+    basedir += "/.cycript";
+    mkdir(basedir.c_str(), 0700);

 
     rl_initialize();
     rl_readline_name = name_;
 
 
     rl_initialize();
     rl_readline_name = name_;
 

-    mkdir(basedir, 0700);
-    read_history(histfile);
+    History history(basedir + "/history");

 
     bool bypass(false);
     bool debug(false);
     bool expand(false);
 
     bool bypass(false);
     bool debug(false);
     bool expand(false);

+    bool lower(true);

     bool syntax(true);
 
     out_ = &std::cout;
     bool syntax(true);
 
     out_ = &std::cout;


@@ -443,24 +471,20 @@ static void Console(CYOptions &options) {
       read:
 
 #if RL_READLINE_VERSION >= 0x0600
       read:
 
 #if RL_READLINE_VERSION >= 0x0600

-        if (syntax) {
-            rl_prep_term_function = CYDisplayStart;
+        if (syntax)

             rl_redisplay_function = CYDisplayUpdate;
             rl_redisplay_function = CYDisplayUpdate;

-            rl_deprep_term_function = CYDisplayFinish;
-        } else {
-            rl_prep_term_function = rl_prep_terminal;
+        else

             rl_redisplay_function = rl_redisplay;
             rl_redisplay_function = rl_redisplay;

-            rl_deprep_term_function = rl_deprep_terminal;
-        }

 #endif
 
         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;
 
 #endif
 
         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;
 

-        if (line == NULL)
+        if (line == NULL) {
+            *out_ << std::endl;

             break;
             break;

-        if (line[0] == '\0')
+        } else if (line[0] == '\0')

             goto read;
 
         if (!extra) {
             goto read;
 
         if (!extra) {


@@ -476,12 +500,15 @@ static void Console(CYOptions &options) {
                 } else if (data == "expand") {
                     expand = !expand;
                     *out_ << "expand == " << (expand ? "true" : "false") << std::endl;
                 } else if (data == "expand") {
                     expand = !expand;
                     *out_ << "expand == " << (expand ? "true" : "false") << std::endl;

+                } else if (data == "lower") {
+                    lower = !lower;
+                    *out_ << "lower == " << (lower ? "true" : "false") << std::endl;

                 } else if (data == "syntax") {
                     syntax = !syntax;
                     *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
                 }
                 } else if (data == "syntax") {
                     syntax = !syntax;
                     *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
                 }

-                add_history(line);
-                ++histlines;
+                command_ = line;
+                history += command_;

                 goto restart;
             }
         }
                 goto restart;
             }
         }


@@ -535,8 +562,7 @@ static void Console(CYOptions &options) {
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 

-                        add_history(command_.c_str());
-                        ++histlines;
+                        history += command_;

                         goto restart;
                     }
                 }
                         goto restart;
                     }
                 }


@@ -551,19 +577,14 @@ static void Console(CYOptions &options) {
             if (driver.program_ == NULL)
                 goto restart;
 
             if (driver.program_ == NULL)
                 goto restart;
 

-            if (client_ != -1)
-                code = command_;
-            else {
-                std::ostringstream str;
-                CYOutput out(str, options);
-                Setup(out, driver, options);
-                out << *driver.program_;
-                code = str.str();
-            }
+            std::ostringstream str;
+            CYOutput out(str, options);
+            Setup(out, driver, options, lower);
+            out << *driver.program_;
+            code = str.str();

         }
 
         }
 

-        add_history(command_.c_str());
-        ++histlines;
+        history += command_;

 
         if (debug) {
             Write(syntax, code.c_str(), code.size(), std::cout);
 
         if (debug) {
             Write(syntax, code.c_str(), code.size(), std::cout);


@@ -572,32 +593,6 @@ static void Console(CYOptions &options) {
 
         Run(client_, syntax, code, out_, expand);
     }
 
         Run(client_, syntax, code, out_, expand);
     }

-
-    if (append_history$ != NULL) {
-        _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600))));
-        (*append_history$)(histlines, histfile);
-    } else {
-        write_history(histfile);
-    }
-
-    *out_ << std::endl;
-}
-
-static void *Map(const char *path, size_t *psize) {
-    int fd;
-    _syscall(fd = open(path, O_RDONLY));
-
-    struct stat stat;
-    _syscall(fstat(fd, &stat));
-    size_t size(stat.st_size);
-
-    *psize = size;
-
-    void *base;
-    _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0));
-
-    _syscall(close(fd));
-    return base;

 }
 
 void InjectLibrary(pid_t pid);
 }
 
 void InjectLibrary(pid_t pid);


@@ -861,56 +856,33 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     else {
         CYLocalPool pool;
 
     else {
         CYLocalPool pool;
 

-        char *start, *end;
-        std::istream *indirect;
-
+        std::istream *stream;

         if (script == NULL) {
         if (script == NULL) {

-            start = NULL;
-            end = NULL;
-            indirect = &std::cin;
+            stream = &std::cin;
+            script = "<stdin>";

         } else {
         } else {

-            size_t size;
-            start = reinterpret_cast<char *>(Map(script, &size));
-            end = start + size;
-
-            if (size >= 2 && start[0] == '#' && start[1] == '!') {
-                start += 2;
-
-                if (void *line = memchr(start, '\n', end - start))
-                    start = reinterpret_cast<char *>(line);
-                else
-                    start = end;
-            }
-
-            indirect = NULL;
+            stream = new std::fstream(script, std::ios::in | std::ios::binary);
+            _assert(!stream->fail());

         }
 
         }
 

-        CYStream direct(start, end);
-        std::istream &stream(indirect == NULL ? direct : *indirect);
-        CYDriver driver(stream, script ?: "<stdin>");
-
+        CYDriver driver(*stream, script);

         cy::parser parser(driver);
         Setup(driver, parser);
 
         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;
         cy::parser parser(driver);
         Setup(driver, parser);
 
         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.program_ != NULL)
-            if (client_ != -1) {
-                // XXX: this code means that you can't pipe to another process
-                std::string code(start, end-start);
+        } else if (driver.program_ != NULL) {
+            std::ostringstream str;
+            CYOutput out(str, options);
+            Setup(out, driver, options, true);
+            out << *driver.program_;
+            std::string code(str.str());
+            if (compile)
+                std::cout << code;
+            else

                 Run(client_, false, code, &std::cout);
                 Run(client_, false, code, &std::cout);

-            } else {
-                std::ostringstream str;
-                CYOutput out(str, options);
-                Setup(out, driver, options);
-                out << *driver.program_;
-                std::string code(str.str());
-                if (compile)
-                    std::cout << code;
-                else
-                    Run(client_, false, code, &std::cout);
-            }
+        }

     }
 
     apr_pool_destroy(pool);
     }
 
     apr_pool_destroy(pool);