Changeset 06601401

Timestamp:

Mar 8, 2024, 12:22:59 AM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

03606ce

Parents:

76fe046

Message:

Change the common type interpretation of EnumPos?

Location:

src/ResolvExpr

Files:

• CommonType.cc (modified) (1 diff)
• Unify.cc (modified) (1 diff)

src/ResolvExpr/CommonType.cc

@@ -681 +681 @@
 
         void postvisit( const ast::EnumPosType * enumPos ) {
-                if ( dynamic_cast<const ast::EnumPosType *>(type2) ) {
+                if ( auto type2AsPos = dynamic_cast<const ast::EnumPosType *>(type2) ) {
                         // result = commonType( type2AsPos->instance, enumPos->instance, tenv, need, have, open, widen );
-                        result = enumPos;
+                        // result = enumPos;
+                        if ( enumPos->instance->base->name == type2AsPos->instance->base->name ) {
+                                result = type2;
+                        }
                 } else if ( dynamic_cast<const ast::BasicType *>(type2) ) {
                         result = type2;

src/ResolvExpr/Unify.cc

@@ -517 +517 @@
                 }
 
-                void postvisit( const ast::EnumPosType * ) {
+                void postvisit( const ast::EnumPosType * posType ) {
                         // Lazy approach for now
                         auto otherPos = dynamic_cast< const ast::EnumPosType *>(type2);
-                        if (otherPos) this->result = otherPos;
+                        if ( otherPos ) {
+                                if ( otherPos->instance->base->name == posType->instance->base->name )
+                                        result = otherPos;
+                        }
                 }