Remove redundant implicit NSString length property.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index d41f6ef5bbb174e312a07b05a31f9139a3f9354d..642cc20fcb9f79ad30c81ed46e7ce189f4cf16d2 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -64,6 +64,7 @@
 #include <dlfcn.h>
 
 #include "Replace.hpp"
 #include <dlfcn.h>
 
 #include "Replace.hpp"

+#include "Display.hpp"

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


@@ -152,46 +153,55 @@ static CYUTF8String Run(CYPool &pool, int client, const std::string &code) {
     return Run(pool, client, CYUTF8String(code.c_str(), code.size()));
 }
 
     return Run(pool, client, CYUTF8String(code.c_str(), code.size()));
 }
 

-FILE *fout_;
+static std::ostream *out_;

 
 

-static void Output(CYUTF8String json, FILE *fout, bool expand = false) {
+static void Write(bool syntax, const char *data, size_t size, std::ostream &out) {
+    if (syntax)
+        CYLexerHighlight(data, size, out);
+    else
+        out.write(data, size);
+}
+
+static void Output(bool syntax, CYUTF8String json, std::ostream *out, bool expand = false) {

     const char *data(json.data);
     size_t size(json.size);
 
     const char *data(json.data);
     size_t size(json.size);
 

-    if (data == NULL || fout == NULL)
+    if (data == NULL || out == NULL)

         return;
 
         return;
 

-    if (!expand || data[0] != '"' && data[0] != '\'')
-        fputs(data, fout);
+    if (!expand ||
+        data[0] != '@' && data[0] != '"' && data[0] != '\'' ||
+        data[0] == '@' && data[1] != '"' && data[1] != '\''
+    )
+        Write(syntax, data, size, *out);

     else for (size_t i(0); i != size; ++i)
         if (data[i] != '\\')
     else for (size_t i(0); i != size; ++i)
         if (data[i] != '\\')

-            fputc(data[i], fout);
+            *out << data[i];

         else switch(data[++i]) {
             case '\0': goto done;
         else switch(data[++i]) {
             case '\0': goto done;

-            case '\\': fputc('\\', fout); break;
-            case '\'': fputc('\'', fout); break;
-            case '"': fputc('"', fout); break;
-            case 'b': fputc('\b', fout); break;
-            case 'f': fputc('\f', fout); break;
-            case 'n': fputc('\n', fout); break;
-            case 'r': fputc('\r', fout); break;
-            case 't': fputc('\t', fout); break;
-            case 'v': fputc('\v', fout); break;
-            default: fputc('\\', fout); --i; break;
+            case '\\': *out << '\\'; break;
+            case '\'': *out << '\''; break;
+            case '"': *out << '"'; break;
+            case 'b': *out << '\b'; break;
+            case 'f': *out << '\f'; break;
+            case 'n': *out << '\n'; break;
+            case 'r': *out << '\r'; break;
+            case 't': *out << '\t'; break;
+            case 'v': *out << '\v'; break;
+            default: *out << '\\'; --i; break;

         }
 
   done:
         }
 
   done:

-    fputs("\n", fout);
-    fflush(fout);
+    *out << std::endl;

 }
 
 }
 

-static void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
+static void Run(int client, bool syntax, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) {

     CYPool pool;
     CYPool pool;

-    Output(Run(pool, client, CYUTF8String(data, size)), fout, expand);
+    Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, expand);

 }
 
 }
 

-static void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) {
-    Run(client, code.c_str(), code.size(), fout, expand);
+static void Run(int client, bool syntax, std::string &code, std::ostream *out = NULL, bool expand = false) {
+    Run(client, syntax, code.c_str(), code.size(), out, expand);

 }
 
 int (*append_history$)(int, const char *);
 }
 
 int (*append_history$)(int, const char *);


