Changeset 7f6a7c9 for src/ResolvExpr/ConversionCost.cc

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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' into pthread-emulation

File:

• src/ResolvExpr/ConversionCost.cc (modified) (5 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -22 +22 @@
 #include "ResolvExpr/Cost.h"             // for Cost
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
+#include "ResolvExpr/Unify.h"
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for TypeDecl, NamedTypeDecl
 #include "SynTree/Type.h"                // for Type, BasicType, TypeInstType
 #include "typeops.h"                     // for typesCompatibleIgnoreQualifiers
+
 
 namespace ResolvExpr {
@@ -338 +340 @@
                 } else if ( const EnumInstType * enumInst = dynamic_cast< const EnumInstType * >( dest ) ) {
                         const EnumDecl * base_enum = enumInst->baseEnum;
-                        if ( const Type * base = base_enum->base ) { // if the base enum has a base (if it is typed)
+                        if ( const Type * base = base_enum->base ) {
                                 if ( const BasicType * enumBaseAstBasic = dynamic_cast< const BasicType *> (base) ) {
                                         conversionCostFromBasicToBasic(basicType, enumBaseAstBasic);
@@ -632 +634 @@
         } else if ( const ast::EnumInstType * enumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
                 const ast::EnumDecl * enumDecl = enumInst->base.get();
-                if ( const ast::Type * enumType = enumDecl->base.get() ) {
+                if ( enumDecl->isTyped && !enumDecl->base.get() ) {
+                        cost = Cost::infinity; 
+                } else if ( const ast::Type * enumType = enumDecl->base.get() ) {
                         if ( const ast::BasicType * enumTypeAsBasic = dynamic_cast<const ast::BasicType *>(enumType) ) {
                                 conversionCostFromBasicToBasic( basicType, enumTypeAsBasic );
@@ -655 +659 @@
                                 cost = Cost::safe;
                         }
-                } else {
+                }
+                /*
+                else if ( const ast::FunctionType * dstFunc = dstAsPtr->base.as<ast::FunctionType>()) {
+                        if (const ast::FunctionType * srcFunc = pointerType->base.as<ast::FunctionType>()) {
+                                if (dstFunc->params.empty() && dstFunc->isVarArgs ) {
+                                        cost = Cost::unsafe; // assign any function to variadic fptr
+                                }
+                        }
+                        else {
+                                ast::AssertionSet need, have; // unused
+                                ast::OpenVarSet open;
+                                env.extractOpenVars(open);
+                                ast::TypeEnvironment tenv = env;
+                                if ( unify(dstAsPtr->base, pointerType->base, tenv, need, have, open, symtab) ) {
+                                        cost = Cost::safe;
+                                }
+                        }
+                        // else infinity
+                }
+                */
+                else {
                         int assignResult = ptrsAssignable( pointerType->base, dstAsPtr->base, env );
                         if ( 0 < assignResult && tq1 <= tq2 ) {
@@ -694 +718 @@
         const ast::EnumDecl * baseEnum = enumInstType->base;
         if ( const ast::Type * baseType = baseEnum->base ) {
-                cost = costCalc( baseType, dst, srcIsLvalue, symtab, env );
+                costCalc( baseType, dst, srcIsLvalue, symtab, env );
         } else {
                 (void)enumInstType;