Changeset 8d182b1 for src/ResolvExpr/ConversionCost.h

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/ResolvExpr/ConversionCost.h

@@ -22 +22 @@
 #include "AST/Fwd.hpp"
 #include "AST/Pass.hpp"       // for WithShortCircuiting
-#include "Common/PassVisitor.h"
-#include "SynTree/Visitor.h"  // for Visitor
-#include "SynTree/SynTree.h"  // for Visitor Nodes
-
-namespace SymTab {
-        class Indexer;
-}  // namespace SymTab
 
 namespace ResolvExpr {
-        class TypeEnvironment;
-
-        Cost conversionCost(
-                const Type * src, const Type * dest, bool srcIsLvalue,
-                const SymTab::Indexer & indexer, const TypeEnvironment & env );
-
-        typedef std::function<Cost(const Type *, const Type *, bool,
-                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 );
-
-                Cost get_cost() const { return cost; }
-
-                void previsit( const 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 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 );
-          protected:
-                const Type * dest;
-                bool srcIsLvalue;
-                const SymTab::Indexer &indexer;
-                Cost cost;
-                const TypeEnvironment &env;
-                CostFunction costFunc;
-          private:
-                // refactor for code resue
-                void conversionCostFromBasicToBasic( const BasicType * src, const BasicType* dest );
-        };
-
-        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.
@@ -92 +39 @@
         PtrsCalculation func );
 
-#warning when the old ConversionCost is removed, get ride of the _new suffix.
-class ConversionCost_new : public ast::WithShortCircuiting {
+class ConversionCost : public ast::WithShortCircuiting {
 protected:
         const ast::Type * dst;
@@ -105 +51 @@
         Cost result() { return cost; }
 
-        ConversionCost_new( const ast::Type * dst, bool srcIsLvalue, const ast::SymbolTable & symtab,
+        ConversionCost( const ast::Type * dst, bool srcIsLvalue, const ast::SymbolTable & symtab,
                         const ast::TypeEnvironment & env, CostCalculation costCalc ) :
                 dst( dst ), srcIsLvalue( srcIsLvalue ), symtab( symtab ), env( env ),