Index: sts/.expect/completeTypeError.txt
===================================================================
--- tests/.expect/completeTypeError.txt	(revision 3966d9a34af5c01e9d3ce15fa58f8f8a2875251b)
+++ 	(revision )
@@ -1,141 +1,0 @@
-completeTypeError.cfa:34:1 error: Cannot choose between 2 alternatives for expression
-Generated Cast of:
-  Applying untyped:
-    Name: *?
-  ...to:
-    Name: x
-
-... to: nothing Alternatives are:
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
-      Application of
-        Variable Expression: *?: forall
-          DT: data type
-          function
-        ... with parameters
-          intrinsic pointer to instance of type DT (not function type)
-        ... returning
-          _retval__operator_deref: reference to instance of type DT (not function type)
-          ... with attributes:
-            Attribute with name: unused
-
-
-      ... to arguments
-        Variable Expression: x: pointer to instance of struct A with body 0
-
-    ... to: nothing
-  (types:
-    void 
-  )
-  Environment:( _83_4_DT ) -> instance of struct A with body 0 (no widening)
-
-
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
-      Application of
-        Variable Expression: *?: forall
-          DT: data type
-          function
-        ... with parameters
-          intrinsic pointer to instance of type DT (not function type)
-        ... returning
-          _retval__operator_deref: reference to instance of type DT (not function type)
-          ... with attributes:
-            Attribute with name: unused
-
-
-      ... to arguments
-        Variable Expression: x: pointer to instance of struct B with body 1
-
-    ... to: nothing
-  (types:
-    void 
-  )
-  Environment:( _83_4_DT ) -> instance of struct B with body 1 (no widening)
-
-
-
-completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
-  Name: foo
-...to:
-  Name: v
-
-completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
-  Name: baz
-...to:
-  Name: v
-
-completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
-  Name: quux
-...to:
-  Name: v
-
-completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
-  Name: baz
-...to:
-  Name: y
-
-completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
-  Name: quux
-...to:
-  Name: y
-
-completeTypeError.cfa:72:1 error: No alternatives with satisfiable assertions for Applying untyped:
-  Name: baz
-...to:
-  Name: z
-
-      Unsatisfiable alternative:
-Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of
-            Variable Expression: baz: forall
-              T: sized data type
-              ... with assertions
-                ?=?: pointer to function
-                ... with parameters
-                  reference to instance of type T (not function type)
-                  instance of type T (not function type)
-                ... returning
-                  _retval__operator_assign: instance of type T (not function type)
-                  ... with attributes:
-                    Attribute with name: unused
-
-
-                ?{}: pointer to function
-                ... with parameters
-                  reference to instance of type T (not function type)
-                ... returning nothing
-
-                ?{}: pointer to function
-                ... with parameters
-                  reference to instance of type T (not function type)
-                  instance of type T (not function type)
-                ... returning nothing
-
-                ^?{}: pointer to function
-                ... with parameters
-                  reference to instance of type T (not function type)
-                ... returning nothing
-
-
-              function
-            ... with parameters
-              pointer to instance of type T (not function type)
-            ... returning nothing
-
-          ... to arguments
-            Variable Expression: z: pointer to instance of type T (not function type)
-
-        (types:
-          void 
-        )
-        Environment:( _102_0_T ) -> instance of type T (not function type) (no widening)
-
-      Could not satisfy assertion:
-?=?: pointer to function
-        ... with parameters
-          reference to instance of type _102_0_T (not function type)
-          instance of type _102_0_T (not function type)
-        ... returning
-          _retval__operator_assign: instance of type _102_0_T (not function type)
-          ... with attributes:
-            Attribute with name: unused
-
-
Index: sts/.expect/declarationErrors.txt
===================================================================
--- tests/.expect/declarationErrors.txt	(revision 3966d9a34af5c01e9d3ce15fa58f8f8a2875251b)
+++ 	(revision )
@@ -1,70 +1,0 @@
-declarationErrors.cfa:16:1 error: duplicate static in declaration of x1: static const volatile short int 
-
-declarationErrors.cfa:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int 
-
-declarationErrors.cfa:18:1 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int 
-
-declarationErrors.cfa:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
-  with members
-    i: int 
-   with body
-
-
-declarationErrors.cfa:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
-  with members
-    i: int 
-   with body
-
-
-declarationErrors.cfa:22:1 error: duplicate static in declaration of x6: static const volatile Int
-
-declarationErrors.cfa:24:1 error: duplicate const in declaration of f01: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:26:1 error: duplicate const in declaration of f03: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:28:1 error: duplicate const in declaration of f05: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:30:1 error: duplicate const in declaration of f07: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
-  with no parameters
-  returning const volatile int 
-
-
-declarationErrors.cfa:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
-  with no parameters
-  returning const restrict volatile _Atomic int 
-
-
Index: sts/.expect/scopeErrors.txt
===================================================================
--- tests/.expect/scopeErrors.txt	(revision 3966d9a34af5c01e9d3ce15fa58f8f8a2875251b)
+++ 	(revision )
@@ -1,12 +1,0 @@
-scopeErrors.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
-scopeErrors.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
-... with parameters
-  double
-... returning
-  _retval_butThisIsAnError: double
-  ... with attributes:
-    Attribute with name: unused
-
-... with body
-  CompoundStmt
-
Index: sts/completeTypeError.cfa
===================================================================
--- tests/completeTypeError.cfa	(revision 3966d9a34af5c01e9d3ce15fa58f8f8a2875251b)
+++ 	(revision )
@@ -1,73 +1,0 @@
-void foo(int *) {}
-void bar(void *) {}
-forall(otype T) void baz(T *);
-forall(dtype T) void qux(T *);
-forall(dtype T | sized(T)) void quux(T *);
-
-struct A;	// incomplete
-struct B {};	// complete
-
-int main() {
-	int * i;
-	void * v;
-
-	A * x;
-	A * y;
-	B * x;
-	B * z;
-
-	// okay
-	*i;
-	*y;
-	*z;
-	foo(i);
-	bar(i);
-	baz(i);
-	qux(i);
-	quux(i);
-
-	bar(v);
-	qux(v);
-
-	// bad
-	*v;
-	*x;	// ambiguous
-	foo(v);
-	baz(v);
-	quux(v);
-}
-
-
-forall(otype T)
-void baz(T * x) {
-	// okay
-	bar(x);
-	baz(x);
-	qux(x);
-	quux(x);
-	*x;
-}
-
-forall(dtype T)
-void qux(T * y) {
-	// okay
-	*y;
-	bar(y);
-	qux(y);
-
-	// bad
-	baz(y);
-	quux(y);
-}
-
-forall(dtype T | sized(T))
-void quux(T * z) {
-	// okay
-	bar(z);
-	qux(z);
-	quux(z);
-	*z;
-
-	// bad
-	baz(z);
-}
Index: sts/declarationErrors.cfa
===================================================================
--- tests/declarationErrors.cfa	(revision 3966d9a34af5c01e9d3ce15fa58f8f8a2875251b)
+++ 	(revision )
@@ -1,45 +1,0 @@
-// 
-// 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.
-// 
-// declarationErrors.cfa -- 
-// 
-// Author           : Peter A. Buhr
-// Created On       : Wed Aug 17 08:23:43 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:52:47 2018
-// Update Count     : 32
-// 
-
-static short int volatile static const x1;				// duplicate static
-extern short int static volatile const x2;				// multiple extern & static
-extern short int auto static volatile static extern const x3; // duplicate and multiple storage classes
-struct { int i; } const static volatile static x4;		// duplicate static
-struct { int i; } const static volatile const static volatile x5; // duplicate static & const & volatile
-typedef int Int;
-static Int volatile static const x6;					// duplicate static
-
-const static inline const volatile int f01();			// duplicate const
-volatile inline const volatile static int f02();		// duplicate volatile
-const inline const volatile int static f03();			// duplicate const
-volatile inline static const volatile int f04();		// duplicate volatile
-const static int const inline volatile f05();			// duplicate const
-volatile int static const volatile inline f06();		// duplicate volatile
-const static const int volatile inline f07();			// duplicate const
-volatile static const int inline const volatile f08();	// duplicate volatile
-
-volatile static const int inline const volatile f09();	// duplicate volatile
-_Atomic _Atomic _Atomic volatile restrict static const const int inline restrict const volatile f09();	// duplicate volatile
-
-//Dummy main
-int main(int argc, char const *argv[])
-{
-	return 0;
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa declarationErrors.cfa" //
-// End: //
Index: tests/errors/.expect/completeType.txt
===================================================================
--- tests/errors/.expect/completeType.txt	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/errors/.expect/completeType.txt	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,141 @@
+completeTypeError.cfa:34:1 error: Cannot choose between 2 alternatives for expression
+Generated Cast of:
+  Applying untyped:
+    Name: *?
+  ...to:
+    Name: x
+
+... to: nothing Alternatives are:
+Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+      Application of
+        Variable Expression: *?: forall
+          DT: data type
+          function
+        ... with parameters
+          intrinsic pointer to instance of type DT (not function type)
+        ... returning
+          _retval__operator_deref: reference to instance of type DT (not function type)
+          ... with attributes:
+            Attribute with name: unused
+
+
+      ... to arguments
+        Variable Expression: x: pointer to instance of struct A with body 0
+
+    ... to: nothing
+  (types:
+    void 
+  )
+  Environment:( _83_4_DT ) -> instance of struct A with body 0 (no widening)
+
+
+Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+      Application of
+        Variable Expression: *?: forall
+          DT: data type
+          function
+        ... with parameters
+          intrinsic pointer to instance of type DT (not function type)
+        ... returning
+          _retval__operator_deref: reference to instance of type DT (not function type)
+          ... with attributes:
+            Attribute with name: unused
+
+
+      ... to arguments
+        Variable Expression: x: pointer to instance of struct B with body 1
+
+    ... to: nothing
+  (types:
+    void 
+  )
+  Environment:( _83_4_DT ) -> instance of struct B with body 1 (no widening)
+
+
+
+completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
+  Name: foo
+...to:
+  Name: v
+
+completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
+  Name: baz
+...to:
+  Name: v
+
+completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
+  Name: quux
+...to:
+  Name: v
+
+completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
+  Name: baz
+...to:
+  Name: y
+
+completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
+  Name: quux
+...to:
+  Name: y
+
+completeTypeError.cfa:72:1 error: No alternatives with satisfiable assertions for Applying untyped:
+  Name: baz
+...to:
+  Name: z
+
+      Unsatisfiable alternative:
+Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of
+            Variable Expression: baz: forall
+              T: sized data type
+              ... with assertions
+                ?=?: pointer to function
+                ... with parameters
+                  reference to instance of type T (not function type)
+                  instance of type T (not function type)
+                ... returning
+                  _retval__operator_assign: instance of type T (not function type)
+                  ... with attributes:
+                    Attribute with name: unused
+
+
+                ?{}: pointer to function
+                ... with parameters
+                  reference to instance of type T (not function type)
+                ... returning nothing
+
+                ?{}: pointer to function
+                ... with parameters
+                  reference to instance of type T (not function type)
+                  instance of type T (not function type)
+                ... returning nothing
+
+                ^?{}: pointer to function
+                ... with parameters
+                  reference to instance of type T (not function type)
+                ... returning nothing
+
+
+              function
+            ... with parameters
+              pointer to instance of type T (not function type)
+            ... returning nothing
+
+          ... to arguments
+            Variable Expression: z: pointer to instance of type T (not function type)
+
+        (types:
+          void 
+        )
+        Environment:( _102_0_T ) -> instance of type T (not function type) (no widening)
+
+      Could not satisfy assertion:
+?=?: pointer to function
+        ... with parameters
+          reference to instance of type _102_0_T (not function type)
+          instance of type _102_0_T (not function type)
+        ... returning
+          _retval__operator_assign: instance of type _102_0_T (not function type)
+          ... with attributes:
+            Attribute with name: unused
+
+
Index: tests/errors/.expect/declaration.txt
===================================================================
--- tests/errors/.expect/declaration.txt	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/errors/.expect/declaration.txt	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,70 @@
+declarationErrors.cfa:16:1 error: duplicate static in declaration of x1: static const volatile short int 
+
+declarationErrors.cfa:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int 
+
+declarationErrors.cfa:18:1 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int 
+
+declarationErrors.cfa:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
+  with members
+    i: int 
+   with body
+
+
+declarationErrors.cfa:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
+  with members
+    i: int 
+   with body
+
+
+declarationErrors.cfa:22:1 error: duplicate static in declaration of x6: static const volatile Int
+
+declarationErrors.cfa:24:1 error: duplicate const in declaration of f01: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:26:1 error: duplicate const in declaration of f03: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:28:1 error: duplicate const in declaration of f05: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:30:1 error: duplicate const in declaration of f07: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
+  with no parameters
+  returning const volatile int 
+
+
+declarationErrors.cfa:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
+  with no parameters
+  returning const restrict volatile _Atomic int 
+
+
Index: tests/errors/.expect/scope.txt
===================================================================
--- tests/errors/.expect/scope.txt	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/errors/.expect/scope.txt	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,12 @@
+scopeErrors.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
+scopeErrors.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
+... with parameters
+  double
+... returning
+  _retval_butThisIsAnError: double
+  ... with attributes:
+    Attribute with name: unused
+
+... with body
+  CompoundStmt
+
Index: tests/errors/.expect/signature.txt
===================================================================
--- tests/errors/.expect/signature.txt	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/errors/.expect/signature.txt	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,9 @@
+errors/signature.cfa:2:1 error: Constructor has invalid parameter list (cannot be void/empty)
+errors/signature.cfa:3:1 error: Destructor has invalid parameter list (cannot be void/empty)
+errors/signature.cfa:4:1 error: Assignment has invalid parameter list (cannot be void/empty)
+errors/signature.cfa:5:1 error: Cannot declare a Constructor for type Void
+errors/signature.cfa:6:1 error: Cannot declare a Destructor for type Void
+errors/signature.cfa:7:1 error: Cannot declare a Assignment for type Void
+errors/signature.cfa:10:1 error: Constructor must have a reference to a type as its first parameter
+errors/signature.cfa:11:1 error: Destructor must have a reference to a type as its first parameter
+errors/signature.cfa:12:1 error: Assignment must have a reference to a type as its first parameter
Index: tests/errors/completeType.cfa
===================================================================
--- tests/errors/completeType.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/errors/completeType.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,73 @@
+void foo(int *) {}
+void bar(void *) {}
+forall(otype T) void baz(T *);
+forall(dtype T) void qux(T *);
+forall(dtype T | sized(T)) void quux(T *);
+
+struct A;	// incomplete
+struct B {};	// complete
+
+int main() {
+	int * i;
+	void * v;
+
+	A * x;
+	A * y;
+	B * x;
+	B * z;
+
+	// okay
+	*i;
+	*y;
+	*z;
+	foo(i);
+	bar(i);
+	baz(i);
+	qux(i);
+	quux(i);
+
+	bar(v);
+	qux(v);
+
+	// bad
+	*v;
+	*x;	// ambiguous
+	foo(v);
+	baz(v);
+	quux(v);
+}
+
+
+forall(otype T)
+void baz(T * x) {
+	// okay
+	bar(x);
+	baz(x);
+	qux(x);
+	quux(x);
+	*x;
+}
+
+forall(dtype T)
+void qux(T * y) {
+	// okay
+	*y;
+	bar(y);
+	qux(y);
+
+	// bad
+	baz(y);
+	quux(y);
+}
+
+forall(dtype T | sized(T))
+void quux(T * z) {
+	// okay
+	bar(z);
+	qux(z);
+	quux(z);
+	*z;
+
+	// bad
+	baz(z);
+}
Index: tests/errors/declaration.cfa
===================================================================
--- tests/errors/declaration.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/errors/declaration.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,45 @@
+// 
+// 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.
+// 
+// declarationErrors.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:23:43 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Nov  6 17:52:47 2018
+// Update Count     : 32
+// 
+
+static short int volatile static const x1;				// duplicate static
+extern short int static volatile const x2;				// multiple extern & static
+extern short int auto static volatile static extern const x3; // duplicate and multiple storage classes
+struct { int i; } const static volatile static x4;		// duplicate static
+struct { int i; } const static volatile const static volatile x5; // duplicate static & const & volatile
+typedef int Int;
+static Int volatile static const x6;					// duplicate static
+
+const static inline const volatile int f01();			// duplicate const
+volatile inline const volatile static int f02();		// duplicate volatile
+const inline const volatile int static f03();			// duplicate const
+volatile inline static const volatile int f04();		// duplicate volatile
+const static int const inline volatile f05();			// duplicate const
+volatile int static const volatile inline f06();		// duplicate volatile
+const static const int volatile inline f07();			// duplicate const
+volatile static const int inline const volatile f08();	// duplicate volatile
+
+volatile static const int inline const volatile f09();	// duplicate volatile
+_Atomic _Atomic _Atomic volatile restrict static const const int inline restrict const volatile f09();	// duplicate volatile
+
+//Dummy main
+int main(int argc, char const *argv[])
+{
+	return 0;
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa declarationErrors.cfa" //
+// End: //
Index: tests/errors/scope.cfa
===================================================================
--- tests/errors/scope.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/errors/scope.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,25 @@
+int thisIsAnError;
+int thisIsAnError;
+
+int thisIsNotAnError;
+float thisIsNotAnError;
+
+int thisIsAlsoNotAnError() {
+  int thisIsNotAnError;
+}
+
+int thisIsAlsoNotAnError( double x ) {
+}
+
+double thisIsStillNotAnError( double );
+double thisIsStillNotAnError( double );
+
+double butThisIsAnError( double ) {
+}
+
+double butThisIsAnError( double ) {
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: tests/errors/signature.cfa
===================================================================
--- tests/errors/signature.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/errors/signature.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,12 @@
+// No parameters
+void  ?{}();
+void ^?{}();
+void  ?=?();
+void  ?{}(void);
+void ^?{}(void);
+void  ?=?(void);
+
+// Wrong parameters
+void  ?{}(int);
+void ^?{}(int);
+void  ?=?(int);
Index: sts/occursError.cfa
===================================================================
--- tests/occursError.cfa	(revision 3966d9a34af5c01e9d3ce15fa58f8f8a2875251b)
+++ 	(revision )
@@ -1,12 +1,0 @@
-forall( otype T ) void f( void (*)( T, T * ) );
-forall( otype U ) void g( U,  U * );
-forall( otype U ) void h( U *, U );
-
-void test() {
-    f( h );
-    f( g );
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// End: //
Index: sts/scope.cfa
===================================================================
--- tests/scope.cfa	(revision 3966d9a34af5c01e9d3ce15fa58f8f8a2875251b)
+++ 	(revision )
@@ -1,73 +1,0 @@
-int x;
-typedef double y;
-typedef float t;
-y z;
-//otype u = struct { int a; double b; };
-typedef struct { int a; double b; } u;
-int f( int y );
-y q;
-struct x { int x; };
-
-y w( y y, u v ) {
-//	otype x | { x t(u); };
-	void ?{}(struct x *);
-	void ^?{}(struct x *);
-	extern struct x t( u );
-	u u = y;
-	struct x z = t(u);
-}
-
-y p;
-
-trait has_u( otype z ) {
-	z u(z);
-};
-
-forall( otype t | has_u( t ) )
-y q( t the_t ) {
-	t y = u( the_t );
-}
-
-t f( y p ) {
-	int y;
-	typedef char x;
-	{
-		x y;
-		typedef x z;
-		{
-			z x;
-			typedef z y;
-			y z = x;
-		}
-		z x = y;
-	}
-	x q = y;
-}
-
-void some_func() {}
-
-t g( void ) {
-	typedef char x;
-//	try {
-		some_func();
-//	} catch ( x x ) {
-//		t y = x;
-//	}
-	x z;
-}
-
-y q( i )												/* K&R style */
-	int i;
-{
-	switch ( i ) {
-		y q = i;
-	  case 0:
-		return q;
-	  default:
-		return i;
-	}
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// End: //
Index: sts/scopeErrors.cfa
===================================================================
--- tests/scopeErrors.cfa	(revision 3966d9a34af5c01e9d3ce15fa58f8f8a2875251b)
+++ 	(revision )
@@ -1,25 +1,0 @@
-int thisIsAnError;
-int thisIsAnError;
-
-int thisIsNotAnError;
-float thisIsNotAnError;
-
-int thisIsAlsoNotAnError() {
-  int thisIsNotAnError;
-}
-
-int thisIsAlsoNotAnError( double x ) {
-}
-
-double thisIsStillNotAnError( double );
-double thisIsStillNotAnError( double );
-
-double butThisIsAnError( double ) {
-}
-
-double butThisIsAnError( double ) {
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// End: //
Index: tests/zombies/occursError.cfa
===================================================================
--- tests/zombies/occursError.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/zombies/occursError.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,12 @@
+forall( otype T ) void f( void (*)( T, T * ) );
+forall( otype U ) void g( U,  U * );
+forall( otype U ) void h( U *, U );
+
+void test() {
+    f( h );
+    f( g );
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: tests/zombies/scope.cfa
===================================================================
--- tests/zombies/scope.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
+++ tests/zombies/scope.cfa	(revision 686cb635b121f6f110922fdcb68fbf96df312238)
@@ -0,0 +1,73 @@
+int x;
+typedef double y;
+typedef float t;
+y z;
+//otype u = struct { int a; double b; };
+typedef struct { int a; double b; } u;
+int f( int y );
+y q;
+struct x { int x; };
+
+y w( y y, u v ) {
+//	otype x | { x t(u); };
+	void ?{}(struct x *);
+	void ^?{}(struct x *);
+	extern struct x t( u );
+	u u = y;
+	struct x z = t(u);
+}
+
+y p;
+
+trait has_u( otype z ) {
+	z u(z);
+};
+
+forall( otype t | has_u( t ) )
+y q( t the_t ) {
+	t y = u( the_t );
+}
+
+t f( y p ) {
+	int y;
+	typedef char x;
+	{
+		x y;
+		typedef x z;
+		{
+			z x;
+			typedef z y;
+			y z = x;
+		}
+		z x = y;
+	}
+	x q = y;
+}
+
+void some_func() {}
+
+t g( void ) {
+	typedef char x;
+//	try {
+		some_func();
+//	} catch ( x x ) {
+//		t y = x;
+//	}
+	x z;
+}
+
+y q( i )												/* K&R style */
+	int i;
+{
+	switch ( i ) {
+		y q = i;
+	  case 0:
+		return q;
+	  default:
+		return i;
+	}
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //