Changes in src/ResolvExpr/ConversionCost.h [bd0b6b62:0c6596f]

File:

• src/ResolvExpr/ConversionCost.h (modified) (3 diffs)

src/ResolvExpr/ConversionCost.h

@@ -19 +19 @@
 
 #include "Cost.h"             // for Cost
-
-#include "Common/PassVisitor.h"
 #include "SynTree/Visitor.h"  // for Visitor
 #include "SynTree/SynTree.h"  // for Visitor Nodes
@@ -31 +29 @@
         class TypeEnvironment;
 
-        typedef std::function<Cost(Type *, Type *, const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
-        struct ConversionCost : public WithShortCircuiting {
+        class ConversionCost : public Visitor {
           public:
-                ConversionCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
+                ConversionCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
 
                 Cost get_cost() const { return cost; }
 
-                void previsit( BaseSyntaxNode * ) { visit_children = false; }
-
-                void postvisit( VoidType * voidType );
-                void postvisit( BasicType * basicType );
-                void postvisit( PointerType * pointerType );
-                void postvisit( ArrayType * arrayType );
-                void postvisit( ReferenceType * refType );
-                void postvisit( FunctionType * functionType );
-                void postvisit( StructInstType * aggregateUseType );
-                void postvisit( UnionInstType * aggregateUseType );
-                void postvisit( EnumInstType * aggregateUseType );
-                void postvisit( TraitInstType * aggregateUseType );
-                void postvisit( TypeInstType * aggregateUseType );
-                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(ReferenceType *refType);
+                virtual void visit(FunctionType *functionType);
+                virtual void visit(StructInstType *aggregateUseType);
+                virtual void visit(UnionInstType *aggregateUseType);
+                virtual void visit(EnumInstType *aggregateUseType);
+                virtual void visit(TraitInstType *aggregateUseType);
+                virtual void visit(TypeInstType *aggregateUseType);
+                virtual void visit(TupleType *tupleType);
+                virtual void visit(VarArgsType *varArgsType);
+                virtual void visit(ZeroType *zeroType);
+                virtual void visit(OneType *oneType);
           protected:
                 Type *dest;
@@ -60 +55 @@
                 Cost cost;
                 const TypeEnvironment &env;
-                CostFunction costFunc;
         };
 
-        typedef std::function<int(Type *, Type *, const SymTab::Indexer &, const TypeEnvironment &)> PtrsFunction;
+        typedef std::function<int(Type *, Type *, const TypeEnvironment &, const SymTab::Indexer &)> PtrsFunction;
         Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
 } // namespace ResolvExpr