Changes in src/GenPoly/Box.cc [f2b2029:f8b961b]

File:

• src/GenPoly/Box.cc (modified) (10 diffs)

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Dec 02 11:52:37 2015
-// Update Count     : 201
+// Last Modified On : Thu Nov 26 17:01:55 2015
+// Update Count     : 191
 //
 
@@ -50 +50 @@
                 FunctionType *makeAdapterType( FunctionType *adaptee, const TyVarMap &tyVars );
 
+                /// Replaces polymorphic return types with out-parameters, replaces calls to polymorphic functions with adapter calls as needed, and adds appropriate type variables to the function call
                 class Pass1 : public PolyMutator {
                   public:
@@ -88 +89 @@
                 };
 
+                /// Moves polymorphic returns in function types to pointer-type parameters, adds type size and assertion parameters to parameter lists as well
                 class Pass2 : public PolyMutator {
                   public:
@@ -105 +107 @@
                 };
 
+                /// Replaces initialization of polymorphic values with alloca, declaration of dtype/ftype with appropriate void expression, and sizeof expressions of polymorphic types with the proper variable
                 class Pass3 : public PolyMutator {
                   public:
@@ -183 +186 @@
                 }
 
-                // returns true if the given declaration is: (*?=?)(T *, T) for some T (return not checked, but maybe should be)
                 bool checkAssignment( DeclarationWithType *decl, std::string &name ) {
                         if ( decl->get_name() == "?=?" ) {
@@ -669 +671 @@
                                                 TypeInstType *typeInst1 = isPolyPtr( appExpr->get_args().front()->get_results().front(), env, scopeTyVars );
                                                 TypeInstType *typeInst2 = isPolyPtr( appExpr->get_args().back()->get_results().front(), env, scopeTyVars );
-                                                assert( ! typeInst1 || ! typeInst2 );  // the arguments cannot both be polymorphic pointers
+                                                assert( ! typeInst1 || ! typeInst2 );
                                                 UntypedExpr *ret = 0;
-                                                if ( typeInst1 || typeInst2 ) { // one of the arguments is a polymorphic pointer
+                                                if ( typeInst1 || typeInst2 ) {
                                                         ret = new UntypedExpr( new NameExpr( "?+?" ) );
                                                 } // if
@@ -867 +869 @@
 
                 Statement * Pass1::mutate(ReturnStmt *retStmt) {
-                        // by this point, a cast expr on a polymorphic return value is redundant
+                        // a cast expr on a polymorphic return value is either redundant or invalid
                         while ( CastExpr *castExpr = dynamic_cast< CastExpr *>( retStmt->get_expr() ) ) {
                                 retStmt->set_expr( castExpr->get_arg() );
@@ -1009 +1011 @@
                         std::list< DeclarationWithType *> inferredParams;
                         ObjectDecl *newObj = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0 );
-///   ObjectDecl *newFunPtr = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 );
+//   ObjectDecl *newFunPtr = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 );
                         for ( std::list< TypeDecl *>::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) {
                                 ObjectDecl *thisParm;
@@ -1021 +1023 @@
                                 // move all assertions into parameter list
                                 for ( std::list< DeclarationWithType *>::iterator assert = (*tyParm)->get_assertions().begin(); assert != (*tyParm)->get_assertions().end(); ++assert ) {
-///      *assert = (*assert)->acceptMutator( *this );
+//      *assert = (*assert)->acceptMutator( *this );
                                         inferredParams.push_back( *assert );
                                 }
@@ -1063 +1065 @@
 
                 TypeDecl * Pass3::mutate( TypeDecl *typeDecl ) {
-///   Initializer *init = 0;
-///   std::list< Expression *> designators;
-///   scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
-///   if ( typeDecl->get_base() ) {
-///     init = new SimpleInit( new SizeofExpr( handleDecl( typeDecl, typeDecl->get_base() ) ), designators );
-///   }
-///   return new ObjectDecl( typeDecl->get_name(), Declaration::Extern, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ), init );
+//   Initializer *init = 0;
+//   std::list< Expression *> designators;
+//   scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+//   if ( typeDecl->get_base() ) {
+//     init = new SimpleInit( new SizeofExpr( handleDecl( typeDecl, typeDecl->get_base() ) ), designators );
+//   }
+//   return new ObjectDecl( typeDecl->get_name(), Declaration::Extern, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ), init );
 
                         scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();