X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/6a5fd0d98dd2bf466dacba8ce7c5f66acf75dbfc..20052ff75c224699725da0f8e096053009c62741:/Console.cpp

diff --git a/Console.cpp b/Console.cpp
index fdff81c..e2cf364 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
 /*
- * 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.
- *
- * Cycript is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
@@ -44,6 +44,8 @@
 #endif
 
 #include <errno.h>
+#include <getopt.h>
+#include <signal.h>
 #include <unistd.h>
 
 #include <sys/socket.h>
@@ -58,17 +60,16 @@
 #include <sys/un.h>
 #include <pwd.h>
 
-#include <apr_getopt.h>
-#include <apr_pools.h>
-#include <apr_strings.h>
-
 #include <dlfcn.h>
 
-#include "Display.hpp"
-#include "Replace.hpp"
+#ifdef __APPLE__
+#include <mach/mach_time.h>
+#endif
 
-#include "Cycript.tab.hh"
+#include "Display.hpp"
 #include "Driver.hpp"
+#include "Highlight.hpp"
+#include "Syntax.hpp"
 
 static volatile enum {
     Working,
@@ -87,7 +88,8 @@ static void sigint(int) {
         case Parsing:
             longjmp(ctrlc_, 1);
         case Running:
-            throw "*** Ctrl-C";
+            CYCancel();
+            return;
         case Sending:
             return;
         case Waiting:
@@ -95,26 +97,22 @@ static void sigint(int) {
     }
 }
 
-#if YYDEBUG
 static bool bison_;
-#endif
+static bool timing_;
 static bool strict_;
 static bool pretty_;
 
-void Setup(CYDriver &driver, cy::parser &parser) {
-#if YYDEBUG
+void Setup(CYDriver &driver) {
     if (bison_)
-        parser.set_debug_level(1);
-#endif
+        driver.debug_ = 1;
     if (strict_)
         driver.strict_ = true;
 }
 
 void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) {
     out.pretty_ = pretty_;
-    CYContext context(options);
     if (lower)
-        driver.program_->Replace(context);
+        driver.Replace(options);
 }
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
@@ -213,180 +211,21 @@ int (*append_history$)(int, const char *);
 
 static std::string command_;
 
-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())
-        return NULL;
-
-    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);
+static int client_;
 
-    return NULL;
+static CYUTF8String Run(CYPool &pool, const std::string &code) {
+    return Run(pool, client_, code);
 }
 
-static int client_;
-
 static char **Complete(const char *word, int start, int end) {
-    rl_attempted_completion_over = TRUE;
-
-    CYLocalPool pool;
-
+    rl_attempted_completion_over = ~0;
     std::string line(rl_line_buffer, start);
-    std::istringstream stream(command_ + line);
-    CYDriver driver(stream);
-
-    driver.auto_ = true;
-
-    cy::parser parser(driver);
-    Setup(driver, parser);
-
-    if (parser.parse() != 0 || !driver.errors_.empty())
-        return NULL;
-
-    if (driver.mode_ == CYDriver::AutoNone)
-        return NULL;
-
-    CYExpression *expression;
-
-    CYOptions options;
-    CYContext context(options);
-
-    std::ostringstream prefix;
-
-    switch (driver.mode_) {
-        case CYDriver::AutoPrimary:
-            expression = $ CYThis();
-        break;
-
-        case CYDriver::AutoDirect:
-            expression = driver.context_;
-        break;
-
-        case CYDriver::AutoIndirect:
-            expression = $ CYIndirect(driver.context_);
-        break;
-
-        case CYDriver::AutoMessage: {
-            CYDriver::Context &thing(driver.contexts_.back());
-            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;
-
-        default:
-            _assert(false);
-    }
-
-    std::string begin(prefix.str());
-
-    driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression(
-    "   function(object, prefix, word) {\n"
-    "       var names = [];\n"
-    "       var before = prefix.length;\n"
-    "       prefix += word;\n"
-    "       var entire = prefix.length;\n"
-    "       for (name in object)\n"
-    "           if (name.substring(0, entire) == prefix)\n"
-    "               names.push(name.substr(before));\n"
-    "       return names;\n"
-    "   }\n"
-    ), expression, $S(begin.c_str()), $S(word))));
-
-    driver.program_->Replace(context);
-
-    std::ostringstream str;
-    CYOutput out(str, options);
-    out << *driver.program_;
-
-    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;
-
-    CYArray *array(dynamic_cast<CYArray *>(result));
-
-    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;
-    Completions completions;
-
-    std::string common;
-    bool rest(false);
-
-    CYForEach (element, array->elements_) {
-        CYString *string(dynamic_cast<CYString *>(element->value_));
-        _assert(string != NULL);
-
-        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) {
-            common = completion;
-            rest = true;
-        } else {
-            size_t limit(completion.size()), size(common.size());
-            if (size > limit)
-                common = common.substr(0, limit);
-            else
-                limit = size;
-            for (limit = 0; limit != size; ++limit)
-                if (common[limit] != completion[limit])
-                    break;
-            if (limit != size)
-                common = common.substr(0, limit);
-        }
-    }
-
-    size_t count(completions.size());
-    if (count == 0)
-        return NULL;
-
-    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))));
-
-    results[0] = strdup(common.c_str());
-    size_t index(0);
-    for (Completions::const_iterator i(completions.begin()); i != completions.end(); ++i)
-        results[++index] = strdup(i->c_str());
-    results[count + 1] = NULL;
-
-    return results;
+    return CYComplete(word, command_ + line, &Run);
 }
 
 // need char *, not const char *
 static char name_[] = "cycript";
-static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
+static char break_[] = " \t\n\"\\'`@><=;|&{(" ")}" ".:[]";
 
 class History {
   private:
@@ -403,7 +242,8 @@ class History {
 
     ~History() {
         if (append_history$ != NULL) {
-            _syscall(close(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))));
+            int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600)));
+            _syscall(close(fd));
             _assert((*append_history$)(histlines_, histfile_.c_str()) == 0);
         } else {
             _assert(write_history(histfile_.c_str()) == 0);
@@ -411,21 +251,24 @@ class History {
     }
 
     void operator +=(const std::string &command) {
-        add_history(command_.c_str());
+        add_history(command.c_str());
         ++histlines_;
     }
 };
 
 static void Console(CYOptions &options) {
-    CYPool pool;
-
-    passwd *passwd;
-    if (const char *username = getenv("LOGNAME"))
-        passwd = getpwnam(username);
-    else
-        passwd = getpwuid(getuid());
+    std::string basedir;
+    if (const char *home = getenv("HOME"))
+        basedir = home;
+    else {
+        passwd *passwd;
+        if (const char *username = getenv("LOGNAME"))
+            passwd = getpwnam(username);
+        else
+            passwd = getpwuid(getuid());
+        basedir = passwd->pw_dir;
+    }
 
-    std::string basedir(passwd->pw_dir);
     basedir += "/.cycript";
     mkdir(basedir.c_str(), 0700);
 
@@ -500,7 +343,9 @@ static void Console(CYOptions &options) {
                 } else if (data == "destroy") {
                     CYDestroyContext();
                 } else if (data == "gc") {
+                    *out_ << "collecting... " << std::flush;
                     CYGarbageCollect(CYGetJSContext());
+                    *out_ << "done." << std::endl;
                 } else if (data == "exit") {
                     return;
                 } else if (data == "expand") {
@@ -520,6 +365,7 @@ static void Console(CYOptions &options) {
         }
 
         command_ += line;
+        command_ += "\n";
 
         char *begin(line), *end(line + strlen(line));
         while (char *nl = reinterpret_cast<char *>(memchr(begin, '\n', end - begin))) {
@@ -537,19 +383,19 @@ static void Console(CYOptions &options) {
         if (bypass)
             code = command_;
         else {
-            CYLocalPool pool;
-
             std::istringstream stream(command_);
-            CYDriver driver(stream);
 
-            cy::parser parser(driver);
-            Setup(driver, parser);
+            CYPool pool;
+            CYDriver driver(pool, stream);
+            Setup(driver);
 
-            if (parser.parse() != 0 || !driver.errors_.empty()) {
+            bool failed(driver.Parse());
+
+            if (failed || !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 < lines.back().size() || error->warning_) {
-                        cy::position end(error->location_.end);
+                    CYPosition begin(error->location_.begin);
+                    if (begin.line != lines.size() + 1 || error->warning_) {
+                        CYPosition end(error->location_.end);
 
                         if (begin.line != lines.size()) {
                             std::cerr << "  | ";
@@ -568,29 +414,28 @@ static void Console(CYOptions &options) {
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 
-                        history += command_;
+                        history += command_.substr(0, command_.size() - 1);
                         goto restart;
                     }
                 }
 
                 driver.errors_.clear();
 
-                command_ += '\n';
                 prompt = "cy> ";
                 goto read;
             }
 
-            if (driver.program_ == NULL)
+            if (driver.script_ == NULL)
                 goto restart;
 
-            std::ostringstream str;
+            std::stringbuf str;
             CYOutput out(str, options);
             Setup(out, driver, options, lower);
-            out << *driver.program_;
+            out << *driver.script_;
             code = str.str();
         }
 
-        history += command_;
+        history += command_.substr(0, command_.size() - 1);
 
         if (debug) {
             std::cout << "cy= ";
@@ -602,16 +447,22 @@ static void Console(CYOptions &options) {
     }
 }
 
-void InjectLibrary(pid_t pid);
-
-int Main(int argc, char const * const argv[], char const * const envp[]) {
-    _aprcall(apr_initialize());
+void InjectLibrary(pid_t, int, const char *const []);
 
-    apr_pool_t *pool;
-    apr_pool_create(&pool, NULL);
+static uint64_t CYGetTime() {
+#ifdef __APPLE__
+    return mach_absolute_time();
+#else
+    struct timespec spec;
+    clock_gettime(CLOCK_MONOTONIC, &spec);
+    return spec.tv_sec * UINT64_C(1000000000) + spec.tv_nsec;
+#endif
+}
 
+int Main(int argc, char * const argv[], char const * const envp[]) {
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
+    bool target(false);
     CYOptions options;
 
     append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));
@@ -623,27 +474,35 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     const char *host(NULL);
     const char *port(NULL);
 
-    apr_getopt_t *state;
-    _aprcall(apr_getopt_init(&state, pool, argc, argv));
+    optind = 1;
 
     for (;;) {
-        char opt;
-        const char *arg;
-
-        apr_status_t status(apr_getopt(state,
-            "cg:n:"
+        int option(getopt_long(argc, argv,
+            "c"
+            "g:"
+            "n:"
 #ifdef CY_ATTACH
             "p:"
 #endif
             "r:"
             "s"
-        , &opt, &arg));
+        , (const struct option[]) {
+            {NULL, no_argument, NULL, 'c'},
+            {NULL, required_argument, NULL, 'g'},
+            {NULL, required_argument, NULL, 'n'},
+#ifdef CY_ATTACH
+            {NULL, required_argument, NULL, 'p'},
+#endif
+            {NULL, required_argument, NULL, 'r'},
+            {NULL, no_argument, NULL, 's'},
+        {0, 0, 0, 0}}, NULL));
 
-        switch (status) {
-            case APR_EOF:
+        switch (option) {
+            case -1:
                 goto getopt;
-            case APR_BADCH:
-            case APR_BADARG:
+
+            case ':':
+            case '?':
                 fprintf(stderr,
                     "usage: cycript [-c]"
 #ifdef CY_ATTACH
@@ -653,23 +512,32 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                     " [<script> [<arg>...]]\n"
                 );
                 return 1;
-            default:
-                _aprcall(status);
-        }
 
-        switch (opt) {
+            target:
+                if (!target)
+                    target = true;
+                else {
+                    fprintf(stderr, "only one of -[c"
+#ifdef CY_ATTACH
+                    "p"
+#endif
+                    "r] may be used at a time\n");
+                    return 1;
+                }
+            break;
+
             case 'c':
                 compile = true;
-            break;
+            goto target;
 
             case 'g':
                 if (false);
-                else if (strcmp(arg, "rename") == 0)
+                else if (strcmp(optarg, "rename") == 0)
                     options.verbose_ = true;
-#if YYDEBUG
-                else if (strcmp(arg, "bison") == 0)
+                else if (strcmp(optarg, "bison") == 0)
                     bison_ = true;
-#endif
+                else if (strcmp(optarg, "timing") == 0)
+                    timing_ = true;
                 else {
                     fprintf(stderr, "invalid name for -g\n");
                     return 1;
@@ -678,7 +546,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
             case 'n':
                 if (false);
-                else if (strcmp(arg, "minify") == 0)
+                else if (strcmp(optarg, "minify") == 0)
                     pretty_ = true;
                 else {
                     fprintf(stderr, "invalid name for -n\n");
@@ -688,13 +556,16 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
 #ifdef CY_ATTACH
             case 'p': {
-                size_t size(strlen(arg));
+                size_t size(strlen(optarg));
                 char *end;
 
-                pid = strtoul(arg, &end, 0);
-                if (arg + size != end) {
+                pid = strtoul(optarg, &end, 0);
+                if (optarg + size != end) {
                     // XXX: arg needs to be escaped in some horrendous way of doom
-                    const char *command(apr_pstrcat(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^", arg, " /{s/^[^ ]* //;q;};};d'", NULL));
+                    // XXX: this is a memory leak now because I just don't care enough
+                    char *command;
+                    int writ(asprintf(&command, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", optarg));
+                    _assert(writ != -1);
 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];
@@ -728,17 +599,17 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                     }
 
                     if (pid == _not(pid_t)) {
-                        fprintf(stderr, "unable to find process `%s' using ps\n", arg);
+                        fprintf(stderr, "unable to find process `%s' using ps\n", optarg);
                         return 1;
                     }
                 }
-            } break;
+            } goto target;
 #endif
 
             case 'r': {
-                //size_t size(strlen(arg));
+                //size_t size(strlen(optarg));
 
-                char *colon(strrchr(arg, ':'));
+                char *colon(strrchr(optarg, ':'));
                 if (colon == NULL) {
                     fprintf(stderr, "missing colon in hostspec\n");
                     return 1;
@@ -746,83 +617,105 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
                 /*char *end;
                 port = strtoul(colon + 1, &end, 10);
-                if (end != arg + size) {
+                if (end != optarg + size) {
                     fprintf(stderr, "invalid port in hostspec\n");
                     return 1;
                 }*/
 
