Changes in / [7e23d0a:5189888]

Location:

src

Files:

• ResolvExpr/Unify.cc (modified) (2 diffs)
• examples/runTests.sh (deleted)
• examples/tests/log.txt (deleted)
• examples/tests/vector_test.in.txt (deleted)
• examples/tests/vector_test.out.txt (deleted)

src/ResolvExpr/Unify.cc

@@ -61 +61 @@
 
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
-                template< typename RefType > void handleGenericRefType( RefType *inst, Type *other );
 
                 bool result;
@@ -497 +496 @@
 
         template< typename RefType >
-        void Unify::handleRefType( RefType *inst, Type *other ) {
-                // check that other type is compatible and named the same
+        void Unify::handleRefType( RefType *inst, Type *other ) {  
                 RefType *otherStruct = dynamic_cast< RefType* >( other );
                 result = otherStruct && inst->get_name() == otherStruct->get_name();
-        }
-
-        template< typename RefType >
-        void Unify::handleGenericRefType( RefType *inst, Type *other ) {
-                // Check that other type is compatible and named the same
-                handleRefType( inst, other );
-                if ( ! result ) return;
-                // Check that parameters of type unify, if any
-                std::list< Expression* > params = inst->get_parameters();
-                if ( ! params.empty() ) {
-                        std::list< TypeDecl* > *baseParams = inst->get_baseParameters();
-                        if ( ! baseParams ) {
-                                result = false;
-                                return;
-                        }
-                        std::list< Expression* >::const_iterator it = params.begin();
-                        std::list< TypeDecl* >::const_iterator baseIt = baseParams->begin();
-                        while ( it != params.end() && baseIt != baseParams->end()) {
-                                TypeExpr *param = dynamic_cast< TypeExpr* >(*it);
-                                assert(param && "Aggregate parameters should be type expressions");
-                                TypeInstType baseType(Type::Qualifiers(), (*baseIt)->get_name(), *baseIt);
-                                if ( ! unifyExact( param->get_type(), &baseType, env, needAssertions, haveAssertions, openVars, WidenMode(false, false), indexer ) ) {
-                                        result = false;
-                                        return;
-                                }
-                                
-                                ++it;
-                                ++baseIt;
-                        }
-                        if ( it != params.end() || baseIt != baseParams->end() ) {
-                                result = false;
-                        }
-                }
-        }
+        }  
 
         void Unify::visit(StructInstType *structInst) {
-                handleGenericRefType( structInst, type2 );
+                handleRefType( structInst, type2 );
         }
 
         void Unify::visit(UnionInstType *unionInst) {
-                handleGenericRefType( unionInst, type2 );
+                handleRefType( unionInst, type2 );
         }