Changeset 400b8be for src/ControlStruct/ExceptTranslateNew.cpp

Timestamp:

Mar 28, 2022, 10:41:45 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

8e819a9

Parents:

f5bace8

Message:

Added StmtClause? and converted the existing nodes that should be clauses.

File:

• src/ControlStruct/ExceptTranslateNew.cpp (modified) (11 diffs)

src/ControlStruct/ExceptTranslateNew.cpp

@@ -26 +26 @@
 namespace {
 
-        typedef std::list<ast::CatchStmt*> CatchList;
+        typedef std::list<ast::CatchClause*> CatchList;
 
         void appendDeclStmt( ast::CompoundStmt * block, ast::DeclWithType * item ) {
@@ -45 +45 @@
         {}
 
-        void previsit( const ast::CatchStmt * stmt );
+        void previsit( const ast::CatchClause * stmt );
         const ast::Stmt * postvisit( const ast::ThrowStmt * stmt );
 };
@@ -88 +88 @@
 }
 
-void TranslateThrowsCore::previsit( const ast::CatchStmt * stmt ) {
+void TranslateThrowsCore::previsit( const ast::CatchClause * stmt ) {
         // Validate the statement's form.
         const ast::ObjectDecl * decl = stmt->decl.as<ast::ObjectDecl>();
@@ -147 +147 @@
         ast::FunctionDecl * create_terminate_catch( CatchList &handlers );
         ast::CompoundStmt * create_single_matcher(
-                const ast::DeclWithType * except_obj, ast::CatchStmt * modded_handler );
+                const ast::DeclWithType * except_obj, ast::CatchClause * modded_handler );
         ast::FunctionDecl * create_terminate_match( CatchList &handlers );
         ast::CompoundStmt * create_terminate_caller( CodeLocation loc, ast::FunctionDecl * try_wrapper,
@@ -338 +338 @@
 ast::FunctionDecl * TryMutatorCore::create_terminate_catch(
                 CatchList &handlers ) {
-        std::vector<ast::ptr<ast::Stmt>> handler_wrappers;
+        std::vector<ast::ptr<ast::CaseClause>> handler_wrappers;
 
         assert (!handlers.empty());
@@ -352 +352 @@
         for ( ; it != handlers.end() ; ++it ) {
                 ++index;
-                ast::CatchStmt * handler = *it;
+                ast::CatchClause * handler = *it;
                 const CodeLocation loc = handler->location;
 
@@ -390 +390 @@
                 // handler->body = nullptr;
 
-                handler_wrappers.push_back( new ast::CaseStmt(loc,
+                handler_wrappers.push_back( new ast::CaseClause(loc,
                         ast::ConstantExpr::from_int(loc, index) ,
                         { block, new ast::ReturnStmt( loc, nullptr ) }
@@ -410 +410 @@
 // except_obj is referenced, modded_handler will be freed.
 ast::CompoundStmt * TryMutatorCore::create_single_matcher(
-                const ast::DeclWithType * except_obj, ast::CatchStmt * modded_handler ) {
+                const ast::DeclWithType * except_obj, ast::CatchClause * modded_handler ) {
         // {
         //     `modded_handler.decl`
@@ -465 +465 @@
         for ( it = handlers.begin() ; it != handlers.end() ; ++it ) {
                 ++index;
-                ast::CatchStmt * handler = *it;
+                ast::CatchClause * handler = *it;
 
                 // Body should have been taken by create_terminate_catch.
@@ -520 +520 @@
         CatchList::iterator it;
         for ( it = handlers.begin() ; it != handlers.end() ; ++it ) {
-                ast::CatchStmt * handler = *it;
+                ast::CatchClause * handler = *it;
                 const CodeLocation loc = handler->location;
                 // Modifiy body.
@@ -587 +587 @@
                 ast::TryStmt * tryStmt ) {
         // void finally() { `finally->block` }
-        const ast::FinallyStmt * finally = tryStmt->finally;
+        const ast::FinallyClause * finally = tryStmt->finally;
         const ast::CompoundStmt * body = finally->body;