-                host = arg;
+                host = optarg;
                 *colon = '\0';
                 port = colon + 1;
-            } break;
+            } goto target;
 
             case 's':
                 strict_ = true;
             break;
+
+            default:
+                _assert(false);
         }
-    } getopt:;
+    }
+
+  getopt:
+    argc -= optind;
+    argv += optind;
 
     const char *script;
-    int ind(state->ind);
 
 #ifdef CY_ATTACH
-    if (pid != _not(pid_t) && ind < argc - 1) {
+    if (pid != _not(pid_t) && argc > 1) {
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
-
-    if (pid != _not(pid_t) && compile) {
-        fprintf(stderr, "-p conflicts with -c\n");
-        return 1;
-    }
 #endif
 
-    if (ind == argc)
+    if (argc == 0)
         script = NULL;
     else {
 #ifdef CY_EXECUTE
         // XXX: const_cast?! wtf gcc :(
-        CYSetArgs(argc - ind - 1, const_cast<const char **>(argv + ind + 1));
+        CYSetArgs(argc - 1, const_cast<const char **>(argv + 1));
 #endif
-        script = argv[ind];
+        script = argv[0];
         if (strcmp(script, "-") == 0)
             script = NULL;
     }
 
-#ifdef CY_ATTACH
-    if (pid != _not(pid_t) && script == NULL && !tty) {
-        fprintf(stderr, "non-terminal attaching to remote console\n");
-        return 1;
-    }
-#endif
-
 #ifdef CY_ATTACH
     if (pid == _not(pid_t))
         client_ = -1;
     else {
-        int server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0))); try {
-            struct sockaddr_un address;
-            memset(&address, 0, sizeof(address));
-            address.sun_family = AF_UNIX;
-
-            sprintf(address.sun_path, "/tmp/.s.cy.%u", getpid());
-
-            _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
-            _syscall(chmod(address.sun_path, 0777));
-
-            try {
-                _syscall(listen(server, 1));
-                InjectLibrary(pid);
-                client_ = _syscall(accept(server, NULL, NULL));
-            } catch (...) {
-                // XXX: exception?
-                unlink(address.sun_path);
-                throw;
+        struct Socket {
+            int fd_;
+
+            Socket(int fd) :
+                fd_(fd)
+            {
             }
-        } catch (...) {
-            _syscall(close(server));
-            throw;
-        }
+
+            ~Socket() {
+                close(fd_);
+            }
+
+            operator int() {
+                return fd_;
+            }
+        } server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0)));
+
+        struct sockaddr_un address;
+        memset(&address, 0, sizeof(address));
+        address.sun_family = AF_UNIX;
+
+        const char *tmp;
+#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
+        tmp = "/Library/Caches";
+#else
+        tmp = "/tmp";
+#endif
+
+        sprintf(address.sun_path, "%s/.s.cy.%u", tmp, getpid());
+        unlink(address.sun_path);
+
+        struct File {
+            const char *path_;
+
+            File(const char *path) :
+                path_(path)
+            {
+            }
+
+            ~File() {
+                unlink(path_);
+            }
+        } file(address.sun_path);
+
+        _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
+        _syscall(chmod(address.sun_path, 0777));
+
+        _syscall(listen(server, 1));
+        const char *const argv[] = {address.sun_path, NULL};
+        InjectLibrary(pid, 1, argv);
+        client_ = _syscall(accept(server, NULL, NULL));
     }
 #else
     client_ = -1;
