Index: doc/theses/andrew_beach_MMath/performance.tex
===================================================================
--- doc/theses/andrew_beach_MMath/performance.tex	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
+++ doc/theses/andrew_beach_MMath/performance.tex	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -0,0 +1,101 @@
+\chapter{Performance}
+\label{c:performance}
+
+\textbf{Just because of the stage of testing there are design notes for
+the tests as well as commentary on them.}
+
+Performance has been of secondary importance for most of this project.
+The driving for has been to get the features working, the only performance
+requirements were to make sure the tests for correctness rain in a reasonable
+amount of time.
+Still this is an implementation others could use for similar prototypes and
+so the results still have some use.
+
+\section{Test Set-Up}
+Tests will be run on \CFA, C++ and Java.
+
+C++ is the most comparable language because both it and \CFA use the same
+framework, libunwind.
+In fact the comparison is almost entirely a quality of implementation
+comparison. \CFA's EHM has had significantly less time to be optimized and
+does not generate its own assembly. It does have a slight advantage in that
+there are some features it does not handle.
+
+% Some languages I left out:
+% Python: Its a scripting language, different
+% uC++: Not well known and should the same results as C++, except for
+%   resumption which should be the same.
+\todo{Can we find a good language to compare resumptions in.}
+
+All tests will be run inside a main loop which will perform the test
+repeatedly. This is to avoid letting and start-up or tear-down time from
+affecting the timing results.
+This also means that tests cannot terminate the program, which does limit
+how tests can be implemented. There are catch-alls to keep unhandled
+exceptions from terminating the program.
+
+The exceptions used in this test will always be a new exception based off of
+the base exception. This should minimize and preformance differences based
+on the object model.
+Catch-alls will be done by catching the root exception type (not using \Cpp's
+\code{C++}{catch(...)}).
+
+Tests run in Java were not warmed because exception code paths should not be
+hot.
+
+\section{Tests}
+\paragraph{Raise/Handle}
+What is the basic cost to raise and handle an exception?
+
+There are a number of factors that can effect this, for \CFA this includes
+the type of raise,
+
+Main loop, pass through a catch-all, call through some empty helper functions
+to put frames on the stack then raise and exception.
+\todo{Raise/Handle (or a similar test) could also test how much it costs to
+search over things, not sure if that is a useful test.}
+
+\paragraph{Unwinding}
+Isolating the unwinding of the stack as much as possible.
+
+This has the same set-up as the raise/handle test except the intermediate
+stack frames contain either an object declaration with a destructor or a
+try statement with no handlers except for a finally clause.
+
+\paragraph{Enter/Leave}
+What is the cost of entering and leaving a try block, even if no exception
+is thrown?
+
+This is the simplist pattern to test as it is a simple matter of entering
+and leaving a try statement.
+
+The only tunables here are which clauses are attached to the try block:
+termination handlers, resumption handlers and finally clauses.
+
+\paragraph{Re-throw and Conditional-Catch}
+How expencive it is to run a non-exception type check for a handler?
+
+In this case different languages approach this problem differently, either
+through a re-throw or a conditional-catch.
+Where \CFA uses its condition other languages will have to unconditionally
+catch the exception then re-throw if the condition if the condition is false.
+
+The set up is as follows: main loop, a catch-all exception handler,
+a conditional catch and then the raise.
+
+% We could do a Cforall test without the catch all and a new default handler
+% that does a catch all.
+As a point of comparison one of the raise/handle tests (which one?) has
+same layout but never catches anything.
+
+The main tunable in this test is how often the conditional-catch matches.
+
+%\section{Cost in Size}
+%Using exceptions also has a cost in the size of the executable.
+%Although it is sometimes ignored
+%
+%There is a size cost to defining a personality function but the later problem
+%is the LSDA which will be generated for every function.
+%
+%(I haven't actually figured out how to compare this, probably using something
+%related to -fexceptions.)
Index: doc/theses/andrew_beach_MMath/uw-ethesis.tex
===================================================================
--- doc/theses/andrew_beach_MMath/uw-ethesis.tex	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ doc/theses/andrew_beach_MMath/uw-ethesis.tex	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -244,4 +244,5 @@
 \input{features}
 \input{implement}
+\input{performance}
 \input{future}
 
