Changes in src/ResolvExpr/Unify.cc [89e6ffc:aefcc3b]

File:

• src/ResolvExpr/Unify.cc (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -60 +60 @@
                 virtual void visit(TupleType *tupleType);
                 virtual void visit(VarArgsType *varArgsType);
-                virtual void visit(ZeroType *zeroType);
-                virtual void visit(OneType *oneType);
 
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
@@ -590 +588 @@
         }
 
-        void Unify::visit(ZeroType *zeroType) {
-                result = dynamic_cast< ZeroType* >( type2 );
-        }
-
-        void Unify::visit(OneType *oneType) {
-                result = dynamic_cast< OneType* >( type2 );
+        // xxx - compute once and store in the FunctionType?
+        Type * extractResultType( FunctionType * function ) {
+                if ( function->get_returnVals().size() == 0 ) {
+                        return new VoidType( Type::Qualifiers() );
+                } else if ( function->get_returnVals().size() == 1 ) {
+                        return function->get_returnVals().front()->get_type()->clone();
+                } else {
+                        TupleType * tupleType = new TupleType( Type::Qualifiers() );
+                        for ( DeclarationWithType * decl : function->get_returnVals() ) {
+                                tupleType->get_types().push_back( decl->get_type()->clone() );
+                        } // for
+                        return tupleType;
+                }
         }