Changeset c6a1e8a for src/SynTree/DeclReplacer.h

Timestamp:

Jun 5, 2019, 8:36:48 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

866545b

Parents:

67130fe (diff), 3cd5fdd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicit

File:

• src/SynTree/DeclReplacer.h (modified) (1 diff)

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 ) {