Changeset 7042c60 for src/ResolvExpr/ConversionCost.cc

Timestamp:

Apr 25, 2024, 3:48:17 PM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

eb7586e

Parents:

cf191ac (diff), 55c97e4 (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:

resolve conflict

File:

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

src/ResolvExpr/ConversionCost.cc

@@ -31 +31 @@
 #define PRINT(x)
 #endif
+
+namespace {
 
         // GENERATED START, DO NOT EDIT
@@ -152 +154 @@
         );
 
-namespace {
         int localPtrsAssignable(const ast::Type * t1, const ast::Type * t2,
                         const ast::SymbolTable &, const ast::TypeEnvironment & env ) {
@@ -379 +380 @@
 
 void ConversionCost::postvisit( const ast::EnumAttrType * src ) {
-    auto dstAsEnumAttrType = dynamic_cast<const ast::EnumAttrType *>(dst);
+        auto dstAsEnumAttrType = dynamic_cast<const ast::EnumAttrType *>(dst);
         assert( src->attr != ast::EnumAttribute::Label );
-    if ( src->attr == ast::EnumAttribute::Value ) {
-        if ( dstAsEnumAttrType && dstAsEnumAttrType->attr == ast::EnumAttribute::Value) {
-            cost = costCalc( src->instance, dstAsEnumAttrType->instance, srcIsLvalue, symtab, env );
-        } else {
-            auto baseType = src->instance->base->base;
-            cost = costCalc( baseType, dst, srcIsLvalue, symtab, env );
+        if ( src->attr == ast::EnumAttribute::Value ) {
+                if ( dstAsEnumAttrType && dstAsEnumAttrType->attr == ast::EnumAttribute::Value) {
+                        cost = costCalc( src->instance, dstAsEnumAttrType->instance, srcIsLvalue, symtab, env );
+                } else {
+                        auto baseType = src->instance->base->base;
+                        cost = costCalc( baseType, dst, srcIsLvalue, symtab, env );
                         if ( cost < Cost::infinity ) {
                                 cost.incUnsafe();
                         }
-        }
-    } else { // ast::EnumAttribute::Posn
-        if ( auto dstBase = dynamic_cast<const ast::EnumInstType *>( dst ) ) {
-                    cost = costCalc( src->instance, dstBase, srcIsLvalue, symtab, env );
-                    if ( cost < Cost::unsafe ) cost.incSafe();
-            } else {
-                    static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicKind::SignedInt ) };
-                    cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
-                    if ( cost < Cost::unsafe ) {
-                            cost.incSafe();
-                    }
-            }
-    }
+                }
+        } else { // ast::EnumAttribute::Posn
+                if ( auto dstBase = dynamic_cast<const ast::EnumInstType *>( dst ) ) {
+                        cost = costCalc( src->instance, dstBase, srcIsLvalue, symtab, env );
+                        if ( cost < Cost::unsafe ) cost.incSafe();
+                } else {
+                        static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicKind::SignedInt ) };
+                        cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
+                        if ( cost < Cost::unsafe ) {
+                                cost.incSafe();
+                        }
+                }
+        }
 }