Index: tests/.expect/array.txt
===================================================================
--- tests/.expect/array.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/array.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-array.cfa: In function '_X4mainFi___1':
-array.cfa:55:9: note: #pragma message: Compiled
+array.cfa:52:25: warning: Compiled
Index: tests/.expect/cast.txt
===================================================================
--- tests/.expect/cast.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/cast.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-cast.cfa: In function '_X4mainFi_iPPKc__1':
-cast.cfa:18:9: note: #pragma message: Compiled
+cast.cfa:16:25: warning: Compiled
Index: tests/.expect/expression.txt
===================================================================
--- tests/.expect/expression.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/expression.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-expression.cfa: In function '_X4mainFi___1':
-expression.cfa:89:9: note: #pragma message: Compiled
+expression.cfa:86:25: warning: Compiled
Index: tests/.expect/forall.txt
===================================================================
--- tests/.expect/forall.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/forall.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-forall.cfa: In function '_X4mainFi___1':
-forall.cfa:218:9: note: #pragma message: Compiled
+forall.cfa:216:25: warning: Compiled
Index: tests/.expect/identFuncDeclarator.txt
===================================================================
--- tests/.expect/identFuncDeclarator.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/identFuncDeclarator.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-identFuncDeclarator.cfa: In function '_X4mainFi___1':
-identFuncDeclarator.cfa:116:9: note: #pragma message: Compiled
+identFuncDeclarator.cfa:114:25: warning: Compiled
Index: tests/.expect/init1-ERROR.nast.txt
===================================================================
--- tests/.expect/init1-ERROR.nast.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/init1-ERROR.nast.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,3 @@
+init1.cfa:134:25: warning: Compiled
 init1.cfa:56:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
   Name: rx  InitAlternative: reference to signed int
Index: tests/.expect/init1.txt
===================================================================
--- tests/.expect/init1.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/init1.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-init1.cfa: In function '_X4mainFi___1':
-init1.cfa:136:9: note: #pragma message: Compiled
+init1.cfa:134:25: warning: Compiled
Index: tests/.expect/labelledExit.txt
===================================================================
--- tests/.expect/labelledExit.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/labelledExit.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-labelledExit.cfa: In function '_X4mainFi_iPPKc__1':
-labelledExit.cfa:183:9: note: #pragma message: Compiled
+labelledExit.cfa:181:25: warning: Compiled
Index: tests/.expect/limits.txt
===================================================================
--- tests/.expect/limits.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/limits.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-limits.cfa: In function '_X4mainFi_iPPKc__1':
-limits.cfa:154:9: note: #pragma message: Compiled
+limits.cfa:152:25: warning: Compiled
Index: tests/.expect/nested-types-ERR1.txt
===================================================================
--- tests/.expect/nested-types-ERR1.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/nested-types-ERR1.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,1 +1,2 @@
+nested-types.cfa:100:25: warning: Compiled
 nested-types.cfa:83:1 error: Use of undefined type T
Index: tests/.expect/nested-types-ERR2.txt
===================================================================
--- tests/.expect/nested-types-ERR2.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/nested-types-ERR2.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,3 @@
+nested-types.cfa:100:25: warning: Compiled
 nested-types.cfa:86:1 error: Use of undefined global type Z
 nested-types.cfa:87:1 error: Qualified type requires an aggregate on the left, but has: signed int
Index: tests/.expect/nested-types.txt
===================================================================
--- tests/.expect/nested-types.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/nested-types.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-nested-types.cfa: In function '_X4mainFi___1':
-nested-types.cfa:102:9: note: #pragma message: Compiled
+nested-types.cfa:100:25: warning: Compiled
Index: tests/.expect/numericConstants.txt
===================================================================
--- tests/.expect/numericConstants.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/numericConstants.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-numericConstants.cfa: In function '_X4mainFi___1':
-numericConstants.cfa:68:9: note: #pragma message: Compiled
+numericConstants.cfa:66:25: warning: Compiled
Index: tests/.expect/quasiKeyword.txt
===================================================================
--- tests/.expect/quasiKeyword.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/quasiKeyword.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-quasiKeyword.cfa: In function '_X4mainFi_iPPKc__1':
-quasiKeyword.cfa:56:9: note: #pragma message: Compiled
+quasiKeyword.cfa:54:25: warning: Compiled
Index: sts/.expect/stdincludes.txt
===================================================================
--- tests/.expect/stdincludes.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ 	(revision )
@@ -1,2 +1,0 @@
-stdincludes.cfa: In function '_X4mainFi___1':
-stdincludes.cfa:52:9: note: #pragma message: Compiled
Index: tests/.expect/switch.txt
===================================================================
--- tests/.expect/switch.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/switch.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-switch.cfa: In function '_X4mainFi___1':
-switch.cfa:105:9: note: #pragma message: Compiled
+switch.cfa:103:25: warning: Compiled
Index: tests/.expect/typedefRedef-ERR1.txt
===================================================================
--- tests/.expect/typedefRedef-ERR1.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/typedefRedef-ERR1.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,3 @@
+typedefRedef.cfa:69:25: warning: Compiled
 typedefRedef.cfa:4:1 error: Cannot redefine typedef: Foo
 typedefRedef.cfa:59:1 error: Cannot redefine typedef: ARR
