Remove as many double-replaces as could be found.

diff --git a/Parser.hpp b/Parser.hpp
index db4b1e6f297dc6f9a51ee2dd2f7aa784f318241f..69609ad603f34e481dcdfae987110a570980eff2 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1329,8 +1329,6 @@ struct CYMember :
     void SetLeft(CYExpression *object) {
         object_ = object;
     }
-
-    void Replace_(CYContext &context);
 };
 
 struct CYDirectMember :

diff --git a/Replace.cpp b/Replace.cpp
index d9465832fb980eb4ebfe9ecff0d2348600beb9b8..5ec0b9346c12d69433011f2857d015417ead414b 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -55,7 +55,6 @@ CYExpression *CYAdd::Replace(CYContext &context) {
 }
 
 CYExpression *CYAddressOf::Replace(CYContext &context) {
-    CYPrefix::Replace(context);
     return $C0($M(rhs_, $S("$cya")));
 }
 
@@ -243,7 +242,8 @@ CYCompound *CYDeclarations::Compound(CYContext &context) { $T(NULL)
 }
 
 CYExpression *CYDirectMember::Replace(CYContext &context) {
-    Replace_(context);
+    context.Replace(object_);
+    context.Replace(property_);
     return this;
 }
 
@@ -451,12 +451,10 @@ CYStatement *CYIfComprehension::Replace(CYContext &context, CYStatement *stateme
 }
 
 CYExpression *CYIndirect::Replace(CYContext &context) {
-    CYPrefix::Replace(context);
     return $M(rhs_, $S("$cyi"));
 }
 
 CYExpression *CYIndirectMember::Replace(CYContext &context) {
-    Replace_(context);
     return $M($ CYIndirect(object_), property_);
 }
 
@@ -475,11 +473,6 @@ CYStatement *CYLet::Replace(CYContext &context) {
     return $E($ CYCall($ CYFunctionExpression(NULL, declarations_->Parameter(context), code_), declarations_->Argument(context)));
 }
 
-void CYMember::Replace_(CYContext &context) {
-    context.Replace(object_);
-    context.Replace(property_);
-}
-
 namespace cy {
 namespace Syntax {