Changes in src/ResolvExpr/PtrsCastable.cc [00ac42e:b0837e4]

File:

• src/ResolvExpr/PtrsCastable.cc (modified) (9 diffs)

src/ResolvExpr/PtrsCastable.cc

@@ -14 +14 @@
 //
 
-#include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 #include "SymTab/Indexer.h"              // for Indexer
@@ -22 +21 @@
 #include "typeops.h"                     // for ptrsAssignable
 
+
 namespace ResolvExpr {
-        struct PtrsCastable : public WithShortCircuiting  {
+        class PtrsCastable : public Visitor {
           public:
                 PtrsCastable( Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
@@ -29 +29 @@
                 int get_result() const { return result; }
 
-                void previsit( Type * ) { visit_children = false; }
-
-                void postvisit( VoidType * voidType );
-                void postvisit( BasicType * basicType );
-                void postvisit( PointerType * pointerType );
-                void postvisit( ArrayType * arrayType );
-                void postvisit( FunctionType * functionType );
-                void postvisit( StructInstType * inst );
-                void postvisit( UnionInstType * inst );
-                void postvisit( EnumInstType * inst );
-                void postvisit( TraitInstType * inst );
-                void postvisit( TypeInstType * inst );
-                void postvisit( TupleType * tupleType );
-                void postvisit( VarArgsType * varArgsType );
-                void postvisit( ZeroType * zeroType );
-                void postvisit( OneType * oneType );
+                virtual void visit(VoidType *voidType);
+                virtual void visit(BasicType *basicType);
+                virtual void visit(PointerType *pointerType);
+                virtual void visit(ArrayType *arrayType);
+                virtual void visit(FunctionType *functionType);
+                virtual void visit(StructInstType *inst);
+                virtual void visit(UnionInstType *inst);
+                virtual void visit(EnumInstType *inst);
+                virtual void visit(TraitInstType *inst);
+                virtual void visit(TypeInstType *inst);
+                virtual void visit(TupleType *tupleType);
+                virtual void visit(VarArgsType *varArgsType);
+                virtual void visit(ZeroType *zeroType);
+                virtual void visit(OneType *oneType);
           private:
                 Type *dest;
@@ -57 +55 @@
                                 return -1;
                         } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( src ) ) {
+                                EqvClass eqvClass;
                                 if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
                                         if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
@@ -63 +62 @@
                                                 } // if
                                         } //if
-                                } else if ( const EqvClass *eqvClass = env.lookup( typeInst->get_name() ) ) {
-                                        if ( eqvClass->data.kind == TypeDecl::Ftype ) {
+                                } else if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
+                                        if ( eqvClass.data.kind == TypeDecl::Ftype ) {
                                                 return -1;
                                         } // if
@@ -78 +77 @@
         int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
-                        if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
-                                // xxx - should this be ptrsCastable?
-                                return ptrsAssignable( src, eqvClass->type, env );
+                        EqvClass eqvClass;
+                        if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
+                                return ptrsAssignable( src, eqvClass.type, env );
                         } // if
                 } // if
@@ -86 +85 @@
                         return objectCast( src, env, indexer );
                 } else {
-                        PassVisitor<PtrsCastable> ptrs( dest, env, indexer );
+                        PtrsCastable ptrs( dest, env, indexer );
                         src->accept( ptrs );
-                        return ptrs.pass.get_result();
+                        return ptrs.get_result();
                 } // if
         }
@@ -96 +95 @@
         }
 
-        void PtrsCastable::postvisit( VoidType * ) {
+        void PtrsCastable::visit( VoidType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( BasicType * ) {
+        void PtrsCastable::visit( BasicType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( PointerType * ) {
+        void PtrsCastable::visit( PointerType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( ArrayType * ) {
+        void PtrsCastable::visit( ArrayType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( FunctionType * ) {
+        void PtrsCastable::visit( FunctionType * ) {
                 // result = -1;
                 result = functionCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( StructInstType * ) {
+        void PtrsCastable::visit( StructInstType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( UnionInstType * ) {
+        void PtrsCastable::visit( UnionInstType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( EnumInstType * ) {
+        void PtrsCastable::visit( EnumInstType * ) {
                 if ( dynamic_cast< EnumInstType* >( dest ) ) {
                         result = 1;
@@ -139 +138 @@
         }
 
-        void PtrsCastable::postvisit( TraitInstType * ) {}
+        void PtrsCastable::visit( TraitInstType * ) {}
 
-        void PtrsCastable::postvisit(TypeInstType *inst) {
+        void PtrsCastable::visit(TypeInstType *inst) {
                 //result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0 ? 1 : -1;
                 result = objectCast( inst, env, indexer ) == objectCast( dest, env, indexer ) ? 1 : -1;
         }
 
-        void PtrsCastable::postvisit( TupleType * ) {
+        void PtrsCastable::visit( TupleType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( VarArgsType * ) {
+        void PtrsCastable::visit( VarArgsType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( ZeroType * ) {
+        void PtrsCastable::visit( ZeroType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( OneType * ) {
+        void PtrsCastable::visit( OneType * ) {
                 result = objectCast( dest, env, indexer );
         }