Update the copyright year now that 2016 has begun.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 76ad5532b259f33e27e8e16a19d6a7c272856fb6..6587106bd0c3ac2378e476947fe4348f8ea7995f 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -389,10 +389,23 @@ static Type_ *CYmemrchr(Type_ *data, Type_ value, size_t size) {
     return NULL;
 }
 
     return NULL;
 }
 

+static void _lblcall(int (*command)(int, int), int count, int key) {
+    int last(_rl_last_c_pos);
+    // rl_rubout crashes in _rl_erase_at_end_of_line if _rl_last_c_pos != 0
+    if (command == &rl_rubout)
+        _rl_last_c_pos = 0;
+    for (int i(0); i != count; ++i)
+        if (command(1, key) != 0)
+            _assert(false);
+    _rl_last_c_pos = last;
+}
+

 static int CYConsoleKeyReturn(int count, int key) {
     if (rl_point != rl_end) {
 static int CYConsoleKeyReturn(int count, int key) {
     if (rl_point != rl_end) {

-        if (memchr(rl_line_buffer, '\n', rl_end) == NULL)
-            return rl_newline(count, key);
+        if (memchr(rl_line_buffer, '\n', rl_end) == NULL) {
+            _lblcall(&rl_newline, count, key);
+            return 0;
+        }

 
       insert:
         char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
 
       insert:
         char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));


@@ -405,11 +418,11 @@ static int CYConsoleKeyReturn(int count, int key) {
 
         int adjust(rl_line_buffer + space - 1 - before);
         if (space == rl_point && adjust != 0)
 
         int adjust(rl_line_buffer + space - 1 - before);
         if (space == rl_point && adjust != 0)

-            rl_rubout(adjust, '\b');
+            _lblcall(&rl_rubout, adjust, '\b');

 
 

-        rl_insert(count, '\n');
+        _lblcall(&rl_insert, count, '\n');

         if (adjust != 0)
         if (adjust != 0)

-            rl_insert(adjust, ' ');
+            _lblcall(&rl_insert, adjust, ' ');

 
         return 0;
     }
 
         return 0;
     }


@@ -420,7 +433,7 @@ static int CYConsoleKeyReturn(int count, int key) {
     else {
         std::string command(rl_line_buffer, rl_end);
         command += '\n';
     else {
         std::string command(rl_line_buffer, rl_end);
         command += '\n';

-        std::istringstream stream(command);
+        std::stringbuf stream(command);

 
         size_t last(std::string::npos);
         for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1))
 
         size_t last(std::string::npos);
         for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1))


@@ -438,15 +451,17 @@ static int CYConsoleKeyReturn(int count, int key) {
             done = true;
     }
 
             done = true;
     }
 

-    if (done)
-        return rl_newline(count, key);
+    if (done) {
+        _lblcall(&rl_newline, count, key);
+        return 0;
+    }

 
     // XXX: this was the most obvious fix, but is seriously dumb
     goto insert;
 }
 
 static int CYConsoleKeyUp(int count, int key) {
 
     // XXX: this was the most obvious fix, but is seriously dumb
     goto insert;
 }
 
 static int CYConsoleKeyUp(int count, int key) {

-    while (count-- != 0) {
+    for (; count != 0; --count) {

         char *after(CYmemrchr(rl_line_buffer, '\n', rl_point));
         if (after == NULL) {
             if (int value = rl_get_previous_history(1, key))
         char *after(CYmemrchr(rl_line_buffer, '\n', rl_point));
         if (after == NULL) {
             if (int value = rl_get_previous_history(1, key))


@@ -469,7 +484,7 @@ static int CYConsoleKeyUp(int count, int key) {
 }
 
 static int CYConsoleKeyDown(int count, int key) {
 }
 
 static int CYConsoleKeyDown(int count, int key) {

-    while (count-- != 0) {
+    for (; count != 0; --count) {

         char *after(static_cast<char *>(memchr(rl_line_buffer + rl_point, '\n', rl_end - rl_point)));
         if (after == NULL) {
             int where(where_history());
         char *after(static_cast<char *>(memchr(rl_line_buffer + rl_point, '\n', rl_end - rl_point)));
         if (after == NULL) {
             int where(where_history());


@@ -516,21 +531,28 @@ static int CYConsoleLineEnd(int count, int key) {
 }
 
 static int CYConsoleKeyBack(int count, int key) {
 }
 
 static int CYConsoleKeyBack(int count, int key) {

-    while (count-- != 0) {
+    for (; count != 0; --count) {
+        if (rl_point == 0)
+            return 1;
+

         char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
         char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));

-        if (before == NULL)
-            return rl_rubout(count, key);
+        if (before == NULL) {
+            int adjust(std::min(count, rl_point));
+            _lblcall(&rl_rubout, adjust, key);
+            count -= adjust - 1;
+            continue;
+        }

 
         int start(before + 1 - rl_line_buffer);
         if (start == rl_point) rubout: {
 
         int start(before + 1 - rl_line_buffer);
         if (start == rl_point) rubout: {

-            rl_rubout(1, key);
+            _lblcall(&rl_rubout, 1, key);

             continue;
         }
 
         for (int i(start); i != rl_point; ++i)
             if (rl_line_buffer[i] != ' ')
                 goto rubout;
             continue;
         }
 
         for (int i(start); i != rl_point; ++i)
             if (rl_line_buffer[i] != ' ')
                 goto rubout;

-        rl_rubout((rl_point - start) % 4 ?: 4, key);
+        _lblcall(&rl_rubout, (rl_point - start) % 4 ?: 4, key);

     }
 
     return 0;
     }
 
     return 0;


@@ -544,7 +566,8 @@ static int CYConsoleKeyTab(int count, int key) {
     for (int i(start); i != rl_point; ++i)
         if (rl_line_buffer[i] != ' ')
             goto complete;
     for (int i(start); i != rl_point; ++i)
         if (rl_line_buffer[i] != ' ')
             goto complete;

-    return rl_insert(4 - (rl_point - start) % 4, ' ');
+    _lblcall(&rl_insert, 4 - (rl_point - start) % 4, ' ');
+    return 0;

 }
 
 static void CYConsoleRemapBind(Keymap map, rl_command_func_t *from, rl_command_func_t *to) {
 }
 
 static void CYConsoleRemapBind(Keymap map, rl_command_func_t *from, rl_command_func_t *to) {


@@ -680,7 +703,7 @@ static void Console(CYOptions &options) {
         if (bypass)
             code = command;
         else try {
         if (bypass)
             code = command;
         else try {

-            std::istringstream stream(command);
+            std::stringbuf stream(command);

 
             CYPool pool;
             CYDriver driver(pool, stream);
 
             CYPool pool;
             CYDriver driver(pool, stream);


@@ -1066,7 +1089,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
                 stream = new std::istringstream(buffer.str());
 
                 CYPool pool;
                 stream = new std::istringstream(buffer.str());
 
                 CYPool pool;

-                CYDriver driver(pool, *stream, script);
+                CYDriver driver(pool, *stream->rdbuf(), script);

                 Setup(driver);
 
                 uint64_t begin(CYGetTime());
                 Setup(driver);
 
                 uint64_t begin(CYGetTime());


@@ -1092,7 +1115,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
         }
 
         CYPool pool;
         }
 
         CYPool pool;

-        CYDriver driver(pool, *stream, script);
+        CYDriver driver(pool, *stream->rdbuf(), script);

         Setup(driver);
 
         bool failed(driver.Parse());
         Setup(driver);
 
         bool failed(driver.Parse());