Progress on autoconf doom!

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 0ed0bfe220d03421f63e1471d50f4e3e20ca62ba..b6bcedf6616f8cf89d82aab56683e5de66026ba6 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -38,7 +38,6 @@
 /* }}} */
 
 #include "cycript.hpp"
 /* }}} */
 
 #include "cycript.hpp"

-#include "Context.hpp"

 
 #ifdef CY_EXECUTE
 #include "JavaScript.hpp"
 
 #ifdef CY_EXECUTE
 #include "JavaScript.hpp"


@@ -113,10 +112,8 @@ void Setup(CYDriver &driver, cy::parser &parser) {
         driver.strict_ = true;
 }
 
         driver.strict_ = true;
 }
 

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

     out.pretty_ = pretty_;
     out.pretty_ = pretty_;

-
-    CYOptions options;

     CYContext context(driver.pool_, options);
     driver.program_->Replace(context);
 }
     CYContext context(driver.pool_, options);
     driver.program_->Replace(context);
 }


@@ -184,7 +181,7 @@ void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false)
 
 int (*append_history$)(int, const char *);
 
 
 int (*append_history$)(int, const char *);
 

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

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


@@ -326,9 +323,8 @@ static void Console(apr_pool_t *pool, int client) {
                 code = command;
             else {
                 std::ostringstream str;
                 code = command;
             else {
                 std::ostringstream str;

-                CYOptions options;

                 CYOutput out(str, options);
                 CYOutput out(str, options);

-                Setup(out, driver);
+                Setup(out, driver, options);

                 out << *driver.program_;
                 code = str.str();
             }
                 out << *driver.program_;
                 code = str.str();
             }


@@ -376,6 +372,7 @@ void InjectLibrary(pid_t pid);
 int Main(int argc, char const * const argv[], char const * const envp[]) {
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
 int Main(int argc, char const * const argv[], char const * const envp[]) {
     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$ = reinterpret_cast<int (*)(int, const char *)>(dlsym(RTLD_DEFAULT, "append_history"));
 


@@ -423,6 +420,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
             case 'g':
                 if (false);
 
             case 'g':
                 if (false);

+                else if (strcmp(arg, "rename") == 0)
+                    options.verbose_ = true;

 #if YYDEBUG
                 else if (strcmp(arg, "bison") == 0)
                     bison_ = true;
 #if YYDEBUG
                 else if (strcmp(arg, "bison") == 0)
                     bison_ = true;


@@ -569,7 +568,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 #endif
 
     if (script == NULL && tty)
 #endif
 
     if (script == NULL && tty)

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

     else {
         CYDriver driver(script ?: "<stdin>");
         cy::parser parser(driver);
     else {
         CYDriver driver(script ?: "<stdin>");
         cy::parser parser(driver);


@@ -609,9 +608,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                 Run(client, code, stdout);
             } else {
                 std::ostringstream str;
                 Run(client, code, stdout);
             } else {
                 std::ostringstream str;

-                CYOptions options;

                 CYOutput out(str, options);
                 CYOutput out(str, options);

-                Setup(out, driver);
+                Setup(out, driver, options);

                 out << *driver.program_;
                 std::string code(str.str());
                 if (compile)
                 out << *driver.program_;
                 std::string code(str.str());
                 if (compile)