Changes in src/ResolvExpr/PolyCost.cc [3e5dd913:5aa4656]

File:

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

src/ResolvExpr/PolyCost.cc

@@ -58 +58 @@
 
 // TODO: When the old PolyCost is torn out get rid of the _new suffix.
-class PolyCost_new {
+struct PolyCost_new {
+        int result;
         const ast::SymbolTable &symtab;
-public:
-        int result;
         const ast::TypeEnvironment &env_;
 
-        PolyCost_new( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) 
-        : symtab( symtab ), result( 0 ), env_( env ) {}
+        PolyCost_new( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) :
+                result( 0 ), symtab( symtab ), env_( env ) {}
 
         void previsit( const ast::TypeInstType * type ) {
-                if ( const ast::EqvClass * eqv = env_.lookup( *type ) ) /* && */ if ( eqv->bound ) {
+                if ( const ast::EqvClass * eqv = env_.lookup( type->name ) ) /* && */ if ( eqv->bound ) {
                         if ( const ast::TypeInstType * otherType = eqv->bound.as< ast::TypeInstType >() ) {
                                 if ( symtab.lookupType( otherType->name ) ) {
@@ -87 +86 @@
         ast::Pass<PolyCost_new> costing( symtab, env );
         type->accept( costing );
-        return costing.core.result;
+        return costing.pass.result;
 }