Changeset d60a4c2 for src/ControlStruct

Timestamp:

Jan 11, 2025, 5:48:46 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

f886608

Parents:

7d65715f (diff), 32a119e9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ControlStruct/ExceptDecl.cpp (modified) (4 diffs)

src/ControlStruct/ExceptDecl.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExceptDecl.cpp --
+// ExceptDecl.cpp -- Translate "exception" and exception related declarations.
 //
 // Author           : Andrew Beach
 // Created On       : Tue Jul 12 15:50:00 2022
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Sep  7 12:05:55 2024
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jan 10 15:35:55 2024
+// Update Count     : 2
 //
 
@@ -117 +117 @@
         decl->body = true;
         for ( ast::ptr<ast::TypeDecl> const & param : forallClause ) {
-                decl->params.push_back( ast::deepCopy( param ) );
+                // Create an unsized and assertionless copy of the parameter.
+                decl->params.push_back( new ast::TypeDecl(
+                        param->location,
+                        param->name,
+                        param->storage,
+                        param->base ? ast::deepCopy( param->base ) : nullptr,
+                        ast::TypeDecl::Dtype,
+                        false,
+                        nullptr
+                ) );
         }
         return decl;
@@ -445 +454 @@
 }
 
+ast::NameExpr const * designatedName( ast::Designation const * des ) {
+        if ( des && 1 == des->designators.size() ) {
+                return des->designators.front().as<ast::NameExpr>();
+        }
+        return nullptr;
+}
+
 ast::ObjectDecl const * ExceptDeclCore::transformVTable(
                 ast::ObjectDecl const * decl, ast::VTableType const * type ) {
@@ -467 +483 @@
                                 createTypeIdValue( location, exceptionName, params ) );
                 }
-                declsToAddBefore.push_back(
-                        createCopy( location, exceptionName, params ) );
-                declsToAddBefore.push_back(
-                        createMsg( location, exceptionName, params ) );
                 retDecl = createVirtualTable(
                         location, exceptionName, params, tableName );
+                // There is quite a bit of work to pull over any initializers and
+                // decide if we want to insert the default functions.
+                bool foundCopy = false;
+                bool foundMsg = false;
+                ast::ListInit const * init = decl->init.as<ast::ListInit>();
+                if ( init ) {
+                        for ( size_t i = 0 ; i < init->initializers.size() ; ++i ) {
+                                ast::Designation const * des = init->designations.at(i);
+                                auto name = designatedName( des );
+                                if ( nullptr == name ) continue;
+                                if ( "copy" == name->name ) {
+                                        foundCopy = true;
+                                } else if ( "msg" == name->name ) {
+                                        foundMsg = true;
+                                }
+                                auto retInit = retDecl->init.as<ast::ListInit>();
+                                for ( size_t j = 0 ; j < retInit->initializers.size() ; ++j ) {
+                                        ast::Designation const * des = retInit->designations.at(j);
+                                        auto retName = designatedName( des );
+                                        if ( retName && name->name == retName->name ) {
+                                                retInit = ast::mutate_field_index( retInit,
+                                                        &ast::ListInit::initializers, j,
+                                                        init->initializers.at(i) );
+                                        }
+                                }
+                                retDecl->init = retInit;
+                        }
+                }
+                if ( !foundCopy ) {
+                        declsToAddBefore.push_back(
+                                createCopy( location, exceptionName, params ) );
+                }
+                if ( !foundMsg ) {
+                        declsToAddBefore.push_back(
+                                createMsg( location, exceptionName, params ) );
+                }
         }