Index: src/tests/.expect/fallthrough-ERROR.txt
===================================================================
--- src/tests/.expect/fallthrough-ERROR.txt	(revision 7c2a7b6c75c2ca4c5cc70caff9869195d3d95216)
+++ src/tests/.expect/fallthrough-ERROR.txt	(revision 759f05f48719425f2affcf339a1da8bdb2a91f2c)
@@ -1,7 +1,7 @@
-fallthrough.c:54:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-fallthrough.c:56:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-fallthrough.c:58:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-fallthrough.c:65:1 error: 'fallthrough default' must be enclosed in a 'switch' or 'choose' control structure with a 'default' clause
-fallthrough.c:67:1 error: 'fallthrough' target must be a later case statement: common3
-fallthrough.c:75:1 error: 'fallthrough' target must be a later case statement: common4
-fallthrough.c:77:1 error: 'fallthrough default' must precede the 'default' clause
+fallthrough.c:87:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
+fallthrough.c:89:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
+fallthrough.c:91:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
+fallthrough.c:98:1 error: 'fallthrough default' must be enclosed in a 'switch' or 'choose' control structure with a 'default' clause
+fallthrough.c:100:1 error: 'fallthrough' target must be a later case statement: common3
+fallthrough.c:108:1 error: 'fallthrough' target must be a later case statement: common4
+fallthrough.c:110:1 error: 'fallthrough default' must precede the 'default' clause
Index: src/tests/.expect/fallthrough.txt
===================================================================
--- src/tests/.expect/fallthrough.txt	(revision 7c2a7b6c75c2ca4c5cc70caff9869195d3d95216)
+++ src/tests/.expect/fallthrough.txt	(revision 759f05f48719425f2affcf339a1da8bdb2a91f2c)
@@ -3,4 +3,18 @@
 case 3
 default
+
+case 1
+case 1
+0
+1
+2
+common
+default
+
 case 5
 common2
+
+case 5
+check
+common
+default
Index: src/tests/fallthrough.c
===================================================================
--- src/tests/fallthrough.c	(revision 7c2a7b6c75c2ca4c5cc70caff9869195d3d95216)
+++ src/tests/fallthrough.c	(revision 759f05f48719425f2affcf339a1da8bdb2a91f2c)
@@ -9,7 +9,7 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Mar 14 10:06:25 2018
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Mar 14 10:32:12 2018
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar 14 22:45:13 2018
+// Update Count     : 13
 //
 
@@ -31,5 +31,5 @@
 		common1:
 			printf("common1\n");
-		/* break */
+		// break
 		case 4:
 			printf("case 4\n");
@@ -44,9 +44,42 @@
 		common2:
 			printf("common2\n");
-		/* break */
+		// break
 		default:
 			printf("default\n");
 			fallthru;
 	}
+
+	printf("\n");
+
+	switch ( choice ) {
+	  case 1:
+		printf("case 1\n");
+		switch ( choice ) {
+		  case 1:
+			printf("case 1\n");
+			for ( int i = 0; i < 4; i += 1 ) {
+				printf("%d\n", i);
+				if ( i == 2 ) fallthru common;
+			} // for
+		} // switch
+		break;
+	  case 5:
+		printf("case 5\n");
+		if ( choice == 5 ) {
+			if ( choice != 5 ) {
+				printf("error\n");
+			} else {
+				printf("check\n");
+				fallthru common;
+			} // if
+		} // if
+	  common:
+		printf( "common\n" );
+		fallthru;
+		break;
+	  default:
+		printf( "default\n" );
+		fallthru;
+	} // switch
 
 #if ERR1
@@ -82,4 +115,5 @@
 int main() {
 	test(1);
+	printf("\n");
 	test(5);
 }
@@ -87,4 +121,4 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa dtor-early-exit" //
+// compile-command: "cfa fallthrough.c" //
 // End: //