Changeset cde3891 for tests

tests/.expect/alloc-ERROR.txt

-              r9b086ca
+              rcde3891
 alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:265:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
+...to:
   Name: p
   Applying untyped:
+  Applying untyped:
     Name: realloc
   ...to:
+  ...to:
     Name: stp
     Applying untyped:
+    Applying untyped:
       Name: ?*?
     ...to:
+    ...to:
       Name: dim
       Sizeof Expression on: Applying untyped:
+      Sizeof Expression on: Applying untyped:
           Name: *?
         ...to:
+        ...to:
           Name: stp
 …
 alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:266:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
+...to:
   Name: p
   Applying untyped:
+  Applying untyped:
     Name: alloc
   ...to:
+  ...to:
     Name: stp
     Applying untyped:
+    Applying untyped:
       Name: ?*?
     ...to:
+    ...to:
       Name: dim
       Sizeof Expression on: Applying untyped:
+      Sizeof Expression on: Applying untyped:
           Name: *?
         ...to:
+        ...to:
           Name: stp
 …
 alloc.c:267:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:267:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
+...to:
   Name: p
   Applying untyped:
+  Applying untyped:
     Name: memset
   ...to:
+  ...to:
     Name: stp
     constant expression (10 10: signed int)
 alloc.c:268:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:268:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
+...to:
   Name: p
   Applying untyped:
+  Applying untyped:
     Name: memcpy
   ...to:
+  ...to:
     Address of:
       Name: st1

tests/.expect/castError.txt

-              r9b086ca
+              rcde3891
 castError.c:7:1 error: Cannot choose between 3 alternatives for expression
+castError.cfa:7:1 error: Cannot choose between 3 alternatives for expression
 Cast of:
   Name: f
 ... to:
   charAlternatives are:
 Cost ( 1, 0, 0, 0 ): Cast of:
+  char Alternatives are:
+Cost ( 1, 0, 0, 0, 0, 0 ): Cast of:
      Variable Expression: f: function
        accepting unspecified arguments
      ... returning nothing
+     ... returning nothing
    ... to:
 …
    char
+ )
  Environment:
+ Environment:
 Cost ( 1, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0 ): Cast of:
      Variable Expression: f: double
    ... to:
 …
    char
+ )
  Environment:
+ Environment:
 Cost ( 1, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0 ): Cast of:
      Variable Expression: f: signed int
    ... to:
 …
    char
+ )
  Environment:
+ Environment:

tests/.expect/completeTypeError.txt

-              r9b086ca
+              rcde3891
 completeTypeError.c:33:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:33:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
 ...to:
+...to:
   Name: v
 completeTypeError.c:34:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:34:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
 ...to:
+...to:
   Name: y
 completeTypeError.c:35:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
   Name: foo
 ...to:
+...to:
   Name: v
 completeTypeError.c:36:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
 ...to:
+...to:
   Name: v
 completeTypeError.c:37:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
   Name: quux
 ...to:
+...to:
   Name: v
 completeTypeError.c:58:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:58:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
 ...to:
+...to:
   Name: y
 completeTypeError.c:59:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
   Name: quux
 ...to:
+...to:
   Name: y
 completeTypeError.c:60:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
 ...to:
+...to:
   Name: y
 completeTypeError.c:72:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.cfa:72:1 error: No resolvable alternatives for expression Applying untyped:
   Name: baz
 ...to:
+...to:
   Name: z
+Alternatives with failing assertions are:
+Cost ( 0, 1, 0, 1, -5, 0 ): Application of
+     Variable Expression: baz: forall
+       T: sized object 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:( _73_0_T ) -> instance of type T (not function type) (no widening)

tests/.expect/declarationErrors.txt

-              r9b086ca
+              rcde3891
 declarationErrors.c:16:1 error: duplicate static in declaration of x1: static const volatile short int
+declarationErrors.cfa:16:1 error: duplicate static in declaration of x1: static const volatile short int
 declarationErrors.c:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int
+declarationErrors.cfa:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int
 declarationErrors.c: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:18:1 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int
 declarationErrors.c:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
   with members
+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
+   with body
 declarationErrors.c:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
   with members
+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
+   with body
 declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile Int
+declarationErrors.cfa:22:1 error: duplicate static in declaration of x6: static const volatile Int
 declarationErrors.c:24:1 error: duplicate const in declaration of f01: static inline function
   with no parameters
+declarationErrors.cfa:24:1 error: duplicate const in declaration of f01: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c:25:1 error: duplicate volatile in declaration of f02: static inline function
   with no parameters
+declarationErrors.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c:26:1 error: duplicate const in declaration of f03: static inline function
   with no parameters
+declarationErrors.cfa:26:1 error: duplicate const in declaration of f03: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c:27:1 error: duplicate volatile in declaration of f04: static inline function
   with no parameters
+declarationErrors.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c:28:1 error: duplicate const in declaration of f05: static inline function
   with no parameters
+declarationErrors.cfa:28:1 error: duplicate const in declaration of f05: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c:29:1 error: duplicate volatile in declaration of f06: static inline function
   with no parameters
+declarationErrors.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c:30:1 error: duplicate const in declaration of f07: static inline function
   with no parameters
+declarationErrors.cfa:30:1 error: duplicate const in declaration of f07: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
   with no parameters
+declarationErrors.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
   with no parameters
+declarationErrors.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
+  with no parameters
   returning const volatile int
 declarationErrors.c: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
+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

tests/.expect/nested-types-ERR1.txt

r9b086ca	rcde3891
1		nested-types.c:70:1 error: Use of undefined type T
	1	nested-types.cfa:70:1 error: Use of undefined type T

tests/.expect/nested-types-ERR2.txt

-              r9b086ca
+              rcde3891
 nested-types.c:73:1 error: Use of undefined global type Z
 nested-types.c:74:1 error: Qualified type requires an aggregate on the left, but has: signed int
 nested-types.c:75:1 error: Undefined type in qualified type: Qualified Type:
   instance of struct S with body 1
   instance of type Z (not function type)
+nested-types.cfa:73:1 error: Use of undefined global type Z
+nested-types.cfa:74:1 error: Qualified type requires an aggregate on the left, but has: signed int
+nested-types.cfa:75:1 error: Undefined type in qualified type: Qualified Type:
+  instance of struct S with body 1
+  instance of type Z (not function type)

tests/.expect/scopeErrors.txt

-              r9b086ca
+              rcde3891
 scopeErrors.c:2:1 error: duplicate object definition for thisIsAnError: signed int
 scopeErrors.c:20:1 error: duplicate function definition for butThisIsAnError: function
+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
+... returning
   _retval_butThisIsAnError: double
   ... with attributes:
+  ... with attributes:
     Attribute with name: unused
 ... with body
+... with body
   CompoundStmt

tests/.expect/typedefRedef-ERR1.txt

r9b086ca	rcde3891
1		typedefRedef.c:4:1 error: Cannot redefine typedef: Foo
2		typedefRedef.c:60:1 error: Cannot redefine typedef: ARR
	1	typedefRedef.cfa:4:1 error: Cannot redefine typedef: Foo
	2	typedefRedef.cfa:60:1 error: Cannot redefine typedef: ARR

tests/KRfunctions.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // KRfunctions.c --
+// KRfunctions.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Thu Feb 16 15:23:17 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Aug 20 07:34:17 2017
 // Update Count     : 7
+// Last Modified On : Tue Nov  6 17:50:34 2018
+// Update Count     : 9
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa KRfunctions.c" //
+// compile-command: "cfa KRfunctions.cfa" //
 // End: //

tests/Makefile.am

-              r9b086ca
+              rcde3891
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Wed Jun  6 16:42:20 2018
 ## Update Count     : 49
+## Last Modified On : Tue Nov 20 11:18:51 2018
+## Update Count     : 68
 ###############################################################################
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS  = -I automake
+include $(top_srcdir)/src/cfa.make
 debug=yes
 …
 concurrent=
+timeouts=
 TEST_PY = python ${builddir}/test.py
 …
 AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
 CC = @CFACC@
 …
 .PHONY: list .validate
 .INTERMEDIATE: .validate .validate.c
 EXTRA_PROGRAMS = fstream_test avl_test # build but do not install
+.INTERMEDIATE: .validate .validate.cfa
+EXTRA_PROGRAMS = avl_test .dummy_hack # build but do not install
+fstream_test_SOURCES = fstream_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
+avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
+# automake doesn't know we still need C rules so pretend like we have a C program
+_dummy_hack_SOURCES = .dummy_hack.c
 #----------------------------------------------------------------------------------------------------------------
 all-local :
         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
 all-tests :
         @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 clean-local :
 …
         @+${TEST_PY} --list ${concurrent}
 .validate: .validate.c
         $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
+.validate: .validate.cfa
+        $(CFACOMPILE) .validate.cfa -fsyntax-only -Wall -Wextra -Werror
+.validate.c:
+.validate.cfa:
+        @echo "int main() { return 0; }" > ${@}
+# automake doesn't know we still need C rules so pretend like we have a C program
+.dummy_hack.c:
         @echo "int main() { return 0; }" > ${@}
 …
 #----------------------------------------------------------------------------------------------------------------
 # implicit rule so not all test require a rule
 % : %.c $(CC)
         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+% : %.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 declarationSpecifier: declarationSpecifier.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+declarationSpecifier: declarationSpecifier.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 gccExtensions : gccExtensions.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gccExtensions : gccExtensions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 extension : extension.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+extension : extension.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 attributes : attributes.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+attributes : attributes.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 functions: functions.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+functions: functions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 KRfunctions : KRfunctions.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+KRfunctions : KRfunctions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 sched-ext-parse : sched-ext-parse.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+sched-ext-parse : sched-ext-parse.c $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 gmp : gmp.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gmp : gmp.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 #builtins
 builtins/sync: builtins/sync.c $(CC)
         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+builtins/sync: builtins/sync.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 #------------------------------------------------------------------------------
 #To make errors path independent we need to cd into the correct directories
 completeTypeError : completeTypeError.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+completeTypeError : completeTypeError.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 typedefRedef-ERR1: typedefRedef.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 alloc-ERROR: alloc.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+alloc-ERROR: alloc.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 fallthrough-ERROR: fallthrough.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+fallthrough-ERROR: fallthrough.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 nested-types-ERR1: nested-types.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR1: nested-types.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 nested-types-ERR2: nested-types.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR2: nested-types.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 # Warnings
 warnings/self-assignment: warnings/self-assignment.c $(CC)
         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only

tests/Makefile.in

-              r9b086ca
+              rcde3891
 build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) avl_test$(EXEEXT)
+EXTRA_PROGRAMS = avl_test$(EXEEXT) .dummy_hack$(EXEEXT)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+        $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
+        $(top_srcdir)/automake/ltoptions.m4 \
+        $(top_srcdir)/automake/ltsugar.m4 \
+        $(top_srcdir)/automake/ltversion.m4 \
+        $(top_srcdir)/automake/lt~obsolete.m4 \
+        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 …
 CONFIG_CLEAN_FILES = config.py
 CONFIG_CLEAN_VPATH_FILES = test.py
+am__dummy_hack_OBJECTS = .dummy_hack.$(OBJEXT)
+_dummy_hack_OBJECTS = $(am__dummy_hack_OBJECTS)
+_dummy_hack_LDADD = $(LDADD)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
 am__dirstamp = $(am__leading_dot)dirstamp
 am_avl_test_OBJECTS = avltree/avl_test.$(OBJEXT) \
 …
 avl_test_OBJECTS = $(am_avl_test_OBJECTS)
 avl_test_LDADD = $(LDADD)
-am_fstream_test_OBJECTS = fstream_test.$(OBJEXT)
-fstream_test_OBJECTS = $(am_fstream_test_OBJECTS)
-fstream_test_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 …
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 …
 am__v_CC_1 =
 CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
 SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES)
 DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES)
+SOURCES = $(_dummy_hack_SOURCES) $(avl_test_SOURCES)
+DIST_SOURCES = $(_dummy_hack_SOURCES) $(avl_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
 …
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.py.in \
+        $(srcdir)/test.py $(top_srcdir)/automake/depcomp
+        $(srcdir)/test.py $(top_srcdir)/automake/depcomp \
+        $(top_srcdir)/src/cfa.make
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BACKEND_CC = @BACKEND_CC@
 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @CFACC@
 …
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 …
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
 HOST_FLAGS = @HOST_FLAGS@
 …
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 …
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 …
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 …
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 …
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS = -I automake
+CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
+        $(AM_CFLAGS) $(CFLAGS)
+AM_V_CFA = $(am__v_CFA_@AM_V@)
+am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
+am__v_CFA_0 = @echo "  CFA     " $@;
+am__v_CFA_1 =
+AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
+am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
+am__v_JAVAC_0 = @echo "  JAVAC   " $@;
+am__v_JAVAC_1 =
+AM_V_GOC = $(am__v_GOC_@AM_V@)
+am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
+am__v_GOC_0 = @echo "  GOC     " $@;
+am__v_GOC_1 =
+UPPCC = u++
+UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_UPP = $(am__v_UPP_@AM_V@)
+am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
+am__v_UPP_0 = @echo "  UPP     " $@;
+am__v_UPP_1 =
 debug = yes
 installed = no
 quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
 concurrent =
+timeouts =
 TEST_PY = python ${builddir}/test.py
 …
         ${INSTALL_FLAGS} ${ARCH_FLAGS}
 PRETTY_PATH = cd ${srcdir} &&
+fstream_test_SOURCES = fstream_test.c
+avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
+avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
+# automake doesn't know we still need C rules so pretend like we have a C program
+_dummy_hack_SOURCES = .dummy_hack.c
 all: all-am
 .SUFFIXES:
 .SUFFIXES: .c .o .obj .validate
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+.SUFFIXES: .c .cfa .dummy_hack .lo .o .obj .validate
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
 …
             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
         esac;
+$(top_srcdir)/src/cfa.make $(am__empty):
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 …
 config.py: $(top_builddir)/config.status $(srcdir)/config.py.in
         cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+.dummy_hack$(EXEEXT): $(_dummy_hack_OBJECTS) $(_dummy_hack_DEPENDENCIES) $(EXTRA__dummy_hack_DEPENDENCIES)
+        @rm -f .dummy_hack$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(_dummy_hack_OBJECTS) $(_dummy_hack_LDADD) $(LIBS)
 avltree/$(am__dirstamp):
         @$(MKDIR_P) avltree
 …
         $(AM_V_CCLD)$(LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS)
-fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES)
-        @rm -f fstream_test$(EXEEXT)
-        $(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS)
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
 …
         -rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl-private.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/.dummy_hack.Po@am__quote@
 .c.o:
 …
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+.c.lo:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+mostlyclean-libtool:
+        -rm -f *.lo
+clean-libtool:
+        -rm -rf .libs _libs
 ID: $(am__tagged_files)
 …
 clean: clean-am
 clean-am: clean-generic clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 distclean: distclean-am
         -rm -rf ./$(DEPDIR) avltree/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 …
 maintainer-clean: maintainer-clean-am
         -rm -rf ./$(DEPDIR) avltree/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 …
 mostlyclean: mostlyclean-am
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool
 pdf: pdf-am
 …
 .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
+        clean-generic clean-local cscopelist-am ctags ctags-am \
+        distclean distclean-compile distclean-generic distclean-tags \
+        distdir dvi dvi-am html html-am info info-am install \
+        install-am install-data install-data-am install-dvi \
+        install-dvi-am install-exec install-exec-am install-html \
+        install-html-am install-info install-info-am install-man \
+        install-pdf install-pdf-am install-ps install-ps-am \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+        clean-generic clean-libtool clean-local cscopelist-am ctags \
+        ctags-am distclean distclean-compile distclean-generic \
+        distclean-libtool distclean-tags distdir dvi dvi-am html \
+        html-am info info-am install install-am install-data \
+        install-data-am install-dvi install-dvi-am install-exec \
+        install-exec-am install-html install-html-am install-info \
+        install-info-am install-man install-pdf install-pdf-am \
+        install-ps install-ps-am install-strip installcheck \
+        installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
         tags tags-am uninstall uninstall-am
 …
+.cfa.o:
+        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+        $(am__mv) $$depbase.Tpo $$depbase.Po
+.cfa.lo:
+        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+        $(am__mv) $$depbase.Tpo $$depbase.Plo
 .PHONY: list .validate
 .INTERMEDIATE: .validate .validate.c
+.INTERMEDIATE: .validate .validate.cfa
 #----------------------------------------------------------------------------------------------------------------
 all-local :
         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
 all-tests :
         @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 clean-local :
 …
         @+${TEST_PY} --list ${concurrent}
+.validate: .validate.c
+        $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
+.validate.c:
+.validate: .validate.cfa
+        $(CFACOMPILE) .validate.cfa -fsyntax-only -Wall -Wextra -Werror
+.validate.cfa:
+        @echo "int main() { return 0; }" > ${@}
+# automake doesn't know we still need C rules so pretend like we have a C program
+.dummy_hack.c:
         @echo "int main() { return 0; }" > ${@}
 …
 #----------------------------------------------------------------------------------------------------------------
 # implicit rule so not all test require a rule
 % : %.c $(CC)
         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 declarationSpecifier: declarationSpecifier.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 gccExtensions : gccExtensions.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 extension : extension.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 attributes : attributes.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 functions: functions.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 KRfunctions : KRfunctions.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 sched-ext-parse : sched-ext-parse.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 gmp : gmp.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+% : %.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+declarationSpecifier: declarationSpecifier.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gccExtensions : gccExtensions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+extension : extension.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+attributes : attributes.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+functions: functions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+KRfunctions : KRfunctions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+sched-ext-parse : sched-ext-parse.c $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gmp : gmp.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 #builtins
 builtins/sync: builtins/sync.c $(CC)
         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+builtins/sync: builtins/sync.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 #------------------------------------------------------------------------------
 #To make errors path independent we need to cd into the correct directories
 completeTypeError : completeTypeError.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 typedefRedef-ERR1: typedefRedef.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 alloc-ERROR: alloc.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 fallthrough-ERROR: fallthrough.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 nested-types-ERR1: nested-types.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 nested-types-ERR2: nested-types.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+completeTypeError : completeTypeError.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+alloc-ERROR: alloc.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+fallthrough-ERROR: fallthrough.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR1: nested-types.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR2: nested-types.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 # Warnings
 warnings/self-assignment: warnings/self-assignment.c $(CC)
         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

tests/abs.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // abs.c --
+// abs.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Thu Jan 28 18:26:16 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Feb 22 22:31:03 2017
 // Update Count     : 52
