Changes in src/ResolvExpr/CastCost.cc [251ce80:46da46b]

File:

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

src/ResolvExpr/CastCost.cc

@@ -13 +13 @@
 // Update Count     : 9
 //
-
-#include "CastCost.hpp"
 
 #include <cassert>                       // for assert
@@ -24 +22 @@
 #include "ConversionCost.h"              // for ConversionCost
 #include "Cost.h"                        // for Cost, Cost::infinity
-#include "ResolvExpr/ConversionCost.h"   // for conversionCost
-#include "ResolvExpr/PtrsCastable.hpp"   // for ptrsCastable
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment, EqvClass
-#include "ResolvExpr/typeops.h"          // for ptrsCastable
-#include "ResolvExpr/Unify.h"            // for typesCompatibleIgnoreQualifiers
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for TypeDecl, NamedTypeDecl
 #include "SynTree/Type.h"                // for PointerType, Type, TypeInstType
+#include "typeops.h"                     // for typesCompatibleIgnoreQualifiers
 
 #if 0
@@ -165 +160 @@
                                 if (
                                         pointerType->qualifiers <= ptr->qualifiers
-                                        && typesCompatibleIgnoreQualifiers( pointerType->base, ptr->base, env )
+                                        && typesCompatibleIgnoreQualifiers( pointerType->base, ptr->base, symtab, env )
                                 ) {
                                         cost = Cost::safe;
@@ -232 +227 @@
         )
 
-        if ( typesCompatibleIgnoreQualifiers( src, dst, env ) ) {
+        if ( typesCompatibleIgnoreQualifiers( src, dst, symtab, env ) ) {
                 PRINT( std::cerr << "compatible!" << std::endl; )
+                if (dynamic_cast<const ast::ZeroType *>(dst) || dynamic_cast<const ast::OneType *>(dst)) {
+                        return Cost::spec;
+                }
                 return Cost::zero;
         } else if ( dynamic_cast< const ast::VoidType * >( dst ) ) {