Changeset 21b7161 for src/SymTab/FixFunction.cc

Timestamp:

Oct 3, 2017, 2:55:13 PM (5 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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, resolv-new, with_gc

Children:

7821d6c

Parents:

11a2d9b

Message:

Convert FixFunction? to PassVisitor?

File:

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

src/SymTab/FixFunction.cc

@@ -26 +26 @@
         FixFunction::FixFunction() : isVoid( false ) {}
 
-        DeclarationWithType * FixFunction::mutate(FunctionDecl *functionDecl) {
+
+        DeclarationWithType * FixFunction::postmutate(FunctionDecl *functionDecl) {
                 // can't delete function type because it may contain assertions, so transfer ownership to new object
-                ObjectDecl *pointer = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClasses(), functionDecl->get_linkage(), 0, new PointerType( Type::Qualifiers(), functionDecl->get_type() ), 0, functionDecl->get_attributes() );
-                functionDecl->get_attributes().clear();
+                ObjectDecl *pointer = new ObjectDecl( functionDecl->name, functionDecl->get_storageClasses(), functionDecl->linkage, nullptr, new PointerType( Type::Qualifiers(), functionDecl->type ), nullptr, functionDecl->attributes );
+                functionDecl->attributes.clear();
                 functionDecl->type = nullptr;
                 delete functionDecl;
@@ -35 +36 @@
         }
 
-        Type * FixFunction::mutate(VoidType *voidType) {
-                isVoid = true;
-                return voidType;
-        }
-
-        Type * FixFunction::mutate(BasicType *basicType) {
-                return basicType;
-        }
-
-        Type * FixFunction::mutate(PointerType *pointerType) {
-                return pointerType;
-        }
-
-        Type * FixFunction::mutate(ArrayType *arrayType) {
+        Type * FixFunction::postmutate(ArrayType *arrayType) {
                 // need to recursively mutate the base type in order for multi-dimensional arrays to work.
-                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->get_base()->clone()->acceptMutator( *this ), maybeClone( arrayType->get_dimension() ), arrayType->get_isVarLen(), arrayType->get_isStatic() );
+                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base, arrayType->dimension, arrayType->isVarLen, arrayType->isStatic );
+                arrayType->base = nullptr;
+                arrayType->dimension = nullptr;
                 delete arrayType;
                 return pointerType;
         }
 
-        Type * FixFunction::mutate(StructInstType *aggregateUseType) {
-                return aggregateUseType;
+        void FixFunction::premutate(VoidType *) {
+                isVoid = true;
         }
 
-        Type * FixFunction::mutate(UnionInstType *aggregateUseType) {
-                return aggregateUseType;
-        }
-
-        Type * FixFunction::mutate(EnumInstType *aggregateUseType) {
-                return aggregateUseType;
-        }
-
-        Type * FixFunction::mutate(TraitInstType *aggregateUseType) {
-                return aggregateUseType;
-        }
-
-        Type * FixFunction::mutate(TypeInstType *aggregateUseType) {
-                return aggregateUseType;
-        }
-
-        Type * FixFunction::mutate(TupleType *tupleType) {
-                return tupleType;
-        }
-
-        Type * FixFunction::mutate(VarArgsType *varArgsType) {
-                return varArgsType;
-        }
-
-        Type * FixFunction::mutate(ZeroType *zeroType) {
-                return zeroType;
-        }
-
-        Type * FixFunction::mutate(OneType *oneType) {
-                return oneType;
-        }
+        void FixFunction::premutate(FunctionDecl *) { visit_children = false; }
+        void FixFunction::premutate(BasicType *) { visit_children = false; }
+        void FixFunction::premutate(PointerType *) { visit_children = false; }
+        void FixFunction::premutate(StructInstType *) { visit_children = false; }
+        void FixFunction::premutate(UnionInstType *) { visit_children = false; }
+        void FixFunction::premutate(EnumInstType *) { visit_children = false; }
+        void FixFunction::premutate(TraitInstType *) { visit_children = false; }
+        void FixFunction::premutate(TypeInstType *) { visit_children = false; }
+        void FixFunction::premutate(TupleType *) { visit_children = false; }
+        void FixFunction::premutate(VarArgsType *) { visit_children = false; }
+        void FixFunction::premutate(ZeroType *) { visit_children = false; }
+        void FixFunction::premutate(OneType *) { visit_children = false; }
 } // namespace SymTab