Changeset 5ccc733 for src/ResolvExpr/CastCost.cpp

Timestamp:

Jun 29, 2024, 5:02:06 AM (3 weeks ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

4117761

Parents:

7552fde

Message:

Fix the bug that C style enum cannot to use as an lvalue

File:

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

src/ResolvExpr/CastCost.cpp

@@ -54 +54 @@
                         cost = conversionCost( enumInst, dst, srcIsLvalue, symtab, env );
 
-                        if (Cost::unsafe < cost) {
+                        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;
-                        }
-                        if ( enumInst->base->isTyped && enumInst->base->base ) {
+                        } else if ( enumInst->base->isTyped() ) {
                                 auto baseConversionCost = 
                                         castCost( enumInst->base->base, dst, srcIsLvalue, symtab, env );
@@ -74 +73 @@
                                 cost = conversionCost( basicType, dst, srcIsLvalue, symtab, env );
                                 if ( Cost::unsafe < cost ) {
-                                        if (auto enumInst = dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                                // Always explict cast only for typed enum
-                                                if (enumInst->base->isTyped) cost = Cost::unsafe;
+                                        if ( dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                                cost = Cost::unsafe;
                                         }
                                 }
@@ -85 +83 @@
                         cost = conversionCost( zero, dst, srcIsLvalue, symtab, env );
                         if ( Cost::unsafe < cost ) {
-                                if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                        if (enumInst->base->isTyped) cost = Cost::unsafe;
+                                if ( dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                        cost = Cost::unsafe;
                                 }
                         }
@@ -94 +92 @@
                         cost = conversionCost( one, dst, srcIsLvalue, symtab, env );
                         if ( Cost::unsafe < cost ) {
-                                if (auto enumInst = dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                        if (enumInst->base->isTyped) cost = Cost::unsafe;
+                                if ( dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                        cost = Cost::unsafe;
                                 }
                         }