Update included configure to match autoconf input.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 7f4f4549bb61d87f93e54211ac71b71eca16bb50..e955311e9ed622059e29e4ca6e52b770e2d9ed49 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 #include "cycript.hpp"
 /* }}} */
 
 #include "cycript.hpp"


@@ -78,10 +60,13 @@
 #include <pwd.h>
 
 #include <apr_getopt.h>
 #include <pwd.h>
 
 #include <apr_getopt.h>

+#include <apr_pools.h>
+#include <apr_strings.h>

 
 #include <dlfcn.h>
 
 #include "Replace.hpp"
 
 #include <dlfcn.h>
 
 #include "Replace.hpp"

+#include "Display.hpp"

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


@@ -125,31 +110,34 @@ void Setup(CYDriver &driver, cy::parser &parser) {
 
 void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
     out.pretty_ = pretty_;
 
 void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
     out.pretty_ = pretty_;

-    CYContext context(driver.pool_, options);
+    CYContext context(options);

     driver.program_->Replace(context);
 }
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     const char *json;
     driver.program_->Replace(context);
 }
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     const char *json;

-    size_t size;
+    uint32_t size;

 
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
 
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE

-        json = CYExecute(pool, code.data);
+        json = CYExecute(pool, code);

 #else
         json = NULL;
 #endif
         mode_ = Working;
 #else
         json = NULL;
 #endif
         mode_ = Working;

-        if (json != NULL)
+        if (json == NULL)
+            size = 0;
+        else

             size = strlen(json);
     } else {
         mode_ = Sending;
             size = strlen(json);
     } else {
         mode_ = Sending;

+        size = code.size;

         CYSendAll(client, &size, sizeof(size));
         CYSendAll(client, &size, sizeof(size));

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

         mode_ = Waiting;
         CYRecvAll(client, &size, sizeof(size));
         mode_ = Waiting;
         CYRecvAll(client, &size, sizeof(size));

-        if (size == _not(size_t))
+        if (size == _not(uint32_t))

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


@@ -167,65 +155,80 @@ 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()));
 }
 

-void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
-    CYPool pool;
-    CYUTF8String json(Run(pool, client, CYUTF8String(data, size)));
-
-    data = json.data;
-    size = json.size;
-
-    if (data != NULL && fout != NULL) {
-        if (!expand || data[0] != '"' && data[0] != '\'')
-            fputs(data, fout);
-        else for (size_t i(0); i != size; ++i)
-            if (data[i] != '\\')
-                fputc(data[i], fout);
-            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;
-            }
+static std::ostream *out_;

 
 

-      done:
-        fputs("\n", fout);
-        fflush(fout);
-    }
+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 Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) {
-    Run(client, code.c_str(), code.size(), fout, expand);
+static void Output(bool syntax, CYUTF8String json, std::ostream *out, bool expand = false) {
+    const char *data(json.data);
+    size_t size(json.size);
+
+    if (data == NULL || out == NULL)
+        return;
+
+    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] != '\\')
+            *out << data[i];
+        else switch(data[++i]) {
+            case '\0': goto done;
+            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:
+    *out << std::endl;
+}
+
+static void Run(int client, bool syntax, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) {
+    CYPool pool;
+    Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, 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 *);
 
 static std::string command_;
 
 }
 
 int (*append_history$)(int, const char *);
 
 static std::string command_;
 

-static CYExpression *ParseExpression(CYPool &pool, CYUTF8String code) {
-    std::ostringstream str;
-    str << '(' << code << ')';
-    std::string string(str.str());
-
-    CYDriver driver(pool);
-    driver.data_ = string.c_str();
-    driver.size_ = string.size();
+static CYExpression *ParseExpression(CYUTF8String code) {
+    std::stringstream stream;
+    stream << '(' << code << ')';
+    CYDriver driver(stream);

 
     cy::parser parser(driver);
     Setup(driver, parser);
 
     if (parser.parse() != 0 || !driver.errors_.empty())
 
     cy::parser parser(driver);
     Setup(driver, parser);
 
     if (parser.parse() != 0 || !driver.errors_.empty())

-        _assert(false);
+        return NULL;

 
 

-    CYExpress *express(dynamic_cast<CYExpress *>(driver.program_->statements_));
-    _assert(express != NULL);
-    return express->expression_;
+    CYOptions options;
+    CYContext context(options);
+
+    // XXX: this could be replaced with a CYStatement::Primitive()
+    if (CYExpress *express = dynamic_cast<CYExpress *>(driver.program_->statements_))
+        return express->expression_->Primitive(context);
+
+    return NULL;

 }
 
 static int client_;
 }
 
 static int client_;


