Index: c/examples/abs.c
===================================================================
--- src/examples/abs.c	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,36 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// abs.c -- 
-//
-// Author           : Peter A. Buhr
-// Created On       : Thu Jan 28 18:26:16 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 15:07:26 2016
-// Update Count     : 51
-//
-
-#include <fstream>
-#include <stdlib>										// abs
-
-int main( void ) {
-	char ch = -65;
-	sout | "char\t\t\t"					| ch     | "\tabs " | abs( ch ) | endl;
-	sout | "signed int\t\t"				| -65    | "\tabs" | abs( -65 ) | endl;
-	sout | "signed long int\t\t" 		| -65l   | "\tabs" | abs( -65l ) | endl;
-	sout | "signed long long int\t"		| -65ll  | "\tabs" | abs( -65ll ) | endl;
-	sout | "float\t\t\t" 				| -65.0f | "\tabs" | abs( -65.0f ) | endl;
-	sout | "double\t\t\t"				| -65.0  | "\tabs" | abs( -65.0 ) | endl;
-	sout | "long double\t\t"			| -65.0l | "\tabs" | abs( -65.0l ) | endl;
-	sout | "float _Complex\t\t"			| -65.0F-2.0iF | "\tabs" | abs( -65.0F-2.0iF ) | endl;
-	sout | "double _Complex\t\t"		| -65.0D-2.0iD | "\tabs" | abs( -65.0D-2.0iD ) | endl;
-	sout | "long double _Complex\t"		| -65.0L-2.0iL | "\tabs" | abs( -65.0L-2.0iL ) | endl;
-} // main
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa abs.c" //
-// End: //
Index: c/examples/assert.c
===================================================================
--- src/examples/assert.c	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,23 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// assert.c -- 
-//
-// Author           : Richard C. Bilson
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:10:43 2015
-// Update Count     : 2
-//
-
-void f() {
-	(1) ? (void)(0) : (void)(0);
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa assert.c" //
-// End: //
Index: c/examples/ato.c
===================================================================
--- src/examples/ato.c	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,56 +1,0 @@
-//                               -*- Mode: C -*- 
-// 
-// 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.
-// 
-// ato.c -- 
-// 
-// Author           : Peter A. Buhr
-// Created On       : Thu Feb  4 08:10:57 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb 29 17:57:35 2016
-// Update Count     : 44
-// 
-
-#include <fstream>
-#include <stdlib>										// ato, strto
-extern "C" {
-#include <stdio.h>
-#include <float.h>
-}
-
-int main( void ) {
-	int i = ato( "-123" );
-	sout | i | "-123" | endl;
-	unsigned int ui = ato( "123" );
-	sout | ui | "123" | endl;
-	long int li = ato( "-123" );
-	sout | li | "-123" | endl;
-	unsigned long int uli = ato( "123" );
-	sout | uli | "123" | endl;
-	long long int lli = ato( "-123" );
-	sout | lli | "-123" | endl;
-	unsigned long long int ulli = ato( "123" );
-	sout | ulli | "123" | endl;
-	float f = ato( "-123.456" );
-	sout | f | "-123.456" | endl;
-	double d = ato( "-123.4567890123456" );
-	sout | d | "-123.4567890123456" | endl;
-	long double ld = ato( "-123.45678901234567890123456789" );
-	sout | ld | "-123.45678901234567890123456789" | endl;
-	float _Complex fc = ato( "-123.456-123.456i" );
-	sout | fc | "-123.456-123.456i" | endl;
-	double _Complex dc = ato( "-123.4567890123456+123.4567890123456i" );
-	sout | dc | "-123.4567890123456+123.4567890123456i" | endl;
-	long double _Complex ldc = ato( "123.45678901234567890123456789-123.45678901234567890123456789i" );
-	sout | ldc | "123.45678901234567890123456789-123.45678901234567890123456789i" | endl;
-	long double _Complex ldc2 = ato( "123.45678901234-123.4567890i" );
-	sout | ldc2 | "123.45678901234-123.4567890i" | endl;
-} // main
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa ato.c" //
-// End: //
Index: c/examples/constants.c
===================================================================
--- src/examples/constants.c	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,64 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// constants.c -- 
-//
-// Author           : Richard C. Bilson
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 11 16:27:38 2016
-// Update Count     : 81
-//
-
-int foo() {
-	1_234_Ul;
-	-0_177;
-	017_777_777_777;
-	037_777_777_777;
-	0x_7f_FF_ff_FF;
-	0x_ff_FF_ff_FF;
-	2_147_483_647;
-	4_294_967_295;
-	4_294_967_296;
-	4_294_967_296U;
-	0_777_777_777_777_777_777_777;
-	01_777_777_777_777_777_777_777;
-	0;
-	0L;
-	0LL;
-	1;
-	1L;
-	1LL;
-	10;
-	10L;
-	10LL;
-	2U;
-	2UL;
-	2ULL;
-	2LU;
-	2LLU;
-	0x_7f_FF_ff_FF_ff_FF_ff_FF;
-	0x_ff_FF_ff_FF_ff_FF_ff_FF;
-	9_223_372_036_854_775_807;
-	18_446_744_073_709_551_615UL;
-	3.141_59f;
-	3.14159;
-	12.123_333_E_27L;
-	0X_1.ff_ff_ff_ff_ff_fff_P_1023;
-	'\0';
-	'\1_2_3';
-	L'\x_ff_ee';
-	L_"\x_ff_ee";
-	L"a_b\r\vyc\u_00_40  x_y_z\xff_AA";
-	L_"a_b\r\vyc\u_00_40\
-  x_y_z\xff_AA";
-	"abc" "def" "ghi";
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa constants.c" //
-// End: //
Index: c/examples/control_structures.c
===================================================================
--- src/examples/control_structures.c	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,66 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// control_structures.c -- 
-//
-// Author           : Richard C. Bilson
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan  4 11:30:30 2016
-// Update Count     : 29
-//
-
-int main( void ) {
-	L1: {
-		L2:	switch ( 3_333_333 ) {						// underscores in constant
-		  case 1,2,3:									// CFA
-		  case 4~8:										// CFA
-		  case 9 ... 10:								// gcc, must have spaces
-				L3: for ( ;; ) {
-					L4: for ( ;; ) {
-						break L1;						// labelled break
-						break L2;
-						break L3;
-						break L4;
-						//continue L1;					// error: not enclosing loop
-						//continue L2;					// error: not enclosing loop
-						continue L3;
-						continue L4;
-					} // for
-				} // for
-				break;
-			default:
-				break L1;
-		} // switch
-		3;
-		int i, j;
-		choose ( 7 ) {
-		  case 1,2,3:
-			i = 3;
-			4;
-			fallthru;
-		  case 4,5,6:
-			j = 3;
-		  default: ;
-		} // choose
-	} // block
-
-#if 0
-	try {
-		int i = 3;
-	} catch( int ) {
-	} catch( double ) {
-	} catch( ... ) {
-	} finally {
-	} // try
-#endif
-
-} // main
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa control_structures.c" //
-// End: //
Index: c/examples/ctxts.c
===================================================================
--- src/examples/ctxts.c	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,29 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// ctxts.c -- 
-//
-// Author           : Richard C. Bilson
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 18:10:21 2016
-// Update Count     : 3
-//
-
-trait has_f( type T ) {
-	T f( T );
-};
-
-trait has_g( type U | has_f( U ) ) {
-	U g( U );
-};
-
-forall( type V | has_g( V ) ) void h( V );
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa ctxts.c" //
-// End: //
Index: c/examples/esskaykay.c
===================================================================
--- src/examples/esskaykay.c	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,29 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// esskaykay.c -- 
-//
-// Author           : Richard C. Bilson
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:11:45 2015
-// Update Count     : 2
-//
-
-// forall (type A, type B, type C) C ess (C (*f) (A,B), B (*g) (A), A x) { return f(x,g(x)); }
-forall (type A, type B, type C) C ess (C (*(*f)(A))(B), B (*g)(A), A x) { return f(x)(g(x)); }
-
-// forall (type A, type B) A kay (A a, B b) { return a; }
-forall (type A, type B) A (*kay(A a))(B b);
-
-// Now is the following function well-typed, or not?
-
-forall (type A) A esskaykay (A x) { ess (kay, kay, x); }
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa esskaykay.c" //
-// End: //
Index: c/examples/runTests.sh
===================================================================
--- src/examples/runTests.sh	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,65 +1,0 @@
-#!/bin/bash
-
-##############################################################################
-#
-# Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-#
-# The contents of this file are covered under the licence agreement in the
-# file "LICENCE" distributed with Cforall.
-#
-# Runs integration tests for cfa-cc.
-#
-# Output of test run will be copied into $logfile (default: tests/log.txt).
-# Build failures for tests will be placed in tests/$test.make.txt, incorrect
-# output in tests/$test.run.txt.
-#
-# Author           : Aaron B. Moss
-# Created On       : Mon Nov 23 14:19:00 2015
-# Last Modified By : Aaron B. Moss
-# Last Modified On : Mon Nov 23 14:19:00 2015
-# Update Count     : 1
-#
-##############################################################################
-
-# list of tests to run;
-# Should be a make target for each test that generates an executable in the
-# current directory named the same; should also be an input file
-# tests/$test.in.txt and expected output tests/$test.out.txt
-tests="vector_test avl_test"
-
-# log file for test output;
-# reset at the beginning of each run
-logfile=tests/log.txt
-touch $logfile && rm $logfile
-
-# clean existing build artifacts before run
-make clean > /dev/null 2>&1
-
-ret_val=0
-
-for test in $tests; do
-	echo -n "    $test" | tee -a $logfile
-
-	# build, skipping to next test on error
-	if ! make -j 8 $test > tests/$test.make.txt 2>&1; then
-		ret_val=1
-		echo -e "\tFAILED with build error:" | tee -a $logfile
-		cat tests/$test.make.txt | tee -a $logfile
-		continue
-	fi
-	rm tests/$test.make.txt
-
-	# run, testing against expected output
-	./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1
-	if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then
-		ret_val=1
-		echo -e "\tFAILED with output mismatch:" | tee -a $logfile
-		cat tests/$test.diff.txt | tee -a $logfile
-		continue
-	fi
-	rm tests/$test.run.txt tests/$test.diff.txt ./$test
-
-	echo -e "\tPASSED" | tee -a $logfile
-done
-
-exit $((ret_val))
Index: c/examples/vector_test.c
===================================================================
--- src/examples/vector_test.c	(revision 7a48361a029f71ba37b82bd9207e9ea617eee8f9)
+++ 	(revision )
@@ -1,47 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// vector_test.c --
-//
-// Author           : Richard C. Bilson
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:31:27 2016
-// Update Count     : 18
-//
-
-#include <fstream>
-#include <iterator>
-#include "vector_int.h"
-#include "array.h"
-
-int main( void ) {
-	vector_int vec;
-
-	// read in numbers until EOF or error
-	int num;
-
-	sout | "enter N elements and C-d on a separate line:" | endl;
-	for ( ;; ) {
-		sin | &num;
-	  if ( fail( sin ) || eof( sin ) ) break;
-		append( &vec, num );
-	}
-	// write out the numbers
-
-	sout | "Array elements:" | endl;
-	write( begin( &vec ), end( &vec ), sout );
-	sout | endl;
-
-	sout | "Array elements reversed:" | endl;
-	write_reverse( begin( &vec ), end( &vec ), sout );
-	sout | endl;
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa vector_test.c vector_int.o array.o" //
-// End: //
Index: src/tests/abs.c
===================================================================
--- src/tests/abs.c	(revision 1e37d4dba6b5ea6779ee45ac66989cefd076fb23)
+++ src/tests/abs.c	(revision 1e37d4dba6b5ea6779ee45ac66989cefd076fb23)
@@ -0,0 +1,36 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// abs.c -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Thu Jan 28 18:26:16 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 15:07:26 2016
+// Update Count     : 51
+//
+
+#include <fstream>
+#include <stdlib>										// abs
+
+int main( void ) {
+	char ch = -65;
+	sout | "char\t\t\t"					| ch     | "\tabs " | abs( ch ) | endl;
+	sout | "signed int\t\t"				| -65    | "\tabs" | abs( -65 ) | endl;
+	sout | "signed long int\t\t" 		| -65l   | "\tabs" | abs( -65l ) | endl;
+	sout | "signed long long int\t"		| -65ll  | "\tabs" | abs( -65ll ) | endl;
+	sout | "float\t\t\t" 				| -65.0f | "\tabs" | abs( -65.0f ) | endl;
+	sout | "double\t\t\t"				| -65.0  | "\tabs" | abs( -65.0 ) | endl;
+	sout | "long double\t\t"			| -65.0l | "\tabs" | abs( -65.0l ) | endl;
+	sout | "float _Complex\t\t"			| -65.0F-2.0iF | "\tabs" | abs( -65.0F-2.0iF ) | endl;
+	sout | "double _Complex\t\t"		| -65.0D-2.0iD | "\tabs" | abs( -65.0D-2.0iD ) | endl;
+	sout | "long double _Complex\t"		| -65.0L-2.0iL | "\tabs" | abs( -65.0L-2.0iL ) | endl;
+} // main
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa abs.c" //
+// End: //
Index: src/tests/ato.c
===================================================================
--- src/tests/ato.c	(revision 1e37d4dba6b5ea6779ee45ac66989cefd076fb23)
+++ src/tests/ato.c	(revision 1e37d4dba6b5ea6779ee45ac66989cefd076fb23)
@@ -0,0 +1,56 @@
+//                               -*- Mode: C -*- 
+// 
+// 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.
+// 
+// ato.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Thu Feb  4 08:10:57 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Feb 29 17:57:35 2016
+// Update Count     : 44
+// 
+
+#include <fstream>
+#include <stdlib>										// ato, strto
+extern "C" {
+#include <stdio.h>
+#include <float.h>
+}
+
+int main( void ) {
+	int i = ato( "-123" );
+	sout | i | "-123" | endl;
+	unsigned int ui = ato( "123" );
+	sout | ui | "123" | endl;
+	long int li = ato( "-123" );
+	sout | li | "-123" | endl;
+	unsigned long int uli = ato( "123" );
+	sout | uli | "123" | endl;
+	long long int lli = ato( "-123" );
+	sout | lli | "-123" | endl;
+	unsigned long long int ulli = ato( "123" );
+	sout | ulli | "123" | endl;
+	float f = ato( "-123.456" );
+	sout | f | "-123.456" | endl;
+	double d = ato( "-123.4567890123456" );
+	sout | d | "-123.4567890123456" | endl;
+	long double ld = ato( "-123.45678901234567890123456789" );
+	sout | ld | "-123.45678901234567890123456789" | endl;
+	float _Complex fc = ato( "-123.456-123.456i" );
+	sout | fc | "-123.456-123.456i" | endl;
+	double _Complex dc = ato( "-123.4567890123456+123.4567890123456i" );
+	sout | dc | "-123.4567890123456+123.4567890123456i" | endl;
+	long double _Complex ldc = ato( "123.45678901234567890123456789-123.45678901234567890123456789i" );
+	sout | ldc | "123.45678901234567890123456789-123.45678901234567890123456789i" | endl;
+	long double _Complex ldc2 = ato( "123.45678901234-123.4567890i" );
+	sout | ldc2 | "123.45678901234-123.4567890i" | endl;
+} // main
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa ato.c" //
+// End: //
Index: src/tests/runTests.sh
===================================================================
--- src/tests/runTests.sh	(revision 1e37d4dba6b5ea6779ee45ac66989cefd076fb23)
+++ src/tests/runTests.sh	(revision 1e37d4dba6b5ea6779ee45ac66989cefd076fb23)
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+##############################################################################
+#
+# Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+#
+# The contents of this file are covered under the licence agreement in the
+# file "LICENCE" distributed with Cforall.
+#
+# Runs integration tests for cfa-cc.
+#
+# Output of test run will be copied into $logfile (default: tests/log.txt).
+# Build failures for tests will be placed in tests/$test.make.txt, incorrect
+# output in tests/$test.run.txt.
+#
+# Author           : Aaron B. Moss
+# Created On       : Mon Nov 23 14:19:00 2015
+# Last Modified By : Aaron B. Moss
+# Last Modified On : Mon Nov 23 14:19:00 2015
+# Update Count     : 1
+#
+##############################################################################
+
+# list of tests to run;
+# Should be a make target for each test that generates an executable in the
+# current directory named the same; should also be an input file
+# tests/$test.in.txt and expected output tests/$test.out.txt
+tests="vector_test avl_test"
+
+# log file for test output;
+# reset at the beginning of each run
+logfile=tests/log.txt
+touch $logfile && rm $logfile
+
+# clean existing build artifacts before run
+make clean > /dev/null 2>&1
+
+ret_val=0
+
+for test in $tests; do
+	echo -n "    $test" | tee -a $logfile
+
+	# build, skipping to next test on error
+	if ! make -j 8 $test > tests/$test.make.txt 2>&1; then
+		ret_val=1
+		echo -e "\tFAILED with build error:" | tee -a $logfile
+		cat tests/$test.make.txt | tee -a $logfile
+		continue
+	fi
+	rm tests/$test.make.txt
+
+	# run, testing against expected output
+	./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1
+	if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then
+		ret_val=1
+		echo -e "\tFAILED with output mismatch:" | tee -a $logfile
+		cat tests/$test.diff.txt | tee -a $logfile
+		continue
+	fi
+	rm tests/$test.run.txt tests/$test.diff.txt ./$test
+
+	echo -e "\tPASSED" | tee -a $logfile
+done
+
+exit $((ret_val))
Index: src/tests/vector_test.c
===================================================================
--- src/tests/vector_test.c	(revision 1e37d4dba6b5ea6779ee45ac66989cefd076fb23)
+++ src/tests/vector_test.c	(revision 1e37d4dba6b5ea6779ee45ac66989cefd076fb23)
@@ -0,0 +1,47 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// vector_test.c --
+//
+// Author           : Richard C. Bilson
+// Created On       : Wed May 27 17:56:53 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 27 17:31:27 2016
+// Update Count     : 18
+//
+
+#include <fstream>
+#include <iterator>
+#include "vector_int.h"
+#include "array.h"
+
+int main( void ) {
+	vector_int vec;
+
+	// read in numbers until EOF or error
+	int num;
+
+	sout | "enter N elements and C-d on a separate line:" | endl;
+	for ( ;; ) {
+		sin | &num;
+	  if ( fail( sin ) || eof( sin ) ) break;
+		append( &vec, num );
+	}
+	// write out the numbers
+
+	sout | "Array elements:" | endl;
+	write( begin( &vec ), end( &vec ), sout );
+	sout | endl;
+
+	sout | "Array elements reversed:" | endl;
+	write_reverse( begin( &vec ), end( &vec ), sout );
+	sout | endl;
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa vector_test.c vector_int.o array.o" //
+// End: //