Changeset 15215f02 for src/ResolvExpr/Unify.cc

Timestamp:

Apr 22, 2024, 11:37:36 PM (6 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

13de4478

Parents:

0fe07be (diff), d7c0ad5 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/ResolvExpr/Unify.cc

@@ -307 +307 @@
                                 // type unification calls expression unification (mutual recursion)
                                 if ( ! unify(array->dimension, array2->dimension,
-                                    tenv, need, have, open, widen) ) return;
+                                        tenv, need, have, open, widen) ) return;
                         }
 
@@ -455 +455 @@
                         // check that the other type is compatible and named the same
                         auto otherInst = dynamic_cast< const XInstType * >( other );
-                        if (otherInst && inst->name == otherInst->name) 
+                        if (otherInst && inst->name == otherInst->name)
                                 this->result = otherInst;
                         return otherInst;
@@ -542 +542 @@
                         // Lazy approach for now
                         if ( auto otherPos = dynamic_cast< const ast::EnumAttrType *>(type2) ) {
-                            if ( enumAttr->match(otherPos) ) {
-                                    result = otherPos;
-                            }
-            }  
+                                if ( enumAttr->match(otherPos) ) {
+                                        result = otherPos;
+                                }
+                        }
                 }