Optimized the variable renamer to rename more variables to 'a'.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index dd9263ec71bf493984f84145be434254a7ae6d37..cdeff501547b454cc71e26e8e7b283c8207c5c30 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -243,10 +243,12 @@ struct CYIdentifier :
     CYWord
 {
     CYIdentifier *replace_;
+    size_t offset_;
 
     CYIdentifier(const char *word) :
         CYWord(word),
-        replace_(NULL)
+        replace_(NULL),
+        offset_(0)
     {
     }
 
@@ -315,17 +317,18 @@ typedef std::map<CYIdentifier *, CYIdentifierFlags> CYIdentifierAddressFlagsMap;
 
 struct CYScope {
     CYScope *parent_;
-    CYIdentifierValueSet identifiers_;
     CYIdentifierAddressFlagsMap internal_;
-    size_t offset_;
+
+    CYIdentifierValueSet identifiers_;
 
     CYScope() :
-        parent_(NULL),
-        offset_(0)
+        parent_(NULL)
     {
     }
 
-    void Add(CYContext &context, CYIdentifierAddressVector &external);
+    void Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags);
+    virtual CYIdentifier *Lookup(CYContext &context, CYIdentifier *identifier);
+    void Merge(CYContext &context, CYIdentifier *identifier);
     void Scope(CYContext &context, CYStatement *&statements);
 };
 
@@ -335,7 +338,6 @@ struct CYProgram :
 {
     CYStatement *statements_;
     CYIdentifierAddressVector rename_;
-    CYCStringSet external_;
 
     CYProgram(CYStatement *statements) :
         statements_(statements)
@@ -346,6 +348,35 @@ struct CYProgram :
     virtual void Output(CYOutput &out) const;
 };
 
+struct CYContext :
+    CYScope
+{
+    apr_pool_t *pool_;
+    CYOptions &options_;
+    CYScope *scope_;
+    CYProgram *program_;
+
+    CYContext(apr_pool_t *pool, CYOptions &options) :
+        pool_(pool),
+        options_(options),
+        scope_(this),
+        program_(NULL)
+    {
+    }
+
+    template <typename Type_>
+    void Replace(Type_ *&value) {
+        for (;;) if (value == NULL)
+            break;
+        else {
+            Type_ *replace(value->Replace(*this));
+            if (replace != value)
+                value = replace;
+            else break;
+        }
+    }
+};
+
 struct CYBlock :
     CYStatement,
     CYThing