+// Last Modified On : Tue Dec  4 21:33:15 2018
+// Update Count     : 55
 //
 …
 int main( void ) {
         signed 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;
+        sout | "char\t\t\t"                                     | ch     | "\tabs " | abs( ch );
+        sout | "signed int\t\t"                         | -65    | "\tabs" | abs( -65 );
+        sout | "signed long int\t\t"            | -65l   | "\tabs" | abs( -65l );
+        sout | "signed long long int\t"         | -65ll  | "\tabs" | abs( -65ll );
+        sout | "float\t\t\t"                            | -65.0f | "\tabs" | abs( -65.0f );
+        sout | "double\t\t\t"                           | -65.0  | "\tabs" | abs( -65.0 );
+        sout | "long double\t\t"                        | -65.0l | "\tabs" | abs( -65.0l );
+        sout | "float _Complex\t\t"                     | -65.0F-2.0iF | "\tabs" | abs( -65.0F-2.0iF );
+        sout | "double _Complex\t\t"            | -65.0D-2.0iD | "\tabs" | abs( -65.0D-2.0iD );
+        sout | "long double _Complex\t"         | -65.0L-2.0iL | "\tabs" | abs( -65.0L-2.0iL );
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa abs.c" //
+// compile-command: "cfa abs.cfa" //
 // End: //

tests/alloc.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // alloc.c --
+// alloc.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug  9 06:21:35 2018
 // Update Count     : 337
+// Last Modified On : Tue Nov  6 17:50:52 2018
+// Update Count     : 339
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa alloc.c" //
+// compile-command: "cfa alloc.cfa" //
 // End: //

tests/ato.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // ato.c --
+// ato.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Thu Feb  4 08:10:57 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Nov 16 18:31:56 2017
 // Update Count     : 89
+// Last Modified On : Tue Dec  4 21:33:53 2018
+// Update Count     : 92
 //
 …
         const char * sptr = "-123";
         int i = ato( sptr );
         sout | i | sptr | endl;
+        sout | i | sptr;
         sptr = "123";
         unsigned int ui = ato( sptr );
         sout | ui | sptr | endl;
+        sout | ui | sptr;
         sptr = "-123";
         long int li = ato( sptr );
         sout | li | sptr | endl;
+        sout | li | sptr;
         sptr = "123";
         unsigned long int uli = ato( sptr );
         sout | uli | sptr | endl;
+        sout | uli | sptr;
         sptr = "-123";
         long long int lli = ato( sptr );
         sout | lli | sptr | endl;
+        sout | lli | sptr;
         sptr = "123";
         unsigned long long int ulli = ato( sptr );
         sout | ulli | sptr | endl;
+        sout | ulli | sptr;
         sptr = "-123.456";
         float f = ato( sptr );
         sout | f | sptr | endl;
+        sout | f | sptr;
         sptr = "-123.4567890123456";
         double d = ato( sptr );
         sout | d | sptr | endl;
+        sout | d | sptr;
         sptr = "-123.45678901234567890123456789";
         long double ld = ato( sptr );
         sout | ld | sptr | endl;
+        sout | ld | sptr;
         sptr = "-123.456-123.456i";
         float _Complex fc = ato( sptr );
         sout | fc | sptr | endl;
+        sout | fc | sptr;
         sptr = "-123.4567890123456+123.4567890123456i";
         double _Complex dc = ato( sptr );
         sout | dc | sptr | endl;
+        sout | dc | sptr;
         sptr = "123.45678901234567890123456789-123.45678901234567890123456789i";
         long double _Complex ldc = ato( sptr );
         sout | ldc | sptr | endl;
+        sout | ldc | sptr;
         sptr = "123.45678901234-123.4567890i";
         long double _Complex ldc2 = ato( sptr );
         sout | ldc2 | sptr | endl;
+        sout | ldc2 | sptr;
         sptr = "-123";
         i = strto( sptr, 0, 10 );
         sout | i | sptr | endl;
+        sout | i | sptr;
         sptr = "123";
         ui = strto( sptr, 0, 10 );
         sout | ui | sptr | endl;
+        sout | ui | sptr;
         sptr = "-123";
         li = strto( sptr, 0, 10 );
         sout | li | sptr | endl;
+        sout | li | sptr;
         sptr = "123";
         uli = strto( sptr, 0, 10 );
         sout | uli | sptr | endl;
+        sout | uli | sptr;
         sptr = "-123";
         lli = strto( sptr, 0, 10 );
         sout | lli | sptr | endl;
+        sout | lli | sptr;
         sptr = "123";
         ulli = strto( sptr, 0, 10 );
         sout | ulli | sptr | endl;
+        sout | ulli | sptr;
         sptr = "-123.456";
         f = strto( sptr, 0 );
         sout | f | sptr | endl;
+        sout | f | sptr;
         sptr = "-123.4567890123456";
         d = strto( sptr, 0 );
         sout | d | sptr | endl;
+        sout | d | sptr;
         sptr = "-123.45678901234567890123456789";
         ld = strto( sptr, 0 );
         sout | ld | sptr | endl;
+        sout | ld | sptr;
         sptr = "-123.456-123.456i";
         fc = strto( sptr, 0 );
         sout | fc | sptr | endl;
+        sout | fc | sptr;
         char * eptr = 0;
         // sptr = "2fred";
         // fc = strto( sptr, &eptr );
         // sout | fc | sptr | eptr | endl;
+        // sout | fc | sptr | eptr;
         sptr = "2  3";
         fc = strto( sptr, &eptr );
         sout | fc | sptr | eptr | endl;
+        sout | fc | sptr | eptr;
         sptr = "-123.4567890123456+123.4567890123456i";
         dc = strto( sptr, 0 );
         sout | dc | sptr | endl;
+        sout | dc | sptr;
         sptr = "123.45678901234567890123456789-123.45678901234567890123456789i";
         ldc = strto( sptr, 0 );
         sout | ldc | sptr | endl;
+        sout | ldc | sptr;
         sptr = "123.45678901234-123.4567890i";
         ldc2 = strto( sptr, 0 );
         sout | ldc2 | sptr | endl;
+        sout | ldc2 | sptr;
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa ato.c" //
+// compile-command: "cfa ato.cfa" //
 // End: //

tests/attributes.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // attributes.c --
+// attributes.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Mon Feb  6 16:07:02 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jul 19 13:50:51 2018
 // Update Count     : 15
+// Last Modified On : Tue Nov  6 17:51:12 2018
+// Update Count     : 17
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa attributes.c" //
+// compile-command: "cfa attributes.cfa" //
 // End: //

tests/complex.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // complex.c --
+// complex.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 24 22:07:31 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed May 24 22:08:01 2017
 // Update Count     : 1
+// Last Modified On : Tue Dec  4 21:34:21 2018
+// Update Count     : 4
 //
 …
     printf( "x:%g+%gi y:%g+%gi z:%g+%gi\n", creal(x), cimag(x), creal(y), cimag(y), creal(z), cimag(z) );
 #ifdef __CFA__
     sout | "x:" | x | "y:" | y | "z:" | z | endl;
+    sout | "x:" | x | "y:" | y | "z:" | z;
 #endif // __CFA
     x = 2.1 + 1.3i;
 …
     printf( "x:%g+%gi y:%g+%gi z:%g+%gi\n", creal(x), cimag(x), creal(y), cimag(y), creal(z), cimag(z) );
 #ifdef __CFA__
     sout | "x:" | x | "y:" | y | "z:" | z | endl;
+    sout | "x:" | x | "y:" | y | "z:" | z;
 #endif // __CFA
+}
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa complex.c" //
+// compile-command: "cfa complex.cfa" //
 // End: //

tests/concurrent/coroutineYield.cfa

-              r9b086ca
+              rcde3891
 #include <fstream.hfa>
 #include <kernel.hfa>hfa>
+#include <kernel.hfa>
 #include <stdlib.hfa>
 #include <thread.hfa>
 …
 #define __kick_rate 150000ul
 #include "long_tests.h"
+#include "long_tests.hfa"
 #ifndef PREEMPTION_RATE
 …
         while(true) {
                 #if !defined(TEST_FOREVER)
                         sout | "Coroutine 1" | endl;
+                        sout | "Coroutine 1";
                 #endif
                 yield();
                 #if !defined(TEST_FOREVER)
                         sout | "Coroutine 2" | endl;
+                        sout | "Coroutine 2";
                 #endif
                 suspend();
 …
         for(int i = 0; TEST(i < N); i++) {
                 #if !defined(TEST_FOREVER)
                         sout | "Thread 1" | endl;
+                        sout | "Thread 1";
                 #endif
                 resume(c);
                 #if !defined(TEST_FOREVER)
                         sout | "Thread 2" | endl;
+                        sout | "Thread 2";
                 #endif
                 yield();

tests/concurrent/examples/boundedBufferEXT.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 16 08:17:03 2018
 // Update Count     : 8
+// Last Modified On : Tue Dec 11 21:55:02 2018
+// Update Count     : 9
 //
 …
                 sum += sums[i];
         } // for
         sout | "total:" | sum | endl;
+        sout | "total:" | sum;
+}

tests/concurrent/examples/boundedBufferINT.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Mon Oct 30 12:45:13 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 16 08:17:58 2018
 // Update Count     : 83
+// Last Modified On : Tue Dec 11 21:55:45 2018
+// Update Count     : 84
 //
 …
                 sum += sums[i];
         } // for
         sout | "total:" | sum | endl;
+        sout | "total:" | sum;
+}

tests/concurrent/examples/datingService.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun May 27 09:05:18 2018
 // Update Count     : 26
+// Last Modified On : Tue Dec 11 21:55:34 2018
+// Update Count     : 28
 //
 …
                 signal_block( Boys[ccode] );                                    // restart boy to set phone number
         } // if
+        sout | "Girl:" | PhoneNo | "is dating Boy at" | BoyPhoneNo | "with ccode" | ccode;
         return BoyPhoneNo;
 } // DatingService girl
 …
                 signal_block( Girls[ccode] );                                   // restart girl to set phone number
         } // if
+        sout | " Boy:" | PhoneNo | "is dating Girl" | GirlPhoneNo | "with ccode" | ccode;
         return GirlPhoneNo;
 } // DatingService boy
 …
         yield( random( 100 ) );                                                         // don't all start at the same time
         unsigned int partner = girl( TheExchange, id, ccode );
-        sout | "Girl:" | id | "is dating Boy at" | partner | "with ccode" | ccode | endl;
         girlck[id] = partner;
 } // Girl main
 …
 thread Boy {
         DatingService &TheExchange;
+        DatingService & TheExchange;
         unsigned int id, ccode;
 }; // Boy
 …
         yield( random( 100 ) );                                                         // don't all start at the same time
         unsigned int partner = boy( TheExchange, id, ccode );
-        sout | " Boy:" | id | "is dating Girl" | partner | "with ccode" | ccode | endl;
         boyck[id] = partner;
 } // Boy main

tests/concurrent/examples/matrixSum.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // matrixSum.c --
+// matrixSum.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Mon Oct  9 08:29:28 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug  9 09:17:30 2018
 // Update Count     : 13
+// Last Modified On : Tue Dec 11 21:54:55 2018
+// Update Count     : 15
 //
 …
                 total += subtotals[r];                                                  // total subtotals
         } // for
         sout | total | endl;
+        sout | total;
+}
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa matrixSum.c" //
+// compile-command: "cfa matrixSum.cfa" //
 // End: //

tests/concurrent/examples/quickSort.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Wed Dec  6 12:15:52 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 16 08:17:41 2018
 // Update Count     : 163
+// Last Modified On : Sat Dec 22 08:44:27 2018
+// Update Count     : 168
 //
 …
 void usage( char * argv[] ) {
         sout | "Usage:" | argv[0] | "( -s unsorted-file [ sorted-file ] | -t size (>= 0) [ depth (>= 0) ] )" | endl;
+        sout | "Usage:" | argv[0] | "( -s unsorted-file [ sorted-file ] | -t size (>= 0) [ depth (>= 0) ] )";
         exit( EXIT_FAILURE );                                                           // TERMINATE!
 } // usage
 …
                                 &sortedfile = new( (const char *)argv[2] ); // open the output file
                                 if ( fail( sortedfile ) ) {
                                         serr | "Error! Could not open sorted output file \"" | argv[2] | "\"" | endl;
+                                        serr | "Error! Could not open sorted output file \"" | argv[2] | "\"";
                                         usage( argv );
                                 } // if
 …
                                 &unsortedfile = new( (const char *)argv[1] ); // open the input file
                                 if ( fail( unsortedfile ) ) {
                                         serr | "Error! Could not open unsorted input file \"" | argv[1] | "\"" | endl;
+                                        serr | "Error! Could not open unsorted input file \"" | argv[1] | "\"";
                                         usage( argv );
                                 } // if
 …
                 } // if
         } // if
+        sortedfile | nlOff;                                                                     // turn off auto newline
         enum { ValuesPerLine = 22 };                                            // number of values printed per line
 …
                         for ( int counter = 0; counter < size; counter += 1 ) { // read unsorted numbers
                                 unsortedfile | values[counter];
                                 if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | endl | "  ";
+                                if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | nl | "  ";
                                 sortedfile | values[counter];
                                 if ( counter < size - 1 && (counter + 1) % ValuesPerLine != 0 ) sortedfile | ' ';
                         } // for
                         sortedfile | endl;
+                        sortedfile | nl;
                         if ( size > 0 ) {                                                       // values to sort ?
                                 Quicksort QS = { values, size - 1, 0 }; // sort values
                         } // wait until sort tasks terminate
                         for ( int counter = 0; counter < size; counter += 1 ) { // print sorted list
                                 if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | endl | "  ";
+                                if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | nl | "  ";
                                 sortedfile | values[counter];
                                 if ( counter < size - 1 && (counter + 1) % ValuesPerLine != 0 ) sortedfile | ' ';
                         } // for
                         sortedfile | endl | endl;
+                        sortedfile | nl | nl;
                         delete( values );

tests/concurrent/monitor.cfa

r9b086ca	rcde3891
40	40	MyThread f[4];
41	41	}
42		sout \| global.value ~~\| endl~~;
	42	sout \| global.value;
43	43	}

tests/concurrent/multi-monitor.cfa

r9b086ca	rcde3891
52	52	}
53	53	}
54		sout \| global12 \| global23 \| global13 ~~\| endl~~;
	54	sout \| global12 \| global23 \| global13;
55	55	}

tests/concurrent/preempt.cfa

-              r9b086ca
+              rcde3891
 #include <kernel.hfa>hfa>
+#include <kernel.hfa>
 #include <thread.hfa>
 #include <time.hfa>
 #include "long_tests.h"
+#include "long_tests.hfa"
 #ifndef PREEMPTION_RATE

tests/concurrent/signal/block.cfa

-              r9b086ca
+              rcde3891
 #include <fstream.hfa>
 #include <kernel.hfa>hfa>
+#include <kernel.hfa>
 #include <monitor.hfa>
 #include <stdlib.hfa>
 …
 #include <time.hfa>
 #include "long_tests.h"
+#include "long_tests.hfa"
 #ifndef PREEMPTION_RATE
 …
         if(a.last_thread != a.last_signaller || b.last_thread != b.last_signaller ) {
                 sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread | endl;
+                sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread;
                 abort();
+        }
 …
                 if( ! signal_block( cond ) ) {
                         sout | "ERROR expected to be able to signal" | endl;
+                        sout | "ERROR expected to be able to signal";
                         abort();
+                }
 …
                 if(a.last_thread != next || b.last_thread != next) {
                         sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread | endl;
+                        sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread;
                         abort();
+                }
 …
                 Signaller s[4];
                 Barger b[13];
                 sout | "Starting waiters" | endl;
+                sout | "Starting waiters";
+                {
                         Waiter w[3];
+                }
                 sout | "Waiters done" | endl;
+                sout | "Waiters done";
                 done = true;
+        }

tests/concurrent/signal/disjoint.cfa

-              r9b086ca
+              rcde3891
 #include <fstream.hfa>
 #include <kernel.hfa>hfa>
+#include <kernel.hfa>
 #include <monitor.hfa>
 #include <thread.hfa>
 #include <time.hfa>
 #include "long_tests.h"
+#include "long_tests.hfa"
 #ifndef PREEMPTION_RATE
 …
         wait( cond );
         if( d.state != SIGNAL ) {
                 sout | "ERROR barging!" | endl;
+                sout | "ERROR barging!";
+        }
         #if !defined(TEST_FOREVER)
                 d.counter++;
                 if( (d.counter % 1000) == 0 ) sout | d.counter | endl;
+                if( (d.counter % 1000) == 0 ) sout | d.counter;
         #endif
 …
         bool running = TEST(data.counter < N) && data.counter > 0;
         if( data.state != SIGNAL && running ) {
                 sout | "ERROR Eager signal" | data.state | endl;
+                sout | "ERROR Eager signal" | data.state;
+        }
+}
 …
                         Waiter w[4];
+                }
                 sout | "All waiter done" | endl;
+                sout | "All waiter done";
                 all_done = true;
+        }

tests/concurrent/signal/wait.cfa

-              r9b086ca
+              rcde3891
 #include <fstream.hfa>
 #include <kernel.hfa>hfa>
+#include <kernel.hfa>
 #include <monitor.hfa>
 #include <stdlib.hfa>
 …
 #define __kick_rate 12000ul
 #include "long_tests.h"
+#include "long_tests.hfa"
 #ifndef PREEMPTION_RATE
 …
                                 break;
                         default:
                                 sout | "Something went wrong" | endl;
+                                sout | "Something went wrong";
                                 abort();
+                }
 …
         waiter_left = 4;
         processor p[2];
         sout | "Starting" | endl;
+        sout | "Starting";
+        {
                 Signaler  e;
 …
+                }
+        }
         sout | "Done" | endl;
+        sout | "Done";
+}

tests/concurrent/thread.cfa

r9b086ca	rcde3891
12	12	void main(First& this) {
13	13	for(int i = 0; i < 10; i++) {
14		sout \| "First : Suspend No." \| i + 1 ~~\| endl~~;
	14	sout \| "First : Suspend No." \| i + 1;
15	15	yield();
16	16	}
…	…
21	21	P(*this.lock);
22	22	for(int i = 0; i < 10; i++) {
23		sout \| "Second : Suspend No." \| i + 1 ~~\| endl~~;
	23	sout \| "Second : Suspend No." \| i + 1;
24	24	yield();
25	25	}
…	…
29	29	int main(int argc, char* argv[]) {
30	30	semaphore lock = { 0 };
31		sout \| "User main begin" ~~\| endl~~;
	31	sout \| "User main begin";
32	32	{
33	33	processor p;
…	…
37	37	}
38	38	}
39		sout \| "User main end" ~~\| endl~~;
	39	sout \| "User main end";
40	40	}

tests/concurrent/waitfor/barge.cfa

r9b086ca	rcde3891
48	48	yield(random( 10 ));
49	49	if( this.state != WAITFOR && !this.done && this.started ) {
50		serr \| "Barging before caller detected" ~~\| endl~~;
	50	serr \| "Barging before caller detected";
51	51	}
52	52
…	…
66	66	this.state = WAITFOR;
67	67	waitfor(do_call, this) {
68		sout \| i ~~\| endl~~;
	68	sout \| i;
69	69	}
70	70
71	71	if( this.state != CALL ) {
72		serr \| "Barging after caller detected" ~~\| endl~~;
	72	serr \| "Barging after caller detected";
73	73	}
74	74	}
…	…
83	83
84	84	int main() {
85		sout \| "Starting" ~~\| endl~~;
	85	sout \| "Starting";
86	86	{
87	87	barger_t bargers[17];
…	…
89	89	waiter_t waiters;
90	90	}
91		sout \| "Stopping" ~~\| endl~~;
	91	sout \| "Stopping";
92	92	}

tests/concurrent/waitfor/dtor.cfa

-              r9b086ca
+              rcde3891
         switch(state) {
                 case CTOR  : break;
                 case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR"  | endl; abort(); } this.state = state; break;
                 case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN"  | endl; abort(); } this.state = state; break;
                 case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER" | endl; abort(); } this.state = state; break;
                 case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"   | endl; abort(); } this.state = state; break;
+                case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR" ; abort(); } this.state = state; break;
+                case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN" ; abort(); } this.state = state; break;
+                case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER"; abort(); } this.state = state; break;
+                case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"  ; abort(); } this.state = state; break;
+        }
+}
 …
 int main() {
         sout | "Starting" | endl;
+        sout | "Starting";
         processor p;
         for( int i = 0; i < N; i++ ){
 …
                 yield( random( 100 ) );
+        }
         sout | "Stopping" | endl;
+        sout | "Stopping";
+}

tests/concurrent/waitfor/else.cfa

-              r9b086ca
+              rcde3891
 void test( M & mutex m ) {
         int i = 0;
         sout | "Starting" | endl;
+        sout | "Starting";
         when( false ) waitfor( notcalled, m );
         sout | "Step" | i++ | endl;
+        sout | "Step" | i++;
         waitfor( notcalled, m ); or else {
                 sout | "else called" | endl;
+                sout | "else called";
+        }
         sout | "Step" | i++ | endl;
+        sout | "Step" | i++;
         when( true ) waitfor( notcalled, m ); or when( true ) else {
                 sout | "else called" | endl;
+                sout | "else called";
+        }
         sout | "Step" | i++ | endl;
+        sout | "Step" | i++;
         when( false ) waitfor( notcalled, m ); or when( true ) else {
                 sout | "else called" | endl;
+                sout | "else called";
+        }
         sout | "Step" | i++ | endl;
+        sout | "Step" | i++;
         when( false ) waitfor( notcalled, m ); or when( false ) else {
                 sout | "else called" | endl;
+                sout | "else called";
+        }
         sout | "Done" | endl;
+        sout | "Done";
+}

tests/concurrent/waitfor/recurse.cfa

-              r9b086ca
+              rcde3891
         rand_yield();
         sout | "1st" | endl;
+        sout | "1st" | nl;
         return this.counter < N ? (state_t)this.actions[idx] : (state_t)STOP;
 …
                         case THIRD  : while( !global.ready ) { yield(); } this.state = call3( global, this.idx ); break;
                         case LAST   : while( !global.ready ) { yield(); } this.state = call4( global, this.idx ); break;
                         case STOP   : serr | "This should not happen" | endl;
+                        case STOP   : serr | "This should not happen" | nl;
+                }
+        }
 …
 int main() {
         srandom( time(NULL) );
+        sout | "Starting" | endl;
+        sout | nlOff;                                   // turn off auto newline
+        sout | "Starting" | nl;
+        {
                 waiter_t waiters[4] = {
 …
                 the_threads = waiters;
+        }
         sout | "Stopping" | endl;
+        sout | "Stopping" | nl;
+}

tests/concurrent/waitfor/simple.cfa

-              r9b086ca
+              rcde3891
 void do_wait( global_t * mutex a ) {
         sout | "Waiting to accept" | endl;
+        sout | "Waiting to accept";
         yield( random( 10 ) );
         sout | "Accepting" | endl;
+        sout | "Accepting";
         __acceptable_t acceptable;
 …
         __waitfor_internal( 1, &acceptable );
         sout | "Accepted" | endl;
+        sout | "Accepted";
         yield( random( 10 ) );
+}
 …
         for( int i = 0; i < N; i++ ) {
                 do_wait( &globalA );
                 sout | i | endl;
+                sout | i;
+        }
 …
         srandom( time( NULL ) );
         printf("%p\n", &globalA);
         sout | "Starting" | endl;
+        sout | "Starting";
+        {
                 Acceptor r;
 …
+        }
         sout | "Done" | endl;
+        sout | "Done";
+}

tests/concurrent/waitfor/statment.cfa

-              r9b086ca
+              rcde3891
                 case 7: return call7( m );
                 default :
                         serr | "Incorrect index" | index | endl;
+                        serr | "Incorrect index" | index;
                         abort();
+        }
 …
         while( !done ) {
                    waitfor( get_index, this );
                 or waitfor( call1, this ) { sout | "Statement" | endl; if( this.last_val != 1 ) { serr | "Incorrect index: expected" | 1 | "got" | this.last_val | endl; } }
                 or waitfor( call2, this ) { sout | "Statement" | endl; if( this.last_val != 2 ) { serr | "Incorrect index: expected" | 2 | "got" | this.last_val | endl; } }
                 or waitfor( call3, this ) { sout | "Statement" | endl; if( this.last_val != 3 ) { serr | "Incorrect index: expected" | 3 | "got" | this.last_val | endl; } }
                 or waitfor( call4, this ) { sout | "Statement" | endl; if( this.last_val != 4 ) { serr | "Incorrect index: expected" | 4 | "got" | this.last_val | endl; } }
                 or waitfor( call5, this ) { sout | "Statement" | endl; if( this.last_val != 5 ) { serr | "Incorrect index: expected" | 5 | "got" | this.last_val | endl; } }
                 or waitfor( call6, this ) { sout | "Statement" | endl; if( this.last_val != 6 ) { serr | "Incorrect index: expected" | 6 | "got" | this.last_val | endl; } }
                 or waitfor( call7, this ) { sout | "Statement" | endl; if( this.last_val != 7 ) { serr | "Incorrect index: expected" | 7 | "got" | this.last_val | endl; } }
+                or waitfor( call1, this ) { sout | "Statement"; if( this.last_val != 1 ) { serr | "Incorrect index: expected" | 1 | "got" | this.last_val; } }
+                or waitfor( call2, this ) { sout | "Statement"; if( this.last_val != 2 ) { serr | "Incorrect index: expected" | 2 | "got" | this.last_val; } }
+                or waitfor( call3, this ) { sout | "Statement"; if( this.last_val != 3 ) { serr | "Incorrect index: expected" | 3 | "got" | this.last_val; } }
+                or waitfor( call4, this ) { sout | "Statement"; if( this.last_val != 4 ) { serr | "Incorrect index: expected" | 4 | "got" | this.last_val; } }
+                or waitfor( call5, this ) { sout | "Statement"; if( this.last_val != 5 ) { serr | "Incorrect index: expected" | 5 | "got" | this.last_val; } }
+                or waitfor( call6, this ) { sout | "Statement"; if( this.last_val != 6 ) { serr | "Incorrect index: expected" | 6 | "got" | this.last_val; } }
+                or waitfor( call7, this ) { sout | "Statement"; if( this.last_val != 7 ) { serr | "Incorrect index: expected" | 7 | "got" | this.last_val; } }
                 done = true;
 …
 int main() {
         processor p[2];
         sout | "Starting" | endl;
+        sout | "Starting";
+        {
                 caller c[7];
                 waiter w;
+        }
         sout | "Stopping" | endl;
+        sout | "Stopping";
+}

tests/concurrent/waitfor/when.cfa

-              r9b086ca
+              rcde3891
 void arbiter( global_t & mutex this ) {
         for( int i = 0; i < N; i++ ) {
                    when( this.last_call == 6 ) waitfor( call1, this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call | endl; } }
                 or when( this.last_call == 1 ) waitfor( call2, this ) { if( this.last_call != 2) { serr | "Expected last_call to be 2 got" | this.last_call | endl; } }
                 or when( this.last_call == 2 ) waitfor( call3, this ) { if( this.last_call != 3) { serr | "Expected last_call to be 3 got" | this.last_call | endl; } }
                 or when( this.last_call == 3 ) waitfor( call4, this ) { if( this.last_call != 4) { serr | "Expected last_call to be 4 got" | this.last_call | endl; } }
                 or when( this.last_call == 4 ) waitfor( call5, this ) { if( this.last_call != 5) { serr | "Expected last_call to be 5 got" | this.last_call | endl; } }
                 or when( this.last_call == 5 ) waitfor( call6, this ) { if( this.last_call != 6) { serr | "Expected last_call to be 6 got" | this.last_call | endl; } }
+                   when( this.last_call == 6 ) waitfor( call1, this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call; } }
+                or when( this.last_call == 1 ) waitfor( call2, this ) { if( this.last_call != 2) { serr | "Expected last_call to be 2 got" | this.last_call; } }
+                or when( this.last_call == 2 ) waitfor( call3, this ) { if( this.last_call != 3) { serr | "Expected last_call to be 3 got" | this.last_call; } }
+                or when( this.last_call == 3 ) waitfor( call4, this ) { if( this.last_call != 4) { serr | "Expected last_call to be 4 got" | this.last_call; } }
+                or when( this.last_call == 4 ) waitfor( call5, this ) { if( this.last_call != 5) { serr | "Expected last_call to be 5 got" | this.last_call; } }
+                or when( this.last_call == 5 ) waitfor( call6, this ) { if( this.last_call != 6) { serr | "Expected last_call to be 6 got" | this.last_call; } }
                 sout | this.last_call | endl;
+                sout | this.last_call;
+        }
 …
 int main() {
         srandom( time(NULL) );
         sout | "Starting" | endl;
+        sout | "Starting";
+        {
                 arbiter_t arbiter;
 …
+        }
         sout | "Stopping" | endl;
+        sout | "Stopping";
+}

tests/coroutine/.expect/fmtLines.txt

-              r9b086ca
+              rcde3891
 difi  ed B  y :   Pete  r A.
  Buh  r//   Last   Mod  ifie
 d On   : M  on S  ep 1  8 11
 :35:  57 2  017/  / Up  date
  Cou  nt       :   31/  /#in
+d On   : T  ue D  ec 1  1 23
+:31:  12 2  018/  / Up  date
+ Cou  nt       :   32/  /#in
 clud  e <f  stre  am.h  fa>#
 incl  ude   <cor  outi  ne.h
 …
 t )   {      if   ( fm  t.g
 != 0   ||   fmt.  b !=   0 )
+ sou  t |   endl  ;}vo  id m
+ain(   For  mat   & fm  t )
+{       fo  r (   ;; )   {
+                                  // f  or a  s ma  ny c
+hara  cter  s           f  or (   fmt
+.g =   0;   fmt.  g <   5; f
+mt.g   +=   1 )   {             /  / gr
+oups   of   5 bl  ocks                          f
+or (   fmt  .b =   0;   fmt.
+b <   4; f  mt.b   +=   1 )
+{       //   blo  cks   of 4   cha
+ract  ers                               f  or (   ;;
+) {                                                     //   for   new
+line   cha  ract  ers
+susp  end(  );                                  i  f (
+fmt.  ch !  = '\  n' )   bre
+ak;             //   igno  re n  ewli
+ne                              }   // f  or                            so
+ut |   fmt  .ch;                                                        /
+/ pr  int   char  acte  r
+} //   for                      s  out   | "
+ ";                                                             /  / pr  int
+bloc  k se  para  tor           } /
+/ fo  r         s  out   | en  dl;
+                                                                  // p  rint   gro
+up s  epar  ator        } /  / fo
+r} /  / ma  invo  id p  rt(
+Form  at &   fmt  , ch  ar c
+h )   {      fmt  .ch   = ch
+;      res  ume(   fmt   );}
+ //   prti  nt m  ain(  ) {
+Form  at f  mt;   char   ch;
+        for   ( ;  ; )   {              s  in |
+ ch;                                                                            //   rea
+d on  e ch  arac  ter       if
+ ( e  of(   sin   ) )   brea
+k;                                                      //   eof   ?            p
+rt(   fmt,   ch   );    }   //
+for}   //   main  // L  ocal
+ Var  iabl  es:   ////   tab
+-wid  th:   4 //  // c  ompi
+le-c  omma  nd:   "cfa   fmt
+Line  s.c"   ///  / En  d: /
+/
+ sou  t |   nl;}  void   mai
+n( F  orma  t &   fmt   ) {
+for   ( ;;   ) {
+                //   for   as   many   cha
+ract  ers               for   ( f  mt.g
+ = 0  ; fm  t.g   < 5;   fmt
+.g +  = 1   ) {         //   grou
+ps o  f 5   bloc  ks                    for
+ ( f  mt.b   = 0  ; fm  t.b
+< 4;   fmt  .b +  = 1   ) {
+// b  lock  s of   4 c  hara
+cter  s                         for   ( ;  ; )
+{                                                         // f  or n  ewli
+ne c  hara  cter  s                                     su
+spen  d();                                      if   ( fm
+t.ch   !=   '\n'   ) b  reak
+;               /  / ig  nore   new  line
+                                  } //   for                              sout
+ | f  mt.c  h;                                                  //
+prin  t ch  arac  ter                   }
+// f  or                        sou  t |   "  "
+;                                                               //   prin  t bl
+ock   sepa  rato  r             }   //
+for             sou  t |   nl;
+                                  // p  rint   gro  up s
+epar  ator      } /  / fo  r} /
+/ ma  invo  id p  rt(   Form
+at &   fmt  , ch  ar c  h )
+{      fmt  .ch   = ch  ;
+ res  ume(   fmt   );}   //
+prti  nt m  ain(  ) {     Form
+at f  mt;         char   ch;    for
+ ( ;  ; )   {           s  in |   ch;
+                                                                                //   rea  d on
+e ch  arac  ter     if   ( e
+of(   sin   ) )   brea  k;
+                                        //   eof   ?            p  rt(
+fmt,   ch   );  }   //   for}
+ //   main  // L  ocal   Var
+iabl  es:   ////   tab  -wid
+th:   4 //  // c  ompi  le-c
+omma  nd:   "cfa   fmt  Line
+s.c"   ///  / En  d: /  /

tests/coroutine/.in/fmtLines.txt

-              r9b086ca
+              rcde3891
 // Created On       : Sun Sep 17 21:56:15 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Sep 18 11:35:57 2017
 // Update Count     : 31
+// Last Modified On : Tue Dec 11 23:31:12 2018
+// Update Count     : 32
 //
 …
 void ^?{}( Format & fmt ) {
     if ( fmt.g != 0 || fmt.b != 0 ) sout | endl;
+    if ( fmt.g != 0 || fmt.b != 0 ) sout | nl;
+}
 …
                         sout | "  ";                                                            // print block separator
                 } // for
                 sout | endl;                                                                    // print group separator
+                sout | nl;                                                                      // print group separator
         } // for
 } // main

tests/coroutine/fibonacci.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Thu Jun  8 07:29:37 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Aug 18 11:21:58 2018
 // Update Count     : 24
+// Last Modified On : Tue Dec 11 21:57:33 2018
+// Update Count     : 25
 //
 …
         Fibonacci f1, f2;
         for ( 10 ) {                                                                            // print N Fibonacci values
                 sout | next( f1 ) | next( f2 ) | endl;
+                sout | next( f1 ) | next( f2 );
         } // for
+}

tests/coroutine/fibonacci_1.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Thu Apr 26 23:20:08 2018
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Aug 18 11:21:02 2018
 // Update Count     : 13
+// Last Modified On : Tue Dec 11 21:57:54 2018
+// Update Count     : 14
 //
 …
         Fibonacci f1, f2;
         for ( 10 ) {                                                                            // print N Fibonacci values
                 sout | next( f1 ) | next( f2 ) | endl;
+                sout | next( f1 ) | next( f2 );
         } // for
+}

tests/coroutine/fmtLines.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Sun Sep 17 21:56:15 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 16 08:20:54 2018
 // Update Count     : 45