@@ -233,20 +236,17 @@ static int client_;
 static char **Complete(const char *word, int start, int end) {
     rl_attempted_completion_over = TRUE;
 
 static char **Complete(const char *word, int start, int end) {
     rl_attempted_completion_over = TRUE;
 

-    CYPool pool;
-
-    CYDriver driver(pool);
-    cy::parser parser(driver);
-    Setup(driver, parser);
+    CYLocalPool pool;

 
     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;
 


@@ -256,7 +256,7 @@ static char **Complete(const char *word, int start, int end) {
     CYExpression *expression;
 
     CYOptions options;
     CYExpression *expression;
 
     CYOptions options;

-    CYContext context(driver.pool_, options);
+    CYContext context(options);

 
     std::ostringstream prefix;
 
 
     std::ostringstream prefix;
 


@@ -275,7 +275,7 @@ static char **Complete(const char *word, int start, int end) {
 
         case CYDriver::AutoMessage: {
             CYDriver::Context &thing(driver.contexts_.back());
 
         case CYDriver::AutoMessage: {
             CYDriver::Context &thing(driver.contexts_.back());

-            expression = $M($M($ CYIndirect(thing.context_), $S("isa")), $S("messages"));
+            expression = $M($C1($V("object_getClass"), thing.context_), $S("messages"));

             for (CYDriver::Context::Words::const_iterator part(thing.words_.begin()); part != thing.words_.end(); ++part)
                 prefix << (*part)->word_ << ':';
         } break;
             for (CYDriver::Context::Words::const_iterator part(thing.words_.begin()); part != thing.words_.end(); ++part)
                 prefix << (*part)->word_ << ':';
         } break;


@@ -284,18 +284,20 @@ static char **Complete(const char *word, int start, int end) {
             _assert(false);
     }
 
             _assert(false);
     }
 

-    std::string begin(prefix.str() + word);
+    std::string begin(prefix.str());

 
 

-    driver.program_ = $ CYProgram($ CYExpress($C2(ParseExpression(pool,
-    "   function(object, prefix) {\n"
+    driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression(
+    "   function(object, prefix, word) {\n"

     "       var names = [];\n"
     "       var names = [];\n"

-    "       var pattern = '^' + prefix;\n"
+    "       var before = prefix.length;\n"
+    "       prefix += word;\n"
+    "       var entire = prefix.length;\n"

     "       for (name in object)\n"
     "       for (name in object)\n"

-    "           if (name.match(pattern) != null)\n"
-    "               names.push(name);\n"
+    "           if (name.substring(0, entire) == prefix)\n"
+    "               names.push(name.substr(before));\n"

     "       return names;\n"
     "   }\n"
     "       return names;\n"
     "   }\n"

-    ), expression, $S(begin.c_str()))));
+    ), expression, $S(begin.c_str()), $S(word))));

 
     driver.program_->Replace(context);
 
 
     driver.program_->Replace(context);
 


@@ -305,10 +307,20 @@ 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)
+        return NULL;

 
 

-    CYExpression *result(ParseExpression(pool, json));

     CYArray *array(dynamic_cast<CYArray *>(result));
     CYArray *array(dynamic_cast<CYArray *>(result));

-    _assert(array != NULL);
+
+    if (array == NULL) {
+        *out_ << '\n';
+        Output(false, json, out_);
+        rl_forced_update_display();
+        return NULL;
+    }

 
     // XXX: use an std::set?
     typedef std::vector<std::string> Completions;
 
     // XXX: use an std::set?
     typedef std::vector<std::string> Completions;


