Changes in src/ResolvExpr/Unify.cc [62e5546:a2a77af]

File:

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

src/ResolvExpr/Unify.cc

@@ -31 +31 @@
 
 namespace ResolvExpr {
-        struct WidenMode {
-                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
-                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
-                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
-                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
-                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
-                operator bool() { return widenFirst && widenSecond; }
-
-                bool widenFirst : 1, widenSecond : 1;
-        };
 
         class Unify : public Visitor {
@@ -597 +587 @@
         }
 
+        // 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;
+                }
+        }
 } // namespace ResolvExpr