Changeset f045f34

Timestamp:

Aug 11, 2023, 6:40:05 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

2137eb7, 279f8df, f259682

Parents:

409bb8f (diff), c1f502c (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/ExceptDeclNew.cpp (modified) (4 diffs)

src/ControlStruct/ExceptDeclNew.cpp

@@ -242 +242 @@
 }
 
-static ast::ObjectDecl * createExternVTable(
+ast::ObjectDecl * createExternVTable(
                 CodeLocation const & location,
                 std::string const & exceptionName,
@@ -451 +451 @@
         std::string const & tableName = decl->name;
 
-    ast::ObjectDecl * retDecl;
+        ast::ObjectDecl * retDecl;
         if ( decl->storage.is_extern ) {
                 // Unique type-ids are only needed for polymorphic instances.
@@ -473 +473 @@
         }
 
-    for ( ast::ptr<ast::Attribute> const & attr : decl->attributes ) {
-        retDecl->attributes.push_back( attr );
-    }
-
-    return retDecl;
+        for ( ast::ptr<ast::Attribute> const & attr : decl->attributes ) {
+                retDecl->attributes.push_back( attr );
+        }
+
+        return retDecl;
 }
 
@@ -483 +483 @@
         ast::StructInstType const * postvisit( ast::VTableType const * type ) {
                 auto inst = type->base.as<ast::BaseInstType>();
-        
+
                 std::string vtableName = Virtual::vtableTypeName( inst->name );