@@ -317,11 +329,18 @@ static char **Complete(const char *word, int start, int end) {
     std::string common;
     bool rest(false);
 
     std::string common;
     bool rest(false);
 

-    for (CYElement *element(array->elements_); element != NULL; element = element->next_) {
+    CYForEach (element, array->elements_) {

         CYString *string(dynamic_cast<CYString *>(element->value_));
         _assert(string != NULL);
 
         CYString *string(dynamic_cast<CYString *>(element->value_));
         _assert(string != NULL);
 

-        std::string completion(string->value_, string->size_);
+        std::string completion;
+        if (string->size_ != 0)
+            completion.assign(string->value_, string->size_);
+        else if (driver.mode_ == CYDriver::AutoMessage)
+            completion = "]";
+        else
+            continue;
+

         completions.push_back(completion);
 
         if (!rest) {
         completions.push_back(completion);
 
         if (!rest) {


@@ -345,15 +364,11 @@ static char **Complete(const char *word, int start, int end) {
     if (count == 0)
         return NULL;
 
     if (count == 0)
         return NULL;
 

-    if (!common.empty()) {
-        size_t size(prefix.str().size());
-        _assert(common.size() >= size);
-        common = common.substr(size);
-    }
-

     size_t colon(common.find(':'));
     if (colon != std::string::npos)
         common = common.substr(0, colon + 1);
     size_t colon(common.find(':'));
     if (colon != std::string::npos)
         common = common.substr(0, colon + 1);

+    if (completions.size() == 1)
+        common += ' ';

 
     char **results(reinterpret_cast<char **>(malloc(sizeof(char *) * (count + 2))));
 
 
     char **results(reinterpret_cast<char **>(malloc(sizeof(char *) * (count + 2))));
 


@@ -368,17 +383,19 @@ static char **Complete(const char *word, int start, int end) {
 
 // need char *, not const char *
 static char name_[] = "cycript";
 
 // need char *, not const char *
 static char name_[] = "cycript";

-static char break_[] = " \t\n\"\\'`@$><=;|&{(" ".:";
+static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
+
+static void Console(CYOptions &options) {
+    CYPool pool;

 
 

-static void Console(apr_pool_t *pool, CYOptions &options) {

     passwd *passwd;
     if (const char *username = getenv("LOGNAME"))
         passwd = getpwnam(username);
     else
         passwd = getpwuid(getuid());
 
     passwd *passwd;
     if (const char *username = getenv("LOGNAME"))
         passwd = getpwnam(username);
     else
         passwd = getpwuid(getuid());
 

-    const char *basedir(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir));
-    const char *histfile(apr_psprintf(pool, "%s/history", basedir));
+    const char *basedir(pool.strcat(passwd->pw_dir, "/.cycript", NULL));
+    const char *histfile(pool.strcat(basedir, "/history", NULL));

     size_t histlines(0);
 
     rl_initialize();
     size_t histlines(0);
 
     rl_initialize();


@@ -390,8 +407,9 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
     bool bypass(false);
     bool debug(false);
     bool expand(false);
     bool bypass(false);
     bool debug(false);
     bool expand(false);

+    bool syntax(true);

 
 

-    FILE *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_;


@@ -415,15 +433,28 @@ static void Console(apr_pool_t *pool, 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')


@@ -435,16 +466,16 @@ static void Console(apr_pool_t *pool, 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;


@@ -470,17 +501,18 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
         if (bypass)
             code = command_;
         else {
         if (bypass)
             code = command_;
         else {

-            CYDriver driver;
+            CYLocalPool pool;
+
+            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);

-                    if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) {
+                    if (begin.line != lines.size() || begin.column < 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()) {


@@ -489,7 +521,7 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
                         }
 
                         std::cerr << "....";
                         }
 
                         std::cerr << "....";

-                        for (size_t i(0); i != begin.column - 1; ++i)
+                        for (size_t i(0); i != begin.column; ++i)

                             std::cerr << '.';
                         if (begin.line != end.line || begin.column == end.column)
                             std::cerr << '^';
                             std::cerr << '.';
                         if (begin.line != end.line || begin.column == end.column)
                             std::cerr << '^';


@@ -530,10 +562,12 @@ static void Console(apr_pool_t *pool, 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) {


@@ -543,8 +577,7 @@ static void Console(apr_pool_t *pool, 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) {


@@ -567,17 +600,21 @@ static void *Map(const char *path, size_t *psize) {
 void InjectLibrary(pid_t pid);
 
 int Main(int argc, char const * const argv[], char const * const envp[]) {
 void InjectLibrary(pid_t pid);
 
 int Main(int argc, char const * const argv[], char const * const envp[]) {

+    _aprcall(apr_initialize());
+
+    apr_pool_t *pool;
+    apr_pool_create(&pool, NULL);
+

     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
     CYOptions options;
 
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
     CYOptions options;
 

-    append_history$ = reinterpret_cast<int (*)(int, const char *)>(dlsym(RTLD_DEFAULT, "append_history"));
+    append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));

 
 #ifdef CY_ATTACH
     pid_t pid(_not(pid_t));
 #endif
 
 
 #ifdef CY_ATTACH
     pid_t pid(_not(pid_t));
 #endif
 

-    CYPool pool;

     apr_getopt_t *state;
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 
     apr_getopt_t *state;
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 


@@ -647,7 +684,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                 pid = strtoul(arg, &end, 0);
                 if (arg + size != end) {
                     // XXX: arg needs to be escaped in some horrendous way of doom
                 pid = strtoul(arg, &end, 0);
                 if (arg + size != end) {
                     // XXX: arg needs to be escaped in some horrendous way of doom

-                    const char *command(apr_psprintf(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", arg));
+                    const char *command(apr_pstrcat(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^", arg, " /{s/^[^ ]* //;q;};};d'", NULL));

 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];
 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];


@@ -763,19 +800,17 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 #endif
 
     if (script == NULL && tty)
 #endif
 
     if (script == NULL && tty)

-        Console(pool, options);
+        Console(options);

     else {
     else {

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

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


@@ -790,17 +825,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);


@@ -810,10 +852,12 @@ 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);

             }
     }
 
             }
     }
 

+    apr_pool_destroy(pool);
+

     return 0;
 }
 
     return 0;
 }