Changeset a32b204 for translator/GenPoly

Timestamp:

May 17, 2015, 1:19:35 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

0dd3a2f

Parents:

b87a5ed

Message:

licencing: second groups of files

Location:

translator/GenPoly

Files:

• Box.cc (modified) (18 diffs)
• CopyParams.cc (modified) (1 diff)
• FindFunction.cc (modified) (2 diffs)
• GenPoly.cc (modified) (3 diffs)
• Lvalue.cc (modified) (8 diffs)
• PolyMutator.cc (modified) (5 diffs)
• ScrubTyVars.cc (modified) (1 diff)
• Specialize.cc (modified) (8 diffs)

translator/GenPoly/Box.cc

@@ -110 +110 @@
     void printAllNotBuiltin( const std::list< Declaration *>& translationUnit, std::ostream &os ) {
         for ( std::list< Declaration *>::const_iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
-            if ( !LinkageSpec::isBuiltin( (*i)->get_linkage() ) ) {
+            if ( ! LinkageSpec::isBuiltin( (*i)->get_linkage() ) ) {
                 (*i)->print( os );
                 os << std::endl;
@@ -135 +135 @@
         bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars ) {
             bool doTransform = false;
-            if ( !function->get_returnVals().empty() ) {
+            if ( ! function->get_returnVals().empty() ) {
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType *>( function->get_returnVals().front()->get_type() ) ) {
     
@@ -146 +146 @@
                         } // if
                     } // for
-                    if ( !doTransform && otherTyVars.find( typeInst->get_name() ) != otherTyVars.end() ) {
+                    if ( ! doTransform && otherTyVars.find( typeInst->get_name() ) != otherTyVars.end() ) {
                         doTransform = true;
                     } // if
@@ -304 +304 @@
                 ObjectDecl *newObj = makeTemporary( retType->clone() );
                 Expression *paramExpr = new VariableExpr( newObj );
-                if ( !isPolyType( newObj->get_type(), env, scopeTyVars ) ) {
+                if ( ! isPolyType( newObj->get_type(), env, scopeTyVars ) ) {
                     paramExpr = new AddressExpr( paramExpr );
                 } // if
@@ -330 +330 @@
         Expression *Pass1::applyAdapter( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &tyVars ) {
             Expression *ret = appExpr;
-            if ( !function->get_returnVals().empty() && isPolyVal( function->get_returnVals().front()->get_type(), tyVars ) ) {
+            if ( ! function->get_returnVals().empty() && isPolyVal( function->get_returnVals().front()->get_type(), tyVars ) ) {
                 ret = addRetParam( appExpr, function, function->get_returnVals().front()->get_type(), arg );
             } // if
@@ -343 +343 @@
 
         void Pass1::boxParam( Type *param, Expression *&arg, const TyVarMap &exprTyVars ) {
-            assert( !arg->get_results().empty() );
-///   if ( !dynamic_cast< PointerType *>( arg->get_results().front() ) ) {
+            assert( ! arg->get_results().empty() );
+///   if ( ! dynamic_cast< PointerType *>( arg->get_results().front() ) ) {
             TypeInstType *typeInst = dynamic_cast< TypeInstType *>( param );
             if ( typeInst && exprTyVars.find( typeInst->get_name() ) != exprTyVars.end() ) {
@@ -373 +373 @@
             // any function mentioning a polymorphic type
             findAndReplaceFunction( newType, functions, tyVars, needsAdapter );
-            if ( !functions.empty() ) {
+            if ( ! functions.empty() ) {
                 actual = new CastExpr( actual, newType );
             } else {
@@ -422 +422 @@
             // actually make the adapter type
             FunctionType *adapter = adaptee->clone();
-            if ( !adapter->get_returnVals().empty() && isPolyVal( adapter->get_returnVals().front()->get_type(), tyVars ) ) {
+            if ( ! adapter->get_returnVals().empty() && isPolyVal( adapter->get_returnVals().front()->get_type(), tyVars ) ) {
                 makeRetParm( adapter );
             } // if
@@ -611 +611 @@
                 if ( varExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
                     if ( varExpr->get_var()->get_name() == "?[?]" ) {
-                        assert( !appExpr->get_results().empty() );
+                        assert( ! appExpr->get_results().empty() );
                         assert( appExpr->get_args().size() == 2 );
                         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 );
+                        assert( ! typeInst1 || ! typeInst2 );
                         UntypedExpr *ret = 0;
                         if ( typeInst1 || typeInst2 ) {
@@ -644 +644 @@
                         } // if
                     } else if ( varExpr->get_var()->get_name() == "*?" ) {
-                        assert( !appExpr->get_results().empty() );
-                        assert( !appExpr->get_args().empty() );
+                        assert( ! appExpr->get_results().empty() );
+                        assert( ! appExpr->get_args().empty() );
                         if ( isPolyType( appExpr->get_results().front(), env, scopeTyVars ) ) {
                             Expression *ret = appExpr->get_args().front();
@@ -659 +659 @@
                         } // if
                     } else if ( varExpr->get_var()->get_name() == "?++" || varExpr->get_var()->get_name() == "?--" ) {
-                        assert( !appExpr->get_results().empty() );
+                        assert( ! appExpr->get_results().empty() );
                         assert( appExpr->get_args().size() == 1 );
                         if ( TypeInstType *typeInst = isPolyPtr( appExpr->get_results().front(), env, scopeTyVars ) ) {
@@ -679 +679 @@
                         } // if
                     } else if ( varExpr->get_var()->get_name() == "++?" || varExpr->get_var()->get_name() == "--?" ) {
-                        assert( !appExpr->get_results().empty() );
+                        assert( ! appExpr->get_results().empty() );
                         assert( appExpr->get_args().size() == 1 );
                         if ( TypeInstType *typeInst = isPolyPtr( appExpr->get_results().front(), env, scopeTyVars ) ) {
@@ -685 +685 @@
                         } // if
                     } else if ( varExpr->get_var()->get_name() == "?+?" || varExpr->get_var()->get_name() == "?-?" ) {
-                        assert( !appExpr->get_results().empty() );
+                        assert( ! appExpr->get_results().empty() );
                         assert( appExpr->get_args().size() == 2 );
                         TypeInstType *typeInst1 = isPolyPtr( appExpr->get_args().front()->get_results().front(), env, scopeTyVars );
@@ -711 +711 @@
                         } // if
                     } else if ( varExpr->get_var()->get_name() == "?+=?" || varExpr->get_var()->get_name() == "?-=?" ) {
-                        assert( !appExpr->get_results().empty() );
+                        assert( ! appExpr->get_results().empty() );
                         assert( appExpr->get_args().size() == 2 );
                         TypeInstType *typeInst = isPolyPtr( appExpr->get_results().front(), env, scopeTyVars );
@@ -739 +739 @@
             useRetval = oldUseRetval;
   
-            assert( !appExpr->get_function()->get_results().empty() );
+            assert( ! appExpr->get_function()->get_results().empty() );
             PointerType *pointer = dynamic_cast< PointerType *>( appExpr->get_function()->get_results().front() );
             assert( pointer );
@@ -784 +784 @@
 
         Expression *Pass1::mutate( UntypedExpr *expr ) {
-            if ( !expr->get_results().empty() && isPolyType( expr->get_results().front(), env, scopeTyVars ) ) {
+            if ( ! expr->get_results().empty() && isPolyType( expr->get_results().front(), env, scopeTyVars ) ) {
                 if ( NameExpr *name = dynamic_cast< NameExpr *>( expr->get_function() ) ) {
                     if ( name->get_name() == "*?" ) {
@@ -798 +798 @@
 
         Expression *Pass1::mutate( AddressExpr *addrExpr ) {
-            assert( !addrExpr->get_arg()->get_results().empty() );
+            assert( ! addrExpr->get_arg()->get_results().empty() );
             addrExpr->set_arg( mutateExpression( addrExpr->get_arg() ) );
             if ( isPolyType( addrExpr->get_arg()->get_results().front(), env, scopeTyVars ) ) {
@@ -823 +823 @@
             }
             if ( retval && retStmt->get_expr() ) {
-                assert( !retStmt->get_expr()->get_results().empty() );
+                assert( ! retStmt->get_expr()->get_results().empty() );
                 if ( retStmt->get_expr()->get_results().front()->get_isLvalue() ) {
 ///       retStmt->set_expr( mutateExpression( retStmt->get_expr() ) );

translator/GenPoly/CopyParams.cc

@@ -46 +46 @@
                     } // if
                 } // for
-                for( std::list< DeclarationWithType* >::iterator param = funcDecl->get_functionType()->get_parameters().begin(); param != funcDecl->get_functionType()->get_parameters().end(); ++param ) {
+                for ( std::list< DeclarationWithType* >::iterator param = funcDecl->get_functionType()->get_parameters().begin(); param != funcDecl->get_functionType()->get_parameters().end(); ++param ) {
                     std::set< UniqueId >::const_iterator var = modVars.find( (*param)->get_uniqueId() );
                     if ( var != modVars.end() ) {

translator/GenPoly/FindFunction.cc

@@ -52 +52 @@
 FindFunction::handleForall( const std::list< TypeDecl* > &forall )
 {
-  for( std::list< TypeDecl* >::const_iterator i = forall.begin(); i != forall.end(); ++i ) {
+  for ( std::list< TypeDecl* >::const_iterator i = forall.begin(); i != forall.end(); ++i ) {
     TyVarMap::iterator var = tyVars.find( (*i)->get_name() );
-    if( var != tyVars.end() ) {
+    if ( var != tyVars.end() ) {
       tyVars.erase( var );
     }
@@ -67 +67 @@
   mutateAll( functionType->get_returnVals(), *this );
   Type *ret = functionType;
-  if( predicate( functionType, tyVars ) ) {
+  if ( predicate( functionType, tyVars ) ) {
     functions.push_back( functionType );
-    if( replaceMode ) {
+    if ( replaceMode ) {
       ret = new FunctionType( Type::Qualifiers(), true );
     }

translator/GenPoly/GenPoly.cc

@@ -26 +26 @@
 isPolyVal( Type *type, const TyVarMap &tyVars, bool considerAllTyVars )
 {
-  if( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
-    if( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
+  if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+    if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
       return true;
     }
@@ -41 +41 @@
 {
   bool needsAdapter = false;
-  if( !adaptee->get_returnVals().empty() && isPolyVal( adaptee->get_returnVals().front()->get_type(), tyVars, considerAllTyVars ) ) {
+  if ( ! adaptee->get_returnVals().empty() && isPolyVal( adaptee->get_returnVals().front()->get_type(), tyVars, considerAllTyVars ) ) {
     needsAdapter = true;
   }
-  for( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); !needsAdapter && innerArg != adaptee->get_parameters().end(); ++innerArg ) {
-    if( isPolyVal( (*innerArg)->get_type(), tyVars, considerAllTyVars ) ) {
+  for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); ! needsAdapter && innerArg != adaptee->get_parameters().end(); ++innerArg ) {
+    if ( isPolyVal( (*innerArg)->get_type(), tyVars, considerAllTyVars ) ) {
       needsAdapter = true;
     }
@@ -56 +56 @@
 printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap )
 {
-  for( TyVarMap::const_iterator i = tyVarMap.begin(); i != tyVarMap.end(); ++i ) {
+  for ( TyVarMap::const_iterator i = tyVarMap.begin(); i != tyVarMap.end(); ++i ) {
     os << i->first << " (" << i->second << ") ";
   }

translator/GenPoly/Lvalue.cc

@@ -67 +67 @@
 isLvalueRet( FunctionType *function )
 {
-  if( !function->get_returnVals().empty() ) {
+  if ( ! function->get_returnVals().empty() ) {
     return function->get_returnVals().front()->get_type()->get_isLvalue();
   } else {
@@ -77 +77 @@
 isIntrinsicApp( ApplicationExpr *appExpr )
 {
-  if( VariableExpr *varExpr = dynamic_cast< VariableExpr* >( appExpr->get_function() ) ) {
+  if ( VariableExpr *varExpr = dynamic_cast< VariableExpr* >( appExpr->get_function() ) ) {
     return varExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic;
   } else {
@@ -91 +91 @@
 Pass1::mutate( FunctionDecl *funcDecl )
 {
-  if( funcDecl->get_statements() ) {
+  if ( funcDecl->get_statements() ) {
     DeclarationWithType* oldRetval = retval;
     retval = 0;
-    if( !LinkageSpec::isBuiltin( funcDecl->get_linkage() ) && isLvalueRet( funcDecl->get_functionType() ) ) {
+    if ( ! LinkageSpec::isBuiltin( funcDecl->get_linkage() ) && isLvalueRet( funcDecl->get_functionType() ) ) {
       retval = funcDecl->get_functionType()->get_returnVals().front();
     }
@@ -110 +110 @@
   mutateAll( appExpr->get_args(), *this );
   
-  assert( !appExpr->get_function()->get_results().empty() );
+  assert( ! appExpr->get_function()->get_results().empty() );
 
   PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
@@ -118 +118 @@
 
   std::string typeName;
-  if( isLvalueRet( function ) && !isIntrinsicApp( appExpr ) ) {
+  if ( isLvalueRet( function ) && ! isIntrinsicApp( appExpr ) ) {
     UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
     deref->get_results().push_back( appExpr->get_results().front() );
@@ -132 +132 @@
 Pass1::mutate(ReturnStmt *retStmt)
 {
-  if( retval && retStmt->get_expr() ) {
-    assert( !retStmt->get_expr()->get_results().empty() );
-    while( CastExpr *castExpr = dynamic_cast< CastExpr* >( retStmt->get_expr() ) ) {
+  if ( retval && retStmt->get_expr() ) {
+    assert( ! retStmt->get_expr()->get_results().empty() );
+    while ( CastExpr *castExpr = dynamic_cast< CastExpr* >( retStmt->get_expr() ) ) {
       retStmt->set_expr( castExpr->get_arg() );
       retStmt->get_expr()->set_env( castExpr->get_env() );
@@ -141 +141 @@
       delete castExpr;
     }
-    if( retStmt->get_expr()->get_results().front()->get_isLvalue() ) {
+    if ( retStmt->get_expr()->get_results().front()->get_isLvalue() ) {
       retStmt->set_expr( new AddressExpr( retStmt->get_expr()->acceptMutator( *this ) ) );
     } else {
@@ -154 +154 @@
 {
   std::string typeName;
-  if( isLvalueRet( funType ) ) {
+  if ( isLvalueRet( funType ) ) {
     DeclarationWithType *retParm = funType->get_returnVals().front();
     

translator/GenPoly/PolyMutator.cc

@@ -28 +28 @@
 PolyMutator::mutateStatementList( std::list< Statement* > &statements )
 {
-  for( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
-    if( !stmtsToAddAfter.empty() ) {
+  for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
+    if ( ! stmtsToAddAfter.empty() ) {
       statements.splice( i, stmtsToAddAfter );
     }
     *i = (*i)->acceptMutator( *this );
-    if( !stmtsToAdd.empty() ) {
+    if ( ! stmtsToAdd.empty() ) {
       statements.splice( i, stmtsToAdd );
     }
   }
-  if( !stmtsToAddAfter.empty() ) {
+  if ( ! stmtsToAddAfter.empty() ) {
     statements.splice( statements.end(), stmtsToAddAfter );
   }
@@ -46 +46 @@
 {
   Statement *newStmt = maybeMutate( stmt, *this );
-  if( !stmtsToAdd.empty() || !stmtsToAddAfter.empty() ) {
+  if ( ! stmtsToAdd.empty() || ! stmtsToAddAfter.empty() ) {
     CompoundStmt *compound = new CompoundStmt( noLabels );
     compound->get_kids().splice( compound->get_kids().end(), stmtsToAdd );
@@ -61 +61 @@
 PolyMutator::mutateExpression( Expression *expr )
 {
-  if( expr ) {
-    if( expr->get_env() ) {
+  if ( expr ) {
+    if ( expr->get_env() ) {
       env = expr->get_env();
     }
@@ -167 +167 @@
 PolyMutator::mutate(UntypedExpr *untypedExpr)
 {
-  for( std::list< Expression* >::iterator i = untypedExpr->get_args().begin(); i != untypedExpr->get_args().end(); ++i ) {
+  for ( std::list< Expression* >::iterator i = untypedExpr->get_args().begin(); i != untypedExpr->get_args().end(); ++i ) {
     *i = mutateExpression( *i );
   }
@@ -177 +177 @@
 PolyMutator::makeTyVarMap( Type *type, TyVarMap &tyVarMap )
 {
-  for( std::list< TypeDecl* >::const_iterator tyVar = type->get_forall().begin(); tyVar != type->get_forall().end(); ++tyVar ) {
+  for ( std::list< TypeDecl* >::const_iterator tyVar = type->get_forall().begin(); tyVar != type->get_forall().end(); ++tyVar ) {
     assert( *tyVar );
     tyVarMap[ (*tyVar)->get_name() ] = (*tyVar)->get_kind();
   }
-  if( PointerType *pointer = dynamic_cast< PointerType* >( type ) ) {
+  if ( PointerType *pointer = dynamic_cast< PointerType* >( type ) ) {
     makeTyVarMap( pointer->get_base(), tyVarMap );
   }

translator/GenPoly/ScrubTyVars.cc

@@ -11 +11 @@
         TyVarMap::const_iterator tyVar = tyVars.find( typeInst->get_name() );
         if ( doAll || tyVar != tyVars.end() ) {
-            switch( tyVar->second ) {
+            switch ( tyVar->second ) {
               case TypeDecl::Any:
               case TypeDecl::Dtype:

translator/GenPoly/Specialize.cc

@@ -61 +61 @@
 needsSpecialization( Type *formalType, Type *actualType, TypeSubstitution *env )
 {
-  if( env ) {
+  if ( env ) {
     using namespace ResolvExpr;
     OpenVarSet openVars, closedVars;
@@ -67 +67 @@
     findOpenVars( formalType, openVars, closedVars, need, have, false );
     findOpenVars( actualType, openVars, closedVars, need, have, true );
-    for( OpenVarSet::const_iterator openVar = openVars.begin(); openVar != openVars.end(); ++openVar ) {
+    for ( OpenVarSet::const_iterator openVar = openVars.begin(); openVar != openVars.end(); ++openVar ) {
       Type *boundType = env->lookup( openVar->first );
-      if( !boundType ) continue;
-      if( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( boundType ) ) {
-        if( closedVars.find( typeInst->get_name() ) == closedVars.end() ) {
+      if ( ! boundType ) continue;
+      if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( boundType ) ) {
+        if ( closedVars.find( typeInst->get_name() ) == closedVars.end() ) {
           return true;
         }
@@ -87 +87 @@
 Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams )
 {
-  if( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
+  if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
     PointerType *ptrType;
     FunctionType *funType;
-    if( ( ptrType = dynamic_cast< PointerType* >( formalType ) ) && ( funType = dynamic_cast< FunctionType* >( ptrType->get_base() ) ) ) {
+    if ( ( ptrType = dynamic_cast< PointerType* >( formalType ) ) && ( funType = dynamic_cast< FunctionType* >( ptrType->get_base() ) ) ) {
       FunctionType *newType = funType->clone();
-      if( env ) {
+      if ( env ) {
         TypeSubstitution newEnv( *env );
         // it is important to replace only occurrences of type variables that occur free in the
@@ -103 +103 @@
       UniqueName paramNamer( paramPrefix );
       ApplicationExpr *appExpr = new ApplicationExpr( actual );
-      for( std::list< DeclarationWithType* >::iterator param = thunkFunc->get_functionType()->get_parameters().begin(); param != thunkFunc->get_functionType()->get_parameters().end(); ++param ) {
+      for ( std::list< DeclarationWithType* >::iterator param = thunkFunc->get_functionType()->get_parameters().begin(); param != thunkFunc->get_functionType()->get_parameters().end(); ++param ) {
         (*param)->set_name( paramNamer.newName() );
         appExpr->get_args().push_back( new VariableExpr( *param ) );
       }
       appExpr->set_env( maybeClone( env ) );
-      if( inferParams ) {
+      if ( inferParams ) {
         appExpr->get_inferParams() = *inferParams;
       }
@@ -123 +123 @@
       
       Statement *appStmt;
-      if( funType->get_returnVals().empty() ) {
+      if ( funType->get_returnVals().empty() ) {
         appStmt = new ExprStmt( noLabels, appExpr );
       } else {
@@ -143 +143 @@
 {
   // create thunks for the explicit parameters
-  assert( !appExpr->get_function()->get_results().empty() );
+  assert( ! appExpr->get_function()->get_results().empty() );
   PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
   assert( pointer );
@@ -149 +149 @@
   std::list< DeclarationWithType* >::iterator formal;
   std::list< Expression* >::iterator actual;
-  for( formal = function->get_parameters().begin(), actual = appExpr->get_args().begin(); formal != function->get_parameters().end() && actual != appExpr->get_args().end(); ++formal, ++actual ) {
+  for ( formal = function->get_parameters().begin(), actual = appExpr->get_args().begin(); formal != function->get_parameters().end() && actual != appExpr->get_args().end(); ++formal, ++actual ) {
     *actual = doSpecialization( (*formal)->get_type(), *actual, &appExpr->get_inferParams() );
   }
@@ -161 +161 @@
   
   // create thunks for the inferred parameters
-  for( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
+  for ( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
     inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, &appExpr->get_inferParams() );
   }