Changeset 0ce063b

Timestamp:

Jun 5, 2019, 4:28:53 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

54d4c0e

Parents:

4864a73

Message:

DeclReplacer? now returns number of node changed

Location:

src/SynTree

Files:

• DeclReplacer.cc (modified) (6 diffs)
• DeclReplacer.h (modified) (1 diff)

src/SynTree/DeclReplacer.cc

@@ -30 +30 @@
                         bool debug;
                 public:
+                        size_t replaced;
+
+                public:
                         DeclReplacer( const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
 
@@ -45 +48 @@
                         bool debug;
                 public:
+                        size_t replaced;
+
+                public:
                         ExprDeclReplacer( const ExprMap & exprMap, bool debug = false );
 
@@ -52 +58 @@
         }
 
-        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 );
         }
 
-        void replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool 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
@@ -79 +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 ) {
@@ -89 +98 @@
                 void DeclReplacer::previsit( TypeInstType * inst ) {
                         if ( typeMap.count( inst->baseType ) ) {
+                                replaced++;
                                 auto replacement = typeMap.at( inst->baseType );
                                 if ( debug ) {
@@ -97 +107 @@
                 }
 
-                ExprDeclReplacer::ExprDeclReplacer( const ExprMap & exprMap, bool debug ) : exprMap( exprMap ), debug( debug ) {}
+                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 ) {

src/SynTree/DeclReplacer.h

@@ -28 +28 @@
         typedef std::map< DeclarationWithType *, Expression * > ExprMap;
 
-        void replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug = false );
-        void replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug = false );
-        void replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
+        size_t replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug = false );
+        size_t replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug = false );
+        size_t replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
 
-        void replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool debug = false);
+        size_t replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool debug = false);
         template<typename T>
                 void replace( T *& node, const ExprMap & exprMap, bool debug = false ) {