Changeset b429026 for src/ResolvExpr/Occurs.cc

Timestamp:

Jun 4, 2018, 11:55:02 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

ee3c93d

Parents:

0a75b77 (diff), 249d6e6 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/ResolvExpr/Occurs.cc

@@ -38 +38 @@
 
         Occurs::Occurs( std::string varName, const TypeEnvironment & env ) : result( false ), tenv( env ) {
-                EqvClass eqvClass;
-                if ( tenv.lookup( varName, eqvClass ) ) {
-                        eqvVars = eqvClass.vars;
+                if ( const EqvClass *eqvClass = tenv.lookup( varName ) ) {
+                        eqvVars = eqvClass->vars;
                 } else {
                         eqvVars.insert( varName );
@@ -47 +46 @@
 
         void Occurs::previsit( TypeInstType * typeInst ) {
-                EqvClass eqvClass;
-///   std::cerr << "searching for vars: ";
+                ///   std::cerr << "searching for vars: ";
 ///   std::copy( eqvVars.begin(), eqvVars.end(), std::ostream_iterator< std::string >( std::cerr, " " ) );
 ///   std::cerr << std::endl;
                 if ( eqvVars.find( typeInst->get_name() ) != eqvVars.end() ) {
                         result = true;
-                } else if ( tenv.lookup( typeInst->get_name(), eqvClass ) ) {
-                        if ( eqvClass.type ) {
+                } else if ( const EqvClass *eqvClass = tenv.lookup( typeInst->get_name() ) ) {
+                        if ( eqvClass->type ) {
 ///       std::cerr << typeInst->get_name() << " is bound to";
 ///       eqvClass.type->print( std::cerr );
 ///       std::cerr << std::endl;
-                                eqvClass.type->accept( *visitor );
+                                eqvClass->type->accept( *visitor );
                         } // if
                 } // if