Changeset 23a08aa0 for src/ControlStruct

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, stuck-waitfor-destruct

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

Location:

src/ControlStruct

Files:

• ExceptTranslateNew.cpp (modified) (2 diffs)
• LabelFixer.cc (modified) (1 diff)
• LabelFixer.h (modified) (1 diff)
• MLEMutator.cc (modified) (1 diff)
• MLEMutator.h (modified) (1 diff)

src/ControlStruct/ExceptTranslateNew.cpp

@@ -32 +32 @@
         }
 
-class TranslateThrowsCore : public ast::WithGuards {
+class TranslateThrowsCore final : public ast::WithGuards {
         const ast::ObjectDecl * terminateHandlerExcept;
         enum Context { NoHandler, TerHandler, ResHandler } currentContext;
@@ -136 +136 @@
 
 
-class TryMutatorCore {
+class TryMutatorCore final {
         // The built in types used in translation.
         const ast::StructDecl * except_decl;

src/ControlStruct/LabelFixer.cc

@@ -119 +119 @@
 
 // Builds a table that maps a label to its defining statement.
-std::map<Label, Statement * > * LabelFixer::resolveJumps() throw ( SemanticErrorException ) {
+std::map<Label, Statement * > * LabelFixer::resolveJumps() {
         std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
         for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {

src/ControlStruct/LabelFixer.h

@@ -33 +33 @@
         LabelFixer( LabelGenerator *gen = 0 );
 
-        std::map < Label, Statement * > *resolveJumps() throw ( SemanticErrorException );
+        std::map < Label, Statement * > *resolveJumps();
 
         // Declarations

src/ControlStruct/MLEMutator.cc

@@ -141 +141 @@
 
 
-        Statement *MultiLevelExitMutator::postmutate( BranchStmt *branchStmt )
-                        throw ( SemanticErrorException ) {
+        Statement *MultiLevelExitMutator::postmutate( BranchStmt *branchStmt ) {
                 std::string originalTarget = branchStmt->originalTarget;
 

src/ControlStruct/MLEMutator.h

@@ -41 +41 @@
 
                 void premutate( CompoundStmt *cmpndStmt );
-                Statement * postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException );
+                Statement * postmutate( BranchStmt *branchStmt );
                 void premutate( WhileDoStmt *whileDoStmt );
                 Statement * postmutate( WhileDoStmt *whileDoStmt );