Index: src/tests/switch.c
===================================================================
--- src/tests/switch.c	(revision 6e4b91391fb1232cd2844955fb350539bfd4511b)
+++ src/tests/switch.c	(revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19)
@@ -1,42 +1,99 @@
-int main(int argc, char const *argv[]) {
-    int i;
-    switch ( i ) case 3 : i = 1;
-    switch ( i ) default : i = 1;
-    switch ( 3 )
-      default:
-      case 2:
-      case 3:
-	3;
+//
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// switch.c -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 12 06:50:22 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 18:02:23 2016
+// Update Count     : 22
+// 
 
-    switch ( i ) {
-    }
+int f( int i ) { return i; }
 
-    switch ( i ) {
-	int i;
-      case 8~10:
-      default:
-	i = 3;
-      case 3:
-      case 'A' ... 'Z':
-      case 5 ... 6:
-      case 2, 4:
-	i = 3;
-	break;
-    }
+int main() {
+	int i = 0;
+	switch ( i ) case 3 : i = 1;
+	switch ( i ) default : f( 3 );
 
-    choose ( i ) case 3 : i = 1;
-    choose ( i ) default : i = 1;
-    choose ( i ) {
-	int i;
-      case 3:
-      case 'A' ... 'Z':
-      case 5 ... 6:
-      case 2, 4, 7:
-	i = 3;
-	fallthru;
-      default:
-	i = 3;
-      case 8~10:
-	fallthru
-    }
+	switch ( 3 )
+	  default:
+	  case 2:
+	  case 3:
+		f( 3 );
+
+	switch ( i ) {}
+	switch ( i ) {
+	  case 3:
+		f( 3 );
+	} // switch
+
+	// switch (3 ) {
+	// 	int j;
+	//   case 3:
+	// 	break;
+	//   case 4:
+	// 	j = 0;
+	// }
+
+	switch ( i ) {
+		int j = 0;
+		int k = 0;
+		struct S { int i; };
+		S s;
+	  case 8~10:
+	  default:
+		i = 3;
+	  case 3:
+	  case 'A' ... 'Z':
+	  case 5 ... 6:
+	  case 2, 4:
+		j = 3;
+		f( 3 );
+		break;
+	} // switch
+
+	choose ( i ) case 3 : f( 3 );
+	choose ( i ) default : i = 1;
+
+	choose ( 3 )
+	  case 2:
+	  default:
+	  case 3:
+		f( 3 );
+
+	choose ( i ) {}
+	choose ( i ) {
+	  case 3:
+		f( 3 );
+	} // choose
+
+	choose ( i ) {
+		int j = 0;
+		int k = 0;
+		struct S { int i; };
+		S s;
+	  case 3:
+	  case 'A' ... 'Z':
+	  case 5 ... 6:
+	  case 2, 4, 7:
+		i = 3;
+		f( 3 );
+	  default:
+		j = 3;
+	  case 8~10:
+		f( 3 );
+		fallthru
+	  case 'd':
+		j = 5;
+	} // choose
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa switch.c" //
+// End: //