Changeset 7156c46

Timestamp:

Aug 11, 2023, 11:24:34 AM (19 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

409bb8f, 89bef959, c1f502c

Parents:

b2ab352

Message:

added code to copy attributes from vtable decl to generated decl

File:

• src/ControlStruct/ExceptDeclNew.cpp (modified) (6 diffs)

src/ControlStruct/ExceptDeclNew.cpp ¶

@@ -242 +242 @@
 }
 
-ast::ObjectDecl const * createExternVTable(
+static ast::ObjectDecl * createExternVTable(
                 CodeLocation const & location,
                 std::string const & exceptionName,
@@ -356 +356 @@
 }
 
-ast::ObjectDecl const * createVirtualTable(
+ast::ObjectDecl * createVirtualTable(
                 CodeLocation const & location,
                 std::string const & exceptionName,
@@ -451 +451 @@
         std::string const & tableName = decl->name;
 
+    ast::ObjectDecl * retDecl;
         if ( decl->storage.is_extern ) {
                 // Unique type-ids are only needed for polymorphic instances.
@@ -457 +458 @@
                                 createExternTypeId( location, exceptionName, params ) );
                 }
-                return createExternVTable( location, exceptionName, params, tableName );
+                retDecl = createExternVTable( location, exceptionName, params, tableName );
         } else {
                 // Unique type-ids are only needed for polymorphic instances.
@@ -468 +469 @@
                 declsToAddBefore.push_back(
                         createMsg( location, exceptionName, params ) );
-                return createVirtualTable(
+                retDecl = createVirtualTable(
                         location, exceptionName, params, tableName );
         }
+
+    for ( ast::ptr<ast::Attribute> const & attr : decl->attributes ) {
+        retDecl->attributes.push_back( attr );
+    }
+
+    return retDecl;
 }
 
@@ -476 +483 @@
         ast::StructInstType const * postvisit( ast::VTableType const * type ) {
                 auto inst = type->base.as<ast::BaseInstType>();
-
+        
                 std::string vtableName = Virtual::vtableTypeName( inst->name );
+
                 auto newType = new ast::StructInstType( vtableName );
                 for ( ast::ptr<ast::Expr> const & param : inst->params ) {