@@ -199,13 +209,9 @@ int (*append_history$)(int, const char *);
 static std::string command_;
 
 static CYExpression *ParseExpression(CYUTF8String code) {
 static std::string command_;
 
 static CYExpression *ParseExpression(CYUTF8String code) {

-    std::ostringstream str;
-    str << '(' << code << ')';
-    std::string string(str.str());
-
-    CYDriver driver;
-    driver.data_ = string.c_str();
-    driver.size_ = string.size();
+    std::stringstream stream;
+    stream << '(' << code << ')';
+    CYDriver driver(stream);

 
     cy::parser parser(driver);
     Setup(driver, parser);
 
     cy::parser parser(driver);
     Setup(driver, parser);


@@ -229,18 +235,16 @@ static char **Complete(const char *word, int start, int end) {
     rl_attempted_completion_over = TRUE;
 
     CYLocalPool pool;
     rl_attempted_completion_over = TRUE;
 
     CYLocalPool pool;

-    CYDriver driver;
-    cy::parser parser(driver);
-    Setup(driver, parser);

 
     std::string line(rl_line_buffer, start);
 
     std::string line(rl_line_buffer, start);

-    std::string command(command_ + line);
-
-    driver.data_ = command.c_str();
-    driver.size_ = command.size();
+    std::istringstream stream(command_ + line);
+    CYDriver driver(stream);

 
     driver.auto_ = true;
 
 
     driver.auto_ = true;
 

+    cy::parser parser(driver);
+    Setup(driver, parser);
+

     if (parser.parse() != 0 || !driver.errors_.empty())
         return NULL;
 
     if (parser.parse() != 0 || !driver.errors_.empty())
         return NULL;
 


@@ -301,6 +305,7 @@ static char **Complete(const char *word, int start, int end) {
 
     std::string code(str.str());
     CYUTF8String json(Run(pool, client_, code));
 
     std::string code(str.str());
     CYUTF8String json(Run(pool, client_, code));

+    // XXX: if this fails we should not try to parse it

 
     CYExpression *result(ParseExpression(json));
     if (result == NULL)
 
     CYExpression *result(ParseExpression(json));
     if (result == NULL)


@@ -309,8 +314,8 @@ static char **Complete(const char *word, int start, int end) {
     CYArray *array(dynamic_cast<CYArray *>(result));
 
     if (array == NULL) {
     CYArray *array(dynamic_cast<CYArray *>(result));
 
     if (array == NULL) {

-        fprintf(fout_, "\n");
-        Output(json, fout_);
+        *out_ << '\n';
+        Output(false, json, out_);

         rl_forced_update_display();
         return NULL;
     }
         rl_forced_update_display();
         return NULL;
     }


@@ -400,8 +405,9 @@ static void Console(CYOptions &options) {
     bool bypass(false);
     bool debug(false);
     bool expand(false);
     bool bypass(false);
     bool debug(false);
     bool expand(false);

+    bool syntax(true);

 
 

-    fout_ = stdout;
+    out_ = &std::cout;

 
     // rl_completer_word_break_characters is broken in libedit
     rl_basic_word_break_characters = break_;
 
     // rl_completer_word_break_characters is broken in libedit
     rl_basic_word_break_characters = break_;


@@ -425,15 +431,28 @@ static void Console(CYOptions &options) {
 
         if (setjmp(ctrlc_) != 0) {
             mode_ = Working;
 
         if (setjmp(ctrlc_) != 0) {
             mode_ = Working;

-            fputs("\n", fout_);
-            fflush(fout_);
+            *out_ << std::endl;

             goto restart;
         }
 
       read:
             goto restart;
         }
 
       read:

+
+#if RL_READLINE_VERSION >= 0x0600
+        if (syntax) {
+            rl_prep_term_function = CYDisplayStart;
+            rl_redisplay_function = CYDisplayUpdate;
+            rl_deprep_term_function = CYDisplayFinish;
+        } else {
+            rl_prep_term_function = rl_prep_terminal;
+            rl_redisplay_function = rl_redisplay;
+            rl_deprep_term_function = rl_deprep_terminal;
+        }
+#endif
+

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

+

         if (line == NULL)
             break;
         if (line[0] == '\0')
         if (line == NULL)
             break;
         if (line[0] == '\0')


@@ -445,16 +464,16 @@ static void Console(CYOptions &options) {
                 std::string data(line + 1);
                 if (data == "bypass") {
                     bypass = !bypass;
                 std::string data(line + 1);
                 if (data == "bypass") {
                     bypass = !bypass;

-                    fprintf(fout_, "bypass == %s\n", bypass ? "true" : "false");
-                    fflush(fout_);
+                    *out_ << "bypass == " << (bypass ? "true" : "false") << std::endl;

                 } else if (data == "debug") {
                     debug = !debug;
                 } else if (data == "debug") {
                     debug = !debug;

-                    fprintf(fout_, "debug == %s\n", debug ? "true" : "false");
-                    fflush(fout_);
+                    *out_ << "debug == " << (debug ? "true" : "false") << std::endl;

                 } else if (data == "expand") {
                     expand = !expand;
                 } else if (data == "expand") {
                     expand = !expand;

-                    fprintf(fout_, "expand == %s\n", expand ? "true" : "false");
-                    fflush(fout_);
+                    *out_ << "expand == " << (expand ? "true" : "false") << std::endl;
+                } else if (data == "syntax") {
+                    syntax = !syntax;
+                    *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;

                 }
                 add_history(line);
                 ++histlines;
                 }
                 add_history(line);
                 ++histlines;


@@ -481,13 +500,13 @@ static void Console(CYOptions &options) {
             code = command_;
         else {
             CYLocalPool pool;
             code = command_;
         else {
             CYLocalPool pool;

-            CYDriver driver;
+
+            std::istringstream stream(command_);
+            CYDriver driver(stream);
+

             cy::parser parser(driver);
             Setup(driver, parser);
 
             cy::parser parser(driver);
             Setup(driver, parser);
 

-            driver.data_ = command_.c_str();
-            driver.size_ = command_.size();
-

             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);


@@ -541,10 +560,12 @@ static void Console(CYOptions &options) {
         add_history(command_.c_str());
         ++histlines;
 
         add_history(command_.c_str());
         ++histlines;
 

-        if (debug)
-            std::cout << code << std::endl;
+        if (debug) {
+            Write(syntax, code.c_str(), code.size(), std::cout);
+            std::cout << std::endl;
+        }

 
 

-        Run(client_, code, fout_, expand);
+        Run(client_, syntax, code, out_, expand);

     }
 
     if (append_history$ != NULL) {
     }
 
     if (append_history$ != NULL) {


@@ -554,8 +575,7 @@ static void Console(CYOptions &options) {
         write_history(histfile);
     }
 
         write_history(histfile);
     }
 

-    fputs("\n", fout_);
-    fflush(fout_);
+    *out_ << std::endl;

 }
 
 static void *Map(const char *path, size_t *psize) {
 }
 
 static void *Map(const char *path, size_t *psize) {


@@ -777,17 +797,14 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         Console(options);
     else {
         CYLocalPool pool;
         Console(options);
     else {
         CYLocalPool pool;

-        CYDriver driver(script ?: "<stdin>");
-        cy::parser parser(driver);
-        Setup(driver, parser);

 
         char *start, *end;
 
         char *start, *end;

+        std::istream *indirect;

 
         if (script == NULL) {
             start = NULL;
             end = NULL;
 
         if (script == NULL) {
             start = NULL;
             end = NULL;

-
-            driver.file_ = stdin;
+            indirect = &std::cin;

         } else {
             size_t size;
             start = reinterpret_cast<char *>(Map(script, &size));
         } else {
             size_t size;
             start = reinterpret_cast<char *>(Map(script, &size));


@@ -802,17 +819,24 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                     start = end;
             }
 
                     start = end;
             }
 

-            driver.data_ = start;
-            driver.size_ = end - start;
+            indirect = NULL;

         }
 
         }
 

+        CYStream direct(start, end);
+        std::istream &stream(indirect == NULL ? direct : *indirect);
+        CYDriver driver(stream, script ?: "<stdin>");
+
+        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) {
         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);
                 std::string code(start, end-start);

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

             } else {
                 std::ostringstream str;
                 CYOutput out(str, options);
             } else {
                 std::ostringstream str;
                 CYOutput out(str, options);


@@ -822,7 +846,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                 if (compile)
                     std::cout << code;
                 else
                 if (compile)
                     std::cout << code;
                 else

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

             }
     }
 
             }
     }