Changeset a16764a6 for src/ControlStruct

Timestamp:

Feb 28, 2018, 4:48:22 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

446ffa3

Parents:

6a8df56

Message:

Changed warning system to prepare for toggling warnings

Location:

src/ControlStruct

Files:

• ExceptTranslate.cc (modified) (1 diff)
• LabelFixer.cc (modified) (2 diffs)
• LabelFixer.h (modified) (1 diff)
• MLEMutator.cc (modified) (3 diffs)
• MLEMutator.h (modified) (1 diff)
• Mutate.cc (modified) (1 diff)

src/ControlStruct/ExceptTranslate.cc

@@ -572 +572 @@
                         // Pass.
                 } else if ( CatchStmt::Terminate == catchStmt->get_kind() ) {
-                        throw SemanticError(catchStmt->location, "catch must have exception type");
+                        SemanticError(catchStmt->location, "catch must have exception type");
                 } else {
-                        throw SemanticError(catchStmt->location, "catchResume must have exception type");
+                        SemanticError(catchStmt->location, "catchResume must have exception type");
                 }
 

src/ControlStruct/LabelFixer.cc

@@ -92 +92 @@
                         } else if ( labelTable[ l ]->defined() ) {
                                 // defined twice, error
-                                throw SemanticError( l.get_statement()->location, "Duplicate definition of label: " + l.get_name() );
+                                SemanticError( l.get_statement()->location, "Duplicate definition of label: " + l.get_name() );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
@@ -117 +117 @@
 
         // Builds a table that maps a label to its defining statement.
-        std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticError ) {
+        std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticErrorException ) {
                 std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
                 for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {
                         if ( ! i->second->defined() ) {
-                                throw SemanticError( i->first.get_statement()->location, "Use of undefined label: " + i->first.get_name() );
+                                SemanticError( i->first.get_statement()->location, "Use of undefined label: " + i->first.get_name() );
                         }
                         (*ret)[ i->first ] = i->second->get_definition();

src/ControlStruct/LabelFixer.h

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

src/ControlStruct/MLEMutator.cc

@@ -98 +98 @@
 
 
-        Statement *MLEMutator::postmutate( BranchStmt *branchStmt ) throw ( SemanticError ) {
+        Statement *MLEMutator::postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException ) {
                 std::string originalTarget = branchStmt->originalTarget;
 
@@ -115 +115 @@
                                         } else {
                                                 // break target is outmost control structure
-                                                if ( enclosingControlStructures.empty() ) throw SemanticError( branchStmt->location, "'break' outside a loop, switch, or labelled block" );
+                                                if ( enclosingControlStructures.empty() ) SemanticError( branchStmt->location, "'break' outside a loop, switch, or labelled block" );
                                                 targetEntry = enclosingControlStructures.rbegin();
                                         } // if
@@ -124 +124 @@
                                 // ensure that selected target is valid
                                 if ( targetEntry == enclosingControlStructures.rend() || (isContinue && ! isLoop( targetEntry->get_controlStructure() ) ) ) {
-                                        throw SemanticError( branchStmt->location, toString( (isContinue ? "'continue'" : "'break'"), " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "), originalTarget ) );
+                                        SemanticError( branchStmt->location, toString( (isContinue ? "'continue'" : "'break'"), " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "), originalTarget ) );
                                 } // if
                                 break;

src/ControlStruct/MLEMutator.h

@@ -37 +37 @@
 
                 void premutate( CompoundStmt *cmpndStmt );
-                Statement * postmutate( BranchStmt *branchStmt ) throw ( SemanticError );
+                Statement * postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException );
                 void premutate( WhileStmt *whileStmt );
                 Statement * postmutate( WhileStmt *whileStmt );

src/ControlStruct/Mutate.cc

@@ -18 +18 @@
 
 #include "Common/PassVisitor.h"    // for mutateAll
-#include "Common/SemanticError.h"  // for SemanticError
 #include "ForExprMutator.h"        // for ForExprMutator
 #include "LabelFixer.h"            // for LabelFixer