Changeset 190a833 for src/ControlStruct/ExceptDecl.cpp

Timestamp:

Jan 7, 2025, 4:31:21 PM (13 days ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

d84f2ae

Parents:

10b5970

Message:

Returning to exceptions after a long time and added the ability to provide fields to the virtual table. Added a connected test.

File:

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

src/ControlStruct/ExceptDecl.cpp

@@ -445 +445 @@
 }
 
+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 +474 @@
                                 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 ) );
+                }
         }