Changeset c408483

Timestamp:

Jul 28, 2020, 2:37:36 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

eb1be63

Parents:

d1ee9ec

Message:

cleanup

Location:

src

Files:

• AST/Pass.hpp (modified) (1 diff)
• AST/Pass.proto.hpp (modified) (1 diff)
• Common/PassVisitor.proto.h (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• SymTab/FixFunction.cc (modified) (3 diffs)
• Tuples/Explode.cc (modified) (2 diffs)

src/AST/Pass.hpp

@@ -343 +343 @@
 extern struct PassVisitorStats {
         size_t depth = 0;
-        Stats::Counters::MaxCounter<double> * max = nullptr;
-        Stats::Counters::AverageCounter<double> * avg = nullptr;
+        Stats::Counters::MaxCounter<double> * max;
+        Stats::Counters::AverageCounter<double> * avg;
 } pass_visitor_stats;
 }

src/AST/Pass.proto.hpp

@@ -84 +84 @@
                 };
 
-                std::stack< cleanup_t > cleanups;
+                std::stack< cleanup_t, std::vector<cleanup_t> > cleanups;
         };
 

src/Common/PassVisitor.proto.h

@@ -38 +38 @@
         };
 
-        std::stack< cleanup_t > cleanups;
+        std::stack< cleanup_t, std::vector<cleanup_t> > cleanups;
 };
 

src/ResolvExpr/Resolver.cc

@@ -1072 +1072 @@
                 /// Strips extraneous casts out of an expression
                 struct StripCasts_new final {
-                        const ast::Expr * postmutate( const ast::CastExpr * castExpr ) {
+                        const ast::Expr * postvisit( const ast::CastExpr * castExpr ) {
                                 if (
                                         castExpr->isGenerated == ast::GeneratedCast

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

src/Tuples/Explode.cc

@@ -147 +147 @@
         }
 
-        const ast::Expr * postmutate( const ast::UniqueExpr * node ) {
+        const ast::Expr * postvisit( const ast::UniqueExpr * node ) {
                 // move cast into unique expr so that the unique expr has type T& rather than
                 // type T. In particular, this transformation helps with generating the
@@ -166 +166 @@
         }
 
-        const ast::Expr * postmutate( const ast::TupleIndexExpr * tupleExpr ) {
+        const ast::Expr * postvisit( const ast::TupleIndexExpr * tupleExpr ) {
                 // tuple index expr needs to be rebuilt to ensure that the type of the
                 // field is consistent with the type of the tuple expr, since the field