Changeset 982f95d for src/ResolvExpr/CastCost.cc

Timestamp:

Jun 15, 2018, 5:09:29 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

97397a26

Parents:

1d7b0a8

Message:

Start of new environment implementation; terribly broken

File:

• src/ResolvExpr/CastCost.cc (modified) (2 diffs)

src/ResolvExpr/CastCost.cc

@@ -18 +18 @@
 #include "ConversionCost.h"              // for ConversionCost
 #include "Cost.h"                        // for Cost, Cost::infinity
-#include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment, EqvClass
+#include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment, ClassRef
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for TypeDecl, NamedTypeDecl
@@ -43 +43 @@
         Cost castCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
-                        if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
-                                if ( eqvClass->type ) {
-                                        return castCost( src, eqvClass->type, indexer, env );
+                        if ( ClassRef eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+                                if ( Type* boundTy = eqvClass.get_bound().type ) {
+                                        return castCost( src, boundTy, indexer, env );
                                 } else {
                                         return Cost::infinity;