Changeset 7862059 for src/SynTree

Timestamp:

Apr 12, 2018, 2:46:15 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

8711c6c

Parents:

98278b3a

Message:

Change VarExprReplacer? to DeclReplacer? and implement TypeInstType? replacement

Location:

src/SynTree

Files:

• CompoundStmt.cc (modified) (3 diffs)
• DeclReplacer.cc (added)
• DeclReplacer.h (moved) (moved from src/SynTree/VarExprReplacer.h) (1 diff)
• FunctionDecl.cc (modified) (3 diffs)
• VarExprReplacer.cc (deleted)
• module.mk (modified) (1 diff)

src/SynTree/CompoundStmt.cc

@@ -23 +23 @@
 #include "Statement.h"                // for CompoundStmt, Statement, DeclStmt
 #include "SynTree/Label.h"            // for Label
-#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
+#include "SynTree/DeclReplacer.h"     // for DeclReplacer
 
 using std::string;
@@ -49 +49 @@
         // recursively execute this routine. There may be more efficient ways of doing
         // this.
-        VarExprReplacer::DeclMap declMap;
+        DeclReplacer::DeclMap declMap;
         std::list< Statement * >::const_iterator origit = other.kids.begin();
         for ( Statement * s : kids ) {
@@ -64 +64 @@
         }
         if ( ! declMap.empty() ) {
-                VarExprReplacer::replace( this, declMap );
+                DeclReplacer::replace( this, declMap );
         }
 }

src/SynTree/DeclReplacer.h

@@ -23 +23 @@
 class VariableExpr;
 
-namespace VarExprReplacer {
+namespace DeclReplacer {
         typedef std::map< DeclarationWithType *, DeclarationWithType * > DeclMap;
+        typedef std::map< TypeDecl *, TypeDecl * > TypeMap;
 
         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 );
 }
 

src/SynTree/FunctionDecl.cc

@@ -26 +26 @@
 #include "Statement.h"           // for CompoundStmt
 #include "Type.h"                // for Type, FunctionType, Type::FuncSpecif...
-#include "VarExprReplacer.h"
+#include "DeclReplacer.h"
 
 extern bool translation_unit_nomain;
@@ -41 +41 @@
                 : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
 
-        VarExprReplacer::DeclMap declMap;
+        DeclReplacer::DeclMap declMap;
         for ( auto p : group_iterate( other.type->parameters, type->parameters ) ) {
                 declMap[ std::get<0>(p) ] = std::get<1>(p);
@@ -49 +49 @@
         }
         if ( ! declMap.empty() ) {
-                VarExprReplacer::replace( this, declMap );
+                DeclReplacer::replace( this, declMap );
         }
         cloneAll( other.withExprs, withExprs );

src/SynTree/module.mk

@@ -48 +48 @@
        SynTree/TypeSubstitution.cc \
        SynTree/Attribute.cc \
-       SynTree/VarExprReplacer.cc
+       SynTree/DeclReplacer.cc