Changeset da7fe39 for src/ControlStruct/ExceptTranslate.cc

Timestamp:

Apr 23, 2018, 12:57:46 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:

57acae0

Parents:

ba89e9b7 (diff), c8ad5d9 (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:

Merge branch 'master' into references

File:

• src/ControlStruct/ExceptTranslate.cc (modified) (2 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -34 +34 @@
 #include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
 #include "SynTree/Type.h"             // for FunctionType, Type, noQualifiers
-#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
+#include "SynTree/DeclReplacer.h"     // for DeclReplacer
 #include "SynTree/Visitor.h"          // for acceptAll
 
@@ -314 +314 @@
                         // Update variables in the body to point to this local copy.
                         {
-                                VarExprReplacer::DeclMap mapping;
+                                DeclReplacer::DeclMap mapping;
                                 mapping[ handler_decl ] = local_except;
-                                VarExprReplacer::replace( handler->body, mapping );
+                                DeclReplacer::replace( handler->body, mapping );
                         }