Changeset e67a82d for src/SymTab/FixFunction.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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 conflicts

File:

• src/SymTab/FixFunction.cc (modified) (4 diffs)

src/SymTab/FixFunction.cc

@@ -106 +106 @@
                 bool isVoid = false;
 
-                void premutate( const ast::FunctionDecl * ) { visit_children = false; }
+                void previsit( const ast::FunctionDecl * ) { visit_children = false; }
 
-                const ast::DeclWithType * postmutate( const ast::FunctionDecl * func ) {
+                const ast::DeclWithType * postvisit( const ast::FunctionDecl * func ) {
                         return new ast::ObjectDecl{ 
                                 func->location, func->name, new ast::PointerType{ func->type }, nullptr, 
@@ -114 +114 @@
                 }
 
-                void premutate( const ast::ArrayType * ) { visit_children = false; }
+                void previsit( const ast::ArrayType * ) { visit_children = false; }
 
-                const ast::Type * postmutate( const ast::ArrayType * array ) {
+                const ast::Type * postvisit( const ast::ArrayType * array ) {
                         return new ast::PointerType{ 
                                 array->base, array->dimension, array->isVarLen, array->isStatic, 
@@ -122 +122 @@
                 }
 
-                void premutate( const ast::VoidType * ) { isVoid = true; }
+                void previsit( const ast::VoidType * ) { isVoid = true; }
 
-                void premutate( const ast::BasicType * ) { visit_children = false; }
-                void premutate( const ast::PointerType * ) { visit_children = false; }
-                void premutate( const ast::StructInstType * ) { visit_children = false; }
-                void premutate( const ast::UnionInstType * ) { visit_children = false; }
-                void premutate( const ast::EnumInstType * ) { visit_children = false; }
-                void premutate( const ast::TraitInstType * ) { visit_children = false; }
-                void premutate( const ast::TypeInstType * ) { visit_children = false; }
-                void premutate( const ast::TupleType * ) { visit_children = false; }
-                void premutate( const ast::VarArgsType * ) { visit_children = false; }
-                void premutate( const ast::ZeroType * ) { visit_children = false; }
-                void premutate( const ast::OneType * ) { visit_children = false; }
+                void previsit( const ast::BasicType * ) { visit_children = false; }
+                void previsit( const ast::PointerType * ) { visit_children = false; }
+                void previsit( const ast::StructInstType * ) { visit_children = false; }
+                void previsit( const ast::UnionInstType * ) { visit_children = false; }
+                void previsit( const ast::EnumInstType * ) { visit_children = false; }
+                void previsit( const ast::TraitInstType * ) { visit_children = false; }
+                void previsit( const ast::TypeInstType * ) { visit_children = false; }
+                void previsit( const ast::TupleType * ) { visit_children = false; }
+                void previsit( const ast::VarArgsType * ) { visit_children = false; }
+                void previsit( const ast::ZeroType * ) { visit_children = false; }
+                void previsit( const ast::OneType * ) { visit_children = false; }
         };
 } // anonymous namespace
@@ -141 +141 @@
         ast::Pass< FixFunction_new > fixer;
         dwt = dwt->accept( fixer );
-        isVoid |= fixer.pass.isVoid;
+        isVoid |= fixer.core.isVoid;
         return dwt;
 }