Changeset 3f7e12cb for src/ResolvExpr/PolyCost.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

954908d

Parents:

78315272 (diff), e35f30a (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

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PolyCost.cc -- 
+// PolyCost.cc --
 //
 // Author           : Richard C. Bilson
@@ -31 +31 @@
         };
 
-        int polyCost( Type *type, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+        int polyCost( Type *type, const TypeEnvironment & env, const SymTab::Indexer &indexer ) {
                 PolyCost coster( env, indexer );
                 type->accept( coster );
@@ -37 +37 @@
         }
 
-        PolyCost::PolyCost( const TypeEnvironment &env, const SymTab::Indexer &indexer ) : result( 0 ), env( env ), indexer( indexer ) {
+        PolyCost::PolyCost( const TypeEnvironment & env, const SymTab::Indexer & indexer ) : result( 0 ), env( env ), indexer( indexer ) {
         }
 
-        void PolyCost::visit(TypeInstType *typeInst) {
+        void PolyCost::visit(TypeInstType * typeInst) {
                 EqvClass eqvClass;
-                if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
+                if ( env.lookup( typeInst->name, eqvClass ) ) {
                         if ( eqvClass.type ) {
-                                if ( TypeInstType *otherTypeInst = dynamic_cast< TypeInstType* >( eqvClass.type ) ) {
-                                        if ( indexer.lookupType( otherTypeInst->get_name() ) ) {
+                                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