Changeset 8a4e472 for src/ControlStruct

Timestamp:

Dec 4, 2023, 4:39:47 PM (22 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ebadb5d

Parents:

2f8d351 (diff), 539a8c8 (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

Location:

src/ControlStruct

Files:

• ExceptDecl.h (modified) (2 diffs)
• ExceptTranslate.cpp (modified) (1 diff)
• ExceptTranslate.h (modified) (2 diffs)

src/ControlStruct/ExceptDecl.h

@@ -16 +16 @@
 #pragma once
 
-#include <list>  // for list
-
-class Declaration;
-
 namespace ast {
         class TranslationUnit;
@@ -25 +21 @@
 
 namespace ControlStruct {
+
 /// Unfold exception declarations into raw structure declarations.
 /// Also builds vtable declarations and converts vtable types.
-void translateExcept( std::list< Declaration *> & translationUnit );
 void translateExcept( ast::TranslationUnit & translationUnit );
+
 }

src/ControlStruct/ExceptTranslate.cpp

@@ -26 +26 @@
 namespace {
 
-        typedef std::list<ast::CatchClause*> CatchList;
-
-        void appendDeclStmt( ast::CompoundStmt * block, ast::DeclWithType * item ) {
-                block->push_back(new ast::DeclStmt(block->location, item));
-        }
+typedef std::list<ast::CatchClause*> CatchList;
+
+void appendDeclStmt( ast::CompoundStmt * block, ast::DeclWithType * item ) {
+        block->push_back( new ast::DeclStmt( block->location, item ) );
+}
 
 class TranslateThrowsCore final : public ast::WithGuards {

src/ControlStruct/ExceptTranslate.h

@@ -16 +16 @@
 #pragma once
 
-#include <list>  // for list
-
-class Declaration;
 namespace ast {
         class TranslationUnit;
@@ -24 +21 @@
 
 namespace ControlStruct {
-        void translateThrows( std::list< Declaration *> & translationUnit );
-        void translateThrows( ast::TranslationUnit & transUnit );
-        /* Replaces all throw & throwResume statements with function calls.
-         * These still need to be resolved, so call this before the reslover.
-         */
 
-        void translateTries( std::list< Declaration *> & translationUnit );
-        void translateTries( ast::TranslationUnit & transUnit );
-        /* Replaces all try blocks (and their many clauses) with function definitions and calls.
-         * This uses the exception built-ins to produce typed output and should take place after
-         * the resolver. It also produces virtual casts and should happen before they are expanded.
-         */
+void translateThrows( ast::TranslationUnit & transUnit );
+/* Replaces all throw & throwResume statements with function calls.
+ * These still need to be resolved, so call this before the reslover.
+ */
+
+void translateTries( ast::TranslationUnit & transUnit );
+/* Replaces all try blocks (and their many clauses) with function definitions and calls.
+ * This uses the exception built-ins to produce typed output and should take place after
+ * the resolver. It also produces virtual casts and should happen before they are expanded.
+ */
+
 }