Changeset 055b562 for src/ResolvExpr

Timestamp:

Apr 10, 2019, 3:18:03 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7889f14

Parents:

7a63486

Message:

fix to last

File:

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

src/ResolvExpr/TypeEnvironment.cc

@@ -430 +430 @@
                                         class1->set_type( common );
                                 }
-                                class1->data.isComplete = data.isComplete;
+                                class1->data.isComplete |= data.isComplete;
                                 env.erase( class2 );
                         } else return false;
@@ -438 +438 @@
                                 class1->vars.insert( class2->vars.begin(), class2->vars.end() );
                                 class1->allowWidening = widen1;
-                                class1->data.isComplete = data.isComplete;
+                                class1->data.isComplete |= data.isComplete;
                                 env.erase( class2 );
                         } else {
                                 class2->vars.insert( class1->vars.begin(), class1->vars.end() );
                                 class2->allowWidening = widen2;
-                                class2->data.isComplete = data.isComplete;
+                                class2->data.isComplete |= data.isComplete;
                                 env.erase( class1 );
                         } // if
@@ -450 +450 @@
                         class1->vars.insert( var2->get_name() );
                         class1->allowWidening = widen1;
-                        class1->data.isComplete = data.isComplete;
+                        class1->data.isComplete |= data.isComplete;
                 } else if ( class2 != env.end() ) {
                         // var1 unbound, add to class2
                         class2->vars.insert( var1->get_name() );
                         class2->allowWidening = widen2;
-                        class2->data.isComplete = data.isComplete;
+                        class2->data.isComplete |= data.isComplete;
                 } else {
                         // neither var bound, create new class