Changeset 7042c60 for src/ResolvExpr/PolyCost.cc

Timestamp:

Apr 25, 2024, 3:48:17 PM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

eb7586e

Parents:

cf191ac (diff), 55c97e4 (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:

resolve conflict

File:

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

src/ResolvExpr/PolyCost.cc

@@ -29 +29 @@
         const ast::TypeEnvironment &env_;
 
-        PolyCost( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) 
+        PolyCost( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env )
         : symtab( symtab ), result( 0 ), 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 ) ; eqv && eqv->bound ) {
                         if ( const ast::TypeInstType * otherType = eqv->bound.as< ast::TypeInstType >() ) {
                                 if ( symtab.lookupType( otherType->name ) ) {
                                         // Bound to opaque type.
-                                        result += 1;
+                                        result = 1;
                                 }
                         } else {
                                 // Bound to concrete type.
-                                result += 1;
+                                result = 1;
                         }
                 }
@@ -52 +52 @@
         const ast::Type * type, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
 ) {
-        ast::Pass<PolyCost> costing( symtab, env );
-        type->accept( costing );
-        return (costing.core.result > 0) ? 1 : 0;
+        return ast::Pass<PolyCost>::read( type, symtab, env );
 }