Changes in src/ResolvExpr/ConversionCost.h [7d01cf44:bd0b6b62]

File:

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

src/ResolvExpr/ConversionCost.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 09:37:28 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thu Aug  8 16:13:00 2019
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:38:24 2017
+// Update Count     : 4
 //
 
@@ -20 +20 @@
 #include "Cost.h"             // for Cost
 
-#include "AST/Fwd.hpp"
-#include "AST/Pass.hpp"       // for WithShortCircuiting
 #include "Common/PassVisitor.h"
 #include "SynTree/Visitor.h"  // for Visitor
@@ -33 +31 @@
         class TypeEnvironment;
 
-        typedef std::function<Cost(const Type *, const Type *, bool,
-                const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
-
+        typedef std::function<Cost(Type *, Type *, const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
         struct ConversionCost : public WithShortCircuiting {
           public:
-                ConversionCost( const Type * dest, bool srcIsLvalue,
-                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
+                ConversionCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
 
                 Cost get_cost() const { return cost; }
 
-                void previsit( const BaseSyntaxNode * ) { visit_children = false; }
+                void previsit( BaseSyntaxNode * ) { visit_children = false; }
 
-                void postvisit( const VoidType * voidType );
-                void postvisit( const BasicType * basicType );
-                void postvisit( const PointerType * pointerType );
-                void postvisit( const ArrayType * arrayType );
-                void postvisit( const ReferenceType * refType );
-                void postvisit( const FunctionType * functionType );
-                void postvisit( const StructInstType * aggregateUseType );
-                void postvisit( const UnionInstType * aggregateUseType );
-                void postvisit( const EnumInstType * aggregateUseType );
-                void postvisit( const TraitInstType * aggregateUseType );
-                void postvisit( const TypeInstType * aggregateUseType );
-                void postvisit( const TupleType * tupleType );
-                void postvisit( const VarArgsType * varArgsType );
-                void postvisit( const ZeroType * zeroType );
-                void postvisit( const OneType * oneType );
+                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 );
           protected:
-                const Type * dest;
-                bool srcIsLvalue;
+                Type *dest;
                 const SymTab::Indexer &indexer;
                 Cost cost;
@@ -69 +63 @@
         };
 
-        typedef std::function<int(const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment &)> PtrsFunction;
-        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, bool srcIsLvalue,
-                const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
-
-// Some function pointer types, differ in return type.
-using CostCalculation = std::function<Cost(const ast::Type *, const ast::Type *,
-        const ast::SymbolTable &, const ast::TypeEnvironment &)>;
-using NumCostCalculation = std::function<int(const ast::Type *, const ast::Type *,
-        const ast::SymbolTable &, const ast::TypeEnvironment &)>;
-
-#warning when the old ConversionCost is removed, get ride of the _new suffix.
-class ConversionCost_new : public ast::WithShortCircuiting {
-protected:
-        const ast::Type * dst;
-        const ast::SymbolTable & symtab;
-        const ast::TypeEnvironment & env;
-        CostCalculation costCalc;
-public:
-        Cost cost;
-
-        ConversionCost_new( const ast::Type * dst, const ast::SymbolTable & symtab,
-                        const ast::TypeEnvironment & env, CostCalculation costCalc ) :
-                dst( dst ), symtab( symtab ), env( env ), costCalc( costCalc ), cost( Cost::infinity )
-        {}
-
-        void previsit( const ast::Node * ) { visit_children = false; }
-
-        void postvisit( const ast::VoidType * voidType );
-        void postvisit( const ast::BasicType * basicType );
-        void postvisit( const ast::PointerType * pointerType );
-        void postvisit( const ast::ArrayType * arrayType );
-        void postvisit( const ast::ReferenceType * refType );
-        void postvisit( const ast::FunctionType * functionType );
-        void postvisit( const ast::StructInstType * structInstType );
-        void postvisit( const ast::UnionInstType * unionInstType );
-        void postvisit( const ast::EnumInstType * enumInstType );
-        void postvisit( const ast::TraitInstType * traitInstType );
-        void postvisit( const ast::TypeInstType * typeInstType );
-        void postvisit( const ast::TupleType * tupleType );
-        void postvisit( const ast::VarArgsType * varArgsType );
-        void postvisit( const ast::ZeroType * zeroType );
-        void postvisit( const ast::OneType * oneType );
-};
-
-Cost convertToReferenceCost( const ast::Type * src, const ast::ReferenceType * dest,
-        const ast::SymbolTable & indexer, const ast::TypeEnvironment & env, NumCostCalculation func );
-
+        typedef std::function<int(Type *, Type *, const SymTab::Indexer &, const TypeEnvironment &)> PtrsFunction;
+        Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
 } // namespace ResolvExpr