Changeset 4b8f918

Timestamp:

Apr 12, 2016, 2:30:22 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

b52d900

Parents:

df2be83

Message:

Fix modularization for generic types, so that caller is only required to pass layout for complete generic types

File:

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

src/GenPoly/Box.cc

@@ -664 +664 @@
                         if ( functionDecl->get_statements() ) {         // empty routine body ?
                                 doBeginScope();
-                                scopeTyVars.beginScope();;
+                                scopeTyVars.beginScope();
                                 assignOps.beginScope();
                                 DeclarationWithType *oldRetval = retval;
@@ -741 +741 @@
 
                 void Pass1::passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes ) {
-                        Type *polyBase = hasPolyBase( parmType, exprTyVars );
-                        if ( polyBase && ! dynamic_cast< TypeInstType* >( polyBase ) ) {
-                                std::string typeName = mangleType( polyBase );
+                        Type *polyType = isPolyType( parmType, exprTyVars );
+                        if ( polyType && ! dynamic_cast< TypeInstType* >( polyType ) ) {
+                                std::string typeName = mangleType( polyType );
                                 if ( seenTypes.count( typeName ) ) return;
 
@@ -750 +750 @@
                                 arg = appExpr->get_args().insert( arg, new AlignofExpr( argBaseType->clone() ) );
                                 arg++;
-                                if ( dynamic_cast< StructInstType* >( polyBase ) ) {
+                                if ( dynamic_cast< StructInstType* >( polyType ) ) {
                                         if ( StructInstType *argBaseStructType = dynamic_cast< StructInstType* >( argBaseType ) ) {
                                                 // zero-length arrays are forbidden by C, so don't pass offset for empty struct
@@ -1301 +1301 @@
 
                         boxParams( appExpr, function, arg, exprTyVars );
-
                         passAdapters( appExpr, function, exprTyVars );
 
@@ -1591 +1590 @@
                         std::set< std::string > seenTypes; // sizeofName for generic types we've seen
                         for ( std::list< DeclarationWithType* >::const_iterator fnParm = last; fnParm != funcType->get_parameters().end(); ++fnParm ) {
-                                Type *polyBase = hasPolyBase( (*fnParm)->get_type(), scopeTyVars );
-                                if ( polyBase && ! dynamic_cast< TypeInstType* >( polyBase ) ) {
-                                        std::string typeName = mangleType( polyBase );
+                                Type *polyType = isPolyType( (*fnParm)->get_type(), scopeTyVars );
+                                if ( polyType && ! dynamic_cast< TypeInstType* >( polyType ) ) {
+                                        std::string typeName = mangleType( polyType );
                                         if ( seenTypes.count( typeName ) ) continue;
 
@@ -1607 +1606 @@
                                         ++last;
 
-                                        if ( StructInstType *polyBaseStruct = dynamic_cast< StructInstType* >( polyBase ) ) {
+                                        if ( StructInstType *polyBaseStruct = dynamic_cast< StructInstType* >( polyType ) ) {
                                                 // NOTE zero-length arrays are illegal in C, so empty structs have no offset array
                                                 if ( ! polyBaseStruct->get_baseStruct()->get_members().empty() ) {
@@ -1820 +1819 @@
                 }
 
-////////////////////////////////////////// MemberExprFixer ////////////////////////////////////////////////////
+////////////////////////////////////////// PolyGenericCalculator ////////////////////////////////////////////////////
 
                 template< typename DeclClass >
@@ -1867 +1866 @@
                         for ( std::list< DeclarationWithType* >::const_iterator fnParm = funcType->get_parameters().begin(); fnParm != funcType->get_parameters().end(); ++fnParm ) {
                                 // condition here duplicates that in Pass2::mutate( FunctionType* )
-                                Type *polyBase = hasPolyBase( (*fnParm)->get_type(), scopeTyVars );
-                                if ( polyBase && ! dynamic_cast< TypeInstType* >( polyBase ) ) {
-                                        knownLayouts.insert( mangleType( polyBase ) );
+                                Type *polyType = isPolyType( (*fnParm)->get_type(), scopeTyVars );
+                                if ( polyType && ! dynamic_cast< TypeInstType* >( polyType ) ) {
+                                        knownLayouts.insert( mangleType( polyType ) );
                                 }
                         }