Changes in src/ResolvExpr/ConversionCost.cc [982f95d:6d53e779]

File:

• src/ResolvExpr/ConversionCost.cc (modified) (4 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -22 +22 @@
 #include "Common/GC.h"                   // for new_static_root
 #include "ResolvExpr/Cost.h"             // for Cost
-#include "ResolvExpr/TypeEnvironment.h"  // for ClassRef, TypeEnvironment
+#include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for TypeDecl, NamedTypeDecl
@@ -29 +29 @@
 
 namespace ResolvExpr {
-        const Cost Cost::zero =      Cost(  0,  0,  0,  0 );
-        const Cost Cost::infinity =  Cost( -1, -1, -1, -1 );
-        const Cost Cost::unsafe =    Cost(  1,  0,  0,  0 );
-        const Cost Cost::poly =      Cost(  0,  1,  0,  0 );
-        const Cost Cost::safe =      Cost(  0,  0,  1,  0 );
-        const Cost Cost::reference = Cost(  0,  0,  0,  1 );
+        const Cost Cost::zero =      Cost{  0,  0,  0,  0,  0,  0 };
+        const Cost Cost::infinity =  Cost{ -1, -1, -1,  1, -1, -1 };
+        const Cost Cost::unsafe =    Cost{  1,  0,  0,  0,  0,  0 };
+        const Cost Cost::poly =      Cost{  0,  1,  0,  0,  0,  0 };
+        const Cost Cost::var =       Cost{  0,  0,  1,  0,  0,  0 };
+        const Cost Cost::spec =      Cost{  0,  0,  0, -1,  0,  0 };
+        const Cost Cost::safe =      Cost{  0,  0,  0,  0,  1,  0 };
+        const Cost Cost::reference = Cost{  0,  0,  0,  0,  0,  1 };
 
 #if 0
@@ -44 +46 @@
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
                         PRINT( std::cerr << "type inst " << destAsTypeInst->name; )
-                        if ( ClassRef eqvClass = env.lookup( destAsTypeInst->name ) ) {
-                                if ( Type* boundTy = eqvClass.get_bound().type ) {
-                                        return conversionCost( src, boundTy, indexer, env );
+                        if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->name ) ) {
+                                if ( eqvClass->type ) {
+                                        return conversionCost( src, eqvClass->type, indexer, env );
                                 } else {
                                         return Cost::infinity;
@@ -360 +362 @@
 
         void ConversionCost::postvisit( TypeInstType *inst ) {
-                if ( ClassRef eqvClass = env.lookup( inst->name ) ) {
-                        cost = costFunc( eqvClass.get_bound().type, dest, indexer, env );
+                if ( const EqvClass *eqvClass = env.lookup( inst->name ) ) {
+                        cost = costFunc( eqvClass->type, dest, indexer, env );
                 } else if ( TypeInstType *destAsInst = dynamic_cast< TypeInstType* >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {