Changeset ca9d65e for src/ControlStruct

Timestamp:

Dec 14, 2023, 9:05:55 PM (22 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

19a2890

Parents:

21ad568

Message:

second attempt at simplifying SemanticError messages

File:

• src/ControlStruct/MultiLevelExit.cpp (modified) (8 diffs)

src/ControlStruct/MultiLevelExit.cpp

@@ -10 +10 @@
 // Created On       : Mon Nov  1 13:48:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 11 13:44:45 2023
-// Update Count     : 38
+// 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, "'return' may not appear in a %s", context );
+        SemanticError( stmt->location, "\"return\" may not appear in a %s", context );
 }