Changeset ad56482 for src/ResolvExpr/Unify.cc

Timestamp:

Jan 26, 2017, 12:03:57 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0157ca7

Parents:

e15df4c (diff), ad6343e (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) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -123 +123 @@
         }
 
-        struct CompleteTypeChecker : public Visitor {
-                virtual void visit( VoidType *basicType ) { status = false; }
-                virtual void visit( BasicType *basicType ) {}
-                virtual void visit( PointerType *pointerType ) {}
-                virtual void visit( ArrayType *arrayType ) { status = ! arrayType->get_isVarLen(); }
-                virtual void visit( FunctionType *functionType ) {}
-                virtual void visit( StructInstType *aggregateUseType ) { status = aggregateUseType->get_baseStruct()->has_body(); }
-                virtual void visit( UnionInstType *aggregateUseType ) { status = aggregateUseType->get_baseUnion()->has_body(); }
-                // xxx - enum inst does not currently contain a pointer to base, this should be fixed.
-                virtual void visit( EnumInstType *aggregateUseType ) { /* status = aggregateUseType->get_baseEnum()->hasBody(); */ }
-                virtual void visit( TraitInstType *aggregateUseType ) { assert( false ); }
-                virtual void visit( TypeInstType *aggregateUseType ) { status = aggregateUseType->get_baseType()->isComplete(); }
-                virtual void visit( TupleType *tupleType ) {} // xxx - not sure if this is right, might need to recursively check complete-ness
-                virtual void visit( TypeofType *typeofType ) { assert( false ); }
-                virtual void visit( AttrType *attrType ) { assert( false ); } // xxx - not sure what to do here
-                virtual void visit( VarArgsType *varArgsType ){} // xxx - is this right?
-                virtual void visit( ZeroType *zeroType ) {}
-                virtual void visit( OneType *oneType ) {}
-                bool status = true;
-        };
-        bool isComplete( Type * type ) {
-                CompleteTypeChecker checker;
-                assert( type );
-                type->accept( checker );
-                return checker.status;
-        }
-
         bool tyVarCompatible( const TypeDecl::Data & data, Type *type, const SymTab::Indexer &indexer ) {
                 switch ( data.kind ) {
@@ -158 +131 @@
                         // type must also be complete
                         // xxx - should this also check that type is not a tuple type and that it's not a ttype?
-                        return ! isFtype( type, indexer ) && (! data.isComplete || isComplete( type ));
+                        return ! isFtype( type, indexer ) && (! data.isComplete || type->isComplete() );
                   case TypeDecl::Ftype:
                         return isFtype( type, indexer );