- Timestamp:
- Apr 10, 2019, 3:18:03 PM (5 years ago)
- 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
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/ResolvExpr/TypeEnvironment.cc
r7a63486 r055b562 430 430 class1->set_type( common ); 431 431 } 432 class1->data.isComplete = data.isComplete;432 class1->data.isComplete |= data.isComplete; 433 433 env.erase( class2 ); 434 434 } else return false; … … 438 438 class1->vars.insert( class2->vars.begin(), class2->vars.end() ); 439 439 class1->allowWidening = widen1; 440 class1->data.isComplete = data.isComplete;440 class1->data.isComplete |= data.isComplete; 441 441 env.erase( class2 ); 442 442 } else { 443 443 class2->vars.insert( class1->vars.begin(), class1->vars.end() ); 444 444 class2->allowWidening = widen2; 445 class2->data.isComplete = data.isComplete;445 class2->data.isComplete |= data.isComplete; 446 446 env.erase( class1 ); 447 447 } // if … … 450 450 class1->vars.insert( var2->get_name() ); 451 451 class1->allowWidening = widen1; 452 class1->data.isComplete = data.isComplete;452 class1->data.isComplete |= data.isComplete; 453 453 } else if ( class2 != env.end() ) { 454 454 // var1 unbound, add to class2 455 455 class2->vars.insert( var1->get_name() ); 456 456 class2->allowWidening = widen2; 457 class2->data.isComplete = data.isComplete;457 class2->data.isComplete |= data.isComplete; 458 458 } else { 459 459 // neither var bound, create new class
Note: See TracChangeset
for help on using the changeset viewer.