Changeset 8d182b1 for src/ResolvExpr/PolyCost.cc

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/PolyCost.cc (modified) (3 diffs)

src/ResolvExpr/PolyCost.cc

@@ -18 +18 @@
 #include "AST/Type.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "Common/PassVisitor.h"
-#include "SymTab/Indexer.h"   // for Indexer
-#include "SynTree/Type.h"     // for TypeInstType, Type
-#include "TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 
 namespace ResolvExpr {
-        struct PolyCost {
-                PolyCost( const TypeEnvironment &env, const SymTab::Indexer &indexer );
 
-                void previsit( TypeInstType * aggregateUseType );
-                int result;
-                const TypeEnvironment &tenv;
-                const SymTab::Indexer &indexer;
-        };
-
-        int polyCost( Type *type, const TypeEnvironment & env, const SymTab::Indexer &indexer ) {
-                PassVisitor<PolyCost> coster( env, indexer );
-                type->accept( coster );
-                return (coster.pass.result > 0) ? 1 : 0;
-        }
-
-        PolyCost::PolyCost( const TypeEnvironment & env, const SymTab::Indexer & indexer ) : result( 0 ), tenv( env ), indexer( indexer ) {
-        }
-
-        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
-                                                result += 1;
-                                        } // if
-                                } else {
-                                        // bound to concrete type
-                                        result += 1;
-                                } // if
-                        } // if
-                } // if
-        }
-
-// TODO: When the old PolyCost is torn out get rid of the _new suffix.
-class PolyCost_new {
+class PolyCost {
         const ast::SymbolTable &symtab;
 public:
@@ -65 +27 @@
         const ast::TypeEnvironment &env_;
 
-        PolyCost_new( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) 
+        PolyCost( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) 
         : symtab( symtab ), result( 0 ), env_( env ) {}
 
@@ -86 +48 @@
         const ast::Type * type, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
 ) {
-        ast::Pass<PolyCost_new> costing( symtab, env );
+        ast::Pass<PolyCost> costing( symtab, env );
         type->accept( costing );
         return (costing.core.result > 0) ? 1 : 0;