Changeset bf4fe05 for src/ResolvExpr/ConversionCost.cpp

Timestamp:

May 13, 2024, 7:07:06 AM (17 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ca4f2b2

Parents:

ec20ab9 (diff), 5f225f5 (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:

fix merge

File:

• src/ResolvExpr/ConversionCost.cpp (moved) (moved from src/ResolvExpr/ConversionCost.cc ) (6 diffs)

src/ResolvExpr/ConversionCost.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ConversionCost.cc --
+// ConversionCost.cpp --
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include "ConversionCost.h"
+#include "ConversionCost.hpp"
 
 #include <cassert>                       // for assert
@@ -20 +20 @@
 #include <string>                        // for operator==, string
 
-#include "ResolvExpr/Cost.h"             // for Cost
-#include "ResolvExpr/Unify.h"            // for typesCompatibleIgnoreQualifiers
+#include "ResolvExpr/Cost.hpp"           // for Cost
+#include "ResolvExpr/Unify.hpp"          // for typesCompatibleIgnoreQualifiers
 #include "ResolvExpr/PtrsAssignable.hpp" // for ptrsAssignable
 
@@ -283 +283 @@
                 cost = costCalc( basicType, integer, srcIsLvalue, symtab, env );
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
                         cost = Cost::unsafe;
                 }
@@ -480 +480 @@
                 // assuming 0p is supposed to be used for pointers?
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
                         cost = Cost::unsafe;
                 }
@@ -501 +501 @@
                 }
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
                         cost = Cost::unsafe;
                 }