Changeset 90152a4 for src/ResolvExpr/PolyCost.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

File:

• src/ResolvExpr/PolyCost.cc (modified) (1 diff)

src/ResolvExpr/PolyCost.cc

@@ -14 +14 @@
 //
 
+#include "Common/PassVisitor.h"
 #include "SymTab/Indexer.h"   // for Indexer
 #include "SynTree/Type.h"     // for TypeInstType, Type
-#include "SynTree/Visitor.h"  // for Visitor
 #include "TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 
 namespace ResolvExpr {
-        class PolyCost : public Visitor {
-          public:
+        struct PolyCost {
                 PolyCost( const TypeEnvironment &env, const SymTab::Indexer &indexer );
-                int get_result() const { return result; }
-          private:
-                virtual void visit(TypeInstType *aggregateUseType);
+
+                void previsit( TypeInstType * aggregateUseType );
                 int result;
-                const TypeEnvironment &env;
+                const TypeEnvironment &tenv;
                 const SymTab::Indexer &indexer;
         };
 
         int polyCost( Type *type, const TypeEnvironment & env, const SymTab::Indexer &indexer ) {
-                PolyCost coster( env, indexer );
+                PassVisitor<PolyCost> coster( env, indexer );
                 type->accept( coster );
-                return coster.get_result();
+                return coster.pass.result;
         }
 
-        PolyCost::PolyCost( const TypeEnvironment & env, const SymTab::Indexer & indexer ) : result( 0 ), env( env ), indexer( indexer ) {
+        PolyCost::PolyCost( const TypeEnvironment & env, const SymTab::Indexer & indexer ) : result( 0 ), tenv( env ), indexer( indexer ) {
         }
 
-        void PolyCost::visit(TypeInstType * typeInst) {
-                EqvClass eqvClass;
-                if ( env.lookup( typeInst->name, eqvClass ) ) {
-                        if ( eqvClass.type ) {
-                                if ( TypeInstType * otherTypeInst = dynamic_cast< TypeInstType* >( eqvClass.type ) ) {
+        void PolyCost::previsit(TypeInstType * typeInst) {
+                if ( const EqvClass *eqvClass = tenv.lookup( typeInst->name ) ) {
+                        if ( eqvClass->type ) {
+                                if ( TypeInstType * otherTypeInst = dynamic_cast< TypeInstType* >( eqvClass->type ) ) {
                                         if ( indexer.lookupType( otherTypeInst->name ) ) {
                                                 // bound to opaque type