+// Last Modified On : Sat Dec 22 18:27:00 2018
+// Update Count     : 57
 //
 …
 void main( Format & fmt ) with( fmt ) {
         for () {                                                                                        // for as many characters
                 for ( g; 5 ) {                                                                  // groups of 5 blocks
                         for ( b; 4 ) {                                                          // blocks of 4 characters
+                for ( g = 0; g < 5; g += 1 ) {                                  // groups of 5 blocks
+                        for ( b = 0; b < 4; b += 1 ) {                          // blocks of 4 characters
                                 for () {                                                                // for newline characters
                                         suspend();
                                         if ( ch != '\n' ) break;                        // ignore newline
+                                  if ( ch != '\n' ) break;                              // ignore newline
                                 } // for
                                 sout | ch;                                                              // print character
 …
                         sout | "  ";                                                            // print block separator
                 } // for
                 sout | endl;                                                                    // print group separator
+                sout | nl;                                                                              // print group separator
         } // for
 } // main
 …
 void ^?{}( Format & fmt ) with( fmt ) {
         if ( g != 0 || b != 0 ) sout | endl;
+        if ( g != 0 || b != 0 ) sout | nl;
+}
 void format( Format & fmt ) {
         resume( fmt );
 } // prt
+} // format
 int main() {
         Format fmt;
+        sout | nlOff;                                                                           // turn off auto newline
   eof: for () {                                                                                 // read until end of file

tests/coroutine/pingpong.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Wed Sep 20 11:55:23 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Aug 18 11:31:11 2018
 // Update Count     : 28
+// Last Modified On : Tue Dec 11 21:58:06 2018
+// Update Count     : 29
 //
 …
 void ?{}( PingPong & this, const char * name, unsigned int N, PingPong & part ) {
+        (this.__cor){name};
         this.name = name;
         this.N = N;
 …
 void main( PingPong & pingpong ) {                                              // ping's starter ::main, pong's starter ping
         for ( pingpong.N ) {                                                            // N ping-pongs
                 sout | pingpong.name | endl;
+                sout | pingpong.name;
                 cycle( *pingpong.part );
         } // for

tests/coroutine/prodcons.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Mon Sep 18 12:23:39 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Aug 18 12:55:10 2018
 // Update Count     : 51
+// Last Modified On : Wed Dec 12 23:04:49 2018
+// Update Count     : 53
 //
 …
 coroutine Prod {
         Cons * c;
+        Cons & c;
         int N, money, receipt;
 };
 …
         // 1st resume starts here
         for ( i; N ) {                                                                          // N pairs of values
+                int p1 = random( 100 );
+                int p2 = random( 100 );
+                sout | p1 | " " | p2 | endl;
+                int status = delivery( *c, p1, p2 );
+                sout | " $" | money | endl;
+                sout | status | endl;
+                int p1 = random( 100 ), p2 = random( 100 );
+                sout | p1 | " " | p2;
+                int status = delivery( c, p1, p2 );
+                sout | " $" | money | nl | status;
                 receipt += 1;
+        }
         stop( *c );
         sout | "prod stops" | endl;
+        stop( c );
+        sout | "prod stops";
+}
 int payment( Prod & prod, int money ) {
 …
+}
 void start( Prod & prod, int N, Cons &c ) {
+        prod.N = N;
+        prod.c = &c;
+        prod.receipt = 0;
+        &prod.c = &c;
+        prod.[N, receipt] = [N, 0];
         resume( prod );                                                                         // activate main
+}
 coroutine Cons {
         Prod * p;
+        Prod & p;
         int p1, p2, status;
         bool done;
 };
 void ?{}( Cons & cons, Prod & p ) {
+        cons.p = &p;
+        cons.status = 0;
+        cons.done = false;
+        &cons.p = &p;
+        cons.[status, done ] = [0, false];
+}
 void ^?{}( Cons & cons ) {}
 …
         int money = 1, receipt;
         for ( ; ! done; ) {
+                sout | p1 | " " | p2 | endl;
+                sout | " $" | money | endl;
+                sout | p1 | " " | p2 | nl | " $" | money;
                 status += 1;
                 receipt = payment( *p, money );
                 sout | " #" | receipt | endl;
+                receipt = payment( p, money );
+                sout | " #" | receipt;
                 money += 1;
+        }
         sout | "cons stops" | endl;
+        sout | "cons stops";
+}
 int delivery( Cons & cons, int p1, int p2 ) {
+        cons.p1 = p1;
+        cons.p2 = p2;
+        cons.[p1, p2] = [p1, p2];
         resume( cons );                                                                         // main 1st time, then
         return cons.status;                                                                     // cons in payment
 …
         srandom( /* getpid() */ 103 );                                          // fixed seed for testing
         start( prod, 5, cons );
         sout | "main stops" | endl;
+        sout | "main stops";
+}

tests/coroutine/runningTotal.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Wed Dec  6 08:05:27 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 16 08:22:29 2018
 // Update Count     : 3
+// Last Modified On : Tue Dec 11 21:59:00 2018
+// Update Count     : 4
 //
 …
         RunTotal rntl;
         for ( i; 10 ) {
                 sout | i | add( rntl, i ) | endl;
+                sout | i | add( rntl, i );
         } // for
+}

tests/counter.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // counter.c --
+// counter.cfa --
 //
 // Author           : Aaron B. Moss
 // Created On       : Thu Feb 22 15:27:00 2018
 // Last Modified By : Aaron B. Moss
 // Last Modified On : Thu Feb 22 15:27:00 2018
 // Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Nov  6 17:50:23 2018
+// Update Count     : 2
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa counter.c" //
+// compile-command: "cfa counter.cfa" //
 // End: //

tests/declarationErrors.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // declarationErrors.c --
+// declarationErrors.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 17 08:23:43 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Sep  9 22:57:52 2016
 // Update Count     : 31
+// Last Modified On : Tue Nov  6 17:52:47 2018
+// Update Count     : 32
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa declarationErrors.c" //
+// compile-command: "cfa declarationErrors.cfa" //
 // End: //

tests/declarationSpecifier.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // declarationSpecifier.c --
+// declarationSpecifier.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 17 08:21:04 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Aug 17 08:24:33 2016
 // Update Count     : 2
+// Last Modified On : Tue Nov  6 17:52:59 2018
+// Update Count     : 3
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa declarationSpecifier.c" //
+// compile-command: "cfa declarationSpecifier.cfa" //
 // End: //

tests/div.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // div.c --
+// div.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Tue Aug  8 16:28:43 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Dec  7 09:06:52 2017
 // Update Count     : 18
+// Last Modified On : Tue Dec  4 21:35:01 2018
+// Update Count     : 20
 //
 #include <fstream.hfa>
 #include <stdlib.hfa>                                                                           // div
+#include <stdlib.hfa>                                                                   // div
 struct T { int i; };
 …
 int main( void ) {
         sout | "div" | div( 13, 5 ) | div( 13L, 5L ) | div( 13LL, 5LL ) | endl;
+        sout | "div" | div( 13, 5 ) | div( 13L, 5L ) | div( 13LL, 5LL );
         short s1 = 13, s2 = 5;
         sout | "div" | div( s1, s2 ) | endl;
+        sout | "div" | div( s1, s2 );
         T t1 = { 13 }, t2 = { 5 };
         sout | "div" | div( t1, t2 ) | endl;                            // polymorphic div
+        sout | "div" | div( t1, t2 );                                           // polymorphic div
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa div.c" //
+// compile-command: "cfa div.cfa" //
 // End: //

tests/except-0.cfa

-              r9b086ca
+              rcde3891
 #include <stdbool.h>
 #include "except-mac.h"
+#include "except-mac.hfa"
 TRIVIAL_EXCEPTION(yin)
 TRIVIAL_EXCEPTION(yang)
 …
 void ^?{}(signal_exit * this) {
         printf("Exiting: %s\n", this->area);
 //      sout | "Exiting:" | this->area | endl;
+//      sout | "Exiting:" | this->area;
+}

tests/except-1.cfa

r9b086ca	rcde3891
5	5	#include <stdio.h>
6	6
7		#include "except-mac.h"
	7	#include "except-mac.hfa"
8	8	TRIVIAL_EXCEPTION(yin)
9	9	TRIVIAL_EXCEPTION(yang)

tests/except-2.cfa

r9b086ca	rcde3891
3	3
4	4	#include <stdlib.hfa>
5		#include "except-mac.h"
	5	#include "except-mac.hfa"
6	6
7	7	TRIVIAL_EXCEPTION(yin)

tests/except-3.cfa

r9b086ca	rcde3891
2	2
3	3	#include <stdio.h>
4		#include "except-mac.h"
	4	#include "except-mac.hfa"
5	5	TRIVIAL_EXCEPTION(myth)
6	6

tests/extension.cfa

-              r9b086ca
+              rcde3891
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // extension.c --
+// extension.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Mon Jul  4 20:42:43 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Feb  6 15:44:39 2017
 // Update Count     : 46
+// Last Modified On : Tue Nov  6 17:53:21 2018
+// Update Count     : 47
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa extension.c" //
+// compile-command: "cfa extension.cfa" //
 // End: //

tests/forall.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // forall.c --
+// forall.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May  9 08:48:15 2018
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jul 12 16:19:08 2018
 // Update Count     : 30
+// Last Modified On : Tue Nov  6 17:53:43 2018
+// Update Count     : 31
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa forall.c" //
+// compile-command: "cfa forall.cfa" //
 // End: //

tests/fstream_test.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // fstream_test.c --
+// fstream_test.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 24 11:30:26 2017
 // Update Count     : 65
+// Last Modified On : Sat Dec 22 09:47:44 2018
+// Update Count     : 68
 //
 …
 int main( void ) {
         int nombre;
         sout | "Entrez un nombre, s'il vous plaît:" | endl;
+        sout | "Entrez un nombre, s'il vous plaît:";
         sin  | nombre;
         sout | "Vous avez entré" | nombre | endl;
+        sout | "Vous avez entré" | nombre;
         sout | "le nombre" | nombre | "est"
                  | (nombre > 0 ? "positif" : nombre == 0 ? "zéro" : "négatif") | endl;
+                 | (nombre > 0 ? "positif" : nombre == 0 ? "zéro" : "négatif");
         sout | "Entrez trois nombres, s'il vous plaît: " | endl;
+        sout | "Entrez trois nombres, s'il vous plaît:";
         int i, j, k;
         sin  | i | j | k;
         sout | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl;
+        sout | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k;
+}
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa fstream_test.c" //
+// compile-command: "cfa fstream_test.cfa" //
 // End: //

tests/function-operator.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Fri Aug 25 15:21:11 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug  2 09:27:53 2018
 // Update Count     : 8
+// Last Modified On : Tue Dec  4 21:37:09 2018
+// Update Count     : 9
 //
 …
 // TODO: abstract over (os, T)
 os_wrapper ?=?(os_wrapper & wrapper, int x) {
         *wrapper.out | x | endl;
+        *wrapper.out | x;
         return wrapper;
+}

tests/functions.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // functions.c --
+// functions.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 17 08:39:58 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jan 17 22:44:12 2018
 // Update Count     : 12
+// Last Modified On : Tue Nov  6 17:54:09 2018
+// Update Count     : 13
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa functions.c" //
+// compile-command: "cfa functions.cfa" //
 // End: //

tests/gccExtensions.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // gccExtensions.c --
+// gccExtensions.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Sun Aug 14 17:28:17 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Aug 17 09:26:50 2016
 // Update Count     : 10
+// Last Modified On : Tue Nov  6 17:54:20 2018
+// Update Count     : 11
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa gccExtensions.c" //
+// compile-command: "cfa gccExtensions.cfa" //
 // End: //

tests/gmp.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // gmp.c --
+// gmp.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Aug 18 12:43:13 2018
 // Update Count     : 556
+// Last Modified On : Thu Dec 20 22:41:47 2018
+// Update Count     : 559
 //
 …
 int main( void ) {
         sout | "constructors" | endl;
+        sout | "constructors";
         short int si = 3;
         Int x = { "50000000000000000000" }, y = { si }, z = x + y;
         sout | x | y | z | endl;
         sout | "x:" | x | "y:" | y | "z:" | z | endl;
+        sout | x | y | z;
+        sout | "x:" | x | "y:" | y | "z:" | z;
         sout | "conversions" | endl;
+        sout | "conversions";
         y = 'a';
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         y = "12345678901234567890123456789";
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         y = 100`mp + 100`mp;
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         y = -200u`mp + -200u`mp;
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         y = "12345678901234567890123456789"`mp + "12345678901234567890123456789"`mp;
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         y = si;
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         y = -3;
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         y += 7;
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         y -= 1;
         sout | "y:" | y | endl;
+        sout | "y:" | y;
         int b;
         b = y;
         si = y;
         sout | "y:" | y | "b:" | b | "si:" | si | endl;
+        sout | "y:" | y | "b:" | b | "si:" | si;
         sout | "comparison" | endl;
         sout | x == x | endl;
         sout | x != x | endl;
         sout | x < x | endl;
         sout | x <= x | endl;
         sout | x > x | endl;
         sout | x >= x | endl;
+        sout | "comparison";
+        sout | x == x;
+        sout | x != x;
+        sout | x < x;
+        sout | x <= x;
+        sout | x > x;
+        sout | x >= x;
         sout | "arithmetic" | endl;
+        sout | "arithmetic";
         z = x + y + z;
         sout | "z:" | z | endl;
+        sout | "z:" | z;
         z = z = x;
         sout | "z:" | z | endl;
+        sout | "z:" | z;
         z = x - y - z;
         sout | "z:" | z | endl;
+        sout | "z:" | z;
         z = x * y * z;
         sout | "z:" | z | endl;
+        sout | "z:" | z;
         z = x * 3;
         sout | "z:" | z | endl;
+        sout | "z:" | z;
         z = 3 * x;
         sout | "z:" | z | endl;
+        sout | "z:" | z;
         z = x / 3;
         sout | "z:" | z | endl;
         sout | div( x, 3 ) | x / 3 | "," | x % 3 | endl;
+        sout | "z:" | z;
+        sout | div( x, 3 ) | x / 3 | "," | x % 3;
         [ x, y ] = div( x, 3 );
         sout | "x:" | x | "y:" | y | endl;
+        sout | "x:" | x | "y:" | y;
         sout | endl;
+        sout | nl;
         sin | x | y | z;
         sout | x | y | z | endl;
+        sout | x | y | z;
         sout | endl;
+        sout | nl;
         sout | "Fibonacci Numbers" | endl;
+        sout | "Fibonacci Numbers";
         Int fn, fn1, fn2;
         fn = (Int){0}; fn1 = fn;                                                        // 1st case
         sout | (int)0 | fn | endl;
+        sout | (int)0 | fn;
         fn = 1; fn2 = fn1; fn1 = fn;                                            // 2nd case
         sout | 1 | fn | endl;
+        sout | 1 | fn;
         for ( i; 2u ~= 200 ) {
                 fn = fn1 + fn2; fn2 = fn1; fn1 = fn;                    // general case
                 sout | i | fn | endl;
+                sout | i | fn;
         } // for
         sout | endl;
+        sout | nl;
         sout | "Factorial Numbers" | endl;
+        sout | "Factorial Numbers";
         Int fact = 1;                                                                           // 1st case
         sout | (int)0 | fact | endl;
+        sout | (int)0 | fact;
         for ( i; 1u ~= 40u ) {
                 fact *= i;                                                                              // general case
                 sout | i | fact | endl;
+                sout | i | fact;
         } // for
 } // main
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa gmp.c -lgmp" //
+// compile-command: "cfa gmp.cfa -lgmp" //
 // End: //

tests/heap.cfa

-              r9b086ca
+              rcde3891
+//
+// 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.
+//
+// heap.cfa --
+//
+// Author           : Peter A. Buhr
+// Created On       : Tue Nov  6 17:54:56 2018
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Dec 11 21:52:40 2018
+// Update Count     : 18
+//
 #include <thread.hfa>
 #include <kernel.hfa>                                                                           // processor
 #include <stdlib.hfa>                                                                           // *allocs
+#include <kernel.hfa>                                                                   // processor
+#include <stdlib.hfa>                                                                   // *allocs
 #include <malloc.h>                                                                             // malloc_*
 …
 void main( Worker & ) {
     enum { NoOfAllocs = 5000, NoOfMmaps = 10 };
     char *locns[NoOfAllocs];
+    char * locns[NoOfAllocs];
     int i;
     // check alloc/free
     for ( int j = 0; j < 40; j += 1 ) {
                 for ( i = 0; i < NoOfAllocs; i += 1 ) {
+    for ( j; 40 ) {
+                for ( i; NoOfAllocs ) {
                         locns[i] = alloc( i );
                         //sout | (void *)locns[i] | endl;
                         for ( int k = 0; k < i; k += 1 ) locns[i][k] = '\345';
                 } // for
                 //sout | (char *)sbrk(0) - start | " bytes" | endl;
                 for ( i = 0; i < NoOfAllocs; i += 1 ) {
                         //sout | (void *)locns[i] | endl;
                         for ( int k = 0; k < i; k += 1 ) if ( locns[i][k] != '\345' ) abort( "new/delete corrupt storage1" );
+                        //sout | (void *)locns[i];
+                        for ( k; i ) locns[i][k] = '\345';
+                } // for
+                //sout | (char *)sbrk(0) - start | " bytes";
+                for ( i; NoOfAllocs ) {
+                        //sout | (void *)locns[i];
+                        for ( k; i ) if ( locns[i][k] != '\345' ) abort( "new/delete corrupt storage1" );
                         free( locns[i] );
                 } // for
                 //sout | (char *)sbrk(0) - start | " bytes" | endl;
                 for ( i = 0; i < NoOfAllocs; i += 1 ) {
+                //sout | (char *)sbrk(0) - start | " bytes";
+                for ( i; NoOfAllocs ) {
                         locns[i] = alloc( i );
                         //sout | (void *)locns[i] | endl;
                         for ( int k = 0; k < i; k += 1 ) locns[i][k] = '\345';
                 } // for
                 for ( i = NoOfAllocs - 1; i >=0 ; i -= 1 ) {
                         //sout | (void *)locns[i] | endl;
                         for ( int k = 0; k < i; k += 1 ) if ( locns[i][k] != '\345' ) abort( "new/delete corrupt storage2" );
+                        //sout | (void *)locns[i];
+                        for ( k; i ) locns[i][k] = '\345';
+                } // for
+                for ( i; NoOfAllocs - 1 -~= 0 ) {
+                        //sout | (void *)locns[i];
+                        for ( k; i ) if ( locns[i][k] != '\345' ) abort( "new/delete corrupt storage2" );
                         free( locns[i] );
                 } // for
 …
     // check malloc/free (sbrk)
     for ( i = 0; i < NoOfAllocs; i += 1 ) {
+    for ( i; NoOfAllocs ) {
                 size_t s = (i + 1) * 20;
                 char *area = (char *)malloc( s );
+                char * area = (char *)malloc( s );
                 if ( area == 0 ) abort( "malloc/free out of memory" );
                 area[0] = '\345'; area[s - 1] = '\345';                 // fill first/last
 …
     } // for
     for ( i = 0; i < NoOfAllocs; i += 1 ) {
                 size_t s = i + 1;                               // +1 to make initialization simpler
+    for ( i; NoOfAllocs ) {
+                size_t s = i + 1;                                                               // +1 to make initialization simpler
                 locns[i] = (char *)malloc( s );
                 if ( locns[i] == 0 ) abort( "malloc/free out of memory" );
 …
                 locns[i][malloc_usable_size( locns[i] ) - 1] = '\345'; // fill ultimate byte
     } // for
     for ( i = 0; i < NoOfAllocs; i += 1 ) {
+    for ( i; NoOfAllocs ) {
                 size_t s = i + 1;
                 if ( locns[i][0] != '\345' || locns[i][s - 1] != '\345' ||
 …
     // check malloc/free (mmap)
     for ( i = 0; i < NoOfMmaps; i += 1 ) {
                 size_t s = i + default_mmap_start();                            // cross over point
                 char *area = (char *)malloc( s );
+    for ( i; NoOfMmaps ) {
+                size_t s = i + default_mmap_start();                    // cross over point
+                char * area = (char *)malloc( s );
                 if ( area == 0 ) abort( "malloc/free out of memory" );
                 area[0] = '\345'; area[s - 1] = '\345';                 // fill first/last
 …
     } // for
     for ( i = 0; i < NoOfMmaps; i += 1 ) {
                 size_t s = i + default_mmap_start();                            // cross over point
+    for ( i; NoOfMmaps ) {
+                size_t s = i + default_mmap_start();                    // cross over point
                 locns[i] = (char *)malloc( s );
                 if ( locns[i] == 0 ) abort( "malloc/free out of memory" );
 …
                 locns[i][malloc_usable_size( locns[i] ) - 1] = '\345'; // fill ultimate byte
     } // for
     for ( i = 0; i < NoOfMmaps; i += 1 ) {
                 size_t s = i + default_mmap_start();                            // cross over point
+    for ( i; NoOfMmaps ) {
+                size_t s = i + default_mmap_start();                    // cross over point
                 if ( locns[i][0] != '\345' || locns[i][s - 1] != '\345' ||
                          locns[i][malloc_usable_size( locns[i] ) - 1] != '\345' ) abort( "malloc/free corrupt storage" );
 …
     // check calloc/free (sbrk)
     for ( i = 0; i < NoOfAllocs; i += 1 ) {
+    for ( i; NoOfAllocs ) {
                 size_t s = (i + 1) * 20;
                 char *area = (char *)calloc( 5, s );
+                char * area = (char *)calloc( 5, s );
                 if ( area == 0 ) abort( "calloc/free out of memory" );
                 if ( area[0] != '\0' || area[s - 1] != '\0' ||
 …
     } // for
     for ( i = 0; i < NoOfAllocs; i += 1 ) {
+    for ( i; NoOfAllocs ) {
                 size_t s = i + 1;
                 locns[i] = (char *)calloc( 5, s );
 …
                 locns[i][malloc_usable_size( locns[i] ) - 1] = '\345'; // fill ultimate byte
     } // for
     for ( i = 0; i < NoOfAllocs; i += 1 ) {
+    for ( i; NoOfAllocs ) {
                 size_t s = i + 1;
                 if ( locns[i][0] != '\345' || locns[i][s - 1] != '\345' ||
 …
     // check calloc/free (mmap)
     for ( i = 0; i < NoOfMmaps; i += 1 ) {
                 size_t s = i + default_mmap_start();                            // cross over point
                 char *area = (char *)calloc( 1, s );
+    for ( i; NoOfMmaps ) {
+                size_t s = i + default_mmap_start();                    // cross over point
+                char * area = (char *)calloc( 1, s );
                 if ( area == 0 ) abort( "calloc/free out of memory" );
                 if ( area[0] != '\0' || area[s - 1] != '\0' ) abort( "calloc/free corrupt storage4.1" );
 …
     } // for
     for ( i = 0; i < NoOfMmaps; i += 1 ) {
                 size_t s = i + default_mmap_start();                            // cross over point
+    for ( i; NoOfMmaps ) {
+                size_t s = i + default_mmap_start();                    // cross over point
                 locns[i] = (char *)calloc( 1, s );
                 if ( locns[i] == 0 ) abort( "calloc/free out of memory" );
 …
                 locns[i][malloc_usable_size( locns[i] ) - 1] = '\345'; // fill ultimate byte
     } // for
     for ( i = 0; i < NoOfMmaps; i += 1 ) {
                 size_t s = i + default_mmap_start();                            // cross over point
+    for ( i; NoOfMmaps ) {
+                size_t s = i + default_mmap_start();                    // cross over point
                 if ( locns[i][0] != '\345' || locns[i][s - 1] != '\345' ||
                          locns[i][malloc_usable_size( locns[i] ) - 1] != '\345' ) abort( "calloc/free corrupt storage6" );
 …
     enum { limit = 64 * 1024 };                                                 // check alignments up to here
     for ( size_t a = libAlign(); a <= limit; a += a ) { // generate powers of 2
                 //sout | alignments[a] | endl;
                 for ( int s = 1; s < NoOfAllocs; s += 1 ) {             // allocation of size 0 can return null
                         char *area = (char *)memalign( a, s );
+        for ( a; libAlign() ~= limit ~ a ) {                            // generate powers of 2
+                //sout | alignments[a];
+                for ( s; 1 ~ NoOfAllocs ) {                                             // allocation of size 0 can return null
+                        char * area = (char *)memalign( a, s );
                         if ( area == 0 ) abort( "memalign/free out of memory" );
                         //sout | i | " " | area | endl;
+                        //sout | i | " " | area;
                         if ( (size_t)area % a != 0 || malloc_alignment( area ) != a ) { // check for initial alignment
                                 abort( "memalign/free bad alignment : memalign(%d,%d) = %p", (int)a, s, area );
 …
     // check memalign/free (mmap)
     for ( size_t a = libAlign(); a <= limit; a += a ) { // generate powers of 2
                 //sout | alignments[a] | endl;
                 for ( i = 1; i < NoOfMmaps; i += 1 ) {
                         size_t s = i + default_mmap_start();                    // cross over point
                         char *area = (char *)memalign( a, s );
+        for ( a; libAlign() ~= limit ~ a ) {                            // generate powers of 2
+                //sout | alignments[a];
+                for ( i; 1 ~ NoOfMmaps ) {
+                        size_t s = i + default_mmap_start();            // cross over point
+                        char * area = (char *)memalign( a, s );
                         if ( area == 0 ) abort( "memalign/free out of memory" );
                         //sout | i | " " | area | endl;
+                        //sout | i | " " | area;
                         if ( (size_t)area % a != 0 || malloc_alignment( area ) != a ) { // check for initial alignment
                                 abort( "memalign/free bad alignment : memalign(%d,%d) = %p", (int)a, (int)s, area );
 …
     // check calloc/realloc/free (sbrk)
     for ( i = 1; i < 10000; i += 12 ) {
+    for ( i; 1 ~ 10_000 ~ 12 ) {
                 // initial N byte allocation
                 char *area = (char *)calloc( 5, i );
+                char * area = (char *)calloc( 5, i );
                 if ( area == 0 ) abort( "calloc/realloc/free out of memory" );
                 if ( area[0] != '\0' || area[i - 1] != '\0' ||
 …
                 // Do not start this loop index at 0 because realloc of 0 bytes frees the storage.
                 for ( int s = i; s < 256 * 1024; s += 26 ) {    // start at initial memory request
+                for ( s; i ~ 256 * 1024 ~ 26 ) {                                // start at initial memory request
                         area = (char *)realloc( area, s );                      // attempt to reuse storage
                         if ( area == 0 ) abort( "calloc/realloc/free out of memory" );
 …
     // check calloc/realloc/free (mmap)
     for ( i = 1; i < 1000; i += 12 ) {
+    for ( i; 1 ~ 10_000 ~ 12 ) {
                 // initial N byte allocation
                 size_t s = i + default_mmap_start();                            // cross over point
                 char *area = (char *)calloc( 1, s );
+                size_t s = i + default_mmap_start();                    // cross over point
+                char * area = (char *)calloc( 1, s );
                 if ( area == 0 ) abort( "calloc/realloc/free out of memory" );
                 if ( area[0] != '\0' || area[s - 1] != '\0' ||
 …
                 // Do not start this loop index at 0 because realloc of 0 bytes frees the storage.
                 for ( int r = i; r < 256 * 1024; r += 26 ) {    // start at initial memory request
                         area = (char *)realloc( area, r );              // attempt to reuse storage
+                for ( r; i ~ 256 * 1024 ~ 26 ) {                                // start at initial memory request
+                        area = (char *)realloc( area, r );                      // attempt to reuse storage
                         if ( area == 0 ) abort( "calloc/realloc/free out of memory" );
                         if ( area[0] != '\0' || area[r - 1] != '\0' ||
 …
     size_t amount = 2;
     for ( size_t a = libAlign(); a <= limit; a += a ) { // generate powers of 2
+        for ( a; libAlign() ~= limit ~ a ) {                            // generate powers of 2
                 // initial N byte allocation
                 char *area = (char *)memalign( a, amount );             // aligned N-byte allocation
+                char * area = (char *)memalign( a, amount );    // aligned N-byte allocation
                 if ( area == 0 ) abort( "memalign/realloc/free out of memory" ); // no storage ?
                 //sout | alignments[a] | " " | area | endl;
+                //sout | alignments[a] | " " | area;
                 if ( (size_t)area % a != 0 || malloc_alignment( area ) != a ) { // check for initial alignment
                         abort( "memalign/realloc/free bad alignment : memalign(%d,%d) = %p", (int)a, (int)amount, area );
 …
                 // Do not start this loop index at 0 because realloc of 0 bytes frees the storage.
                 for ( int s = amount; s < 256 * 1024; s += 1 ) { // start at initial memory request
+                for ( s; amount ~ 256 * 1024 ) {                                // start at initial memory request
                         if ( area[0] != '\345' || area[s - 2] != '\345' ) abort( "memalign/realloc/free corrupt storage" );
                         area = (char *)realloc( area, s );                      // attempt to reuse storage
                         if ( area == 0 ) abort( "memalign/realloc/free out of memory" ); // no storage ?
                         //sout | i | " " | area | endl;
+                        //sout | i | " " | area;
                         if ( (size_t)area % a != 0 ) {                          // check for initial alignment
                                 abort( "memalign/realloc/free bad alignment %p", area );
 …
     // check cmemalign/free
     for ( size_t a = libAlign(); a <= limit; a += a ) { // generate powers of 2
                 //sout | alignments[a] | endl;
                 for ( int s = 1; s < limit; s += 1 ) {                  // allocation of size 0 can return null
                         char *area = (char *)cmemalign( a, 1, s );
+        for ( a; libAlign() ~= limit ~ a ) {                            // generate powers of 2
+                //sout | alignments[a];
+                for ( s; 1 ~ limit ) {                                                  // allocation of size 0 can return null
+                        char * area = (char *)cmemalign( a, 1, s );
                         if ( area == 0 ) abort( "cmemalign/free out of memory" );
                         //sout | i | " " | area | endl;
+                        //sout | i | " " | area;
                         if ( (size_t)area % a != 0 || malloc_alignment( area ) != a ) { // check for initial alignment
                                 abort( "cmemalign/free bad alignment : cmemalign(%d,%d) = %p", (int)a, s, area );
 …
     amount = 2;
     for ( size_t a = libAlign() + libAlign(); a <= limit; a += a ) { // generate powers of 2
+        for ( a; libAlign() ~= limit ~ a ) {                            // generate powers of 2
                 // initial N byte allocation
                 char *area = (char *)cmemalign( a, 1, amount ); // aligned N-byte allocation
+                char * area = (char *)cmemalign( a, 1, amount ); // aligned N-byte allocation
                 if ( area == 0 ) abort( "cmemalign/realloc/free out of memory" ); // no storage ?
                 //sout | alignments[a] | " " | area | endl;
+                //sout | alignments[a] | " " | area;
                 if ( (size_t)area % a != 0 || malloc_alignment( area ) != a ) { // check for initial alignment
                         abort( "cmemalign/realloc/free bad alignment : cmemalign(%d,%d) = %p", (int)a, (int)amount, area );
 …
                 // Do not start this loop index at 0 because realloc of 0 bytes frees the storage.
                 for ( int s = amount; s < 256 * 1024; s += 1 ) { // start at initial memory request
+                for ( s; amount ~ 256 * 1024 ) {                                // start at initial memory request
                         if ( area[0] != '\345' || area[s - 2] != '\345' ) abort( "cmemalign/realloc/free corrupt storage2" );
                         area = (char *)realloc( area, s );                      // attempt to reuse storage
                         if ( area == 0 ) abort( "cmemalign/realloc/free out of memory" ); // no storage ?
                         //sout | i | " " | area | endl;
+                        //sout | i | " " | area;
                         if ( (size_t)area % a != 0 || malloc_alignment( area ) != a ) { // check for initial alignment
                                 abort( "cmemalign/realloc/free bad alignment %p", area );
 …
                 free( area );
     } // for
         //sout | "worker" | thisTask() | "successful completion" | endl;
+        //sout | "worker" | thisTask() | "successful completion";
 } // Worker main
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa -nodebug -O2 heap.c" //
+// compile-command: "cfa -nodebug -O2 heap.cfa" //
 // End: //

tests/identFuncDeclarator.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // identFuncDeclarator.c --
+// identFuncDeclarator.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 17 08:36:34 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jan 17 22:39:13 2018
 // Update Count     : 2
+// Last Modified On : Tue Nov  6 17:56:33 2018
+// Update Count     : 3
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa identFuncDeclarator.c" //
+// compile-command: "cfa identFuncDeclarator.cfa" //
 // End: //

tests/identParamDeclarator.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // identParamDeclarator.c --
+// identParamDeclarator.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 17 08:37:56 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jan 17 22:36:11 2018
 // Update Count     : 2
+// Last Modified On : Tue Nov  6 17:56:44 2018
+// Update Count     : 3
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa identParamDeclarator.c" //
+// compile-command: "cfa identParamDeclarator.cfa" //
 // End: //

tests/ifwhileCtl.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // ifwhileCtl.c --
+// ifwhileCtl.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Sat Aug 26 10:13:11 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jun  6 17:15:09 2018
 // Update Count     : 21
+// Last Modified On : Tue Dec  4 21:39:18 2018
+// Update Count     : 23
 //
 …
         if ( int x = 1 ) {
                 sout | "x != 0 correct" | endl;
+                sout | "x != 0 correct";
         } else {
                 sout | "x == 0 incorrect" | endl;
+                sout | "x == 0 incorrect";
         } // if
         if ( int x = 4, y = 0 ) {
                 sout | "x != 0 && y != 0 incorrect" | endl;
+                sout | "x != 0 && y != 0 incorrect";
         } else if ( int x = 4, y = 1 ) {
                 sout | "x != 0 && y != 0 correct" | endl;
+                sout | "x != 0 && y != 0 correct";
         } else {
                 sout | "x == 0 || y == 0 incorrect" | endl;
+                sout | "x == 0 || y == 0 incorrect";
         } // if
         if ( int x = 5, y = f( x ); x == y ) {
                 sout | "x == y correct" | endl;
+                sout | "x == y correct";
         } else {
                 sout | "x != y incorrect" | endl;
+                sout | "x != y incorrect";
         } // if
         if ( struct S { int i; } s = { 3 }; s.i < 4 ) {
                 S s1;
                 sout | "s.i < 4 correct" | endl;
+                sout | "s.i < 4 correct";
         } else {
                 S s1;
                 sout | "s.i >= 4 incorrect" | endl;
+                sout | "s.i >= 4 incorrect";
         } // if
         while ( int x = 1 ) {
                 sout | "x != 0 correct" | endl;
+                sout | "x != 0 correct";
                 break;
         } // while
         while ( int x = 4, y = 0 ) {
                 sout | "x != 0 && y != 0 incorrect" | endl;
+                sout | "x != 0 && y != 0 incorrect";
         } // while
         while ( int x = 5, y = f( x ); x == y ) {
                 sout | "x == y correct" | endl;
+                sout | "x == y correct";
                 break;
         } // while
 …
         while ( struct S { int i; } s = { 3 }; s.i < 4 ) {
                 S s1;
                 sout | "s.i < 4 correct" | endl;
+                sout | "s.i < 4 correct";
                 break;
         } // while
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa ifwhileCtl.c" //
+// compile-command: "cfa ifwhileCtl.cfa" //
 // End: //

tests/labelledExit.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // labelledExit.c --
+// labelledExit.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 10 07:29:39 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 16 08:55:39 2018
 // Update Count     : 3
+// Last Modified On : Tue Nov  6 17:57:42 2018
+// Update Count     : 4
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa labelledExit.c" //
+// compile-command: "cfa labelledExit.cfa" //
 // End: //

tests/limits.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // limits.c --
+// limits.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Tue May 10 20:44:20 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  1 16:21:55 2018
 // Update Count     : 7
+// Last Modified On : Tue Nov  6 17:57:55 2018
+// Update Count     : 8
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa limits.c" //
+// compile-command: "cfa limits.cfa" //
 // End: //

tests/literals.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // literals.c --
+// literals.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  9 16:34:38 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Jul  1 15:12:15 2018
 // Update Count     : 137
+// Last Modified On : Tue Dec  4 21:44:01 2018
+// Update Count     : 139
 //
 …
 #include <fstream.hfa>
 void f( char v ) { sout | "char " | v | endl; }
 void f( signed char v ) { sout | "signed char " | v | endl; }
 void f( unsigned char v ) { sout | "unsigned char " | v | endl; }
 void f( signed short v ) { sout | "signed short int" | v | endl; }
 void f( unsigned short v ) { sout | "unsigned short int" | v | endl; }
 void f( size_t v ) { sout | "size_t" | v | endl; }
+void f( char v ) { sout | "char " | v; }
+void f( signed char v ) { sout | "signed char " | v; }
+void f( unsigned char v ) { sout | "unsigned char " | v; }
+void f( signed short v ) { sout | "signed short int" | v; }
+void f( unsigned short v ) { sout | "unsigned short int" | v; }
+void f( size_t v ) { sout | "size_t" | v; }
 #endif // __CFA__
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa literals.c" //
+// compile-command: "cfa literals.cfa" //
 // End: //

tests/math1.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // math1.c --
+// math1.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Fri Apr 22 14:59:21 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu May 24 21:01:15 2018
 // Update Count     : 85
+// Last Modified On : Wed Dec 12 16:28:49 2018
+// Update Count     : 89
 //
 …
         long double l;
+        sout | "fmod:" | 5.0F % -2.0F | fmod( 5.0F, -2.0F ) | 5.0D % -2.0D | fmod( 5.0D, -2.0D ) | 5.0L % -2.0L | fmod( 5.0L, -2.0L ) | endl;
+        sout | "remainder:" | remainder( 2.0F, 3.0F ) | remainder( 2.0D, 3.0D ) | remainder( 2.0L, 3.0L ) | endl;
+        sout | "fmod:" | 5.0F % -2.0F | fmod( 5.0F, -2.0F ) | 5.0D % -2.0D | nonl;
+        sout | fmod( 5.0D, -2.0D ) | 5.0L % -2.0L | fmod( 5.0L, -2.0L );
+        sout | "remainder:" | remainder( 2.0F, 3.0F ) | remainder( 2.0D, 3.0D ) | remainder( 2.0L, 3.0L );
         int quot;
         f = remquo( 3.6F, 0.5F, &quot );
         sout | "remquo:" | quot | f;
+        sout | "remquo:" | quot | f | nonl;
         d = remquo( 3.6D, 0.5F, &quot );
         sout | quot | d;
+        sout | quot | d | nonl;
         l = remquo( 3.6L, 0.5L, &quot );
         sout | quot | l | endl;
         sout | "div:" | div( 3.6F, 0.5F ) | div( 3.6D, 0.5D ) | div( 3.6L, 0.5L ) | endl;
         sout | "fma:" | fma( 3.0F, -1.0F, 1.0F ) | fma( 3.0D, -1.0D, 1.0D ) | fma( 3.0L, -1.0L, , 1.0L ) | endl;
         sout | "fdim:" | fdim( 1.0F, -1.0F ) | fdim( 1.0D, -1.0D ) | fdim( 1.0L, -1.0L ) | endl;
         sout | "nan:" | (float)nan( "" ) | (double)nan( "" ) | (long double)nan( "" ) | endl;
+        sout | quot | l;
+        sout | "div:" | div( 3.6F, 0.5F ) | div( 3.6D, 0.5D ) | div( 3.6L, 0.5L );
+        sout | "fma:" | fma( 3.0F, -1.0F, 1.0F ) | fma( 3.0D, -1.0D, 1.0D ) | fma( 3.0L, -1.0L, , 1.0L );
+        sout | "fdim:" | fdim( 1.0F, -1.0F ) | fdim( 1.0D, -1.0D ) | fdim( 1.0L, -1.0L );
+        sout | "nan:" | (float)nan( "" ) | (double)nan( "" ) | (long double)nan( "" );
         //---------------------- Exponential ----------------------
+        sout | "exp:" | exp( 1.0F ) | exp( 1.0D ) | exp( 1.0L ) | exp( 1.0F+1.0FI ) | exp( 1.0D+1.0DI ) | exp( 1.0DL+1.0LI ) | endl;
+        sout | "exp2:" | exp2( 1.0F ) | exp2( 1.0D ) | exp2( 1.0L ) | endl;
+        sout | "expm1:" | expm1( 1.0F ) | expm1( 1.0D ) | expm1( 1.0L ) | endl;
+        sout | "pow:" | pow( 1.0F, 1.0F ) | pow( 1.0D, 1.0D ) | pow( 1.0L, 1.0L ) | pow( 1.0F+1.0FI, 1.0F+1.0FI ) | pow( 1.0D+1.0DI, 1.0D+1.0DI ) | pow( 1.5DL+1.5LI, 1.5DL+1.5LI ) | endl;
+        sout | "exp:" | exp( 1.0F ) | exp( 1.0D ) | exp( 1.0L ) | nonl;
+        sout | exp( 1.0F+1.0FI ) | exp( 1.0D+1.0DI ) | exp( 1.0DL+1.0LI );
+        sout | "exp2:" | exp2( 1.0F ) | exp2( 1.0D ) | exp2( 1.0L );
+        sout | "expm1:" | expm1( 1.0F ) | expm1( 1.0D ) | expm1( 1.0L );
+        sout | "pow:" | pow( 1.0F, 1.0F ) | pow( 1.0D, 1.0D ) | pow( 1.0L, 1.0L ) | nonl;
+        sout | pow( 1.0F+1.0FI, 1.0F+1.0FI ) | pow( 1.0D+1.0DI, 1.0D+1.0DI ) | pow( 1.5DL+1.5LI, 1.5DL+1.5LI );
         int b = 4;
         unsigned int e = 2;
     b \= e;
+    sout | "\\" | b | b \ e | endl;
+    sout | "\\" | 'a' \ 3u | 2 \ 8u | 4 \ 3u | -4 \ 3u | 4 \ -3 | -4 \ -3 | 4.0 \ 2.1 | (1.0f+2.0fi) \ (3.0f+2.0fi) | endl;
+    sout | "\\" | b | b \ e;
+    sout | "\\" | 'a' \ 3u | 2 \ 8u | 4 \ 3u | -4 \ 3u | nonl;
+        sout | 4 \ -3 | -4 \ -3 | 4.0 \ 2.1 | (1.0f+2.0fi) \ (3.0f+2.0fi);
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa math1.c" //
+// compile-command: "cfa math1.cfa" //
 // End: //

tests/math3.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // math3.c --
+// math3.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Fri Apr 22 14:59:21 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu May 24 21:06:12 2018
 // Update Count     : 82
+// Last Modified On : Wed Dec 12 16:30:41 2018
+// Update Count     : 86
 //
 …
         //---------------------- Hyperbolic ----------------------
+        sout | "sinh:" | sinh( 1.0F ) | sinh( 1.0D ) | sinh( 1.0L ) | sinh( 1.0F+1.0FI ) | sinh( 1.0D+1.0DI ) | sinh( 1.0DL+1.0LI ) | endl;
+        sout | "cosh:" | cosh( 1.0F ) | cosh( 1.0D ) | cosh( 1.0L ) | cosh( 1.0F+1.0FI ) | cosh( 1.0D+1.0DI ) | cosh( 1.0DL+1.0LI ) | endl;
+        sout | "tanh:" | tanh( 1.0F ) | tanh( 1.0D ) | tanh( 1.0L ) | tanh( 1.0F+1.0FI ) | tanh( 1.0D+1.0DI ) | tanh( 1.0DL+1.0LI ) | endl;
+        sout | "acosh:" | acosh( 1.0F ) | acosh( 1.0D ) | acosh( 1.0L ) | acosh( 1.0F+1.0FI ) | acosh( 1.0D+1.0DI ) | acosh( 1.0DL+1.0LI ) | endl;
+        sout | "asinh:" | asinh( 1.0F ) | asinh( 1.0D ) | asinh( 1.0L ) | asinh( 1.0F+1.0FI ) | asinh( 1.0D+1.0DI ) | asinh( 1.0DL+1.0LI ) | endl;
+        sout | "atanh:" | atanh( 1.0F ) | atanh( 1.0D ) | atanh( 1.0L ) | atanh( 1.0F+1.0FI ) | atanh( 1.0D+1.0DI ) | atanh( 1.0DL+1.0LI ) | endl;
+        sout | "sinh:" | sinh( 1.0F ) | sinh( 1.0D ) | sinh( 1.0L ) | nonl;
+        sout | sinh( 1.0F+1.0FI ) | sinh( 1.0D+1.0DI ) | sinh( 1.0DL+1.0LI );
+        sout | "cosh:" | cosh( 1.0F ) | cosh( 1.0D ) | cosh( 1.0L ) | nonl;
+        sout | cosh( 1.0F+1.0FI ) | cosh( 1.0D+1.0DI ) | cosh( 1.0DL+1.0LI );
+        sout | "tanh:" | tanh( 1.0F ) | tanh( 1.0D ) | tanh( 1.0L ) | nonl;
+        sout | tanh( 1.0F+1.0FI ) | tanh( 1.0D+1.0DI ) | tanh( 1.0DL+1.0LI );
+        sout | "acosh:" | acosh( 1.0F ) | acosh( 1.0D ) | acosh( 1.0L ) | nonl;
+        sout | acosh( 1.0F+1.0FI ) | acosh( 1.0D+1.0DI ) | acosh( 1.0DL+1.0LI );
+        sout | "asinh:" | asinh( 1.0F ) | asinh( 1.0D ) | asinh( 1.0L ) | nonl;
+        sout | asinh( 1.0F+1.0FI ) | asinh( 1.0D+1.0DI ) | asinh( 1.0DL+1.0LI );
+        sout | "atanh:" | atanh( 1.0F ) | atanh( 1.0D ) | atanh( 1.0L ) | nonl;
+        sout | atanh( 1.0F+1.0FI ) | atanh( 1.0D+1.0DI ) | atanh( 1.0DL+1.0LI );
         //---------------------- Error / Gamma ----------------------
         sout | "erf:" | erf( 1.0F ) | erf( 1.0D ) | erf( 1.0L ) | endl;
         sout | "erfc:" | erfc( 1.0F ) | erfc( 1.0D ) | erfc( 1.0L ) | endl;
         sout | "lgamma:" | lgamma( 4.0F ) | lgamma( 4.0D ) | lgamma( 4.0L ) | endl;
+        sout | "erf:" | erf( 1.0F ) | erf( 1.0D ) | erf( 1.0L );
+        sout | "erfc:" | erfc( 1.0F ) | erfc( 1.0D ) | erfc( 1.0L );
+        sout | "lgamma:" | lgamma( 4.0F ) | lgamma( 4.0D ) | lgamma( 4.0L );
         int sign;
         f = lgamma( 4.0F, &sign );
         sout | "lgamma:" | f | sign;
+        sout | "lgamma:" | f | sign | nonl;
         d = lgamma( 4.0D, &sign );
         sout | d | sign;
+        sout | d | sign | nonl;
         l = lgamma( 4.0L, &sign );
         sout | l | sign | endl;
         sout | "tgamma:" | tgamma( 4.0F ) | tgamma( 4.0D ) | tgamma( 4.0L ) | endl;
+        sout | l | sign;
+        sout | "tgamma:" | tgamma( 4.0F ) | tgamma( 4.0D ) | tgamma( 4.0L );
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa math3.c" //
+// compile-command: "cfa math3.cfa" //
 // End: //

tests/math4.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // math4.c --
+// math4.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Thu May 24 20:56:54 2018
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu May 24 20:58:06 2018
 // Update Count     : 2
+// Last Modified On : Tue Dec  4 18:15:01 2018
+// Update Count     : 4
 //
 …
         //---------------------- Nearest Integer ----------------------
         sout | "floor:" | floor( 1.2F ) | floor( 1.2D ) | floor( 1.2L ) | endl;
         sout | "ceil:" | ceil( 1.6F ) | ceil( 1.6D ) | ceil( 1.6L ) | endl;
         sout | "trunc:" | trunc( 3.5F ) | trunc( 3.5D ) | trunc( 3.5L ) | endl;
         sout | "rint:" | (float)rint( 1.5F ) | (double)rint( 1.5D ) | (long double)rint( 1.5L ) | endl;
         sout | "rint:" | (long int)rint( 1.5F ) | (long int)rint( 1.5D ) | (long int)rint( 1.5L ) | endl;
         sout | "rint:" | (long long int)rint( 1.5F ) | (long long int)rint( 1.5D ) | (long long int)rint( 1.5L ) | endl;
         sout | "lrint:" | lrint( 1.5F ) | lrint( 1.5D ) | lrint( 1.5L ) | endl;
         sout | "llrint:" | llrint( 1.5F ) | llrint( 1.5D ) | llrint( 1.5L ) | endl;
         sout | "nearbyint:" | nearbyint( 3.5F ) | nearbyint( 3.5D ) | nearbyint( 3.5L ) | endl;
         sout | "round:" | (float)round( 1.5F ) | (double)round( 1.5D ) | (long double)round( 1.5L ) | endl;
         sout | "round:" | (long int)round( 1.5F ) | (long int)round( 1.5D ) | (long int)round( 1.5L ) | endl;
         sout | "round:" | (long long int)round( 1.5F ) | (long long int)round( 1.5D ) | (long long int)round( 1.5L ) | endl;
         sout | "lround:" | lround( 1.5F ) | lround( 1.5D ) | lround( 1.5L ) | endl;
         sout | "llround:" | llround( 1.5F ) | llround( 1.5D ) | llround( 1.5L ) | endl;
+        sout | "floor:" | floor( 1.2F ) | floor( 1.2D ) | floor( 1.2L );
+        sout | "ceil:" | ceil( 1.6F ) | ceil( 1.6D ) | ceil( 1.6L );
+        sout | "trunc:" | trunc( 3.5F ) | trunc( 3.5D ) | trunc( 3.5L );
+        sout | "rint:" | (float)rint( 1.5F ) | (double)rint( 1.5D ) | (long double)rint( 1.5L );
+        sout | "rint:" | (long int)rint( 1.5F ) | (long int)rint( 1.5D ) | (long int)rint( 1.5L );
+        sout | "rint:" | (long long int)rint( 1.5F ) | (long long int)rint( 1.5D ) | (long long int)rint( 1.5L );
+        sout | "lrint:" | lrint( 1.5F ) | lrint( 1.5D ) | lrint( 1.5L );
+        sout | "llrint:" | llrint( 1.5F ) | llrint( 1.5D ) | llrint( 1.5L );
+        sout | "nearbyint:" | nearbyint( 3.5F ) | nearbyint( 3.5D ) | nearbyint( 3.5L );
+        sout | "round:" | (float)round( 1.5F ) | (double)round( 1.5D ) | (long double)round( 1.5L );
+        sout | "round:" | (long int)round( 1.5F ) | (long int)round( 1.5D ) | (long int)round( 1.5L );
+        sout | "round:" | (long long int)round( 1.5F ) | (long long int)round( 1.5D ) | (long long int)round( 1.5L );
+        sout | "lround:" | lround( 1.5F ) | lround( 1.5D ) | lround( 1.5L );
+        sout | "llround:" | llround( 1.5F ) | llround( 1.5D ) | llround( 1.5L );
         //---------------------- Manipulation ----------------------
         sout | "copysign:" | copysign( 1.0F, -1.0F ) | copysign( 1.0D, -1.0D ) | copysign( 1.0L, -1.0L ) | endl;
+        sout | "copysign:" | copysign( 1.0F, -1.0F ) | copysign( 1.0D, -1.0D ) | copysign( 1.0L, -1.0L );
         int exp;
         f = frexp( 4.0F, &exp );
         sout | "frexp:" | f | exp;
+        sout | "frexp:" | f | exp | nonl;
         d = frexp( 4.0D, &exp );
         sout | d | exp;
+        sout | d | exp | nonl;
         l = frexp( 4.0L, &exp );
         sout | l | exp | endl;
         sout | "ldexp:" | ldexp( 2.0F, 2 ) | ldexp( 2.0D, 2 ) | ldexp( 2.0L, 2 ) | endl;
+        sout | l | exp;
+        sout | "ldexp:" | ldexp( 2.0F, 2 ) | ldexp( 2.0D, 2 ) | ldexp( 2.0L, 2 );
         float fi;
         double di;
         long double ldi;
         f = modf( 2.3F, &fi );
         sout | "modf:" | fi | f;
+        sout | "modf:" | fi | f | nonl;
         d = modf( 2.3D, &di );
         sout | di | d;
+        sout | di | d | nonl;
         l = modf( 2.3L, &ldi );
         sout | ldi | l | endl;
         sout | "modf:" | modf( 2.3F ) | modf( 2.3D ) | modf( 2.3L ) | endl;
         sout | "nextafter:" | nextafter( 2.0F, 3.0F ) | nextafter( 2.0D, 3.0D ) | nextafter( 2.0L, 3.0L ) | endl;
         sout | "nexttoward:" | nexttoward( 2.0F, 3.0F ) | nexttoward( 2.0D, 3.0D ) | nexttoward( 2.0L, 3.0L ) | endl;
+        sout | ldi | l;
+        sout | "modf:" | modf( 2.3F ) | modf( 2.3D ) | modf( 2.3L );
+        sout | "nextafter:" | nextafter( 2.0F, 3.0F ) | nextafter( 2.0D, 3.0D ) | nextafter( 2.0L, 3.0L );
+        sout | "nexttoward:" | nexttoward( 2.0F, 3.0F ) | nexttoward( 2.0D, 3.0D ) | nexttoward( 2.0L, 3.0L );
         sout | "scalbn:" | scalbn( 2.0F, 3 ) | scalbn( 2.0D, 3 ) | scalbn( 2.0L, 3 ) | endl;
         sout | "scalbln:" | scalbln( 2.0F, 3L ) | scalbln( 2.0D, 3L ) | scalbln( 2.0L, 3L ) | endl;
+        sout | "scalbn:" | scalbn( 2.0F, 3 ) | scalbn( 2.0D, 3 ) | scalbn( 2.0L, 3 );
+        sout | "scalbln:" | scalbln( 2.0F, 3L ) | scalbln( 2.0D, 3L ) | scalbln( 2.0L, 3L );
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa math3.c" //
+// compile-command: "cfa math3.cfa" //
 // End: //

tests/minmax.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // minmax.c --
+// minmax.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Apr 10 17:29:09 2018
 // Update Count     : 50
+// Last Modified On : Tue Dec  4 21:45:31 2018
+// Update Count     : 52
 //
 …
         int ?>?( char op1, char op2 ) { return (int)op1 > (int)op2; }
         sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' ) | endl;
         sout | "signed int\t\t"                         | 4 | 3 | "\tmin" | min( 4, 3 ) | endl;
         sout | "unsigned int\t\t"                       | 4u | 3u | "\tmin" | min( 4u, 3u ) | endl;
         sout | "signed long int\t\t"            | 4l | 3l | "\tmin" | min( 4l, 3l ) | endl;
         sout | "unsigned long int\t"            | 4ul | 3ul | "\tmin" | min( 4ul, 3ul ) | endl;
         sout | "signed long long int\t"         | 4ll | 3ll | "\tmin" | min( 4ll, 3ll ) | endl;
         sout | "unsigned long long int\t"       | 4ull | 3ull | "\tmin" | min( 4ull, 3ull ) | endl;
         sout | "float\t\t\t"                            | 4.0f | 3.1f | "\tmin" | min( 4.0f, 3.1f ) | endl;
         sout | "double\t\t\t"                           | 4.0 | 3.1 | "\tmin" | min( 4.0, 3.1 ) | endl;
         sout | "long double\t\t"                        | 4.0l | 3.1l | "\tmin" | min( 4.0l, 3.1l ) | endl;
+        sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' );
+        sout | "signed int\t\t"                         | 4 | 3 | "\tmin" | min( 4, 3 );
+        sout | "unsigned int\t\t"                       | 4u | 3u | "\tmin" | min( 4u, 3u );
+        sout | "signed long int\t\t"            | 4l | 3l | "\tmin" | min( 4l, 3l );
+        sout | "unsigned long int\t"            | 4ul | 3ul | "\tmin" | min( 4ul, 3ul );
+        sout | "signed long long int\t"         | 4ll | 3ll | "\tmin" | min( 4ll, 3ll );
+        sout | "unsigned long long int\t"       | 4ull | 3ull | "\tmin" | min( 4ull, 3ull );
+        sout | "float\t\t\t"                            | 4.0f | 3.1f | "\tmin" | min( 4.0f, 3.1f );
+        sout | "double\t\t\t"                           | 4.0 | 3.1 | "\tmin" | min( 4.0, 3.1 );
+        sout | "long double\t\t"                        | 4.0l | 3.1l | "\tmin" | min( 4.0l, 3.1l );
         sout | endl;
+        sout | nl;
         sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmax " | max( 'z', 'a' ) | endl;
         sout | "signed int\t\t"                         | 4 | 3 | "\tmax" | max( 4, 3 ) | endl;
         sout | "unsigned int\t\t"                       | 4u | 3u | "\tmax" | max( 4u, 3u ) | endl;
         sout | "signed long int\t\t"            | 4l | 3l | "\tmax" | max( 4l, 3l ) | endl;
         sout | "unsigned long int\t"            | 4ul | 3ul | "\tmax" | max( 4ul, 3ul ) | endl;
         sout | "signed long long int\t"         | 4ll | 3ll | "\tmax" | max( 4ll, 3ll ) | endl;
         sout | "unsigned long long int\t"       | 4ull | 3ull | "\tmax" | max( 4ull, 3ull ) | endl;
         sout | "float\t\t\t"                            | 4.0f | 3.1f | "\tmax" | max( 4.0f, 3.1f ) | endl;
         sout | "double\t\t\t"                           | 4.0 | 3.1 | "\tmax" | max( 4.0, 3.1 ) | endl;
         sout | "long double\t\t"                        | 4.0l | 3.1l | "\tmax" | max( 4.0l, 3.1l ) | endl;
+        sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmax " | max( 'z', 'a' );
+        sout | "signed int\t\t"                         | 4 | 3 | "\tmax" | max( 4, 3 );
+        sout | "unsigned int\t\t"                       | 4u | 3u | "\tmax" | max( 4u, 3u );
+        sout | "signed long int\t\t"            | 4l | 3l | "\tmax" | max( 4l, 3l );
+        sout | "unsigned long int\t"            | 4ul | 3ul | "\tmax" | max( 4ul, 3ul );
+        sout | "signed long long int\t"         | 4ll | 3ll | "\tmax" | max( 4ll, 3ll );
+        sout | "unsigned long long int\t"       | 4ull | 3ull | "\tmax" | max( 4ull, 3ull );
+        sout | "float\t\t\t"                            | 4.0f | 3.1f | "\tmax" | max( 4.0f, 3.1f );
+        sout | "double\t\t\t"                           | 4.0 | 3.1 | "\tmax" | max( 4.0, 3.1 );
+        sout | "long double\t\t"                        | 4.0l | 3.1l | "\tmax" | max( 4.0l, 3.1l );
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa minmax.c" //
+// compile-command: "cfa minmax.cfa" //
 // End: //

tests/nested-types.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // nested-types.c --
+// nested-types.cfa --
 //
 // Author           : Rob Schluntz
 // Created On       : Mon Jul 9 10:20:03 2018
 // Last Modified By : Rob Schluntz
 // Last Modified On : Mon Jul 9 10:20:03 2017
 // Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Nov  6 17:59:40 2018
+// Update Count     : 2
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa nested-types.c" //
+// compile-command: "cfa nested-types.cfa" //
 // End: //

tests/numericConstants.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // numericConstants.c --
+// numericConstants.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 24 22:10:36 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed May 24 22:11:36 2017
 // Update Count     : 2
+// Last Modified On : Tue Nov  6 17:59:53 2018
+// Update Count     : 3
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa minmax.c" //
+// compile-command: "cfa minmax.cfa" //
 // End: //

tests/polymorphism.cfa

-              r9b086ca
+              rcde3891
 // Author           : Rob Schluntz
 // Created On       : Tue Oct 17 12:19:48 2017
 // Last Modified By : Rob Schluntz
 // Last Modified On : Tue Oct 17 12:21:07 2017
 // Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Dec 25 14:40:24 2018
+// Update Count     : 3
 //
 #include <assert.h>
 #include <inttypes.h>
+#include <fstream.hfa>
 forall(otype T)
 …
                 int y = 456;
                 int z = f(x, y);
                 printf("%d %d %d\n", x, y, z);
+                sout | x | y | z;
+        }
+        {
                 // explicitly specialize function
                 int (*f)(int) = ident;
                 ((int(*)(int))ident);
                 printf("%d %d\n", f(5), ((int(*)(int))ident)(5));
+                sout | f(5) | ((int(*)(int))ident)(5);
+        }
+        {
                 // test aggregates with polymorphic members
 …
                 void print(x_type x) {
                         printf("%"PRIu32"\n", x);
+                        sout | x;
+                }
                 void print(y_type y) {
                         printf("%"PRIu64"\n", y);
+                        sout | y;
+                }

tests/preempt_longrun/Makefile.am

r9b086ca	rcde3891
16	16
17	17	AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names
	18	ACLOCAL_AMFLAGS = -I automake
18	19
19	20	repeats=10

tests/preempt_longrun/Makefile.in

-              r9b086ca
+              rcde3891
 subdir = tests/preempt_longrun
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+        $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
+        $(top_srcdir)/automake/ltoptions.m4 \
+        $(top_srcdir)/automake/ltsugar.m4 \
+        $(top_srcdir)/automake/ltversion.m4 \
+        $(top_srcdir)/automake/lt~obsolete.m4 \
+        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 …
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BACKEND_CC = @BACKEND_CC@
 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @CFACC@
 …
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 …
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
 HOST_FLAGS = @HOST_FLAGS@
 …
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 …
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 …
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 …
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 …
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS = -I automake
 repeats = 10
 max_time = 600
 …
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+mostlyclean-libtool:
+        -rm -f *.lo
+clean-libtool:
+        -rm -rf .libs _libs
 tags TAGS:
 …
 clean: clean-am
 clean-am: clean-generic clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 distclean: distclean-am
 …
 mostlyclean: mostlyclean-am
 mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 pdf: pdf-am
 …
 .PHONY: all all-am all-local check check-TESTS check-am clean \
+        clean-generic clean-local cscopelist-am ctags-am distclean \
+        distclean-generic distdir dvi dvi-am html html-am info info-am \
+        install install-am install-data install-data-am install-dvi \
+        install-dvi-am install-exec install-exec-am install-html \
+        install-html-am install-info install-info-am install-man \
+        install-pdf install-pdf-am install-ps install-ps-am \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-generic pdf pdf-am ps ps-am recheck tags-am \
+        clean-generic clean-libtool clean-local cscopelist-am ctags-am \
+        distclean distclean-generic distclean-libtool distdir dvi \
+        dvi-am html html-am info info-am install install-am \
+        install-data install-data-am install-dvi install-dvi-am \
+        install-exec install-exec-am install-html install-html-am \
+        install-info install-info-am install-man install-pdf \
+        install-pdf-am install-ps install-ps-am install-strip \
+        installcheck installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-generic \
+        mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \
         uninstall uninstall-am

tests/preempt_longrun/create.c

r9b086ca	rcde3891
3	3	#include <time.hfa>
4	4
5		#include "long_tests.h"
	5	#include "long_tests.hfa"
6	6
7	7	#ifndef PREEMPTION_RATE

tests/preempt_longrun/enter3.c

r9b086ca	rcde3891
5	5
6	6	#define __kick_rate 75000ul
7		#include "long_tests.h"
	7	#include "long_tests.hfa"
8	8
9	9	#ifndef PREEMPTION_RATE

tests/preempt_longrun/processor.c

r9b086ca	rcde3891
5	5	#include <unistd.h>
6	6
7		#include "long_tests.h"
	7	#include "long_tests.hfa"
8	8
9	9	#ifndef PREEMPTION_RATE

tests/preempt_longrun/yield.c

r9b086ca	rcde3891
4	4
5	5	#define __kick_rate 550000ul
6		#include "long_tests.h"
	6	#include "long_tests.hfa"
7	7
8	8	#ifndef PREEMPTION_RATE

tests/pybin/tools.py

-              r9b086ca
+              rcde3891
 import __main__
 import argparse
+import fileinput
 import multiprocessing
 import os
 import re
+import resource
 import signal
 import stat
 import sys
 import fileinput
+import time
 from pybin import settings
 …
 def diff( lhs, rhs ):
         # diff the output of the files
+        diff_cmd = ("diff --ignore-all-space --text "
+                                "--ignore-blank-lines "
+        diff_cmd = ("diff --text "
+#                               "--ignore-all-space "
+#                               "--ignore-blank-lines "
                                 "--old-group-format='\t\tmissing lines :\n"
                                 "%%<' \\\n"
 …
     return None
+def run(exe, output, input):
+        ret, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe, output), input = input)
+        return ret
 ################################################################################
 #               file handling
 ################################################################################
+# move a file
+def mv(source, dest):
+        ret, _ = sh("mv %s %s" % (source, dest))
+        return ret
+# cat one file into the other
+def cat(source, dest):
+        ret, _ = sh("cat %s > %s" % (source, dest))
+        return ret
 # helper function to replace patterns in a file
 …
                 signal.signal(signal.SIGINT, signal.SIG_IGN)
+# enable core dumps for all the test children
+resource.setrlimit(resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
 ################################################################################
 #               misc
 …
         if column:
                 cmd = "%s 2> /dev/null" % column
-                print(cmd)
                 proc = Popen(cmd, stdin=PIPE, stderr=None, shell=True)
                 proc.communicate(input=text)
+                proc.communicate(input=text + "\n")
         else:
                 print(text)
+def coreInfo(path):
+        cmd   = os.path.join(settings.SRCDIR, "pybin/print-core.gdb")
+        if not os.path.isfile(cmd):
+                return 1, "ERR Printing format for core dumps not found"
+        dname = os.path.dirname(path)
+        core  = os.path.join(dname, "core" )
+        if not os.path.isfile(path):
+                return 1, "ERR Executable path is wrong"
+        if not os.path.isfile(core):
+                return 1, "ERR No core dump"
+        return sh("gdb -n %s %s -batch -x %s" % (path, core, cmd), print2stdout=False)
+class Timed:
+    def __enter__(self):
+        self.start = time.time()
+        return self
+    def __exit__(self, *args):
+        self.end = time.time()
+        self.duration = self.end - self.start

tests/quotedKeyword.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // quoted_keyword.c -- test quoted keyword usage
+// quotedKeyword.cfa -- test quoted keyword usage
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun 30 14:03:59 2016
 // Update Count     : 19
+// Last Modified On : Tue Dec  4 21:45:53 2018
+// Update Count     : 23
 //
 …
         st.`struct` = 3;
         `throw` = 4;
         sout | `catch` + st.`otype` + st.`struct` + `throw` | endl;
+        sout | `catch` + st.`otype` + st.`struct` + `throw`;
+}
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa quoted_keyword.c" //
+// compile-command: "cfa quotedKeyword.cfa" //
 // End: //

tests/raii/.expect/ctor-autogen-ERR1.txt

-              r9b086ca
+              rcde3891
 raii/ctor-autogen.c:102:1 error: Unique best alternative includes deleted identifier in Cast of:
+raii/ctor-autogen.cfa:102:1 error: Unique best alternative includes deleted identifier in Cast of:
   Application of
     Deleted Expression
       Variable Expression: ?{}: static inline function
       ... with parameters
         _dst: reference to instance of struct Managed with body 1
+        _dst: reference to instance of struct Managed with body 1
         x: signed int
       ... returning nothing
+      ... returning nothing
       ... deleted by: ?{}: function
       ... with parameters
         m: reference to instance of struct Managed with body 1
       ... returning nothing
       ... with body
+        m: reference to instance of struct Managed with body 1
+      ... returning nothing
+      ... with body
         CompoundStmt
           Expression Statement:
 …
                 intrinsic reference to signed int
                 intrinsic signed int
               ... returning
+              ... returning
                 _retval__operator_assign: signed int
                 ... with attributes:
+                ... with attributes:
                   Attribute with name: unused
 …
             ... to arguments
               Cast of:
                 Member Expression, with field:
+                Member Expression, with field:
                   x: signed int
                 ... from aggregate:
+                ... from aggregate:
                   Cast of:
                     Variable Expression: m: reference to instance of struct Managed with body 1
+                    Variable Expression: m: reference to instance of struct Managed with body 1
                   ... to:
                     instance of struct Managed with body 1
+                    instance of struct Managed with body 1
               ... to:
                 reference to signed int
 …
   ... to arguments
     Cast of:
       Variable Expression: x: instance of struct Managed with body 1
+      Variable Expression: x: instance of struct Managed with body 1
     ... to:
       reference to instance of struct Managed with body 1
+      reference to instance of struct Managed with body 1
     constant expression (123 123: signed int)

tests/raii/.expect/dtor-early-exit-ERR1.txt

r9b086ca	rcde3891
1		raii/dtor-early-exit.c:150:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
	1	raii/dtor-early-exit.cfa:150:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
2	2	with target: L1
3	3	with original target: L1

tests/raii/.expect/dtor-early-exit-ERR2.txt

r9b086ca	rcde3891
1		raii/dtor-early-exit.c:214:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
	1	raii/dtor-early-exit.cfa:214:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
2	2	with target: L2
3	3	with original target: L2

tests/raii/.expect/memberCtors-ERR1.txt

r9b086ca	rcde3891
1		raii/memberCtors.c:92:1 error: in void ?{}(B &b), field a2 used before being constructed
	1	raii/memberCtors.cfa:92:1 error: in void ?{}(B &b), field a2 used before being constructed

tests/raii/dtor-early-exit.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Wed Aug 17 08:26:25 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Aug 11 07:58:39 2018
 // Update Count     : 8
+// Last Modified On : Fri Dec 21 08:45:19 2018
+// Update Count     : 10
 //
 …
 // don't want these called
 void ?{}(A & a) { assert( false ); }
 void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name | endl; a.x = (int*)malloc(); }
+void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name; a.x = (int*)malloc(); }
 void ?{}(A & a, const char * name, int * ptr) { assert( false ); }
 A ?=?(A & a, A b) {  sout | "assign " | a.name | " " | b.name; return a; }
 void ?{}(A & a, A b) { sout | "copy construct " | b.name | endl; a.x = (int*)malloc(); }
 void ^?{}(A & a) { sout | "destruct " | a.name | endl; free(a.x); }
+void ?{}(A & a, A b) { sout | "copy construct " | b.name; a.x = (int*)malloc(); }
+void ^?{}(A & a) { sout | "destruct " | a.name; free(a.x); }
 // test returns
 void f(int i) {
         sout | "f i=" | i | endl;
+        sout | "f i=" | i;
         A x = { "x" };  // construct x
+        {
 …
 void g() {
         for (int i = 0; i < 10; i++) {
                 sout | "g for i=" | i | endl;
+                sout | "g for i=" | i;
                 A x = { "x" };
                 // construct x
                 // destruct x
+        }
         sout | endl;
+        sout | nl;
+        {
                 int i = 0;
                 while (i < 10) {
                         sout | "g while i=" | i | endl;
+                        sout | "g while i=" | i;
                         A x = { "x" };
                         // construct x
 …
+                }
+        }
         sout | endl;
+        sout | nl;
         for (int i = 0; i < 10; i++) {
                 switch(10) {
 …
                         case 10: {
                                 A y = { "y" };
                                 sout | "g switch i=" | i | endl;
+                                sout | "g switch i=" | i;
                                 // construct y
                                 break; // destruct y
+                        }
                         default: {
                                 sout | "g switch i=" | i | endl;
+                                sout | "g switch i=" | i;
                                 A x = { "x" };
                                 // construct x
 …
+                }
+        }
         sout | endl;
+        sout | nl;
         for (int k = 0; k < 2; k++) {
                 sout | "g for k=" | k | endl;
+                sout | "g for k=" | k;
                 L1: for (int i = 0; i < 10; i++) {
                         sout | "g for i=" | i | endl;
+                        sout | "g for i=" | i;
                         A x = { "x" };
                         if (i == 2) {
                                 sout | "continue L1" | endl;
+                                sout | "continue L1";
                                 continue;  // destruct x
                         } else if (i == 3) {
                                 sout | "break L1" | endl;
+                                sout | "break L1";
                                 break;  // destruct x
+                        }
                         L2: for (int j = 0; j < 10; j++) {
                                 sout | "g for j=" | j | endl;
+                                sout | "g for j=" | j;
                                 A y = { "y" };
                                 if (j == 0) {
                                         sout | "continue L2" | endl;
+                                        sout | "continue L2";
                                         continue; // destruct y - missing because object that needs to be destructed is not a part of this block, it's a part of the for's block
                                 } else if (j == 1) {
                                         sout | "break L2" | endl;
+                                        sout | "break L2";
                                         break;  // destruct y
                                 } else if (i == 1) {
                                         sout | "continue L1" | endl;
+                                        sout | "continue L1";
                                         continue L1; // destruct x,y - note: continue takes you to destructors for block, so only generate destructor for y
                                 } else if (k == 1) {
                                         sout | "break L1" | endl;
+                                        sout | "break L1";
                                         break L1;  // destruct x,y
+                                }
 …
+        }
         sout | endl;
+        sout | nl;
         L3: if( 3 ) {
                 A w = { "w" };
                 if( 4 ) {
                         A v = { "v" };
                         sout | "break L3" | endl;
+                        sout | "break L3";
                         break L3;
+                }
 …
         // * if S_L-S_G is non-empty, error
         // * emit destructors for all variables in S_G-S_L
         sout | "h" | endl;
+        sout | "h";
+        {
                 L0: ;
 …
                         A y = { "y" };
                         // S_L1 = { y }
                 L1: sout | "L1" | endl;
+                L1: sout | "L1";
                         A x = { "x" };
                         // S_L2 = { y, x }
                 L2: sout | "L2" | endl;
+                L2: sout | "L2";
                         if (i == 0) {
                                 ++i;
                                 sout | "goto L1" | endl;
+                                sout | "goto L1";
                                 // S_G = { y, x }
                                 goto L1;  // jump back, destruct b/c before x definition
 …
                         } else if (i == 1) {
                                 ++i;
                                 sout | "goto L2" | endl;
+                                sout | "goto L2";
                                 // S_G = { y, x }
                                 goto L2;  // jump back, do not destruct
 …
                         } else if (i == 2) {
                                 ++i;
                                 sout | "goto L3" | endl;
+                                sout | "goto L3";
                                 // S_G = { y, x }
                                 goto L3;  // jump ahead, do not destruct
 …
                                 ++i;
                                 A z = { "z" };
                                 sout | "goto L3-2" | endl;
+                                sout | "goto L3-2";
                                 // S_G = { z, y, x }
                                 goto L3;
 …
                         } else {
                                 ++i;
                                 sout | "goto L4" | endl;
+                                sout | "goto L4";
                                 // S_G = { y, x }
                                 goto L4;  // jump ahead, destruct b/c left block x was defined in
 …
+                        }
                         // S_L3 = { y, x }
                 L3: sout | "L3" | endl;
                         sout | "goto L2-2" | endl;
+                L3: sout | "L3";
+                        sout | "goto L2-2";
                         // S_G = { y, x }
                         goto L2; // jump back, do not destruct
 …
+        }
         // S_L4 = {}
         L4: sout | "L4" | endl;
+        L4: sout | "L4";
         if (i == 4) {
                 sout | "goto L0" | endl;
+                sout | "goto L0";
                 // S_G = {}
                 goto L0;
 …
                 f(i);
+        }
         sout | endl;
+        sout | nl;
         g();
         sout | endl;
+        sout | nl;
         h();

tests/raii/globals.cfa

-              r9b086ca
+              rcde3891
 int main() {
         sout | "static\t\tinline\t\tautogen\t\tvalue" | endl;
+        sout | "static\t\tinline\t\tautogen\t\tvalue";
         sout | "no \t\tno \t\tno \t\t" | g.val.value    | endl;
         sout | "no \t\tno \t\tyes\t\t" | ga.val.value   | endl;
         sout | "no \t\tyes\t\tno \t\t" | gi.val.value   | endl;
         sout | "no \t\tyes\t\tyes\t\t" | gia.val.value  | endl;
         sout | "yes\t\tno \t\tno \t\t" | gs.val.value   | endl;
         sout | "yes\t\tno \t\tyes\t\t" | gsa.val.value  | endl;
         sout | "yes\t\tyes\t\tno \t\t" | gsi.val.value  | endl;
         sout | "yes\t\tyes\t\tyes\t\t" | gsia.val.value | endl;
+        sout | "no \t\tno \t\tno \t\t" | g.val.value;
+        sout | "no \t\tno \t\tyes\t\t" | ga.val.value;
+        sout | "no \t\tyes\t\tno \t\t" | gi.val.value;
+        sout | "no \t\tyes\t\tyes\t\t" | gia.val.value;
+        sout | "yes\t\tno \t\tno \t\t" | gs.val.value;
+        sout | "yes\t\tno \t\tyes\t\t" | gsa.val.value;
+        sout | "yes\t\tyes\t\tno \t\t" | gsi.val.value;
+        sout | "yes\t\tyes\t\tyes\t\t" | gsia.val.value;
+}

tests/random.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // random.c --
+// random.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Tue Jul  5 21:29:30 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Jan  2 12:19:34 2018
 // Update Count     : 19
+// Last Modified On : Tue Dec  4 21:46:25 2018
+// Update Count     : 22
 //
 #include <fstream.hfa>
 #include <stdlib.hfa>                                                                           // random
+#include <stdlib.hfa>                                                                   // random
 #include <unistd.h>                                                                             // getpid
 …
         // test polymorphic calls to random and stream
         char c = random();
         sout | c | endl;
+        sout | c;
         c = random( 'A' );
         sout | c | endl;
+        sout | c;
         c = random( 'A', 'Z' );
         sout | c | endl;
+        sout | c;
         int i = random();
     sout | i | endl;
+    sout | i;
         i = random( 10 );
     sout | i | endl;
+    sout | i;
         i = random( -10, 20 );
     sout | i | endl;
+    sout | i;
         unsigned int ui = random();
     sout | ui | endl;
+    sout | ui;
         ui = random( 10u );
     sout | ui | endl;
+    sout | ui;
         ui = random( 10u, 20u );
     sout | ui | endl;
+    sout | ui;
         long int li = random();
     sout | li | endl;
+    sout | li;
         li = random( 10l );
     sout | li | endl;
+    sout | li;
         li = random( -10l, 20l );
     sout | li | endl;
+    sout | li;
         unsigned long int uli = random();
     sout | uli | endl;
+    sout | uli;
         uli = random( 10ul );
     sout | uli | endl;
+    sout | uli;
         uli = random( 10ul, 20ul );
     sout | uli | endl;
+    sout | uli;
     float f = random();
     sout | f | endl;
+    sout | f;
     double d = random();
     sout | d | endl;
+    sout | d;
     float _Complex fc = random();
     sout | fc | endl;
+    sout | fc;
     double _Complex dc = random();
     sout | dc | endl;
+    sout | dc;
     long double _Complex ldc = random();
     sout | ldc | endl;
+    sout | ldc;
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa random.c" //
+// compile-command: "cfa random.cfa" //
 // End: //

tests/rational.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // rational.c -- test rational number package
+// rational.cfa -- test rational number package
 //
 // Author           : Peter A. Buhr
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Oct 10 23:25:04 2017
 // Update Count     : 67
+// Last Modified On : Tue Dec  4 21:46:42 2018
+// Update Count     : 69
 //
 …
 int main() {
         sout | "constructor" | endl;
+        sout | "constructor";
         Rational(int) a = { 3 }, b = { 4 }, c;
         sout | a | b | c | endl;
+        sout | a | b | c;
         a = (Rational(int)){ 4, 8 };
         b = (Rational(int)){ 5, 7 };
         sout | a | b | endl;
+        sout | a | b;
         a = (Rational(int)){ -2, -3 };
         b = (Rational(int)){ 3, -2 };
         sout | a | b | endl;
+        sout | a | b;
         a = (Rational(int)){ -2, 3 };
         b = (Rational(int)){ 3, 2 };
         sout | a | b | endl;
+        sout | a | b;
         sout | "logical" | endl;
+        sout | "logical";
         a = (Rational(int)){ -2 };
         b = (Rational(int)){ -3, 2 };
         sout | a | b | endl;
 //      sout | a == 1 | endl; // FIX ME
         sout | a != b | endl;
         sout | a <  b | endl;
         sout | a <= b | endl;
         sout | a >  b | endl;
         sout | a >= b | endl;
+        sout | a | b;
+//      sout | a == 1; // FIX ME
+        sout | a != b;
+        sout | a <  b;
+        sout | a <= b;
+        sout | a >  b;
+        sout | a >= b;
         sout | "arithmetic" | endl;
         sout | a | b | endl;
         sout | a + b | endl;
         sout | a - b | endl;
         sout | a * b | endl;
         sout | a / b | endl;
+        sout | "arithmetic";
+        sout | a | b;
+        sout | a + b;
+        sout | a - b;
+        sout | a * b;
+        sout | a / b;
         sout | "conversion" | endl;
+        sout | "conversion";
         a = (Rational(int)){ 3, 4 };
         sout | widen( a ) | endl;
+        sout | widen( a );
         a = (Rational(int)){ 1, 7 };
         sout | widen( a ) | endl;
+        sout | widen( a );
         a = (Rational(int)){ 355, 113 };
         sout | widen( a ) | endl;
         sout | narrow( 0.75, 4 ) | endl;
         sout | narrow( 0.14285714285714, 16 ) | endl;
         sout | narrow( 3.14159265358979, 256 ) | endl;
+        sout | widen( a );
+        sout | narrow( 0.75, 4 );
+        sout | narrow( 0.14285714285714, 16 );
+        sout | narrow( 3.14159265358979, 256 );
         sout | "decompose" | endl;
+        sout | "decompose";
         int n, d;
 //      [n, d] = a;
 //      sout | a | n | d | endl;
+//      sout | a | n | d;
         sout | "more tests" | endl;
+        sout | "more tests";
         Rational(int) x = { 1, 2 }, y = { 2 };
         sout | x - y | endl;
         sout | x > y | endl;
         sout | x | numerator( x, 2 ) | x | endl;
         sout | y | denominator( y, -2 ) | y | endl;
+        sout | x - y;
+        sout | x > y;
+        sout | x | numerator( x, 2 ) | x;
+        sout | y | denominator( y, -2 ) | y;
         Rational(int) z = { 0, 5 };
         sout | z | endl;
+        sout | z;
         sout | x | numerator( x, 0 ) | x | endl;
+        sout | x | numerator( x, 0 ) | x;
         x = (Rational(int)){ 1, MAX } + (Rational(int)){ 1, MAX };
         sout | x | endl;
+        sout | x;
         x = (Rational(int)){ 3, MAX } + (Rational(int)){ 2, MAX };
         sout | x | endl;
+        sout | x;
         sin | a | b;
         sout | a | b | endl;
+        sout | a | b;
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa rational.c" //
+// compile-command: "cfa rational.cfa" //
 // End: //

tests/searchsort.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // searchsort.c --
+// searchsort.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Thu Feb  4 18:17:50 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug  9 07:54:57 2018
 // Update Count     : 101
+// Last Modified On : Thu Dec 20 22:49:46 2018
+// Update Count     : 108
 //
 #include <fstream.hfa>
 #include <stdlib.hfa>                                                                           // bsearch, qsort
+#include <stdlib.hfa>                                                                   // bsearch, qsort
 #include <stdlib.h>                                                                             // C version of bsearch
 …
 int main( void ) {
         const unsigned int size = 10;
+        const int size = 10;
         int iarr[size];
+        for ( i; 0u ~ size ) {
+        sout | nlOff;                                                                           // turn off auto newline
+        for ( i; 0 ~ size ) {
                 iarr[i] = size - i;
                 sout | iarr[i] | ", ";
         } // for
         sout | endl | endl;
+        sout | nl | nl;
         // ascending sort/search by changing < to >
         qsort( iarr, size );
         for ( i; 0u ~ size ) {
+        for ( i; 0 ~ size ) {
                 sout | iarr[i] | ", ";
         } // for
         sout | endl;
         for ( i; 0u ~ size ) {          // C version
+        sout | nl;
+        for ( i; 0 ~ size ) {           // C version
                 int key = size - i;
                 int * v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
                 sout | key | ':' | *v | ", ";
         } // for
         sout | endl;
+        sout | nl;
         for ( i; 0u ~ size ) {
+        for ( i; 0 ~ size ) {
                 int * v = bsearch( size - i, iarr, size );
                 sout | size - i | ':' | *v | ", ";
         } // for
         sout | endl;
         for ( i; 0u ~ size ) {
+        sout | nl;
+        for ( i; 0 ~ size ) {
                 unsigned int posn = bsearch( size - i, iarr, size );
                 sout | size - i | ':' | iarr[posn] | ", ";
         } // for
         sout | endl | endl;
+        sout | nl | nl;
         // descending sort/search by changing < to >
         for ( i; 0u ~ size ) {
+        for ( i; 0 ~ size ) {
                 iarr[i] = i + 1;
                 sout | iarr[i] | ", ";
         } // for
         sout | endl;
+        sout | nl;
+        {
+                int ?<?( int x, int y ) { return x > y; }
+                qsort( iarr, size );
+                for ( i; 0u ~ size ) {
+                // redefinition of ?<? can't overlap the loop controls:
+                {
+                        int (*?<?)(int, int) = ?>?;
+                        qsort( iarr, size );
+                }
+                for ( i; 0 ~ size ) {
                         sout | iarr[i] | ", ";
                 } // for
+                sout | endl;
+                for ( i; 0u ~ size ) {
+                sout | nl;
+                for ( i; 0 ~ size ) {
+                        int (*?<?)(int, int) = ?>?;
                         int * v = bsearch( size - i, iarr, size );
                         sout | size - i | ':' | *v | ", ";
                 } // for
+                sout | endl;
+                for ( i; 0u ~ size ) {
+                sout | nl;
+                for ( i; 0 ~ size ) {
+                        int (*?<?)(int, int) = ?>?;
                         unsigned int posn = bsearch( size - i, iarr, size );
                         sout | size - i | ':' | iarr[posn] | ", ";
                 } // for
+        }
         sout | endl | endl;
+        sout | nl | nl;
         double darr[size];
         for ( i; 0u ~ size ) {
+        for ( i; 0 ~ size ) {
                 darr[i] = size - i + 0.5;
                 sout | darr[i] | ", ";
         } // for
         sout | endl;
+        sout | nl;
         qsort( darr, size );
         for ( i; 0u ~ size ) {
+        for ( i; 0 ~ size ) {
                 sout | darr[i] | ", ";
         } // for
         sout | endl;
         for ( i; 0u ~ size ) {
+        sout | nl;
+        for ( i; 0 ~ size ) {
                 double * v = bsearch( size - i + 0.5, darr, size );
                 sout | size - i + 0.5 | ':' | *v | ", ";
         } // for
         sout | endl;
         for ( i; 0u ~ size ) {
+        sout | nl;
+        for ( i; 0 ~ size ) {
                 unsigned int posn = bsearch( size - i + 0.5, darr, size );
                 sout | size - i + 0.5 | ':' | darr[posn] | ", ";
         } // for
         sout | endl | endl;
+        sout | nl | nl;
         struct S { int i, j; } sarr[size];
         int ?<?( S t1, S t2 ) { return t1.i < t2.i && t1.j < t2.j; }
         ofstream & ?|?( ofstream & os, S v ) { return os | v.i | ' ' | v.j; }
         for ( i; 0u ~ size ) {
+        for ( i; 0 ~ size ) {
                 sarr[i].i = size - i;
                 sarr[i].j = size - i + 1;
                 sout | sarr[i] | ", ";
         } // for
         sout | endl;
+        sout | nl;
         qsort( sarr, size );
         for ( i; 0u ~ size ) {
+        for ( i; 0 ~ size ) {
                 sout | sarr[i] | ", ";
         } // for
         sout | endl;
         for ( i; 0u ~ size ) {
+        sout | nl;
+        for ( i; 0 ~ size ) {
                 S temp = { size - i, size - i + 1 };
                 S * v = bsearch( temp, sarr, size );
                 sout | temp | ':' | *v | ", ";
         } // for
         sout | endl;
         for ( i; 0u ~ size ) {
+        sout | nl;
+        for ( i; 0 ~ size ) {
                 S temp = { size - i, size - i + 1 };
                 unsigned int posn = bsearch( temp, sarr, size );
                 sout | temp | ':' | sarr[posn] | ", ";
         } // for
         sout | endl | endl;
+        sout | nl | nl;
+        {
                 unsigned int getKey( const S & s ) { return s.j; }
                 for ( i; 0u ~ size ) {
+                int getKey( const S & s ) { return s.j; }
+                for ( i; 0 ~ size ) {
                         sout | sarr[i] | ", ";
                 } // for
                 sout | endl;
                 for ( i; 0u ~ size ) {
+                sout | nl;
+                for ( i; 0 ~ size ) {
                         S * v = bsearch( size - i + 1, sarr, size );
                         sout | size - i + 1 | ':' | *v | ", ";
                 } // for
                 sout | endl;
                 for ( i; 0u ~ size ) {
+                sout | nl;
+                for ( i; 0 ~ size ) {
                         unsigned int posn = bsearch( size - i + 1, sarr, size );
                         sout | size - i + 1 | ':' | sarr[posn] | ", ";
                 } // for
                 sout | endl | endl;
+                sout | nl | nl;
+        }
 } // main
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa searchsort.c" //
+// compile-command: "cfa searchsort.cfa" //
 // End: //

tests/stdincludes.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // stdincludes.c --
+// stdincludes.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Tue Aug 29 08:26:14 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Aug 30 07:56:39 2017
 // Update Count     : 5
+// Last Modified On : Tue Nov  6 18:00:53 2018
+// Update Count     : 6
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa stdincludes.c" //
+// compile-command: "cfa stdincludes.cfa" //
 // End: //

tests/sum.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // sum.c -- test resolvers ability to deal with many variables with the same name and to use the minimum number of casts
 //    necessary to disambiguate overloaded variable names.
+// sum.cfa -- test resolvers ability to deal with many variables with the same name and to use the minimum number of
+//    casts necessary to disambiguate overloaded variable names.
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug  2 08:03:09 2018
 // Update Count     : 279
+// Last Modified On : Sun Dec 23 23:00:38 2018
+// Update Count     : 287
 //
 …
         } // for
         sout | "sum from" | low | "to" | High | "is"
                  | sum( size, (unsigned char *)a ) | ", check" | (int)s | endl;
+                 | sum( size, (unsigned char *)a ) | ", check" | (int)s;
         int s = 0, a[size], v = low;
 …
         } // for
         sout | "sum from" | low | "to" | High | "is"
                  | sum( size, (int *)a ) | ", check" | (int)s | endl;
+                 | sum( size, (int *)a ) | ", check" | (int)s;
         float s = 0.0f, a[size], v = low / 10.0f;
 …
         } // for
         sout | "sum from" | low / 10.0f | "to" | High / 10.0f | "is"
                  | sum( size, (float *)a ) | ", check" | (float)s | endl;
+                 | sum( size, (float *)a ) | ", check" | (float)s;
         double s = 0.0, a[size], v = low / 10.0;
 …
         } // for
         sout | "sum from" | low / 10.0 | "to" | High / 10.0 | "is"
                  | sum( size, (double *)a ) | ", check" | (double)s | endl;
+                 | sum( size, (double *)a ) | ", check" | (double)s;
         struct S { int i, j; };
 …
         S ?++( S & t ) { S temp = t; t += (S){1}; return temp; }
         ofstream & ?|?( ofstream & os, S v ) { return os | v.i | v.j; }
+        void ?|?( ofstream & os, S v ) { (ofstream &)(os | v); nl( os ); }
         S s = (S){0}, a[size], v = { low, low };
 …
         } // for
         sout | "sum from" | low | "to" | High | "is"
                  | sum( size, (S *)a ) | ", check" | (S)s | endl;
+                 | sum( size, (S *)a ) | ", check" | (S)s;
         forall( otype Impl | sumable( Impl ) )
 …
         } // for
         sout | "sum from" | low | "to" | High | "is"
                  | sum( size, gs.x ) | ", check" | (int)s | endl; // add field array in generic type
+                 | sum( size, gs.x ) | ", check" | (int)s;              // add field array in generic type
         delete( gs.x );
 } // main
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa sum.c" //
+// compile-command: "cfa sum.cfa" //
 // End: //

tests/swap.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // swap.c --
+// swap.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Dec  7 09:13:13 2017
 // Update Count     : 71
+// Last Modified On : Sun Dec 23 23:00:49 2018
+// Update Count     : 77
 //
 …
 int main( void ) {
         char c1 = 'a', c2 = 'b';
         sout | "char\t\t\t" | c1 | ' ' | c2 | "\t\t\tswap ";
+        sout | "char\t\t\t" | c1 | ' ' | c2 | "\t\t\tswap " | nonl;
         swap( c1, c2 );
         sout | '\t' | c1 | ' ' | c2 | endl;
+        sout | '\t' | c1 | ' ' | c2;
         signed int i1 = -1, i2 = -2;
         sout | "signed int\t\t" | i1 | i2 | "\t\t\tswap ";
+        sout | "signed int\t\t" | i1 | i2 | "\t\t\tswap " | nonl;
         swap( i1, i2 );
         sout | '\t' | i1 | i2 | endl;
+        sout | '\t' | i1 | i2;
         unsigned int ui1 = 1, ui2 = 2;
         sout | "unsigned int\t\t" | ui1 | ui2 | "\t\t\tswap ";
+        sout | "unsigned int\t\t" | ui1 | ui2 | "\t\t\tswap " | nonl;
         swap( ui1, ui2 );
         sout | '\t' | ui1 | ui2 | endl;
+        sout | '\t' | ui1 | ui2;
         signed long int li1 = -1, li2 = -2;
         sout | "signed long int\t\t" | li1 | li2 | "\t\t\tswap ";
+        sout | "signed long int\t\t" | li1 | li2 | "\t\t\tswap " | nonl;
         swap( li1, li2 );
         sout | '\t' | li1 | li2 | endl;
+        sout | '\t' | li1 | li2;
         unsigned long int uli1 = 1, uli2 = 2;
         sout | "unsigned long int\t" | uli1 | uli2 | "\t\t\tswap ";
+        sout | "unsigned long int\t" | uli1 | uli2 | "\t\t\tswap " | nonl;
         swap( uli1, uli2 );
         sout | '\t' | uli1 | uli2 | endl;
+        sout | '\t' | uli1 | uli2;
         signed long long int lli1 = -1, lli2 = -2;
         sout | "signed long long int\t" | lli1 | lli2 | "\t\t\tswap ";
+        sout | "signed long long int\t" | lli1 | lli2 | "\t\t\tswap " | nonl;
         swap( lli1, lli2 );
         sout | '\t' | lli1 | lli2 | endl;
+        sout | '\t' | lli1 | lli2;
         unsigned long long int ulli1 = 1, ulli2 = 2;
         sout | "unsigned long long int\t" | ulli1 | ulli2 | "\t\t\tswap ";
+        sout | "unsigned long long int\t" | ulli1 | ulli2 | "\t\t\tswap " | nonl;
         swap( ulli1, ulli2 );
         sout | '\t' | ulli1 | ulli2 | endl;
+        sout | '\t' | ulli1 | ulli2;
         float f1 = 1.5, f2 = 2.5;
         sout | "float\t\t\t" | f1 | f2 | "\t\t\tswap ";
+        sout | "float\t\t\t" | f1 | f2 | "\t\t\tswap " | nonl;
         swap( f1, f2 );
         sout | '\t' | f1 | f2 | endl;
+        sout | '\t' | f1 | f2;
         double d1 = 1.5, d2 = 2.5;
         sout | "double\t\t\t" | d1 | d2 | "\t\t\tswap ";
+        sout | "double\t\t\t" | d1 | d2 | "\t\t\tswap " | nonl;
         swap( d1, d2 );
         sout | '\t' | d1 | d2 | endl;
+        sout | '\t' | d1 | d2;
         long double ld1 = 1.5, ld2 = 2.5;
         sout | "long double\t\t" | ld1 | ld2 | "\t\t\tswap ";
+        sout | "long double\t\t" | ld1 | ld2 | "\t\t\tswap " | nonl;
         swap( ld1, ld2 );
         sout | '\t' | ld1 | ld2 | endl;
+        sout | '\t' | ld1 | ld2;
         float _Complex fc1 = 1.5f+1.5if, fc2 = 2.5f+2.5if;
         sout | "float _Complex\t\t" | fc1 | fc2 | "\tswap ";
+        sout | "float _Complex\t\t" | fc1 | fc2 | "\tswap " | nonl;
         swap( fc1, fc2 );
         sout | '\t' | fc1 | fc2 | endl;
+        sout | '\t' | fc1 | fc2;
         double _Complex dc1 = 1.5d+1.5id, dc2 = 2.5d+2.5id;
         sout | "double _Complex\t\t" | dc1 | dc2 | "\tswap ";
+        sout | "double _Complex\t\t" | dc1 | dc2 | "\tswap " | nonl;
         swap( dc1, dc2 );
         sout | '\t' | dc1 | dc2 | endl;
+        sout | '\t' | dc1 | dc2;
         long double _Complex ldc1 = 1.5d+1.5il, ldc2 = 2.5d+2.5il;
         sout | "long double _Complex\t" | ldc1 | ldc2 | "\tswap ";
+        sout | "long double _Complex\t" | ldc1 | ldc2 | "\tswap " | nonl;
         swap( ldc1, ldc2 );
         sout | '\t' | ldc1 | ldc2 | endl;
+        sout | '\t' | ldc1 | ldc2;
         struct S { int i, j; } s1 = { 1, 2 }, s2 = { 2, 1 };
         ofstream & ?|?( ofstream & os, S s ) { return os | s.i | s.j; }
+        sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap ";
+        void ?|?( ofstream & os, S s ) { (ofstream &)(os | s.i | s.j); nl( os ); }
+        sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap " | nonl;
         swap( s1, s2 );
         sout | '\t' | s1 | "," | s2 | endl;
+        sout | '\t' | s1 | "," | s2;
 } // main
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa swap.c" //
+// compile-command: "cfa swap.cfa" //
 // End: //

tests/switch.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // switch.c --
+// switch.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Tue Jul 12 06:50:22 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 07:33:05 2018
 // Update Count     : 36
+// Last Modified On : Tue Nov  6 18:01:34 2018
+// Update Count     : 37
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa switch.c" //
+// compile-command: "cfa switch.cfa" //
 // End: //

tests/test.py

-              r9b086ca
+              rcde3891
         def matchTest(path):
                 match = re.search("%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt" % settings.SRCDIR, path)
+                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
                 if match :
                         test = Test()
 …
 # reads the directory ./.expect and indentifies the tests
 def listTests( includes, excludes ):
-        includes = [canonicalPath( i ) for i in includes] if includes else None
-        excludes = [canonicalPath( i ) for i in excludes] if excludes else None
         # tests directly in the .expect folder will always be processed
         test_list = findTests()
 …
 #               running test functions
 ################################################################################
+# fix the absolute paths in the output
+def fixoutput( fname ):
+        if not is_ascii(fname):
+                return
+        file_replace(fname, "%s/" % settings.SRCDIR, "")
+def success(val):
+        return val == 0 or settings.dry_run
+def isExe(file):
+        return settings.dry_run or fileIsExecutable(file)
+def noRule(file, target):
+        return not settings.dry_run and fileContainsOnly(file, "make: *** No rule to make target `%s'.  Stop." % target)
 # logic to run a single test and return the result (No handling of printing or other test framework logic)
 …
         # build, skipping to next test on error
+        before = time.time()
+        make_ret, _ = make( test.target(),
+                redirects  = "2> %s 1> /dev/null" % out_file,
+                error_file = err_file
+        )
+        after = time.time()
+        comp_dur = after - before
+        with Timed() as comp_dur:
+                make_ret, _ = make( test.target(),      redirects  = ("2> %s 1> /dev/null" % out_file), error_file = err_file )
+        # if the make command succeds continue otherwise skip to diff
         run_dur = None
+        # if the make command succeds continue otherwise skip to diff
+        if make_ret == 0 or settings.dry_run:
+                before = time.time()
+                if settings.dry_run or fileIsExecutable(exe_file) :
+                        # run test
+                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
+                else :
+                        # simply cat the result into the output
+                        retcode, _ = sh("cat %s > %s" % (exe_file, out_file))
+                after = time.time()
+                run_dur = after - before
+        if success(make_ret):
+                with Timed() as run_dur:
+                        if isExe(exe_file):
+                                # run test
+                                retcode = run(exe_file, out_file, in_file)
+                        else :
+                                # simply cat the result into the output
+                                retcode = cat(exe_file, out_file)
         else:
+                retcode, _ = sh("mv %s %s" % (err_file, out_file))
+        if retcode == 0:
+                # fixoutput(out_file)
+                retcode = mv(err_file, out_file)
+        if success(retcode):
                 if settings.generating :
                         # if we are ounly generating the output we still need to check that the test actually exists
                         if not settings.dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test.target()) :
                                 retcode = 1;
+                        if noRule(out_file, test.target()) :
+                                retcode = 1
                                 error = "\t\tNo make target for test %s!" % test.target()
                                 sh("rm %s" % out_file, False)
+                                rm(out_file)
                         else:
                                 error = None
 …
                         error = myfile.read()
+                ret, info = coreInfo(exe_file)
+                error = error + info
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.target())
         return retcode, error, [comp_dur, run_dur]
+        rm(exe_file)
+        return retcode, error, [comp_dur.duration, run_dur.duration if run_dur else None]
 # run a single test and handle the errors, outputs, printing, exception handling, etc.
 …
         with SignalHandling():
                 # print formated name
                 name_txt = "%20s  " % t.name
+                name_txt = "%24s  " % t.name
                 retcode, error, duration = run_single_test(t)
 …
         allTests = listTests( options.include, options.exclude )
         # if user wants all tests than no other treatement of the test list is required
         if options.all or options.list or options.list_comp or options.include :

tests/tuple/tupleAssign.cfa

-              r9b086ca
+              rcde3891
 // Created On       : Tue Nov 15 17:24:32 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Mar  6 21:23:58 2017
 // Update Count     : 34
+// Last Modified On : Tue Dec  4 22:03:48 2018
+// Update Count     : 35
 //
 …
                 // swap x, y and store the new [x, y] in [u, v] and in z;
                 printf( "u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z );
                 sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]" | endl;
+                sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]";
                 z = [u, v] = [x, y] = [y, x];
                 printf( "u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z );
                 sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]" | endl;
+                sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]";
                 // shuffle elements -- v = z.0, z.0 = z.1, z.1 = u, u = v
                 [v, z, u] = [z, u, v];
                 printf( "u=%d v=%d z=[%d, %d]\n", u, v, z );
                 sout | "u=" | u | "v=" | v | "z=[" | z | "]" | endl;
+                sout | "u=" | u | "v=" | v | "z=[" | z | "]";
                 // multiple assignment with tuple expression on right
 …
                 [u, v] = [123, 456];
                 printf( "u=%d v=%d z=[%d, %d]\n", u, v, z );
                 sout | "u=" | u | "v=" | v | "z=[" | z | "]" | endl;
+                sout | "u=" | u | "v=" | v | "z=[" | z | "]";
+        }
+        {
 …
                 [t, x, d, i, c, x] = (double)94.12;
                 printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, (int)c, t );
                 sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]" | endl;
+                sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]";
                 [x, c, i, d, x, t] = (double)-94.12;
                 printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, c, t );
                 sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]" | endl;
+                sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]";
+        }
+}

tests/userLiterals.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // user_literals.c --
+// user_literals.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Sep  6 21:40:50 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Apr 29 16:51:42 2018
 // Update Count     : 54
+// Last Modified On : Tue Dec  4 22:03:10 2018
+// Update Count     : 56
 //
 …
 #include <uchar.h>
 int ?`s( int s ) { sout | "secs" | s | endl; return s; }
 int ?`m( int m ) { sout | "mins" | m | endl; return m * 60; }
 int ?`h( int h ) { sout | "hours" | h | endl; return h * 3600; }
 int ?`_A_( int x ) { sout | "_A_" | x | endl; return x; }
 int ?`__thingy_( int x ) { sout | "_thingy_" | x | endl; return x; }
+int ?`s( int s ) { sout | "secs" | s; return s; }
+int ?`m( int m ) { sout | "mins" | m; return m * 60; }
+int ?`h( int h ) { sout | "hours" | h; return h * 3600; }
+int ?`_A_( int x ) { sout | "_A_" | x; return x; }
+int ?`__thingy_( int x ) { sout | "_thingy_" | x; return x; }
 int ?`s( const char * s ) { sout | "secs" | s | endl; return 0; }
 int ?`m( const char16_t * m ) { sout | "mins" | m | endl; return 0;}
 int ?`h( const char32_t * h ) { sout | "hours" | h | endl; return 0; }
 int ?`_A_( const wchar_t * str ) { sout | "_A_" | str | endl; return 0; }
 int ?`__thingy_( const char * str ) { sout | "_thingy_" | str | endl; return 0; }
+int ?`s( const char * s ) { sout | "secs" | s; return 0; }
+int ?`m( const char16_t * m ) { sout | "mins" | m; return 0;}
+int ?`h( const char32_t * h ) { sout | "hours" | h; return 0; }
+int ?`_A_( const wchar_t * str ) { sout | "_A_" | str; return 0; }
+int ?`__thingy_( const char * str ) { sout | "_thingy_" | str; return 0; }
 …
         Weight w, heavy = { 20 };                                                       // 20 stone
         w = 155`lb;
         sout | w | endl;
+        sout | w;
         w = 0b_1111`st;
         sout | w | endl;
+        sout | w;
         w = 0_233`lb;                                                                           // octal weight (155)
         sout | w | endl;
+        sout | w;
         w = 0x_9b_u`kg;
         sout | w | endl;
+        sout | w;
         w = 70.3`kg;
         sout | w | endl;
+        sout | w;
         w = 11`st + 1`lb;
         sout | w | endl;
+        sout | w;
         w = 5`st + 8`kg + 25`lb + heavy;
         sout | w | endl;
+        sout | w;
 //      0`secs;
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa user_literals.c" //
+// compile-command: "cfa user_literals.cfa" //
 // End: //

tests/variableDeclarator.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // variableDeclarator.c --
+// variableDeclarator.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 17 08:41:42 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Aug 17 08:42:21 2016
 // Update Count     : 1
+// Last Modified On : Tue Nov  6 18:02:16 2018
+// Update Count     : 2
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa variableDeclarator.c" //
+// compile-command: "cfa variableDeclarator.cfa" //
 // End: //

tests/vector.cfa

-              r9b086ca
+              rcde3891
 // file "LICENCE" distributed with Cforall.
 //
 // vector.c --
+// vector.cfa --
 //
 // Author           : Thierry Delisle
 // Created On       : Mon Jul  4 23:36:19 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jan 18 17:08:08 2018
 // Update Count     : 27
+// Last Modified On : Tue Dec  4 22:02:39 2018
+// Update Count     : 29
 //
 …
         do {                                                                            \
                 if ( !(x) ) {                                                   \
                         sout | "CHECK failed :" | #x | "at" | __FILE__ | " :" | __LINE__ | endl;        \
+                        sout | "CHECK failed :" | #x | "at" | __FILE__ | " :" | __LINE__;       \
                         abort();                                                        \
                 }                                                                               \
 …
         assert( empty( &iv ) );
         assert( size( &iv ) == 0 );
         sout | size( &iv ) | endl;
+        sout | size( &iv );
         push_back( &iv, 1 );
         assert( size( &iv ) == 1 );
         sout | size( &iv ) | endl;
+        sout | size( &iv );
         push_back( &iv, 2 );
         assert( size( &iv ) == 2 );
         sout | size( &iv ) | endl;
+        sout | size( &iv );
         push_back( &iv, 3 );
         assert( size( &iv ) == 3 );
         sout | size( &iv ) | endl;
+        sout | size( &iv );
         assert( !empty( &iv ) );
 …
         assert( empty( &iv ) );
         assert( size( &iv ) == 0 );
         sout | size( &iv ) | endl;
+        sout | size( &iv );
+}
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa vector.c" //
+// compile-command: "cfa vector.cfa" //
 // End: //

tests/warnings/.expect/self-assignment.txt

-              r9b086ca
+              rcde3891
 warnings/self-assignment.c:29:1 warning: self assignment of expression: Cast of:
+warnings/self-assignment.cfa:29:1 warning: self assignment of expression: Cast of:
   Variable Expression: j: signed int
 ... to:
   reference to signed int
 warnings/self-assignment.c:30:1 warning: self assignment of expression: Cast of:
   Variable Expression: s: instance of struct S with body 1
+warnings/self-assignment.cfa:30:1 warning: self assignment of expression: Cast of:
+  Variable Expression: s: instance of struct S with body 1
 ... to:
   reference to instance of struct S with body 1
 warnings/self-assignment.c:31:1 warning: self assignment of expression: Cast of:
   Member Expression, with field:
+  reference to instance of struct S with body 1
+warnings/self-assignment.cfa:31:1 warning: self assignment of expression: Cast of:
+  Member Expression, with field:
     i: signed int
   ... from aggregate:
     Variable Expression: s: instance of struct S with body 1
+  ... from aggregate:
+    Variable Expression: s: instance of struct S with body 1
 ... to:
   reference to signed int
 warnings/self-assignment.c:32:1 warning: self assignment of expression: Cast of:
   Member Expression, with field:
+warnings/self-assignment.cfa:32:1 warning: self assignment of expression: Cast of:
+  Member Expression, with field:
     i: signed int
   ... from aggregate:
     Member Expression, with field:
       s: instance of struct S with body 1
     ... from aggregate:
       Variable Expression: t: instance of struct T with body 1
+  ... from aggregate:
+    Member Expression, with field:
+      s: instance of struct S with body 1
+    ... from aggregate:
+      Variable Expression: t: instance of struct T with body 1
 ... to:
   reference to signed int

Context Navigation

Legend:

Download in other formats: