Changeset 5546eee4 for src/ControlStruct/MultiLevelExit.cpp

Timestamp:

Dec 16, 2023, 1:01:44 AM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

b7898ac

Parents:

0fa0201d (diff), 69ab896 (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/MultiLevelExit.cpp (modified) (8 diffs)

src/ControlStruct/MultiLevelExit.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Nov  1 13:48:00 2021
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Sep  8 17:04:00 2023
-// Update Count     : 36
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Dec 14 17:34:12 2023
+// Update Count     : 39
 //
 
@@ -254 +254 @@
                                 if ( enclosing_control_structures.empty() ) {
                                           SemanticError( stmt->location,
-                                                                         "'break' outside a loop, 'switch', or labelled block" );
+                                                                         "\"break\" outside a loop, \"switch\", or labelled block" );
                                 }
                                 targetEntry = findEnclosingControlStructure( isBreakTarget );
@@ -268 +268 @@
                 // Ensure that selected target is valid.
                 if ( targetEntry == enclosing_control_structures.rend() || ( isContinue && ! isContinueTarget( *targetEntry ) ) ) {
-                        SemanticError( stmt->location, toString( (isContinue ? "'continue'" : "'break'"),
+                        SemanticError( stmt->location, toString( (isContinue ? "\"continue\"" : "\"break\""),
                                                         " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "),
                                                         stmt->originalTarget ) );
@@ -279 +279 @@
                 // Check that target is valid.
                 if ( targetEntry == enclosing_control_structures.rend() ) {
-                        SemanticError( stmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
+                        SemanticError( stmt->location, "\"fallthrough\" must be enclosed in a \"switch\" or \"choose\"" );
                 }
                 if ( ! stmt->target.empty() ) {
                         // Labelled fallthrough: target must be a valid fallthough label.
                         if ( ! fallthrough_labels.count( stmt->target ) ) {
-                                SemanticError( stmt->location, toString( "'fallthrough' target must be a later case statement: ",
+                                SemanticError( stmt->location, toString( "\"fallthrough\" target must be a later case statement: ",
                                                                                                                    stmt->originalTarget ) );
                         }
@@ -296 +296 @@
                 // Check if in switch or choose statement.
                 if ( targetEntry == enclosing_control_structures.rend() ) {
-                        SemanticError( stmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
+                        SemanticError( stmt->location, "\"fallthrough\" must be enclosed in a \"switch\" or \"choose\"" );
                 }
 
@@ -309 +309 @@
                 }
                 if ( ! foundDefault ) {
-                        SemanticError( stmt->location, "'fallthrough default' must be enclosed in a 'switch' or 'choose'"
-                                                   "control structure with a 'default' clause" );
+                        SemanticError( stmt->location, "\"fallthrough default\" must be enclosed in a \"switch\" or \"choose\""
+                                                   "control structure with a \"default\" clause" );
                 }
                 break;
@@ -338 +338 @@
                 // Check that fallthrough default comes before the default clause.
                 if ( ! targetEntry->isFallDefaultValid() ) {
-                        SemanticError( stmt->location, "'fallthrough default' must precede the 'default' clause" );
+                        SemanticError( stmt->location, "\"fallthrough default\" must precede the \"default\" clause" );
                 }
                 break;
@@ -521 +521 @@
                 assert(0);
         }
-        SemanticError( stmt->location, toString( "'return' may not appear in a ", context ) );
+        SemanticError( stmt->location, "\"return\" may not appear in a %s", context );
 }