Changeset 90152a4 for src/ResolvExpr/Occurs.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

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

src/ResolvExpr/Occurs.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Occurs.cc -- 
+// Occurs.cc --
 //
 // Author           : Richard C. Bilson
@@ -17 +17 @@
 #include <string>             // for string
 
+#include "Common/PassVisitor.h"
 #include "SynTree/Type.h"     // for TypeInstType, Type
-#include "SynTree/Visitor.h"  // for Visitor
 #include "TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 
 namespace ResolvExpr {
-        class Occurs : public Visitor {
-          public:
+        struct Occurs : public WithVisitorRef<Occurs> {
                 Occurs( std::string varName, const TypeEnvironment &env );
-                bool get_result() const { return result; }
-                virtual void visit( TypeInstType *typeInst );
-          private:
+                void previsit( TypeInstType * typeInst );
+
                 bool result;
                 std::set< std::string > eqvVars;
-                const TypeEnvironment &env;
+                const TypeEnvironment &tenv;
         };
 
         bool occurs( Type *type, std::string varName, const TypeEnvironment &env ) {
-                Occurs occur( varName, env );
+                PassVisitor<Occurs> occur( varName, env );
                 type->accept( occur );
-                return occur.get_result();
+                return occur.pass.result;
         }
 
-        Occurs::Occurs( std::string varName, const TypeEnvironment &env ) : result( false ), env( env ) {
-                EqvClass eqvClass;
-                if ( env.lookup( varName, eqvClass ) ) {
-                        eqvVars = eqvClass.vars;
+        Occurs::Occurs( std::string varName, const TypeEnvironment & env ) : result( false ), tenv( env ) {
+                if ( const EqvClass *eqvClass = tenv.lookup( varName ) ) {
+                        eqvVars = eqvClass->vars;
                 } else {
                         eqvVars.insert( varName );
@@ -48 +45 @@
         }
 
-        void Occurs::visit( TypeInstType *typeInst ) {
-                EqvClass eqvClass;
-///   std::cout << "searching for vars: ";
-///   std::copy( eqvVars.begin(), eqvVars.end(), std::ostream_iterator< std::string >( std::cout, " " ) );
-///   std::cout << std::endl;
+        void Occurs::previsit( TypeInstType * typeInst ) {
+                ///   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 ( env.lookup( typeInst->get_name(), eqvClass ) ) {
-                        if ( eqvClass.type ) {
-///       std::cout << typeInst->get_name() << " is bound to";
-///       eqvClass.type->print( std::cout );
-///       std::cout << std::endl;
-                                eqvClass.type->accept( *this );
+                } 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 );
                         } // if
                 } // if