Changes in src/ResolvExpr/Occurs.cc [982f95d:8e18b8e]

File:

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

src/ResolvExpr/Occurs.cc

@@ -14 +14 @@
 //
 
+#include <set>                // for set, _Rb_tree_const_iterator
 #include <string>             // for string
-#include <unordered_set>      // for unordered_set
 
 #include "Common/PassVisitor.h"
 #include "SynTree/Type.h"     // for TypeInstType, Type
-#include "TypeEnvironment.h"  // for ClassRef, TypeEnvironment
+#include "TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 
 namespace ResolvExpr {
@@ -27 +27 @@
 
                 bool result;
-                using VarSet = std::unordered_set< std::string >;
-                VarSet eqvVars;
+                std::set< std::string > eqvVars;
                 const TypeEnvironment &tenv;
         };
@@ -39 +38 @@
 
         Occurs::Occurs( std::string varName, const TypeEnvironment & env ) : result( false ), tenv( env ) {
-                if ( ClassRef eqvClass = tenv.lookup( varName ) ) {
-                        eqvVars = eqvClass.get_vars<VarSet>();
+                if ( const EqvClass *eqvClass = tenv.lookup( varName ) ) {
+                        eqvVars = eqvClass->vars;
                 } else {
                         eqvVars.insert( varName );
@@ -52 +51 @@
                 if ( eqvVars.find( typeInst->get_name() ) != eqvVars.end() ) {
                         result = true;
-                } else if ( ClassRef eqvClass = tenv.lookup( typeInst->get_name() ) ) {
-                        if ( Type* boundTy = eqvClass.get_bound().type ) {
+                } else if ( const EqvClass *eqvClass = tenv.lookup( typeInst->get_name() ) ) {
+                        if ( eqvClass->type ) {
 ///       std::cerr << typeInst->get_name() << " is bound to";
-///       boundTy->print( std::cerr );
+///       eqvClass.type->print( std::cerr );
 ///       std::cerr << std::endl;
-                                boundTy->accept( *visitor );
+                                eqvClass->type->accept( *visitor );
                         } // if
                 } // if