Index: tests/.expect/typedefRedef.txt
===================================================================
--- tests/.expect/typedefRedef.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/typedefRedef.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-typedefRedef.cfa: In function '_X4mainFi___1':
-typedefRedef.cfa:71:9: note: #pragma message: Compiled
+typedefRedef.cfa:69:25: warning: Compiled
Index: tests/.expect/variableDeclarator.txt
===================================================================
--- tests/.expect/variableDeclarator.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/.expect/variableDeclarator.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-variableDeclarator.cfa: In function '_X4mainFi_iPPKc__1':
-variableDeclarator.cfa:182:9: note: #pragma message: Compiled
+variableDeclarator.cfa:180:25: warning: Compiled
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/Makefile.am	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Mar  2 21:39:01 2021
-## Update Count     : 90
+## Last Modified On : Sat Jun  5 14:49:25 2021
+## Update Count     : 92
 ###############################################################################
 
@@ -173,5 +173,5 @@
 
 SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator forall \
-	init1 limits nested-types stdincludes cast labelledExit array quasiKeyword include/includes builtins/sync warnings/self-assignment
+	init1 limits nested-types cast labelledExit array quasiKeyword include/stdincludes include/includes builtins/sync warnings/self-assignment
 $(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)
 	$(CFACOMPILE_SYNTAX)
Index: tests/array.cfa
===================================================================
--- tests/array.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/array.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -11,6 +11,6 @@
 // Created On       : Tue Feb 19 21:18:06 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 09:05:40 2020
-// Update Count     : 4
+// Last Modified On : Sat Jun  5 10:05:51 2021
+// Update Count     : 5
 //
 
