Changeset 0bd3faf for src/ResolvExpr/CastCost.cc

Timestamp:

Nov 13, 2023, 1:40:12 PM (11 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

6ea85b22

Parents:

25f2798

Message:

Removed forward declarations missed in the BaseSyntaxNode? removal. Removed code and modified names to support two versions of the ast.

File:

• src/ResolvExpr/CastCost.cc (modified) (4 diffs)

src/ResolvExpr/CastCost.cc

@@ -26 +26 @@
 #include "ResolvExpr/ConversionCost.h"   // for conversionCost
 #include "ResolvExpr/PtrsCastable.hpp"   // for ptrsCastable
-#include "ResolvExpr/typeops.h"          // for ptrsCastable
 #include "ResolvExpr/Unify.h"            // for typesCompatibleIgnoreQualifiers
 
@@ -38 +37 @@
 
 namespace {
-        struct CastCost_new : public ConversionCost_new {
-                using ConversionCost_new::previsit;
-                using ConversionCost_new::postvisit;
+        struct CastCost : public ConversionCost {
+                using ConversionCost::previsit;
+                using ConversionCost::postvisit;
 
-                CastCost_new(
+                CastCost(
                         const ast::Type * dst, bool srcIsLvalue, const ast::SymbolTable & symtab,
                         const ast::TypeEnvironment & env, CostCalculation costFunc )
-                : ConversionCost_new( dst, srcIsLvalue, symtab, env, costFunc ) {}
+                : ConversionCost( dst, srcIsLvalue, symtab, env, costFunc ) {}
 
                 void postvisit( const ast::BasicType * basicType ) {
@@ -85 +84 @@
         };
 
-        #warning For overload resolution between the two versions.
-        int localPtrsCastable(const ast::Type * t1, const ast::Type * t2,
-                        const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) {
-                return ptrsCastable( t1, t2, symtab, env );
-        }
-        Cost localCastCost(
-                const ast::Type * src, const ast::Type * dst, bool srcIsLvalue,
-                const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
-        ) { return castCost( src, dst, srcIsLvalue, symtab, env ); }
 } // anonymous namespace
 
@@ -136 +126 @@
         } else if ( auto refType = dynamic_cast< const ast::ReferenceType * >( dst ) ) {
                 PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
-                #warning cast on ptrsCastable artifact of having two functions, remove when port done
                 return convertToReferenceCost(
-                        src, refType, srcIsLvalue, symtab, env, localPtrsCastable );
+                        src, refType, srcIsLvalue, symtab, env, ptrsCastable );
         } else {
-                #warning cast on castCost artifact of having two functions, remove when port done
-                ast::Pass< CastCost_new > converter(
-                        dst, srcIsLvalue, symtab, env, localCastCost );
+                ast::Pass< CastCost > converter(
+                        dst, srcIsLvalue, symtab, env, castCost );
                 src->accept( converter );
                 return converter.core.cost;