Changeset 7a63486 for src/SynTree

Timestamp:

Apr 10, 2019, 3:15:41 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:

055b562

Parents:

c41c18a6

Message:

Allow merging between complete/incomplete type variables

File:

• src/SynTree/Declaration.h (modified) (1 diff)

src/SynTree/Declaration.h

@@ -211 +211 @@
                 TypeDecl::Kind kind;
                 bool isComplete;
+                
                 Data() : kind( (TypeDecl::Kind)-1 ), isComplete( false ) {}
                 Data( TypeDecl * typeDecl ) : Data( typeDecl->get_kind(), typeDecl->isComplete() ) {}
                 Data( Kind kind, bool isComplete ) : kind( kind ), isComplete( isComplete ) {}
+                Data( const Data& d1, const Data& d2 ) 
+                : kind( d1.kind ), isComplete ( d1.isComplete || d2.isComplete ) {}
+
                 bool operator==(const Data & other) const { return kind == other.kind && isComplete == other.isComplete; }
                 bool operator!=(const Data & other) const { return !(*this == other);}