Changeset 115ac1ce

Timestamp:

Jun 29, 2024, 5:29:40 AM (5 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

73d0e3f4, bc07190

Parents:

4117761

Message:

Allow explict conversion from cfa enum to int (while disallow implicit)

File:

• src/ResolvExpr/CastCost.cpp (modified) (1 diff)

src/ResolvExpr/CastCost.cpp

@@ -53 +53 @@
                 void postvisit( const ast::EnumInstType * enumInst ) {
                         cost = conversionCost( enumInst, dst, srcIsLvalue, symtab, env );
-
-                        if ( !enumInst->base->isCfa ) {
-                                static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicKind::SignedInt ) };
-                                Cost intCost = costCalc( integer, dst, srcIsLvalue, symtab, env );
-                                cost = intCost < cost? intCost: cost;
-                        } else if ( enumInst->base->isTyped() ) {
+                        if ( enumInst->base->isTyped() ) {
                                 auto baseConversionCost = 
                                         castCost( enumInst->base->base, dst, srcIsLvalue, symtab, env );
                                 cost = baseConversionCost < cost? baseConversionCost: cost;
                         }
+                        static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicKind::SignedInt ) };
+                        Cost intCost = costCalc( integer, dst, srcIsLvalue, symtab, env );
+                        intCost.incSafe();
+                        cost = intCost < cost? intCost: cost;
                 }