Changeset b729c01 for src/ResolvExpr

Timestamp:

Jul 25, 2022, 12:30:59 PM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

bbf17d5

Parents:

d958834b

Message:

Update enum unifier; now unifier compare types based on the enum's base

File:

• src/ResolvExpr/Unify.cc (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -165 +165 @@
                 ast::Type * newFirst  = shallowCopy( first  );
                 ast::Type * newSecond = shallowCopy( second );
+                if ( auto temp = dynamic_cast<const ast::EnumInstType *>(first) ) {
+                        if ( !dynamic_cast< const ast::EnumInstType * >( second ) ) {
+                                const ast::EnumDecl * baseEnum = dynamic_cast<const ast::EnumDecl *>(temp->base.get());
+                                if ( auto t = baseEnum->base.get() ) {
+                                        newFirst = ast::shallowCopy( t );
+                                }
+                        }
+                } else if ( auto temp = dynamic_cast<const ast::EnumInstType *>(second) ) {
+                        const ast::EnumDecl * baseEnum = dynamic_cast<const ast::EnumDecl *>(temp->base.get());
+                        if ( auto t = baseEnum->base.get() ) {
+                                newSecond = ast::shallowCopy( t );
+                        }
+                }
+
                 newFirst ->qualifiers = {};
                 newSecond->qualifiers = {};
@@ -988 +1002 @@
                                 if ( isTuple && isTuple2 ) {
                                         ++it; ++jt;  // skip ttype parameters before break
-                                } else if ( isTuple ) {
+                                } else if ( isTuple ) { 
                                         // bundle remaining params into tuple
                                         pty2 = tupleFromExprs( param2, jt, params2.end(), pty->qualifiers );