Fixed a bug where the identifier merging algorithm would fail horribly on pre-merged...

diff --git a/Console.cpp b/Console.cpp
index 65eeb4f08a472db52db8c1d62601b2dcc35c2957..b6bcedf6616f8cf89d82aab56683e5de66026ba6 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -112,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);
 }


@@ -183,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);


@@ -325,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();
             }


@@ -375,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"));
 


@@ -422,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;


@@ -568,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);


@@ -608,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)

diff --git a/Replace.cpp b/Replace.cpp
index 37b7068cd455f4a88b35e9931508d58090ff2c72..0cfbfdc4f48fa5be797a59410c8d9bf0e009f2b1 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -368,8 +368,9 @@ CYStatement *CYFunctionStatement::Replace(CYContext &context) {
 }
 
 CYIdentifier *CYIdentifier::Replace(CYContext &context) {
 }
 
 CYIdentifier *CYIdentifier::Replace(CYContext &context) {

-    if (replace_ == NULL)
-        replace_ = context.scope_->Lookup(context, this);
+    if (replace_ != NULL && replace_ != this)
+        return replace_->Replace(context);
+    replace_ = context.scope_->Lookup(context, this);

     return replace_;
 }
 
     return replace_;
 }
 


@@ -481,6 +482,8 @@ void CYProgram::Replace(CYContext &context) {
 
     // XXX: totalling the probable occurrences and sorting by them would improve the result
     for (CYIdentifierAddressVector::const_iterator i(rename_.begin()); i != rename_.end(); ++i, ++offset) {
 
     // XXX: totalling the probable occurrences and sorting by them would improve the result
     for (CYIdentifierAddressVector::const_iterator i(rename_.begin()); i != rename_.end(); ++i, ++offset) {

+        //std::cout << *i << ":" << (*i)->offset_ << std::endl;
+

         const char *name;
 
         if (context.options_.verbose_)
         const char *name;
 
         if (context.options_.verbose_)


@@ -610,6 +613,7 @@ void CYScope::Scope(CYContext &context, CYStatement *&statements) {
 
     for (CYIdentifierValueSet::const_iterator i(identifiers_.begin()); i != identifiers_.end(); ++i)
         if (internal_.find(*i) == internal_.end()) {
 
     for (CYIdentifierValueSet::const_iterator i(identifiers_.begin()); i != identifiers_.end(); ++i)
         if (internal_.find(*i) == internal_.end()) {

+            //std::cout << *i << '=' << offset << std::endl;

             if ((*i)->offset_ < offset)
                 (*i)->offset_ = offset;
             parent_->Merge(context, *i);
             if ((*i)->offset_ < offset)
                 (*i)->offset_ = offset;
             parent_->Merge(context, *i);