@@ -859,8 +752,6 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     if (script == NULL && tty)
         Console(options);
     else {
-        CYLocalPool pool;
-
         std::istream *stream;
         if (script == NULL) {
             stream = &std::cin;
@@ -870,18 +761,58 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             _assert(!stream->fail());
         }
 
-        CYDriver driver(*stream, script);
-        cy::parser parser(driver);
-        Setup(driver, parser);
+        if (timing_) {
+            std::stringbuf buffer;
+            stream->get(buffer, '\0');
+            _assert(!stream->fail());
+
+            double average(0);
+            int samples(-50);
+            uint64_t start(CYGetTime());
+
+            for (;;) {
+                stream = new std::istringstream(buffer.str());
+
+                CYPool pool;
+                CYDriver driver(pool, *stream, script);
+                Setup(driver);
+
+                uint64_t begin(CYGetTime());
+                driver.Parse();
+                uint64_t end(CYGetTime());
+
+                delete stream;
+
+                average += (end - begin - average) / ++samples;
+
+                uint64_t now(CYGetTime());
+                if (samples == 0)
+                    average = 0;
+                else if ((now - start) / 1000000000 >= 1)
+                    std::cout << std::fixed << average << '\t' << (end - begin) << '\t' << samples << std::endl;
+                else continue;
+
+                start = now;
+            }
+
+            stream = new std::istringstream(buffer.str());
+            std::cin.get();
+        }
+
+        CYPool pool;
+        CYDriver driver(pool, *stream, script);
+        Setup(driver);
+
+        bool failed(driver.Parse());
 
-        if (parser.parse() != 0 || !driver.errors_.empty()) {
+        if (failed || !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) {
-            std::ostringstream str;
+        } else if (driver.script_ != NULL) {
+            std::stringbuf str;
             CYOutput out(str, options);
             Setup(out, driver, options, true);
-            out << *driver.program_;
+            out << *driver.script_;
             std::string code(str.str());
             if (compile)
                 std::cout << code;
@@ -890,18 +821,11 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         }
     }
 
-    apr_pool_destroy(pool);
-
     return 0;
 }
 
-int main(int argc, char const * const argv[], char const * const envp[]) {
-    apr_status_t status(apr_app_initialize(&argc, &argv, &envp));
-
-    if (status != APR_SUCCESS) {
-        fprintf(stderr, "apr_app_initialize() != APR_SUCCESS\n");
-        return 1;
-    } else try {
+int main(int argc, char * const argv[], char const * const envp[]) {
+    try {
         return Main(argc, argv, envp);
     } catch (const CYException &error) {
         CYPool pool;