Changes in src/SynTree/DeclReplacer.cc [7862059:0ce063b]

File:

• src/SynTree/DeclReplacer.cc (modified) (5 diffs)

src/SynTree/DeclReplacer.cc

@@ -30 +30 @@
                         bool debug;
                 public:
+                        size_t replaced;
+
+                public:
                         DeclReplacer( const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
 
@@ -38 +41 @@
                         void previsit( TypeInstType * inst );
                 };
+
+                /// Mutator that replaces uses of declarations with arbitrary expressions, according to the supplied mapping
+                struct ExprDeclReplacer {
+                private:
+                        const ExprMap & exprMap;
+                        bool debug;
+                public:
+                        size_t replaced;
+
+                public:
+                        ExprDeclReplacer( const ExprMap & exprMap, bool debug = false );
+
+                        // replace variable with new node from expr map
+                        Expression * postmutate( VariableExpr * varExpr );
+                };
         }
 
-        void replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug ) {
+        size_t replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug ) {
                 PassVisitor<DeclReplacer> replacer( declMap, typeMap, debug );
                 maybeAccept( node, replacer );
+                return replacer.pass.replaced;
         }
 
-        void replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug ) {
+        size_t replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug ) {
                 TypeMap typeMap;
-                replace( node, declMap, typeMap, debug );
+                return replace( node, declMap, typeMap, debug );
         }
 
-        void replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug ) {
+        size_t replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug ) {
                 DeclMap declMap;
-                replace( node, declMap, typeMap, debug );
+                return replace( node, declMap, typeMap, debug );
+        }
+
+        size_t replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool debug ) {
+                PassVisitor<ExprDeclReplacer> replacer( exprMap, debug );
+                node = maybeMutate( node, replacer );
+                return replacer.pass.replaced;
         }
 
         namespace {
-                DeclReplacer::DeclReplacer( const DeclMap & declMap, const TypeMap & typeMap, bool debug ) : declMap( declMap ), typeMap( typeMap ) , debug( debug ) {}
+                DeclReplacer::DeclReplacer( const DeclMap & declMap, const TypeMap & typeMap, bool debug ) : declMap( declMap ), typeMap( typeMap ) , debug( debug ), replaced( 0 ) {}
 
                 // replace variable with new node from decl map
@@ -62 +87 @@
                         // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are)
                         if ( declMap.count( varExpr->var ) ) {
+                                replaced++;
                                 auto replacement = declMap.at( varExpr->var );
                                 if ( debug ) {
@@ -72 +98 @@
                 void DeclReplacer::previsit( TypeInstType * inst ) {
                         if ( typeMap.count( inst->baseType ) ) {
+                                replaced++;
                                 auto replacement = typeMap.at( inst->baseType );
                                 if ( debug ) {
@@ -79 +106 @@
                         }
                 }
+
+                ExprDeclReplacer::ExprDeclReplacer( const ExprMap & exprMap, bool debug ) : exprMap( exprMap ), debug( debug ), replaced( 0 ) {}
+
+                Expression * ExprDeclReplacer::postmutate( VariableExpr * varExpr ) {
+                        if ( exprMap.count( varExpr->var ) ) {
+                                replaced++;
+                                Expression * replacement = exprMap.at( varExpr->var )->clone();
+                                if ( debug ) {
+                                        std::cerr << "replacing variable reference: " << (void*)varExpr->var << " " << varExpr->var << " with " << (void*)replacement << " " << replacement << std::endl;
+                                }
+                                std::swap( varExpr->env, replacement->env );
+                                delete varExpr;
+                                return replacement;
+                        }
+                        return varExpr;
+                }
         }
 } // namespace VarExprReplacer