Changes in / [6ce67ce:b502055]

Location:

src

Files:

• GenPoly/Box.cc (modified) (12 diffs)
• ResolvExpr/TypeMap.h (added)

src/GenPoly/Box.cc

@@ -25 +25 @@
 #include "PolyMutator.h"
 #include "FindFunction.h"
-#include "ScopedMap.h"
 #include "ScrubTyVars.h"
 
@@ -38 +37 @@
 
 #include "ResolvExpr/TypeEnvironment.h"
+#include "ResolvExpr/TypeMap.h"
+#include "ResolvExpr/typeops.h"
 
 #include "SymTab/Mangler.h"
@@ -101 +102 @@
                         typedef std::map< std::string, DeclarationWithType *> AdapterMap;
                         std::map< std::string, DeclarationWithType *> assignOps;
-                        ScopedMap< std::string, DeclarationWithType *> scopedAssignOps;
+                        ResolvExpr::TypeMap< DeclarationWithType > scopedAssignOps;
                         std::stack< AdapterMap > adapters;
                         DeclarationWithType *retval;
@@ -248 +249 @@
                 }
 
-                /// returns T if the given declaration is: (*?=?)(T *, T) for some T (return not checked, but maybe should be), NULL otherwise
-                ReferenceToType *isAssignment( DeclarationWithType *decl ) {
+                /// Returns T if the given declaration is (*?=?)(T *, T) for some TypeInstType T (return not checked, but maybe should be), NULL otherwise
+                TypeInstType *isTypeInstAssignment( DeclarationWithType *decl ) {
                         if ( decl->get_name() == "?=?" ) {
                                 if ( FunctionType *funType = getFunctionType( decl->get_type() ) ) {
                                         if ( funType->get_parameters().size() == 2 ) {
                                                 if ( PointerType *pointer = dynamic_cast< PointerType *>( funType->get_parameters().front()->get_type() ) ) {
-                                                        if ( ReferenceToType *refType = dynamic_cast< ReferenceToType *>( pointer->get_base() ) ) {
-                                                                if ( ReferenceToType *refType2 = dynamic_cast< ReferenceToType *>( funType->get_parameters().back()->get_type() ) ) {
+                                                        if ( TypeInstType *refType = dynamic_cast< TypeInstType *>( pointer->get_base() ) ) {
+                                                                if ( TypeInstType *refType2 = dynamic_cast< TypeInstType *>( funType->get_parameters().back()->get_type() ) ) {
                                                                         if ( refType->get_name() == refType2->get_name() ) {
                                                                                 return refType;
@@ -267 +268 @@
                         return 0;
                 }
+                
+                /// returns T if the given declaration is: (*?=?)(T *, T) for some type T (return not checked, but maybe should be), NULL otherwise
+                /// Only picks assignments where neither parameter is cv-qualified
+                Type *isAssignment( DeclarationWithType *decl ) {
+                        if ( decl->get_name() == "?=?" ) {
+                                if ( FunctionType *funType = getFunctionType( decl->get_type() ) ) {
+                                        if ( funType->get_parameters().size() == 2 ) {
+                                                Type::Qualifiers defaultQualifiers;
+                                                Type *paramType1 = funType->get_parameters().front()->get_type();
+                                                if ( paramType1->get_qualifiers() != defaultQualifiers ) return 0;
+                                                Type *paramType2 = funType->get_parameters().back()->get_type();
+                                                if ( paramType2->get_qualifiers() != defaultQualifiers ) return 0;
+                                                
+                                                if ( PointerType *pointerType = dynamic_cast< PointerType* >( paramType1 ) ) {
+                                                        Type *baseType1 = pointerType->get_base();
+                                                        if ( baseType1->get_qualifiers() != defaultQualifiers ) return 0;
+                                                        SymTab::Indexer dummy;
+                                                        if ( ResolvExpr::typesCompatible( baseType1, paramType2, dummy ) ) {
+                                                                return baseType1;
+                                                        } // if
+                                                } // if
+                                        } // if
+                                } // if
+                        } // if
+                        return 0;
+                }
 
                 void Pass1::findAssignOps( const std::list< TypeDecl *> &forall ) {
@@ -274 +301 @@
                                 for ( std::list< DeclarationWithType *>::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {
                                         std::string typeName;
-                                        if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( isAssignment( *assert ) ) ) {
+                                        if ( TypeInstType *typeInst = isTypeInstAssignment( *assert ) ) {
                                                 assignOps[ typeInst->get_name() ] = *assert;
                                         } // if
@@ -283 +310 @@
                 DeclarationWithType *Pass1::mutate( FunctionDecl *functionDecl ) {
                         // if this is a polymorphic assignment function, put it in the map for this scope
-                        if ( ReferenceToType *refType = isAssignment( functionDecl ) ) {
-                                if ( ! dynamic_cast< TypeInstType* >( refType ) ) {
-                                        scopedAssignOps.insert( refType->get_name(), functionDecl );
+                        if ( Type *assignedType = isAssignment( functionDecl ) ) {
+                                if ( ! dynamic_cast< TypeInstType* >( assignedType ) ) {
+                                        scopedAssignOps.insert( assignedType, functionDecl );
                                 }
                         }
@@ -934 +961 @@
                         TyVarMap exprTyVars;
                         makeTyVarMap( function, exprTyVars );
-                        ReferenceToType *polyRetType = 0;
-
-                        if ( polyRetType = isPolyRet( function ) ) {
+                        ReferenceToType *polyRetType = isPolyRet( function );
+
+                        if ( polyRetType ) {
                                 ret = addPolyRetParam( appExpr, function, polyRetType, arg );
                         } else if ( needsAdapter( function, scopeTyVars ) ) {
@@ -1042 +1069 @@
                                 } else if ( ReferenceToType *refType = dynamic_cast< ReferenceToType *>( retval->get_type() ) ) {
                                         // find assignment operator for generic type
-                                        ScopedMap< std::string, DeclarationWithType *>::const_iterator assignIter = scopedAssignOps.find( refType->get_name() );
-                                        if ( assignIter == scopedAssignOps.end() ) {
+                                        DeclarationWithType *functionDecl = scopedAssignOps.find( refType );
+                                        if ( ! functionDecl ) {
                                                 throw SemanticError( "Attempt to return dtype or ftype generic object in ", returnStmt->get_expr() );
                                         }
 
                                         // wrap it up in an application expression
-                                        DeclarationWithType *functionDecl = assignIter->second;
                                         assignExpr = new ApplicationExpr( wrapFunctionDecl( functionDecl ) );
                                         assignExpr->set_env( env->clone() );
@@ -1063 +1089 @@
                                                 assert( ! asserts.empty() && "Type param needs assignment operator assertion" );
                                                 DeclarationWithType *actualDecl = asserts.front();
-                                                ReferenceToType *actualType = isAssignment( actualDecl );
+                                                TypeInstType *actualType = isTypeInstAssignment( actualDecl );
                                                 assert( actualType && "First assertion of type with assertions should be assignment operator" );
                                                 TypeExpr *formalTypeExpr = dynamic_cast< TypeExpr* >( *tyIt );
@@ -1077 +1103 @@
                                                         }
                                                         assertAssign = assertAssignIt->second;
-                                                        //assignExpr->get_env()->add( formalTypeInstType->get_name(), actualType );
-                                                } else if ( ReferenceToType *formalReferenceType = dynamic_cast< ReferenceToType* >( formalType ) )  {
-                                                        ScopedMap< std::string, DeclarationWithType *>::const_iterator assertAssignIt = scopedAssignOps.find( formalReferenceType->get_name() );
-                                                        if ( assertAssignIt == scopedAssignOps.end() ) {
-                                                                throw SemanticError( "No assignment operation found for ", formalReferenceType );
+                                                } else {
+                                                        assertAssign = scopedAssignOps.find( formalType );
+                                                        if ( ! assertAssign ) {
+                                                                throw SemanticError( "No assignment operation found for ", formalType );
                                                         }
-                                                        assertAssign = assertAssignIt->second;
-                                                } else assert( false && "returning polymorphic types with non struct/polymorphic parameters not yet supported" );
+                                                }
                                                 
 
@@ -1424 +1448 @@
                         assert( newMemberExpr );
 
-                        // wrap pointer members in appropriate cast
-                        if ( dynamic_cast< PointerType* >( memberExpr->get_member()->get_type() ) ) {
-                                CastExpr *ptrCastExpr = new CastExpr( newMemberExpr, new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ) ) );
+                        Type *memberType = memberExpr->get_member()->get_type();
+                        if ( ! isPolyType( memberType, scopeTyVars ) ) {
+                                // Not all members of a polymorphic type are themselves of polymorphic type; in this case the member expression should be wrapped and dereferenced to form an lvalue
+                                CastExpr *ptrCastExpr = new CastExpr( newMemberExpr, new PointerType( Type::Qualifiers(), memberType->clone() ) );
                                 UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                 derefExpr->get_args().push_back( ptrCastExpr );