Changeset e5c74d1

Timestamp:

Jan 22, 2018, 2:27:24 PM (7 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, resolv-new, with_gc

Children:

b04a408

Parents:

13deae88

Message:

Convert DeclStats? to PassVisitor?

File:

• src/CodeTools/DeclStats.cc (modified) (4 diffs)

src/CodeTools/DeclStats.cc

@@ -23 +23 @@
 #include <utility>                 // for pair, make_pair
 
+#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/VectorMap.h"      // for VectorMap
@@ -35 +36 @@
 namespace CodeTools {
 
-        class DeclStats : public Visitor {
+        struct DeclStats : public WithShortCircuiting {
                 template<typename T>
                 static void sum(T& a, const T& b) { a += b; }
@@ -200 +201 @@
 
         public:
-                using Visitor::visit;
-
-                virtual void visit( FunctionDecl *decl ) {
+                void previsit( FunctionDecl *decl ) {
                         // skip if already seen declaration for this function
-                        const std::string& mangleName = decl->get_mangleName().empty() ? decl->get_name() : decl->get_mangleName();
-                        if ( ! seen_names.insert( mangleName ).second ) {
-                                maybeAccept( decl->get_statements(), *this );
-                                return;
-                        }
-
-                        Stats& stats = for_linkage[ decl->get_linkage() ];
-
-                        ++stats.n_decls;
-                        FunctionType* fnTy = decl->get_functionType();
-                        const Type::ForallList& forall = fnTy->get_forall();
-                        ++stats.n_type_params.at( forall.size() );
-                        unsigned n_assns = 0;
-                        for ( TypeDecl* fdecl : forall ) {
-                                n_assns += fdecl->get_assertions().size();
-                                for ( DeclarationWithType* assn : fdecl->get_assertions() ) {
-                                        FunctionType *assnTy = 0;
-                                        if ( ObjectDecl *assnObj = dynamic_cast<ObjectDecl*>(assn) ) {
-                                                if ( PointerType *ptrTy = dynamic_cast<PointerType*>(assnObj->get_type()) ) {
-                                                        assnTy = dynamic_cast<FunctionType*>(ptrTy->get_base());
-                                                } else assnTy = dynamic_cast<FunctionType*>(assnObj->get_type());
-                                        } else if ( FunctionDecl *assnDecl = dynamic_cast<FunctionDecl*>(assn) ) {
-                                                assnTy = assnDecl->get_functionType();
+                        const std::string& mangleName = decl->get_mangleName().empty() ? decl->name : decl->get_mangleName();
+                        if ( seen_names.insert( mangleName ).second ) {
+                                Stats& stats = for_linkage[ decl->linkage ];
+
+                                ++stats.n_decls;
+                                FunctionType* fnTy = decl->type;
+                                const Type::ForallList& forall = fnTy->forall;
+                                ++stats.n_type_params.at( forall.size() );
+                                unsigned n_assns = 0;
+                                for ( TypeDecl* fdecl : forall ) {
+                                        n_assns += fdecl->assertions.size();
+                                        for ( DeclarationWithType* assn : fdecl->assertions ) {
+                                                FunctionType *assnTy = nullptr;
+                                                if ( ObjectDecl *assnObj = dynamic_cast<ObjectDecl*>(assn) ) {
+                                                        if ( PointerType *ptrTy = dynamic_cast<PointerType*>(assnObj->get_type()) ) {
+                                                                assnTy = dynamic_cast<FunctionType*>(ptrTy->get_base());
+                                                        } else assnTy = dynamic_cast<FunctionType*>(assnObj->get_type());
+                                                } else if ( FunctionDecl *assnDecl = dynamic_cast<FunctionDecl*>(assn) ) {
+                                                        assnTy = assnDecl->type;
+                                                }
+                                                if ( assnTy ) analyzeFunc( assnTy, stats, stats.assn_params, stats.assn_returns );
                                         }
-                                        if ( assnTy ) analyzeFunc( assnTy, stats, stats.assn_params, stats.assn_returns );
-                                }
-                        }
-                        ++stats.n_assns[ n_assns ];
-
-                        ++stats.by_name[ decl->get_name() ];
-
-                        analyzeFunc( fnTy, stats, stats.params, stats.returns );
-
-                        // analyze expressions in decl statements
-                        maybeAccept( decl->get_statements(), *this );
-                }
-
-                virtual void visit( UntypedExpr *expr ) {
+                                }
+                                ++stats.n_assns[ n_assns ];
+
+                                ++stats.by_name[ decl->get_name() ];
+
+                                analyzeFunc( fnTy, stats, stats.params, stats.returns );
+                        }
+                }
+
+                void previsit( UntypedExpr *expr ) {
+                        visit_children = false;
                         analyzeExpr( expr, 0 );
                 }
@@ -366 +360 @@
 
         void printDeclStats( std::list< Declaration * > &translationUnit ) {
-                DeclStats stats;
+                PassVisitor<DeclStats> stats;
                 acceptAll( translationUnit, stats );
-                stats.print();
+                stats.pass.print();
         }