@@ -50,7 +50,5 @@
 
 int main() {
-	#if !defined(NO_COMPILED_PRAGMA)
-		#pragma message( "Compiled" )	// force non-empty .expect file
-	#endif
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
Index: tests/builtins/.expect/sync.txt
===================================================================
--- tests/builtins/.expect/sync.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/builtins/.expect/sync.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-builtins/sync.cfa: In function '_X4mainFi___1':
-builtins/sync.cfa:358:9: note: #pragma message: Compiled
+builtins/sync.cfa:356:25: warning: Compiled
Index: tests/builtins/sync.cfa
===================================================================
--- tests/builtins/sync.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/builtins/sync.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -354,4 +354,4 @@
 
 int main() {
-	#pragma message( "Compiled" )			// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
Index: tests/cast.cfa
===================================================================
--- tests/cast.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/cast.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -14,4 +14,4 @@
 //Dummy main
 int main( int argc, char const * argv[] ) {
-	#pragma message( "Compiled" )						// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
Index: tests/expression.cfa
===================================================================
--- tests/expression.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/expression.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -84,6 +84,4 @@
 	(S)@{2}`mary;
 
-	#if !defined(NO_COMPILED_PRAGMA)
-		#pragma message( "Compiled" )	// force non-empty .expect file
-	#endif
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 } // main
Index: tests/forall.cfa
===================================================================
--- tests/forall.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/forall.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Wed May  9 08:48:15 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 08:43:20 2020
-// Update Count     : 35
+// Last Modified On : Sat Jun  5 10:06:08 2021
+// Update Count     : 36
 // 
 
@@ -214,5 +214,5 @@
 
 int main( void ) {
-	#pragma message( "Compiled" )			// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
Index: tests/identFuncDeclarator.cfa
===================================================================
--- tests/identFuncDeclarator.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/identFuncDeclarator.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Wed Aug 17 08:36:34 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 08:20:46 2020
-// Update Count     : 5
+// Last Modified On : Sat Jun  5 10:06:25 2021
+// Update Count     : 6
 // 
 
@@ -112,5 +112,5 @@
 	int (* const(* const f81)(int))();
 
-	#pragma message( "Compiled" )			// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
Index: tests/include/.expect/includes.nast.txt
===================================================================
--- tests/include/.expect/includes.nast.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/include/.expect/includes.nast.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,1 @@
-include/includes.cfa: In function '_X4mainFi_iPPKc__1':
-include/includes.cfa:156:9: note: #pragma message: Compiled
+include/includes.cfa:154:25: warning: Compiled
Index: tests/include/.expect/stdincludes.txt
===================================================================
--- tests/include/.expect/stdincludes.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
+++ tests/include/.expect/stdincludes.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -0,0 +1,1 @@
+include/stdincludes.cfa:50:25: warning: Compiled
Index: tests/include/includes.cfa
===================================================================
--- tests/include/includes.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/include/includes.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 25 09:08:26 2021
-// Update Count     : 750
+// Last Modified On : Sat Jun  5 10:06:46 2021
+// Update Count     : 751
 //
 
@@ -152,5 +152,5 @@
 
 int main( int argc, char const *argv[] ) {
-	#pragma message( "Compiled" )						// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
Index: tests/include/stdincludes.cfa
===================================================================
--- tests/include/stdincludes.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
+++ tests/include/stdincludes.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -0,0 +1,56 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// stdincludes.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Aug 29 08:26:14 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jun  5 10:08:11 2021
+// Update Count     : 9
+// 
+
+// C11 standard headers
+
+#include <assert.h>
+#include <complex.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fenv.h>
+#include <float.h>
+#include <inttypes.h>
+//#include <iso646.h>										// does not exist on linux
+#include <limits.h>
+#include <locale.h>
+#include <malloc.h>										// extra
+#include <math.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdalign.h>
+#include <stdarg.h>
+#include <stdatomic.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdnoreturn.h>
+#include <string.h>
+#include <tgmath.h>
+#include <time.h>
+#include <uchar.h>
+#include <unistd.h>										// extra
+#include <wchar.h>
+#include <wctype.h>
+
+int main() {
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa stdincludes.cfa" //
+// End: //
Index: tests/init1.cfa
===================================================================
--- tests/init1.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/init1.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jul 16 22:00:00 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct 11 10:26:50 2020
-// Update Count     : 8
+// Last Modified On : Sat Jun  5 10:06:57 2021
+// Update Count     : 9
 //
 
@@ -132,4 +132,4 @@
 
 int main() {
-    #pragma message( "Compiled" )			// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
Index: tests/labelledExit.cfa
===================================================================
--- tests/labelledExit.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/labelledExit.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Wed Aug 10 07:29:39 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 09:01:34 2020
-// Update Count     : 12
+// Last Modified On : Sat Jun  5 10:07:34 2021
+// Update Count     : 13
 // 
 
@@ -179,5 +179,5 @@
 
 int main( int argc, char const *argv[] ) {
-	#pragma message( "Compiled" )						// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
Index: tests/limits.cfa
===================================================================
--- tests/limits.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/limits.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Tue May 10 20:44:20 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 08:45:43 2020
-// Update Count     : 10
+// Last Modified On : Sat Jun  5 10:07:32 2021
+// Update Count     : 11
 //
 
@@ -150,5 +150,5 @@
 
 int main(int argc, char const *argv[]) {
-	#pragma message( "Compiled" )						// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
Index: tests/nested-types.cfa
===================================================================
--- tests/nested-types.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/nested-types.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Mon Jul 9 10:20:03 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 08:48:59 2020
-// Update Count     : 6
+// Last Modified On : Sat Jun  5 10:07:42 2021
+// Update Count     : 7
 //
 
@@ -98,5 +98,5 @@
 	// A.N(int) x;  // xxx - should not be an error, but currently is.
 
-	#pragma message( "Compiled" )			// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
Index: tests/numericConstants.cfa
===================================================================
--- tests/numericConstants.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/numericConstants.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 24 22:10:36 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 07:55:22 2020
-// Update Count     : 7
+// Last Modified On : Sat Jun  5 10:07:52 2021
+// Update Count     : 8
 // 
 
@@ -64,5 +64,5 @@
 	0x_1.ffff_ffff_p_128_l;
 
-	#pragma message( "Compiled" )	// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 } // main
 
Index: tests/quasiKeyword.cfa
===================================================================
--- tests/quasiKeyword.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/quasiKeyword.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -8,6 +8,6 @@
 // Created On       : Wed Feb 17 10:33:49 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Feb 21 15:52:04 2021
-// Update Count     : 7
+// Last Modified On : Sat Jun  5 10:07:59 2021
+// Update Count     : 8
 // 
 
@@ -52,4 +52,4 @@
 	else catch = 3;
 
-	#pragma message( "Compiled" )						// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
Index: sts/stdincludes.cfa
===================================================================
--- tests/stdincludes.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ 	(revision )
@@ -1,56 +1,0 @@
-// 
-// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-// 
-// stdincludes.cfa -- 
-// 
-// Author           : Peter A. Buhr
-// Created On       : Tue Aug 29 08:26:14 2017
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 08:51:38 2020
-// Update Count     : 8
-// 
-
-// C11 standard headers
-
-#include <assert.h>
-#include <complex.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fenv.h>
-#include <float.h>
-#include <inttypes.h>
-//#include <iso646.h>										// does not exist on linux
-#include <limits.h>
-#include <locale.h>
-#include <malloc.h>										// extra
-#include <math.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdalign.h>
-#include <stdarg.h>
-#include <stdatomic.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdnoreturn.h>
-#include <string.h>
-#include <tgmath.h>
-#include <time.h>
-#include <uchar.h>
-#include <unistd.h>										// extra
-#include <wchar.h>
-#include <wctype.h>
-
-int main() {
-	#pragma message( "Compiled" )			// force non-empty .expect file
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa stdincludes.cfa" //
-// End: //
Index: tests/switch.cfa
===================================================================
--- tests/switch.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/switch.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Tue Jul 12 06:50:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 08:35:02 2020
-// Update Count     : 43
+// Last Modified On : Sat Jun  5 10:08:20 2021
+// Update Count     : 44
 // 
 
@@ -101,5 +101,5 @@
 	} // choose
 
-	#pragma message( "Compiled" )						// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 } // main
 
Index: tests/typedefRedef.cfa
===================================================================
--- tests/typedefRedef.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/typedefRedef.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -67,4 +67,4 @@
 	typedef int *** pt;
 
-	#pragma message( "Compiled" )			// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
Index: tests/variableDeclarator.cfa
===================================================================
--- tests/variableDeclarator.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/variableDeclarator.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Wed Aug 17 08:41:42 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 07:46:17 2020
-// Update Count     : 13
+// Last Modified On : Sat Jun  5 10:08:47 2021
+// Update Count     : 14
 // 
 
@@ -178,5 +178,5 @@
 //Dummy main
 int main( int argc, char const * argv[] ) {
-	#pragma message( "Compiled" )						// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
Index: tests/warnings/.expect/self-assignment.nast.txt
===================================================================
--- tests/warnings/.expect/self-assignment.nast.txt	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/warnings/.expect/self-assignment.nast.txt	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -1,2 +1,3 @@
+warnings/self-assignment.cfa:34:25: warning: Compiled
 warnings/self-assignment.cfa:29:1 warning: self assignment of expression: Generated Cast of:
   Variable Expression: j: signed int
@@ -46,4 +47,2 @@
 ... with resolved type:
   reference to signed int
-warnings/self-assignment.cfa: In function '_X4mainFi___1':
-warnings/self-assignment.cfa:36:9: note: #pragma message: Compiled
Index: tests/warnings/self-assignment.cfa
===================================================================
--- tests/warnings/self-assignment.cfa	(revision 4969efd9c90f11983f1a6d17770c854c70729954)
+++ tests/warnings/self-assignment.cfa	(revision 8519fac9f6736f0415e3a108cabf5260ea7322a3)
@@ -10,6 +10,6 @@
 // Created On       : Thu Mar 1 13:53:57 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 27 09:24:34 2020
-// Update Count     : 6
+// Last Modified On : Sat Jun  5 10:08:56 2021
+// Update Count     : 7
 //
 
@@ -32,5 +32,5 @@
 	t.s.i = t.s.i;
 
-	#pragma message( "Compiled" )			// force non-empty .expect file
+    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
 }
 
