Changeset d0c91a6 for tests

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into jenkins-sandbox

Location:

tests

Files:

• .expect/alloc-ERROR.txt (modified) (3 diffs)
• .expect/castError.txt (modified) (4 diffs)
• .expect/completeTypeError.txt (modified) (1 diff)
• .expect/declarationErrors.txt (modified) (2 diffs)
• .expect/heap.txt (deleted)
• .expect/nested-types-ERR2.txt (modified) (1 diff)
• .expect/scopeErrors.txt (modified) (1 diff)
• Makefile.am (modified) (6 diffs)
• Makefile.in (modified) (26 diffs)
• abs.cfa (modified) (2 diffs)
• ato.cfa (modified) (2 diffs)
• avltree/avl-private.cfa (moved) (moved from tests/avltree/avl-private.c )
• avltree/avl0.cfa (moved) (moved from tests/avltree/avl0.c )
• avltree/avl1.cfa (moved) (moved from tests/avltree/avl1.c )
• avltree/avl2.cfa (moved) (moved from tests/avltree/avl2.c )
• avltree/avl3.cfa (moved) (moved from tests/avltree/avl3.c )
• avltree/avl4.cfa (moved) (moved from tests/avltree/avl4.c )
• avltree/avl_test.cfa (moved) (moved from tests/avltree/avl_test.c )
• builtins/sync.cfa (moved) (moved from tests/builtins/sync.c )
• complex.cfa (modified) (3 diffs)
• concurrent/coroutineYield.cfa (moved) (moved from tests/concurrent/coroutineYield.c ) (2 diffs)
• concurrent/examples/boundedBufferEXT.cfa (moved) (moved from tests/concurrent/examples/boundedBufferEXT.c ) (2 diffs)
• concurrent/examples/boundedBufferINT.cfa (moved) (moved from tests/concurrent/examples/boundedBufferINT.c ) (2 diffs)
• concurrent/examples/datingService.cfa (moved) (moved from tests/concurrent/examples/datingService.c ) (6 diffs)
• concurrent/examples/matrixSum.cfa (moved) (moved from tests/concurrent/examples/matrixSum.c ) (2 diffs)
• concurrent/examples/quickSort.cfa (moved) (moved from tests/concurrent/examples/quickSort.c ) (6 diffs)
• concurrent/monitor.cfa (moved) (moved from tests/concurrent/monitor.c ) (1 diff)
• concurrent/multi-monitor.cfa (moved) (moved from tests/concurrent/multi-monitor.c ) (1 diff)
• concurrent/preempt.cfa (moved) (moved from tests/concurrent/preempt.c )
• concurrent/signal/block.cfa (moved) (moved from tests/concurrent/signal/block.c ) (4 diffs)
• concurrent/signal/disjoint.cfa (moved) (moved from tests/concurrent/signal/disjoint.c ) (3 diffs)
• concurrent/signal/wait.cfa (moved) (moved from tests/concurrent/signal/wait.c ) (3 diffs)
• concurrent/thread.cfa (moved) (moved from tests/concurrent/thread.c ) (4 diffs)
• concurrent/waitfor/barge.cfa (moved) (moved from tests/concurrent/waitfor/barge.c ) (4 diffs)
• concurrent/waitfor/dtor.cfa (moved) (moved from tests/concurrent/waitfor/dtor.c ) (3 diffs)
• concurrent/waitfor/else.cfa (moved) (moved from tests/concurrent/waitfor/else.c ) (1 diff)
• concurrent/waitfor/parse.cfa (moved) (moved from tests/concurrent/waitfor/parse.c )
• concurrent/waitfor/parse2.cfa (moved) (moved from tests/concurrent/waitfor/parse2.c )
• concurrent/waitfor/recurse.cfa (moved) (moved from tests/concurrent/waitfor/recurse.c ) (4 diffs)
• concurrent/waitfor/simple.cfa (moved) (moved from tests/concurrent/waitfor/simple.c ) (5 diffs)
• concurrent/waitfor/statment.cfa (moved) (moved from tests/concurrent/waitfor/statment.c ) (3 diffs)
• concurrent/waitfor/when.cfa (moved) (moved from tests/concurrent/waitfor/when.c ) (3 diffs)
• coroutine/.expect/fmtLines.txt (modified) (2 diffs)
• coroutine/.in/fmtLines.txt (modified) (3 diffs)
• coroutine/fibonacci.cfa (moved) (moved from tests/coroutine/fibonacci.c ) (2 diffs)
• coroutine/fibonacci_1.cfa (moved) (moved from tests/coroutine/fibonacci_1.c ) (2 diffs)
• coroutine/fmtLines.cfa (moved) (moved from tests/coroutine/fmtLines.c ) (4 diffs)
• coroutine/pingpong.cfa (moved) (moved from tests/coroutine/pingpong.c ) (3 diffs)
• coroutine/prodcons.cfa (moved) (moved from tests/coroutine/prodcons.c ) (6 diffs)
• coroutine/runningTotal.cfa (moved) (moved from tests/coroutine/runningTotal.c ) (2 diffs)
• div.cfa (modified) (2 diffs)
• except-0.cfa (modified) (1 diff)
• fallthrough.cfa (modified) (5 diffs)
• fstream_test.cfa (modified) (2 diffs)
• function-operator.cfa (modified) (2 diffs)
• genericUnion.cfa (modified) (3 diffs)
• gmp.cfa (modified) (2 diffs)
• heap.cfa (modified) (10 diffs)
• hello.cfa (modified) (2 diffs)
• identity.cfa (modified) (2 diffs)
• ifwhileCtl.cfa (modified) (3 diffs)
• io1.cfa (modified) (2 diffs)
• io2.cfa (modified) (2 diffs)
• literals.cfa (modified) (2 diffs)
• loopctrl.cfa (modified) (2 diffs)
• math1.cfa (modified) (2 diffs)
• math2.cfa (modified) (2 diffs)
• math3.cfa (modified) (2 diffs)
• math4.cfa (modified) (2 diffs)
• minmax.cfa (modified) (2 diffs)
• polymorphism.cfa (modified) (3 diffs)
• preempt_longrun/Makefile.am (modified) (1 diff)
• preempt_longrun/Makefile.in (modified) (14 diffs)
• pybin/tools.py (modified) (2 diffs)
• quotedKeyword.cfa (modified) (2 diffs)
• raii/.expect/ctor-autogen-ERR1.txt (modified) (4 diffs)
• raii/.expect/dtor-early-exit-ERR1.txt (modified) (1 diff)
• raii/.expect/dtor-early-exit-ERR2.txt (modified) (1 diff)
• raii/.expect/memberCtors-ERR1.txt (modified) (1 diff)
• raii/ctor-autogen.cfa (moved) (moved from tests/raii/ctor-autogen.c )
• raii/dtor-early-exit.cfa (moved) (moved from tests/raii/dtor-early-exit.c ) (16 diffs)
• raii/globals.cfa (moved) (moved from tests/raii/globals.c ) (1 diff)
• raii/init_once.cfa (moved) (moved from tests/raii/init_once.c )
• raii/memberCtors.cfa (moved) (moved from tests/raii/memberCtors.c )
• raii/multiDimension.cfa (moved) (moved from tests/raii/multiDimension.c )
• random.cfa (modified) (2 diffs)
• rational.cfa (modified) (2 diffs)
• references.cfa (modified) (3 diffs)
• searchsort.cfa (modified) (2 diffs)
• shortCircuit.cfa (modified) (3 diffs)
• sum.cfa (modified) (8 diffs)
• swap.cfa (modified) (2 diffs)
• test.py (modified) (2 diffs)
• time.cfa (modified) (2 diffs)
• tuple/tupleAssign.cfa (moved) (moved from tests/tuple/tupleAssign.c ) (4 diffs)
• tuple/tupleCast.cfa (moved) (moved from tests/tuple/tupleCast.c )
• tuple/tupleFunction.cfa (moved) (moved from tests/tuple/tupleFunction.c )
• tuple/tupleMember.cfa (moved) (moved from tests/tuple/tupleMember.c )
• tuple/tuplePolymorphism.cfa (moved) (moved from tests/tuple/tuplePolymorphism.c )
• tuple/tupleVariadic.cfa (moved) (moved from tests/tuple/tupleVariadic.c )
• tuple/tuples.cfa (moved) (moved from tests/tuple/tuples.c )
• userLiterals.cfa (modified) (3 diffs)
• vector.cfa (modified) (4 diffs)
• warnings/.expect/self-assignment.txt (modified) (1 diff)
• warnings/self-assignment.cfa (moved) (moved from tests/warnings/self-assignment.c )
• withStatement.cfa (modified) (1 diff)

tests/.expect/alloc-ERROR.txt

@@ -1 @@
-alloc.cfa: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
 
@@ -19 +19 @@
 
 
-alloc.cfa: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
 
@@ -39 +39 @@
 
 
-alloc.cfa: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.cfa: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

@@ -4 +4 @@
 ... to:
   char Alternatives are:
-Cost ( 1, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0 ): Cast of:
      Variable Expression: f: function
        accepting unspecified arguments
-     ... returning nothing 
+     ... returning nothing
 
    ... to:
@@ -14 +14 @@
    char
  )
- Environment: 
+ Environment:
 
-Cost ( 1, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0 ): Cast of:
      Variable Expression: f: double
    ... to:
@@ -23 +23 @@
    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:
@@ -32 +32 @@
    char
  )
- Environment: 
+ Environment:
 
 

tests/.expect/completeTypeError.txt

@@ -1 @@
-completeTypeError.cfa: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.cfa: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.cfa: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.cfa: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.cfa: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.cfa: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.cfa: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.cfa: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.cfa: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

@@ -6 +6 @@
 
 declarationErrors.cfa:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
-  with members 
+  with members
     i: int 
-   with body 
+   with body
 
 
 declarationErrors.cfa:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
-  with members 
+  with members
     i: int 
-   with body 
+   with body
 
 
@@ -20 +20 @@
 
 declarationErrors.cfa:24:1 error: duplicate const in declaration of f01: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:26:1 error: duplicate const in declaration of f03: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:28:1 error: duplicate const in declaration of f05: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:30:1 error: duplicate const in declaration of f07: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
-  with no parameters 
+  with no parameters
   returning const restrict volatile _Atomic int 
 

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

@@ -1 +1 @@
 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) 
+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

@@ -3 +3 @@
 ... with parameters
   double
-... returning 
+... returning
   _retval_butThisIsAnError: double
-  ... with attributes: 
+  ... with attributes:
     Attribute with name: unused
 
-... with body 
+... with body
   CompoundStmt
 

tests/Makefile.am

@@ -16 +16 @@
 
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS  = -I automake
 
 include $(top_srcdir)/src/cfa.make
@@ -44 +45 @@
 .PHONY: list .validate
 .INTERMEDIATE: .validate .validate.cfa
-EXTRA_PROGRAMS = avl_test # build but do not install
+EXTRA_PROGRAMS = avl_test .dummy_hack # build but do not install
 
-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
 
 #----------------------------------------------------------------------------------------------------------------
@@ -67 +70 @@
         @echo "int main() { return 0; }" > ${@}
 
-dummy_hack.c:
+# 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; }" > ${@}
 
@@ -76 +80 @@
 
 # implicit rule so not all test require a rule
-% : %.c $(CFACC)
-        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
 % : %.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
@@ -107 +108 @@
 
 #builtins
-builtins/sync: builtins/sync.c $(CFACC)
+builtins/sync: builtins/sync.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 
@@ -132 +133 @@
 
 # Constructor/destructor tests
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CFACC)
+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 $(CFACC)
+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 $(CFACC)
+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 $(CFACC)
+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 $(CFACC)
+warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only

tests/Makefile.in

@@ -91 +91 @@
 build_triplet = @build@
 host_triplet = @host@
-EXTRA_PROGRAMS = 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)
@@ -103 +107 @@
 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) \
@@ -128 +139 @@
 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@)
@@ -133 +148 @@
 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)
-DIST_SOURCES = $(avl_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 \
@@ -172 +189 @@
 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@
@@ -196 +213 @@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -201 +219 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -207 +228 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
 HOST_FLAGS = @HOST_FLAGS@
@@ -214 +236 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -222 +245 @@
 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@
@@ -235 +268 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -246 +280 @@
 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@
@@ -295 +331 @@
 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
@@ -312 +368 @@
         ${INSTALL_FLAGS} ${ARCH_FLAGS}
 PRETTY_PATH = cd ${srcdir} &&
-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 .cfa .o .obj .validate
+.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 \
@@ -349 +407 @@
 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
@@ -381 +443 @@
         -rm -f *.tab.c
 
-@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:
@@ -404 +460 @@
 @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)
@@ -525 +595 @@
 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 avltree/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -574 +644 @@
 
 maintainer-clean: maintainer-clean-am
-        -rm -rf avltree/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -580 +650 @@
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool
 
 pdf: pdf-am
@@ -595 +666 @@
 
 .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
 
@@ -615 +687 @@
         $(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.cfa
@@ -637 +714 @@
         @echo "int main() { return 0; }" > ${@}
 
-dummy_hack.c:
+# 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; }" > ${@}
 
@@ -646 +724 @@
 
 # implicit rule so not all test require a rule
-% : %.c $(CFACC)
-        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
 % : %.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
@@ -677 +752 @@
 
 #builtins
-builtins/sync: builtins/sync.c $(CFACC)
+builtins/sync: builtins/sync.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 
@@ -702 +777 @@
 
 # Constructor/destructor tests
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CFACC)
+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 $(CFACC)
+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 $(CFACC)
+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 $(CFACC)
+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 $(CFACC)
+warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 

tests/abs.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 18:26:16 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:50:44 2018
-// Update Count     : 54
+// Last Modified On : Tue Dec  4 21:33:15 2018
+// Update Count     : 55
 //
 
@@ -19 +19 @@
 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
 

tests/ato.cfa

@@ -10 +10 @@
 // Created On       : Thu Feb  4 08:10:57 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:51:03 2018
-// Update Count     : 91
+// Last Modified On : Tue Dec  4 21:33:53 2018
+// Update Count     : 92
 //
 
@@ -20 +20 @@
         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
 

tests/complex.cfa

@@ -10 +10 @@
 // Created On       : Wed May 24 22:07:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:51:22 2018
-// Update Count     : 3
+// Last Modified On : Tue Dec  4 21:34:21 2018
+// Update Count     : 4
 //
 
@@ -25 +25 @@
     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;
@@ -32 +32 @@
     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
 }

tests/concurrent/coroutineYield.cfa

@@ -27 +27 @@
         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();
@@ -42 +42 @@
         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

@@ -8 +8 @@
 // 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
 //
 
@@ -115 +115 @@
                 sum += sums[i];
         } // for
-        sout | "total:" | sum | endl;
+        sout | "total:" | sum;
 }
 

tests/concurrent/examples/boundedBufferINT.cfa

@@ -8 +8 @@
 // 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
 //
 
@@ -116 +116 @@
                 sum += sums[i];
         } // for
-        sout | "total:" | sum | endl;
+        sout | "total:" | sum;
 }
 

tests/concurrent/examples/datingService.cfa

@@ -8 +8 @@
 // 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
 //
 
@@ -33 +33 @@
                 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
@@ -44 +45 @@
                 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
@@ -58 +60 @@
         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
@@ -69 +70 @@
 
 thread Boy {
-        DatingService &TheExchange;
+        DatingService & TheExchange;
         unsigned int id, ccode;
 }; // Boy
@@ -76 +77 @@
         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

@@ -11 +11 @@
 // Created On       : Mon Oct  9 08:29:28 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:51:32 2018
-// Update Count     : 14
+// Last Modified On : Tue Dec 11 21:54:55 2018
+// Update Count     : 15
 //
 
@@ -54 +54 @@
                 total += subtotals[r];                                                  // total subtotals
         } // for
-        sout | total | endl;
+        sout | total;
 }
 

tests/concurrent/examples/quickSort.cfa

@@ -9 +9 @@
 // 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
 //
 
@@ -88 +88 @@
 
 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
@@ -114 +114 @@
                                 &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
@@ -121 +121 @@
                                 &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
@@ -127 +127 @@
                 } // if
         } // if
+        sortedfile | nlOff;                                                                     // turn off auto newline
 
         enum { ValuesPerLine = 22 };                                            // number of values printed per line
@@ -137 +138 @@
                         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

@@ -40 +40 @@
                 MyThread f[4];
         }
-        sout | global.value | endl;
+        sout | global.value;
 }

tests/concurrent/multi-monitor.cfa

@@ -52 +52 @@
                 }
         }
-        sout | global12 | global23 | global13 | endl;
+        sout | global12 | global23 | global13;
 }

tests/concurrent/signal/block.cfa

@@ -57 +57 @@
 
         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();
         }
@@ -85 +85 @@
 
                 if( ! signal_block( cond ) ) {
-                        sout | "ERROR expected to be able to signal" | endl;
+                        sout | "ERROR expected to be able to signal";
                         abort();
                 }
@@ -92 +92 @@
 
                 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();
                 }
@@ -130 +130 @@
                 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

@@ -66 +66 @@
         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
 
@@ -99 +99 @@
         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;
         }
 }
@@ -124 +124 @@
                         Waiter w[4];
                 }
-                sout | "All waiter done" | endl;
+                sout | "All waiter done";
                 all_done = true;
         }

tests/concurrent/signal/wait.cfa

@@ -83 +83 @@
                                 break;
                         default:
-                                sout | "Something went wrong" | endl;
+                                sout | "Something went wrong";
                                 abort();
                 }
@@ -140 +140 @@
         waiter_left = 4;
         processor p[2];
-        sout | "Starting" | endl;
+        sout | "Starting";
         {
                 Signaler  e;
@@ -150 +150 @@
                 }
         }
-        sout | "Done" | endl;
+        sout | "Done";
 }

tests/concurrent/thread.cfa

@@ -12 +12 @@
 void main(First& this) {
         for(int i = 0; i < 10; i++) {
-                sout | "First : Suspend No." | i + 1 | endl;
+                sout | "First : Suspend No." | i + 1;
                 yield();
         }
@@ -21 +21 @@
         P(*this.lock);
         for(int i = 0; i < 10; i++) {
-                sout | "Second : Suspend No." | i + 1 | endl;
+                sout | "Second : Suspend No." | i + 1;
                 yield();
         }
@@ -29 +29 @@
 int main(int argc, char* argv[]) {
         semaphore lock = { 0 };
-        sout | "User main begin" | endl;
+        sout | "User main begin";
         {
                 processor p;
@@ -37 +37 @@
                 }
         }
-        sout | "User main end" | endl;
+        sout | "User main end";
 }

tests/concurrent/waitfor/barge.cfa

@@ -48 +48 @@
         yield(random( 10 ));
         if( this.state != WAITFOR && !this.done && this.started ) {
-                serr | "Barging before caller detected" | endl;
+                serr | "Barging before caller detected";
         }
 
@@ -66 +66 @@
                 this.state = WAITFOR;
                 waitfor(do_call, this) {
-                        sout | i | endl;
+                        sout | i;
                 }
 
                 if( this.state != CALL ) {
-                        serr | "Barging after caller detected" | endl;
+                        serr | "Barging after caller detected";
                 }
         }
@@ -83 +83 @@
 
 int main() {
-        sout | "Starting" | endl;
+        sout | "Starting";
         {
                 barger_t bargers[17];
@@ -89 +89 @@
                 waiter_t waiters;
         }
-        sout | "Stopping" | endl;
+        sout | "Stopping";
 }

tests/concurrent/waitfor/dtor.cfa

@@ -29 +29 @@
         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;
         }
 }
@@ -54 +54 @@
 
 int main() {
-        sout | "Starting" | endl;
+        sout | "Starting";
         processor p;
         for( int i = 0; i < N; i++ ){
@@ -60 +60 @@
                 yield( random( 100 ) );
         }
-        sout | "Stopping" | endl;
+        sout | "Stopping";
 }

tests/concurrent/waitfor/else.cfa

@@ -12 +12 @@
 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

@@ -95 +95 @@
         rand_yield();
 
-        sout | "1st" | endl;
+        sout | "1st" | nl;
 
         return this.counter < N ? (state_t)this.actions[idx] : (state_t)STOP;
@@ -123 +123 @@
                         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;
                 }
         }
@@ -132 +132 @@
 int main() {
         srandom( time(NULL) );
-        sout | "Starting" | endl;
+        sout | nlOff;                                   // turn off auto newline
+        sout | "Starting" | nl;
         {
                 waiter_t waiters[4] = {
@@ -142 +143 @@
                 the_threads = waiters;
         }
-        sout | "Stopping" | endl;
+        sout | "Stopping" | nl;
 }

tests/concurrent/waitfor/simple.cfa

@@ -31 +31 @@
 
 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;
@@ -43 +43 @@
         __waitfor_internal( 1, &acceptable );
 
-        sout | "Accepted" | endl;
+        sout | "Accepted";
         yield( random( 10 ) );
 }
@@ -50 +50 @@
         for( int i = 0; i < N; i++ ) {
                 do_wait( &globalA );
-                sout | i | endl;
+                sout | i;
         }
 
@@ -76 +76 @@
         srandom( time( NULL ) );
         printf("%p\n", &globalA);
-        sout | "Starting" | endl;
+        sout | "Starting";
         {
                 Acceptor r;
@@ -82 +82 @@
 
         }
-        sout | "Done" | endl;
+        sout | "Done";
 }

tests/concurrent/waitfor/statment.cfa

@@ -84 +84 @@
                 case 7: return call7( m );
                 default :
-                        serr | "Incorrect index" | index | endl;
+                        serr | "Incorrect index" | index;
                         abort();
         }
@@ -102 +102 @@
         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;
@@ -128 +128 @@
 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

@@ -58 +58 @@
 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;
         }
 
@@ -78 +78 @@
 int main() {
         srandom( time(NULL) );
-        sout | "Starting" | endl;
+        sout | "Starting";
         {
                 arbiter_t arbiter;
@@ -84 +84 @@
 
         }
-        sout | "Stopping" | endl;
+        sout | "Stopping";
 }

tests/coroutine/.expect/fmtLines.txt

@@ -16 +16 @@
 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  
@@ -34 +34 @@
 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

@@ -10 +10 @@
 // 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
 //
 
@@ -27 +27 @@
 
 void ^?{}( Format & fmt ) {
-    if ( fmt.g != 0 || fmt.b != 0 ) sout | endl;
+    if ( fmt.g != 0 || fmt.b != 0 ) sout | nl;
 }
 
@@ -42 +42 @@
                         sout | "  ";                                                            // print block separator
                 } // for
-                sout | endl;                                                                    // print group separator
+                sout | nl;                                                                      // print group separator
         } // for
 } // main

tests/coroutine/fibonacci.cfa

@@ -10 +10 @@
 // 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
 //
 
@@ -39 +39 @@
         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

@@ -10 +10 @@
 // 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
 // 
 
@@ -36 +36 @@
         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

@@ -10 +10 @@
 // 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
 //
 
@@ -24 +24 @@
 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
@@ -34 +34 @@
                         sout | "  ";                                                            // print block separator
                 } // for
-                sout | endl;                                                                    // print group separator
+                sout | nl;                                                                              // print group separator
         } // for
 } // main
@@ -43 +43 @@
 
 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

@@ -10 +10 @@
 // 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
 //
 
@@ -24 +24 @@
 
 void ?{}( PingPong & this, const char * name, unsigned int N, PingPong & part ) {
+        (this.__cor){name};
         this.name = name;
         this.N = N;
@@ -40 +41 @@
 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

@@ -10 +10 @@
 // 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
 //
 
@@ -24 +24 @@
 
 coroutine Prod {
-        Cons * c;
+        Cons & c;
         int N, money, receipt;
 };
@@ -30 +30 @@
         // 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 ) {
@@ -47 +45 @@
 }
 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 ) {}
@@ -68 +64 @@
         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
@@ -92 +86 @@
         srandom( /* getpid() */ 103 );                                          // fixed seed for testing
         start( prod, 5, cons );
-        sout | "main stops" | endl;
+        sout | "main stops";
 }
 

tests/coroutine/runningTotal.cfa

@@ -10 +10 @@
 // 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
 //
 
@@ -42 +42 @@
         RunTotal rntl;
         for ( i; 10 ) {
-                sout | i | add( rntl, i ) | endl;
+                sout | i | add( rntl, i );
         } // for
 }

tests/div.cfa

@@ -10 +10 @@
 // Created On       : Tue Aug  8 16:28:43 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:53:10 2018
-// Update Count     : 19
+// 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; };
@@ -23 +23 @@
 
 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
 

tests/except-0.cfa

@@ -25 +25 @@
 void ^?{}(signal_exit * this) {
         printf("Exiting: %s\n", this->area);
-//      sout | "Exiting:" | this->area | endl;
+//      sout | "Exiting:" | this->area;
 }
 

tests/fallthrough.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 14 10:06:25 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov  8 09:09:09 2018
-// Update Count     : 16
+// Last Modified On : Mon Dec 24 11:24:35 2018
+// Update Count     : 22
 //
 
@@ -18 +18 @@
 void test(int choice) {
         choose ( choice ) {
-                case 1:
-                        sout | "case 1" | endl;
-                        fallthru;
-                case 2:
-                        sout | "case 2" | endl;
-                        fallthru;
-                        sout | "did not fallthru" | endl;
-                        if ( 7 ) fallthru common2;
-                        fallthru common1;
-                case 3:
-                        sout | "case 3" | endl;
-                        fallthru default;
-                        fallthru common1;
-                common1:
-                        sout | "common1" | endl;
+          case 1:
+                sout | "case 1";
+                fallthru;
+          case 2:
+                sout | "case 2";
+                fallthru;
+                sout | "did not fallthru";
+                if ( 7 ) fallthru common2;
+                fallthru common1;
+          case 3:
+                sout | "case 3";
+                fallthru default;
+                fallthru common1;
+          common1:
+                sout | "common1";
                 // break
-                case 4:
-                        sout | "case 4" | endl;
-                        fallthru common2;
-                case 5:
-                        sout | "case 5" | endl;
-                        fallthru common2;
-                        fallthru default;
-                case 6:
-                        sout | "case 6" | endl;
-                        fallthru common2;
-                common2:
-                        sout | "common2" | endl;
+          case 4:
+                sout | "case 4";
+                fallthru common2;
+          case 5:
+                sout | "case 5";
+                fallthru common2;
+                fallthru default;
+          case 6:
+                sout | "case 6";
+                fallthru common2;
+          common2:
+                sout | "common2";
                 // break
-                default:
-                        sout | "default" | endl;
-                        fallthru;
-        }
+          default:
+                sout | "default";
+                fallthru;
+        } // choose
 
-        sout | endl;
+        sout | nl;
 
         switch ( choice ) {
           case 1:
-                sout | "case 1" | endl;
+                sout | "case 1";
                 switch ( choice ) {
                   case 1:
-                        sout | "case 1" | endl;
+                        sout | "case 1";
                         for ( int i = 0; i < 4; i += 1 ) {
-                                printf("%d\n", i);
+                                sout | i;
                                 if ( i == 2 ) fallthru common;
                         } // for
@@ -67 +67 @@
                 break;
           case 5:
-                sout | "case 5" | endl;
+                sout | "case 5";
                 if ( choice == 5 ) {
                         if ( choice != 5 ) {
-                                sout | "error" | endl;
+                                sout | "error";
                         } else {
-                                sout | "check" | endl;
+                                sout | "check";
                                 fallthru common;
                         } // if
                 } // if
           common:
-                printf( "common\n" );
+                sout | "common";
                 fallthru;
                 break;
           default:
-                printf( "default\n" );
+                sout | "default";
                 fallthru;
         } // switch
@@ -93 +93 @@
         fallthru default;
         choose ( 3 ) {
-                case 2:
-                        for () {
-                                choose ( 2 ) {
-                                        case 1:
-                                                // ERROR: default is later, but in a different switch
-                                                fallthru default;
-                                                // ERROR: common3 is later, but not at the same level as a case clause
-                                                fallthru common3;
-                                }
-                                common3: ;
+          case 2:
+                for () {
+                        choose ( 2 ) {
+                          case 1:
+                                // ERROR: default is later, but in a different switch
+                                fallthru default;
+                                // ERROR: common3 is later, but not at the same level as a case clause
+                                fallthru common3;
                         }
-                default:
-                case 1:
-                common4:
-                        // ERROR: attempt to jump up with fallthrough
-                        if ( 7 ) fallthru common4;
-                        // ERROR: attempt to jump up with fallthrough
-                        fallthru default;
-        }
+                  common3: ;
+                } // for
+          default:
+          case 1:
+          common4:
+                // ERROR: attempt to jump up with fallthrough
+                if ( 7 ) fallthru common4;
+                // ERROR: attempt to jump up with fallthrough
+                fallthru default;
+        } // choose
 #endif
 }
@@ -117 +117 @@
 int main() {
         test( 1 );
-        sout | endl;
+        sout | nl;
         test( 5 );
 }

tests/fstream_test.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:53:56 2018
-// Update Count     : 66
+// Last Modified On : Sat Dec 22 09:47:44 2018
+// Update Count     : 68
 //
 
@@ -18 +18 @@
 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;
 }
 

tests/function-operator.cfa

@@ -10 +10 @@
 // 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
 //
 
@@ -83 +83 @@
 // TODO: abstract over (os, T)
 os_wrapper ?=?(os_wrapper & wrapper, int x) {
-        *wrapper.out | x | endl;
+        *wrapper.out | x;
         return wrapper;
 }

tests/genericUnion.cfa

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// genericUnion.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Dec 25 14:42:46 2018
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Dec 25 14:46:33 2018
+// Update Count     : 2
+// 
+
 #include <limits.hfa>
 
@@ -4 +19 @@
 union ByteView {
         T val;
-        char bytes[(sizeof(int))]; // want to change to sizeof(T)
+        char bytes[(sizeof(int))];                                                      // want to change to sizeof(T)
 };
 
 forall(otype T)
 void print(ByteView(T) x) {
-        for (int i = 0; i < sizeof(int); i++) { // want to change to sizeof(T)
+        for (int i = 0; i < sizeof(int); i++) {                         // want to change to sizeof(T)
                 printf("%02x", x.bytes[i] & 0xff);
         }
@@ -29 +44 @@
         f(i, -1);
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa genericUnion.cfa" //
+// End: //

tests/gmp.cfa

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:54:34 2018
-// Update Count     : 557
+// Last Modified On : Thu Dec 20 22:41:47 2018
+// Update Count     : 559
 //
 
@@ -19 +19 @@
 
 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

tests/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Nov  6 17:54:56 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov  8 09:03:54 2018
-// Update Count     : 17
+// Last Modified On : Tue Dec 11 21:52:40 2018
+// Update Count     : 18
 // 
 
@@ -45 +45 @@
                 for ( i; NoOfAllocs ) {
                         locns[i] = alloc( i );
-                        //sout | (void *)locns[i] | endl;
+                        //sout | (void *)locns[i];
                         for ( k; i ) locns[i][k] = '\345';
                 } // for
-                //sout | (char *)sbrk(0) - start | " bytes" | endl;
+                //sout | (char *)sbrk(0) - start | " bytes";
 
                 for ( i; NoOfAllocs ) {
-                        //sout | (void *)locns[i] | endl;
+                        //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;
+                //sout | (char *)sbrk(0) - start | " bytes";
 
                 for ( i; NoOfAllocs ) {
                         locns[i] = alloc( i );
-                        //sout | (void *)locns[i] | endl;
+                        //sout | (void *)locns[i];
                         for ( k; i ) locns[i][k] = '\345';
                 } // for
                 for ( i; NoOfAllocs - 1 -~= 0 ) {
-                        //sout | (void *)locns[i] | endl;
+                        //sout | (void *)locns[i];
                         for ( k; i ) if ( locns[i][k] != '\345' ) abort( "new/delete corrupt storage2" );
                         free( locns[i] );
@@ -186 +186 @@
 
         for ( a; libAlign() ~= limit ~ a ) {                            // generate powers of 2
-                //sout | alignments[a] | endl;
+                //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 );
@@ -203 +203 @@
 
         for ( a; libAlign() ~= limit ~ a ) {                            // generate powers of 2
-                //sout | alignments[a] | endl;
+                //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 );
@@ -268 +268 @@
                 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 );
@@ -279 +279 @@
                         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 );
@@ -291 +291 @@
 
         for ( a; libAlign() ~= limit ~ a ) {                            // generate powers of 2
-                //sout | alignments[a] | endl;
+                //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 );
@@ -314 +314 @@
                 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 );
@@ -328 +328 @@
                         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 );
@@ -339 +339 @@
                 free( area );
     } // for
-        //sout | "worker" | thisTask() | "successful completion" | endl;
+        //sout | "worker" | thisTask() | "successful completion";
 } // Worker main
 

tests/hello.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:56:22 2018
-// Update Count     : 16
+// Last Modified On : Tue Dec  4 21:38:39 2018
+// Update Count     : 17
 //
 
@@ -17 +17 @@
 
 int main() {
-        sout | "Hello world!" | endl;
-        sout | "Bonjour le monde!" | endl;
-        sout | "Hola Mundo!" | endl;
-        sout | "Hallo Welt!" | endl;
-        sout | "Kaixo Mundua!" | endl;
-        sout | "Chào thế giới!" | endl;
-        sout | "Привет мир!" | endl;
-        sout | "שלום עולם!" | endl;
-        sout | "你好，世界!" | endl;
-        sout | "こんにちは世界!" | endl;
-        sout | "안녕하세요 세계!" | endl;
-        sout | "नमस्ते दुनिया!" | endl;
+        sout | "Hello world!";
+        sout | "Bonjour le monde!";
+        sout | "Hola Mundo!";
+        sout | "Hallo Welt!";
+        sout | "Kaixo Mundua!";
+        sout | "Chào thế giới!";
+        sout | "Привет мир!";
+        sout | "שלום עולם!";
+        sout | "你好，世界!";
+        sout | "こんにちは世界!";
+        sout | "안녕하세요 세계!";
+        sout | "नमस्ते दुनिया!";
 }
 

tests/identity.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:56:54 2018
-// Update Count     : 19
+// Last Modified On : Tue Dec  4 21:38:59 2018
+// Update Count     : 20
 //
 
@@ -22 +22 @@
 
 int main() {
-        sout | "char\t\t\t"                                     | identity( 'z' ) | endl;
-        sout | "signed int\t\t"                         | identity( 4 ) | endl;
-        sout | "unsigned int\t\t"                       | identity( 4u ) | endl;
-        sout | "signed long int\t\t"            | identity( 4l ) | endl;
-        sout | "unsigned long int\t"            | identity( 4ul ) | endl;
-        sout | "signed long long int\t"         | identity( 4ll ) | endl;
-        sout | "unsigned long long int\t"       | identity( 4ull ) | endl;
-        sout | "float\t\t\t"                            | identity( 4.1f ) | endl;
-        sout | "double\t\t\t"                           | identity( 4.1 ) | endl;
-        sout | "long double\t\t"                        | identity( 4.1l ) | endl;
-        sout | "float _Complex\t\t"                     | identity( -4.1F-2.0iF ) | endl;
-        sout | "double _Complex\t\t"            | identity( -4.1D-2.0iD ) | endl;
-        sout | "long double _Complex\t"         | identity( -4.1L-2.0iL ) | endl;
+        sout | "char\t\t\t"                                     | identity( 'z' );
+        sout | "signed int\t\t"                         | identity( 4 );
+        sout | "unsigned int\t\t"                       | identity( 4u );
+        sout | "signed long int\t\t"            | identity( 4l );
+        sout | "unsigned long int\t"            | identity( 4ul );
+        sout | "signed long long int\t"         | identity( 4ll );
+        sout | "unsigned long long int\t"       | identity( 4ull );
+        sout | "float\t\t\t"                            | identity( 4.1f );
+        sout | "double\t\t\t"                           | identity( 4.1 );
+        sout | "long double\t\t"                        | identity( 4.1l );
+        sout | "float _Complex\t\t"                     | identity( -4.1F-2.0iF );
+        sout | "double _Complex\t\t"            | identity( -4.1D-2.0iD );
+        sout | "long double _Complex\t"         | identity( -4.1L-2.0iL );
 }
 

tests/ifwhileCtl.cfa

@@ -10 +10 @@
 // Created On       : Sat Aug 26 10:13:11 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:57:07 2018
-// Update Count     : 22
+// Last Modified On : Tue Dec  4 21:39:18 2018
+// Update Count     : 23
 //
 
@@ -22 +22 @@
 
         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
@@ -65 +65 @@
         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

tests/io1.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:57:17 2018
-// Update Count     : 105
+// Last Modified On : Fri Dec 21 16:02:55 2018
+// Update Count     : 114
 //
 
@@ -18 +18 @@
 int main() {
         int x = 3, y = 5, z = 7;
-        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
-        sout | 1 | 2 | 3 | endl;
-        sout | '1' | '2' | '3' | endl;
-        sout | 1 | "" | 2 | "" | 3 | endl;
-        sout | endl;
+        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
+        sout | 1 | 2 | 3;
+        sout | '1' | '2' | '3';
+        sout | 1 | "" | 2 | "" | 3;
+        sout | nl;
 
-        sout | "opening delimiters" | endl;
-        sout
-                 | "x (" | 1
-                 | "x [" | 2
-                 | "x {" | 3
-                 | "x =" | 4
-                 | "x $" | 5
-                 | "x £" | 6
-                 | "x ¥" | 7
-                 | "x ¡" | 8
-                 | "x ¿" | 9
-                 | "x «" | 10
-                 | endl | endl;
+        sout | nlOff;
+        sout | "opening delimiters" | nl;
+        sout | "x (" | 1;
+        sout | "x [" | 2;
+        sout | "x {" | 3;
+        sout | "x =" | 4;
+        sout | "x $" | 5;
+        sout | "x £" | 6;
+        sout | "x ¥" | 7;
+        sout | "x ¡" | 8;
+        sout | "x ¿" | 9;
+        sout | "x «" | 10;
+        sout | nl | nl;
 
-        sout | "closing delimiters" | endl;
-        sout
-                 | 1 | ", x"
-                 | 2 | ". x"
-                 | 3 | "; x"
-                 | 4 | "! x"
-                 | 5 | "? x"
-                 | 6 | "% x"
-                 | 7 | "¢ x"
-                 | 8 | "» x"
-                 | 9 | ") x"
-                 | 10 | "] x"
-                 | 11 | "} x"
-                 | endl | endl;
+        sout | "closing delimiters" | nl;
+        sout | 1 | ", x";
+        sout | 2 | ". x";
+        sout | 3 | "; x";
+        sout | 4 | "! x";
+        sout | 5 | "? x";
+        sout | 6 | "% x";
+        sout | 7 | "¢ x";
+        sout | 8 | "» x";
+        sout | 9 | ") x";
+        sout | 10 | "] x";
+        sout | 11 | "} x";
+        sout | nl | nl;
 
-        sout | "opening/closing delimiters" | endl;
-        sout
-                 | "x`" | 1 | "`x'" | 2
-                 | "'x\"" | 3 | "\"x:" | 4
-                 | ":x " | 5 | " x\t" | 6
-                 | "\tx\f" | 7 | "\fx\v" | 8
-                 | "\vx\n" | 9 | "\nx\r" | 10
-                 | "\rx"
-                 | endl | endl;
+        sout | "opening/closing delimiters" | nl;
+        sout | "x`" | 1 | "`x'" | 2;
+        sout | "'x\"" | 3 | "\"x:" | 4;
+        sout | ":x " | 5 | " x\t" | 6;
+        sout | "\tx\f" | 7 | "\fx\v" | 8;
+        sout | "\vx\n" | 9 | "\nx\r" | 10;
+        sout | "\rx";
+        sout | nl | nl;
 
-        sout | "override opening/closing delimiters" | endl;
-        sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4 | endl;
-        sout | endl;
+        sout | nlOn;
+        sout | "override opening/closing delimiters";
+        sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4;
+        sout | nl;
 }
 

tests/io2.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:57:28 2018
-// Update Count     : 104
+// Last Modified On : Fri Dec 21 08:20:14 2018
+// Update Count     : 112
 //
 
 #include <fstream.hfa>
 
- #define xstr(s) str(s)
+#define xstr(s) str(s)
 #define str(s) #s
 
@@ -41 +41 @@
         char s1[size], s2[size];
 
-        ifstream in = { xstr(IN_DIR) "io.data" };                                               // create / open file
+        ifstream in = { xstr(IN_DIR) "io.data" };                       // create / open file
 
-        sout | "input bacis types" | endl;
-        in       | b                                                                                    // boolean
-                 | c | sc | usc                                                                 // character
-                 | si | usi | i | ui | li | uli | lli | ulli    // integral
-                 | f | d | ld                                                                   // floating point
-                 | fc | dc | ldc                                                                // floating-point complex
-                 | cstr( s1 ) | cstr( s2, size );                               // C string, length unchecked and checked
-        sout | endl;
+        sout | "input bacis types";
+        in       | b;                                                                                   // boolean
+        in       | c | sc | usc;                                                                // character
+        in       | si | usi | i | ui | li | uli | lli | ulli;   // integral
+        in       | f | d | ld;                                                                  // floating point
+        in       | fc | dc | ldc;                                                               // floating-point complex
+        in       | cstr( s1 ) | cstr( s2, size );                               // C string, length unchecked and checked
+        sout | nl;
 
-        sout | "output basic types" | endl;
-        sout | b | endl                                                                         // boolean
-                 | c | ' ' | sc | ' ' | usc | endl                              // character
-                 | si | usi | i | ui | li | uli | lli | ulli | endl // integral
-                 | f | d | ld | endl                                                    // floating point
-                 | fc | dc | ldc | endl;                                                // complex
-        sout | endl;
+        sout | "output basic types";
+        sout | b;                                                                                       // boolean
+        sout | c | ' ' | sc | ' ' | usc;                                        // character
+        sout | si | usi | i | ui | li | uli | lli | ulli;       // integral
+        sout | f | d | ld;                                                                      // floating point
+        sout | fc | dc | ldc;                                                           // complex
+        sout | nl;
 
-        sout | "tuples" | endl;
+        sout | "tuples";
         [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
-        sout | t1 | t2 | endl;                                                          // print tuple
-        sout | endl;
+        sout | t1 | t2;                                                                         // print tuple
+        sout | nl;
 
-        sout | "toggle separator" | endl;
-        sout | f | "" | d | "" | ld | endl                                      // floating point without separator
-                 | sepDisable | fc | dc | ldc | endl                    // complex without separator
-                 | fc | sepOn | dc | ldc | endl                                 // local separator add
-                 | sepEnable | fc | dc | ldc | endl                             // complex with separator
-                 | fc | sepOff | dc | ldc | endl                                // local separator removal
-                 | s1 | sepOff | s2 | endl                                              // local separator removal
-                 | s1 | "" | s2 | endl;                                                 // local separator removal
-        sout | endl;
+        sout | "toggle separator";
+        sout | f | "" | d | "" | ld;                                            // floating point without separator
+        sout | sepDisable | fc | dc | ldc;                                      // complex without separator
+        sout | fc | sepOn | dc | ldc;                                           // local separator add
+        sout | sepEnable | fc | dc | ldc;                                       // complex with separator
+        sout | fc | sepOff | dc | ldc;                                          // local separator removal
+        sout | s1 | sepOff | s2;                                                        // local separator removal
+        sout | s1 | "" | s2;                                                            // local separator removal
+        sout | nl;
 
-        sout | "change separator" | endl;
-        sout | "from \"" | sep | "\"";
+        sout | "change separator";
+        sout | "from \"" | sep | "\"" | nonl;
         sepSet( sout, ", $" );                                                          // change separator, maximum of 15 characters
-        sout | " to \"" | sep | "\"" | endl;
-        sout | f | d | ld | endl
-                 | fc | dc | ldc | endl
-                 | s1 | s2 | endl
-                 | t1 | t2 | endl;                                                              // print tuple
-        sout | endl;
-        sout | "from \"" | sep | "\" ";
+        sout | " to \"" | sep | "\"";
+        sout | f | d | ld;
+        sout | fc | dc | ldc;
+        sout | s1 | s2;
+        sout | t1 | t2;                                                                         // print tuple
+        sout | nl;
+        sout | "from \"" | sep | "\" " | nonl;
         sepSet( sout, " " );                                                            // restore separator
-        sout | "to \"" | sep | "\"" | endl;
-        sout | f | d | ld | endl
-                 | fc | dc | ldc | endl
-                 | s1 | s2 | endl
-                 | t1 | t2 | endl;                                                              // print tuple
-        sout | endl;
+        sout | "to \"" | sep | "\"";
+        sout | f | d | ld;
+        sout | fc | dc | ldc;
+        sout | s1 | s2;
+        sout | t1 | t2;                                                                         // print tuple
+        sout | nl;
 
-        sout | "check sepOn/sepOff" | endl;
-        sout | sepOn | 1 | 2 | 3 | sepOn | endl;                        // no separator at start/end of line
-        sout | 1 | sepOff | 2 | 3 | endl;                                       // locally turn off implicit separator
-        sout | sepOn | sepOn | 1 | 2 | 3 | sepOn | sepOff | sepOn | '\n'; // no separator at start/end of line
-        sout | 1 | 2 | 3 | "\n\n" | sepOn;                                      // no separator at start of next line
-        sout | 1 | 2 | 3 | endl;
-        sout | endl;
+        sout | "check sepOn/sepOff";
+        sout | sepOn | 1 | 2 | 3 | sepOn;                                       // no separator at start/end of line
+        sout | 1 | sepOff | 2 | 3;                                                      // locally turn off implicit separator
+        sout | sepOn | sepOn | 1 | 2 | 3 | sepOn | sepOff | sepOn | '\n' | nonl; // no separator at start/end of line
+        sout | 1 | 2 | 3 | "\n\n" | sepOn | nonl;                                       // no separator at start of next line
+        sout | 1 | 2 | 3;
+        sout | nl;
 
-        sout | "check enable/disable" | endl;
-        sout | sepDisable | 1 | 2 | 3 | endl;                           // globally turn off implicit separation
-        sout | 1 | sepOn | 2 | 3 | endl;                                        // locally turn on implicit separator
-        sout | sepEnable | 1 | 2 | 3 | endl | sepDisable;       // globally turn on/off implicit separation
-        sout | 1 | 2 | 3 | endl | sepEnable;                            // globally turn on implicit separation
-        sout | 1 | 2 | 3 | sepOn | sepDisable | endl;           // ignore seperate at end of line
-        sout | 1 | 2 | 3 | sepOn | sepEnable | endl;            // separator at end of line
-        sout | 1 | 2 | 3 | endl;
-        sout | endl;
+        sout | "check enable/disable";
+        sout | sepDisable | 1 | 2 | 3;                                          // globally turn off implicit separation
+        sout | 1 | sepOn | 2 | 3;                                                       // locally turn on implicit separator
+        sout | sepEnable | 1 | 2 | 3 | sepDisable;                      // globally turn on/off implicit separation
+        sout | 1 | 2 | 3 | sepEnable;                                           // globally turn on implicit separation
+        sout | 1 | 2 | 3 | sepOn | sepDisable;                          // ignore seperate at end of line
+        sout | 1 | 2 | 3 | sepOn | sepEnable;                           // separator at end of line
+        sout | 1 | 2 | 3;
+        sout | nl;
 
-//      sout | fmt( d, "%8.3f" ) || endl;
-//      sout | endl;
+//      sout | fmt( d, "%8.3f" );
 
         sepSetTuple( sout, " " );                                                       // set tuple separator from ", " to " "
-        sout | t1 | t2 | " \"" | sep | "\"" | endl;
+        sout | t1 | t2 | " \"" | sep | "\"";
         sepSetTuple( sout, ", " );                                                      // reset tuple separator to ", "
-        sout | t1 | t2 | " \"" | sep | "\"" | endl;
-        sout | t1 | t2 | endl;                                                          // print tuple
-        sout | endl;
+        sout | t1 | t2 | " \"" | sep | "\"";
+        sout | t1 | t2;                                                                         // print tuple
+        sout | nl;
 
         [int, int, const char *, double] t3 = { 3, 4, "a", 7.2 };
-        sout | [ 3, 4, "a", 7.2 ] | endl;
-        sout | t3 | endl;
+        sout | [ 3, 4, "a", 7.2 ];
+        sout | t3;
         sepSetTuple( sout, " " );
-        sout | t3 | endl;
-        sout | sepOn | t3 | sepDisable | t3 | sepEnable | t3 | endl;
+        sout | t3;
+        sout | sepOn | t3 | sepDisable | t3 | sepEnable | t3;
         sepSet( sout, "^" );
         sepSetTuple( sout, "-" );
-        sout | t3 | 3 | 4 | t3 | endl;
+        sout | t3 | 3 | 4 | t3;
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa io2.cfa" //
+// compile-command: "cfa -DIN_DIR=".in/" io2.cfa" //
 // End: //

tests/literals.cfa

@@ -10 +10 @@
 // Created On       : Sat Sep  9 16:34:38 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:58:07 2018
-// Update Count     : 138
+// Last Modified On : Tue Dec  4 21:44:01 2018
+// Update Count     : 139
 //
 
@@ -18 +18 @@
 #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__
 

tests/loopctrl.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Nov  7 16:54:11 2018
-// Update Count     : 62
+// Last Modified On : Sun Dec 23 23:00:29 2018
+// Update Count     : 79
 // 
 
@@ -32 +32 @@
 S ?-=?( S & t, one_t ) { t.i -= 1; t.j -= 1; return t; }
 ofstream & ?|?( ofstream & os, S v ) { return os | '(' | v.i | v.j | ')'; }
+void & ?|?( ofstream & os, S v ) { (ofstream &)(os | v); nl( os ); }
 
 int main() {
-        while () { sout | "empty"; break; }                     sout | endl;
-        do { sout | "empty"; break; } while ();         sout | endl;
-        for () { sout | "empty"; break; }                       sout | endl | endl;
+        sout | nlOff;                                                                           // turn off auto newline
+        while () { sout | "empty"; break; }                                     sout | nl;
+        do { sout | "empty"; break; } while ();                         sout | nl;
+        for () { sout | "empty"; break; }                                       sout | nl | nl;
 
-        for ( 0 ) { sout | "A"; }                                       sout | "zero" | endl;
-        for ( 1 ) { sout | "A"; }                                       sout | endl;
-        for ( 10 ) { sout | "A"; }                                      sout | endl;
-        for ( 1 ~= 10 ~ 2 ) { sout | "B"; }                     sout | endl;
-        for ( 10 -~= 1 ~ 2 ) { sout | "C"; }            sout | endl;
-        for ( 0.5 ~ 5.5 ) { sout | "D"; }                       sout | endl;
-        for ( 5.5 -~ 0.5 ) { sout | "E"; }                      sout | endl | endl;
+        for ( 0 ) { sout | "A"; }                                                       sout | "zero" | nl;
+        for ( 1 ) { sout | "A"; }                                                       sout | nl;
+        for ( 10 ) { sout | "A"; }                                                      sout | nl;
+        for ( 1 ~= 10 ~ 2 ) { sout | "B"; }                                     sout | nl;
+        for ( 10 -~= 1 ~ 2 ) { sout | "C"; }                            sout | nl;
+        for ( 0.5 ~ 5.5 ) { sout | "D"; }                                       sout | nl;
+        for ( 5.5 -~ 0.5 ) { sout | "E"; }                                      sout | nl | nl;
 
-        for ( i; 10 ) { sout | i; }                                     sout | endl;
-        for ( i; 1 ~= 10 ~ 2 ) { sout | i; }            sout | endl;
-        for ( i; 10 -~= 1 ~ 2 ) { sout | i; }           sout | endl;
-        for ( i; 0.5 ~ 5.5 ) { sout | i; }                      sout | endl;
-        for ( i; 5.5 -~ 0.5 ) { sout | i; }                     sout | endl;
-        for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; }       sout | endl;
-        for ( ui; 10u -~= 2u ~ 2u ) { sout | ui; }      sout | endl | endl | endl;
+        for ( i; 10 ) { sout | i; }                                                     sout | nl;
+        for ( i; 1 ~= 10 ~ 2 ) { sout | i; }                            sout | nl;
+        for ( i; 10 -~= 1 ~ 2 ) { sout | i; }                           sout | nl;
+        for ( i; 0.5 ~ 5.5 ) { sout | i; }                                      sout | nl;
+        for ( i; 5.5 -~ 0.5 ) { sout | i; }                                     sout | nl;
+        for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; }                       sout | nl;
+        for ( ui; 10u -~= 2u ~ 2u ) { sout | ui; }                      sout | nl | nl | nl;
 
         enum { N = 10 };
-        for ( N ) { sout | "N"; }                                       sout | endl;
-        for ( i; N ) { sout | i; }                                      sout | endl;
-        for ( i; N -~ 0 ) { sout | i; }                         sout | endl | endl | endl;
+        for ( N ) { sout | "N"; }                                                       sout | nl;
+        for ( i; N ) { sout | i; }                                                      sout | nl;
+        for ( i; N -~ 0 ) { sout | i; }                                         sout | nl | nl | nl;
 
         const int start = 3, comp = 10, inc = 2;
-        for ( i; start ~ comp ~ inc + 1 ) { sout | i; } sout | endl | endl;
+        for ( i; start ~ comp ~ inc + 1 ) { sout | i; }         sout | nl | nl;
 
-        sout | endl;
-        for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } sout | endl;
-        for ( s; (S){10,10} ) { sout | s; } sout | endl;
-        sout | endl;
-        for ( s; (S){0} ~ (S){10,10} ) { sout | s; } sout | endl;
-        for ( s; (S){0} ~ (S){10,10} ~ (S){1} ) { sout | s; } sout | endl;
-        for ( s; (S){0} ~= (S){10,10} ) { sout | s; } sout | endl;
-        for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } sout | endl;
-        sout | endl;
-        for ( s; (S){10,10} -~ (S){0} ) { sout | s; } sout | endl;
-        for ( s; (S){10,10} -~ (S){0} ~ (S){1} ) { sout | s; } sout | endl;
-        for ( s; (S){10,10} -~= (S){0} ) { sout | s; } sout | endl;
-        for ( s; (S){10,10} -~= (S){0} ~ (S){1} ) { sout | s; } sout | endl;
+        sout | nl;
+        for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } sout | nl;
+        for ( s; (S){10,10} ) { sout | s; } sout | nl;
+        sout | nl;
+        for ( s; (S){0} ~ (S){10,10} ) { sout | s; }             sout | nl;
+        for ( s; (S){0} ~ (S){10,10} ~ (S){1} ) { sout | s; } sout | nl;
+        for ( s; (S){0} ~= (S){10,10} ) { sout | s; }            sout | nl;
+        for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl;
+        sout | nl;
+        for ( s; (S){10,10} -~ (S){0} ) { sout | s; }            sout | nl;
+        for ( s; (S){10,10} -~ (S){0} ~ (S){1} ) { sout | s; } sout | nl;
+        for ( s; (S){10,10} -~= (S){0} ) { sout | s; }           sout | nl;
+        for ( s; (S){10,10} -~= (S){0} ~ (S){1} ) { sout | s; } sout | nl;
 }
 

tests/math1.cfa

@@ -10 +10 @@
 // Created On       : Fri Apr 22 14:59:21 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:58:37 2018
-// Update Count     : 86
+// Last Modified On : Wed Dec 12 16:28:49 2018
+// Update Count     : 89
 //
 
@@ -22 +22 @@
         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
 

tests/math2.cfa

@@ -10 +10 @@
 // Created On       : Fri Apr 22 14:59:21 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:58:55 2018
-// Update Count     : 83
+// Last Modified On : Wed Dec 12 16:11:35 2018
+// Update Count     : 87
 //
 
@@ -24 +24 @@
         //---------------------- Logarithm ----------------------
 
-        sout | "log:" | log( 1.0F ) | log( 1.0D ) | log( 1.0L ) | log( 1.0F+1.0FI ) | log( 1.0D+1.0DI ) | log( 1.0DL+1.0LI ) | endl;
-        sout | "log2:" | log2( 8.0F ) | log2( 8.0D ) | log2( 8.0L ) | endl;
-        sout | "log10:" | log10( 100.0F ) | log10( 100.0D ) | log10( 100.0L ) | endl;
-        sout | "log1p:" | log1p( 1.0F ) | log1p( 1.0D ) | log1p( 1.0L ) | endl;
-        sout | "ilogb:" | ilogb( 1.0F ) | ilogb( 1.0D ) | ilogb( 1.0L ) | endl;
-        sout | "logb:" | logb( 8.0F ) | logb( 8.0D ) | logb( 8.0L ) | endl;
+        sout | "log:" | log( 1.0F ) | log( 1.0D ) | log( 1.0L ) | nonl;
+        sout | log( 1.0F+1.0FI ) | log( 1.0D+1.0DI ) | log( 1.0DL+1.0LI );
+        sout | "log2:" | log2( 8.0F ) | log2( 8.0D ) | log2( 8.0L );
+        sout | "log10:" | log10( 100.0F ) | log10( 100.0D ) | log10( 100.0L );
+        sout | "log1p:" | log1p( 1.0F ) | log1p( 1.0D ) | log1p( 1.0L );
+        sout | "ilogb:" | ilogb( 1.0F ) | ilogb( 1.0D ) | ilogb( 1.0L );
+        sout | "logb:" | logb( 8.0F ) | logb( 8.0D ) | logb( 8.0L );
 
-        sout | "sqrt:" | sqrt( 1.0F ) | sqrt( 1.0D ) | sqrt( 1.0L ) | sqrt( 1.0F+1.0FI ) | sqrt( 1.0D+1.0DI ) | sqrt( 1.0DL+1.0LI ) | endl;
-        sout | "cbrt:" | cbrt( 27.0F ) | cbrt( 27.0D ) | cbrt( 27.0L ) | endl;
-        sout | "hypot:" | hypot( 1.0F, -1.0F ) | hypot( 1.0D, -1.0D ) | hypot( 1.0L, -1.0L ) | endl;
+        sout | "sqrt:" | sqrt( 1.0F ) | sqrt( 1.0D ) | sqrt( 1.0L ) | nonl;
+        sout | sqrt( 1.0F+1.0FI ) | sqrt( 1.0D+1.0DI ) | sqrt( 1.0DL+1.0LI );
+        sout | "cbrt:" | cbrt( 27.0F ) | cbrt( 27.0D ) | cbrt( 27.0L );
+        sout | "hypot:" | hypot( 1.0F, -1.0F ) | hypot( 1.0D, -1.0D ) | hypot( 1.0L, -1.0L );
 
         //---------------------- Trigonometric ----------------------
 
-        sout | "sin:" | sin( 1.0F ) | sin( 1.0D ) | sin( 1.0L ) | sin( 1.0F+1.0FI ) | sin( 1.0D+1.0DI ) | sin( 1.0DL+1.0LI ) | endl;
-        sout | "cos:" | cos( 1.0F ) | cos( 1.0D ) | cos( 1.0L ) | cos( 1.0F+1.0FI ) | cos( 1.0D+1.0DI ) | cos( 1.0DL+1.0LI ) | endl;
-        sout | "tan:" | tan( 1.0F ) | tan( 1.0D ) | tan( 1.0L ) | tan( 1.0F+1.0FI ) | tan( 1.0D+1.0DI ) | tan( 1.0DL+1.0LI ) | endl;
-        sout | "asin:" | asin( 1.0F ) | asin( 1.0D ) | asin( 1.0L ) | asin( 1.0F+1.0FI ) | asin( 1.0D+1.0DI ) | asin( 1.0DL+1.0LI ) | endl;
-        sout | "acos:" | acos( 1.0F ) | acos( 1.0D ) | acos( 1.0L ) | acos( 1.0F+1.0FI ) | acos( 1.0D+1.0DI ) | acos( 1.0DL+1.0LI ) | endl;
-        sout | "atan:" | atan( 1.0F ) | atan( 1.0D ) | atan( 1.0L ) | atan( 1.0F+1.0FI ) | atan( 1.0D+1.0DI ) | atan( 1.0DL+1.0LI ) | endl;
-        sout | "atan2:" | atan2( 1.0F, 1.0F ) | atan2( 1.0D, 1.0D ) | atan2( 1.0L, 1.0L );
-        sout | "atan:" | atan( 1.0F, 1.0F ) | atan( 1.0D, 1.0D ) | atan( 1.0L, 1.0L ) | endl;
+        sout | "sin:" | sin( 1.0F ) | sin( 1.0D ) | sin( 1.0L ) | nonl;
+        sout | sin( 1.0F+1.0FI ) | sin( 1.0D+1.0DI ) | sin( 1.0DL+1.0LI );
+        sout | "cos:" | cos( 1.0F ) | cos( 1.0D ) | cos( 1.0L ) | nonl;
+        sout | cos( 1.0F+1.0FI ) | cos( 1.0D+1.0DI ) | cos( 1.0DL+1.0LI );
+        sout | "tan:" | tan( 1.0F ) | tan( 1.0D ) | tan( 1.0L ) | nonl;
+        sout | tan( 1.0F+1.0FI ) | tan( 1.0D+1.0DI ) | tan( 1.0DL+1.0LI );
+        sout | "asin:" | asin( 1.0F ) | asin( 1.0D ) | asin( 1.0L ) | nonl;
+        sout | asin( 1.0F+1.0FI ) | asin( 1.0D+1.0DI ) | asin( 1.0DL+1.0LI );
+        sout | "acos:" | acos( 1.0F ) | acos( 1.0D ) | acos( 1.0L ) | nonl;
+        sout | acos( 1.0F+1.0FI ) | acos( 1.0D+1.0DI ) | acos( 1.0DL+1.0LI );
+        sout | "atan:" | atan( 1.0F ) | atan( 1.0D ) | atan( 1.0L ) | nonl;
+        sout | atan( 1.0F+1.0FI ) | atan( 1.0D+1.0DI ) | atan( 1.0DL+1.0LI );
+        sout | "atan2:" | atan2( 1.0F, 1.0F ) | atan2( 1.0D, 1.0D ) | atan2( 1.0L, 1.0L ) | nonl;
+        sout | "atan:" | atan( 1.0F, 1.0F ) | atan( 1.0D, 1.0D ) | atan( 1.0L, 1.0L );
 } // main
 

tests/math3.cfa

@@ -10 +10 @@
 // Created On       : Fri Apr 22 14:59:21 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:59:05 2018
-// Update Count     : 83
+// Last Modified On : Wed Dec 12 16:30:41 2018
+// Update Count     : 86
 //
 
@@ -24 +24 @@
         //---------------------- 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
 

tests/math4.cfa

@@ -10 +10 @@
 // Created On       : Thu May 24 20:56:54 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:59:14 2018
-// Update Count     : 3
+// Last Modified On : Tue Dec  4 18:15:01 2018
+// Update Count     : 4
 //
 
@@ -24 +24 @@
         //---------------------- 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
 

tests/minmax.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:59:26 2018
-// Update Count     : 51
+// Last Modified On : Tue Dec  4 21:45:31 2018
+// Update Count     : 52
 //
 
@@ -22 +22 @@
         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
 

tests/polymorphism.cfa

@@ -9 +9 @@
 // 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)
@@ -61 +62 @@
                 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
@@ -100 +99 @@
 
                 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

@@ -16 +16 @@
 
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS  = -I automake
 
 repeats=10

tests/preempt_longrun/Makefile.in

@@ -93 +93 @@
 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)
@@ -333 +337 @@
 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@
@@ -357 +361 @@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -362 +367 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -368 +376 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
 HOST_FLAGS = @HOST_FLAGS@
@@ -375 +384 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -383 +393 @@
 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@
@@ -396 +416 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -407 +428 @@
 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@
@@ -456 +479 @@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS = -I automake
 repeats = 10
 max_time = 600
@@ -503 +527 @@
         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:
 
@@ -806 +836 @@
 clean: clean-am
 
-clean-am: clean-generic clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
@@ -858 +888 @@
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
@@ -873 +903 @@
 
 .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/pybin/tools.py

@@ -79 +79 @@
 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"
@@ -246 +247 @@
         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)

tests/quotedKeyword.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:46:20 2018
-// Update Count     : 22
+// Last Modified On : Tue Dec  4 21:45:53 2018
+// Update Count     : 23
 //
 
@@ -41 +41 @@
         st.`struct` = 3;
         `throw` = 4;
-        sout | `catch` + st.`otype` + st.`struct` + `throw` | endl;
+        sout | `catch` + st.`otype` + st.`struct` + `throw`;
 }
 

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

@@ -1 @@
-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:
@@ -20 +20 @@
                 intrinsic reference to signed int
                 intrinsic signed int
-              ... returning 
+              ... returning
                 _retval__operator_assign: signed int
-                ... with attributes: 
+                ... with attributes:
                   Attribute with name: unused
 
@@ -28 +28 @@
             ... 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
@@ -49 +49 @@
   ... 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

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

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

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

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

@@ -1 @@
-raii/memberCtors.c:71:1 error: in void ?{}(B &b), field a2 used before being constructed
+raii/memberCtors.cfa:71:1 error: in void ?{}(B &b), field a2 used before being constructed

tests/raii/dtor-early-exit.cfa

@@ -10 +10 @@
 // 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
 //
 
@@ -25 +25 @@
 // 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
         {
@@ -55 +55 @@
 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
@@ -71 +71 @@
                 }
         }
-        sout | endl;
+        sout | nl;
         for (int i = 0; i < 10; i++) {
                 switch(10) {
@@ -78 +78 @@
                         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
@@ -90 +90 @@
                 }
         }
-        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
                                 }
@@ -125 +125 @@
         }
 
-        sout | endl;
+        sout | nl;
         L3: if( 3 ) {
                 A w = { "w" };
                 if( 4 ) {
                         A v = { "v" };
-                        sout | "break L3" | endl;
+                        sout | "break L3";
                         break L3;
                 }
@@ -144 +144 @@
         // * 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: ;
@@ -152 +152 @@
                         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
@@ -165 +165 @@
                         } else if (i == 1) {
                                 ++i;
-                                sout | "goto L2" | endl;
+                                sout | "goto L2";
                                 // S_G = { y, x }
                                 goto L2;  // jump back, do not destruct
@@ -172 +172 @@
                         } else if (i == 2) {
                                 ++i;
-                                sout | "goto L3" | endl;
+                                sout | "goto L3";
                                 // S_G = { y, x }
                                 goto L3;  // jump ahead, do not destruct
@@ -180 +180 @@
                                 ++i;
                                 A z = { "z" };
-                                sout | "goto L3-2" | endl;
+                                sout | "goto L3-2";
                                 // S_G = { z, y, x }
                                 goto L3;
@@ -187 +187 @@
                         } 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
@@ -194 +194 @@
                         }
                         // 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
@@ -202 +202 @@
         }
         // S_L4 = {}
-        L4: sout | "L4" | endl;
+        L4: sout | "L4";
         if (i == 4) {
-                sout | "goto L0" | endl;
+                sout | "goto L0";
                 // S_G = {}
                 goto L0;
@@ -240 +240 @@
                 f(i);
         }
-        sout | endl;
+        sout | nl;
         g();
-        sout | endl;
+        sout | nl;
         h();
 

tests/raii/globals.cfa

@@ -70 +70 @@
 
 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

@@ -10 +10 @@
 // Created On       : Tue Jul  5 21:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 18:00:15 2018
-// Update Count     : 20
+// 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
 
@@ -24 +24 @@
         // 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
 

tests/rational.cfa

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 18:00:27 2018
-// Update Count     : 68
+// Last Modified On : Tue Dec  4 21:46:42 2018
+// Update Count     : 69
 //
 
@@ -27 +27 @@
 
 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
 

tests/references.cfa

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Aug 23 16:11:50 2017
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 23 16:12:03
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Dec 25 14:31:48 2018
+// Update Count     : 11
 //
 
+#include <fstream.hfa>
+
 struct Y { int i; };
-void ?{}(Y & y) { printf("Default constructing a Y\n"); }
-void ?{}(Y & y, Y other) { printf("Copy constructing a Y\n"); }
-void ^?{}(Y & y) { printf("Destructing a Y\n"); }
-Y ?=?(Y & y, Y other) { printf("Assigning a Y\n"); return y; }
-void ?{}(Y & y, int i) { printf("Value constructing a Y %d\n", i); y.i = i; }
+void ?{}( Y & y ) { sout | "Default constructing a Y"; }
+void ?{}( Y & y, Y other ) { sout | "Copy constructing a Y"; }
+void ^?{}( Y & y ) { sout | "Destructing a Y"; }
+Y ?=?( Y & y, Y other ) { sout | "Assigning a Y"; return y; }
+void ?{}( Y & y, int i ) { sout | "Value constructing a Y" | i; y.i = i; }
 
 struct X { Y & r; Y y; };
-void ?{}(X & x) {
+void ?{}( X & x ) {
         // ensure that r is not implicitly constructed
 }
-void ?{}(X & x, X other) {
+void ?{}( X & x, X other ) {
         // ensure that r is not implicitly constructed
 }
-void ^?{}(X & x) {
+void ^?{}( X & x ) {
         // ensure that r is not implicitly destructed
 }
-X ?=?(X & x, X other) { return x; }
+X ?=?( X & x, X other ) { return x; }
 
 // ensure that generated functions do not implicitly operate on references
@@ -48 +50 @@
         int x = 123456, x2 = 789, *p1 = &x, **p2 = &p1, ***p3 = &p2,
                 &r1 = x,    &&r2 = r1,   &&&r3 = r2;
-        ***p3 = 3;                          // change x
-        **p3 = &x;                          // change p1
-        *p3 = &p1;                          // change p2
-        int y = 0, z = 11, & ar[3] = { x, y, z };    // initialize array of references
-        // &ar[1] = &z;                        // change reference array element
-        // typeof( ar[1] ) p = 3;              // is int, i.e., the type of referenced object
-        // typeof( &ar[1] ) q = &x;            // is int *, i.e., the type of pointer
+        ***p3 = 3;                                                                                      // change x
+        **p3 = &x;                                                                                      // change p1
+        *p3 = &p1;                                                                                      // change p2
+        int y = 0, z = 11, & ar[3] = { x, y, z };                       // initialize array of references
+                                                                                                                // &ar[1] = &z;                        // change reference array element
+                                                                                                                // typeof( ar[1] ) p = 3;              // is int, i.e., the type of referenced object
+                                                                                                                // typeof( &ar[1] ) q = &x;            // is int *, i.e., the type of pointer
         // _Static_assert( sizeof( ar[1] ) == sizeof( int ), "Array type should be int." );   // is true, i.e., the size of referenced object
         // _Static_assert( sizeof( &ar[1] ) == sizeof( int *), "Address of array should be int *." ); // is true, i.e., the size of a reference
 
-        ((int*&)&r3) = &x;                  // change r1, (&*)**r3
+        ((int*&)&r3) = &x;                                                                      // change r1, (&*)**r3
         x = 3;
         // test that basic reference properties are true - r1 should be an alias for x
-        printf("%d %d %d\n", x, r1, &x == &r1);
+        sout | x | r1 | &x == &r1;
         r1 = 12;
-        printf("%d %d %d\n", x, r1, &x == &r1);
+        sout | x | r1 | &x == &r1;
 
         // test that functions using basic references work
-        printf("%d %d %d %d\n", toref(&x), toref(p1), toptr(r1) == toptr(x), toptr(r1) == &x);
+        sout | toref( &x ) | toref( p1 ) | toptr( r1 ) == toptr( x ) | toptr( r1 ) == &x;
 
         changeRef( x );
         changeRef( y );
         changeRef( z );
-        printf("%d %d %d\n", x, y, z);
+        sout | x | y | z;
         changeRef( r1 );
-        printf("%d %d\n", r1, x);
+        sout | r1 | x;
 
-        r3 = 6;                               // change x, ***r3
-        printf("x = %d ; x2 = %d\n", x, x2);  // check that x was changed
-        &r3 = &x2;                            // change r1 to refer to x2, (&*)**r3
-        r3 = 999;                             // modify x2
-        printf("x = %d ; x2 = %d\n", x, x2);  // check that x2 was changed
-        ((int**&)&&r3) = p2;                  // change r2, (&(&*)*)*r3, ensure explicit cast to reference works
-        r3 = 12345;                           // modify x
-        printf("x = %d ; x2 = %d\n", x, x2);  // check that x was changed
-        &&&r3 = p3;                           // change r3 to p3, (&(&(&*)*)*)r3
-        ((int&)r3) = 22222;                   // modify x, ensure explicit cast to reference works
-        printf("x = %d ; x2 = %d\n", x, x2);  // check that x was changed
+        r3 = 6;                                                                                         // change x, ***r3
+        sout | "x = " | x | " ; x2 = " | x2;                            // check that x was changed
+        &r3 = &x2;                                                                                      // change r1 to refer to x2, (&*)**r3
+        r3 = 999;                                                                                       // modify x2
+        sout | "x = " | x | " ; x2 = " | x2;                            // check that x2 was changed
+        ((int**&)&&r3) = p2;                                                            // change r2, (&(&*)*)*r3, ensure explicit cast to reference works
+        r3 = 12345;                                                                                     // modify x
+        sout | "x = " | x | " ; x2 = " | x2;                            // check that x was changed
+        &&&r3 = p3;                                                                                     // change r3 to p3, (&(&(&*)*)*)r3
+        ((int&)r3) = 22222;                                                                     // modify x, ensure explicit cast to reference works
+        sout | "x = " | x | " ; x2 = " | x2;                                    // check that x was changed
 
         // test that reference members are not implicitly constructed/destructed/assigned
@@ -102 +104 @@
                 struct S { double x, y; };
                 void f( int & i, int & j, S & s, int v[] ) {
-                        printf("%d %d { %g, %g }, [%d, %d, %d]\n", i, j, s.[x, y], v[0], v[1], v[2]);
+                        sout | i | j | "{ " | s.[x, y] | " }," | "[" | v[0] | "," | v[1] | "," | v[2] | "]";
                 }
-                void g(int & i) { printf("%d\n", i); }
-                void h(int &&& i) { printf("%d\n", i); }
+                void g(int & i) { sout | i; }
+                void h(int &&& i) { sout | i; }
 
-                int &&& r = 3;  // rvalue to reference
+                int &&& r = 3;                                                                  // rvalue to reference
                 int i = r;
-                printf("%d %d\n", i, r);  // both 3
+                sout | i | r;                                                                   // both 3
 
-                g( 3 );          // rvalue to reference
-                h( (int &&&)3 ); // rvalue to reference
+                g( 3 );                                                                                 // rvalue to reference
+                h( (int &&&)3 );                                                                // rvalue to reference
 
                 int a = 5, b = 4;

tests/searchsort.cfa

@@ -10 +10 @@
 // Created On       : Thu Feb  4 18:17:50 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 18:00:38 2018
-// Update Count     : 102
+// 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
 
@@ -21 +21 @@
 
 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

tests/shortCircuit.cfa

@@ +1 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+// 
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// shortCircuit.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Thu Jan 28 18:26:16 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Dec  4 18:26:05 2018
+// Update Count     : 4
+// 
+
 void g( float f ) {}
 void g( int i ) {}
@@ -33 +48 @@
 }
 
-
-int main(int argc, char const *argv[])
-{
+int main( int argc, char const *argv[] ) {
+        sout | nlOff;
         test_t true_val, false_val;
         true_val.x = 1;
@@ -41 +55 @@
 
         true_val && false_val;
-        sout | endl;
+        sout | nl;
 
         true_val || false_val;
-        sout | endl;
+        sout | nl;
 
         false_val && true_val;
-        sout | endl;
+        sout | nl;
 
         false_val || true_val;
-        sout | endl;
+        sout | nl;
 
         return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa abs.cfa" //
+// End: //

tests/sum.cfa

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 18:01:10 2018
-// Update Count     : 280
+// Last Modified On : Sun Dec 23 23:00:38 2018
+// Update Count     : 287
 //
 
@@ -56 +56 @@
         } // 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;
@@ -64 +64 @@
         } // 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;
@@ -72 +72 @@
         } // 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;
@@ -80 +80 @@
         } // 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; };
@@ -93 +93 @@
         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 };
@@ -100 +101 @@
         } // 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 ) )
@@ -114 +115 @@
         } // 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

tests/swap.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 18:01:23 2018
-// Update Count     : 72
+// Last Modified On : Sun Dec 23 23:00:49 2018
+// Update Count     : 77
 //
 
@@ -19 +19 @@
 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
 

tests/test.py

@@ -19 +19 @@
 
         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()
@@ -34 +34 @@
 # 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()

tests/time.cfa

@@ -10 +10 @@
 // Created On       : Tue Mar 27 17:24:56 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 18:01:45 2018
-// Update Count     : 17
+// Last Modified On : Thu Dec 20 23:09:21 2018
+// Update Count     : 23
 //
 
@@ -19 +19 @@
 int main() {
         Duration d1 = 3`h, d2 = 2`s, d3 = 3.375`s, d4 = 12`s, d5 = 1`s + 10_000`ns;
-        sout | d1 | d2 | d3 | d4 | d5 | endl;
+        sout | d1 | d2 | d3 | d4 | d5;
         int i;
         d1 = 0;
-        sout | d1 | d2 | d3 | endl;
+        sout | d1 | d2 | d3;
         d1 = 7`s;
         d3 = d2 = d1;
-        sout | d1 | d2 | d3 | endl;
+        sout | d1 | d2 | d3;
         d1 = d1 + d2;
-        sout | d1 | endl;
-        sout | d1 == 7`s | d1 == d2 | d1 == 0 | endl;
-        sout | div( 7`s, 2`s ) | endl;
-        sout | endl;
+        sout | d1;
+        sout | d1 == 7`s | d1 == d2 | d1 == 0;
+        sout | div( 7`s, 2`s );
+        sout | nl;
 
         Time t = { 1970, 1, 2, 0, 0, 0, 10_000_000 };
-        sout | t | endl;
+        sout | t;
         t = t + d1;
-        sout | t | t.tv | endl;
+        sout | t | t.tv;
         Time t1 = (timespec){ 104_414, 10_000_000 };
-        sout | t1 | t1.tv | endl;
-        sout | t - t  | t + d5 | t.tv | endl;
+        sout | t1 | t1.tv;
+        sout | t - t  | t + d5 | t.tv;
         char buf[16];
-        sout | "yy/mm/dd" | [t, buf]`ymd;                                       // shared buf => separate calls
-        sout | "mm/dd/yy" | mm_dd_yy( t, buf );
+        sout | "yy/mm/dd" | [t, buf]`ymd | nonl;                        // shared buf => separate calls
+        sout | "mm/dd/yy" | mm_dd_yy( t, buf ) | nonl;
         strftime( buf, 16, "%D", t );                                           // %D => mm/dd/yy
-        sout | "mm/dd/yy" | buf;
-        sout | "dd/yy/mm" | [t, buf]`dmy | endl;
+        sout | "mm/dd/yy" | buf | nonl;
+        sout | "dd/yy/mm" | [t, buf]`dmy;
         Time t2 = { 2001, 7, 4, 0, 0, 1, 0 }, t3 = (timeval){ 994_219_201 };
-        sout | t2 | t2.tv | endl | t3 | t3.tv | endl;
-        sout | endl;
+        sout | t2 | t2.tv | nl | t3 | t3.tv;
+        sout | nl;
 
         // Clock Newfoundland = { -3.5`h }, PST = { -8`h };     // distance from GMT (UTC)
-        // sout | "Clock Resolution" | getRes() | endl
-        //       | "Newfoundland" | getTime( Newfoundland ) | endl
-        //       | "local" | getTime() | endl
-        //       | "local nsec" | getTimeNsec() | endl
-        //       | "PST" | PST() | endl;                                                // getTime short form
-        // sout | endl;
+        // sout | "Clock Resolution" | getRes()
+        //       | "Newfoundland" | getTime( Newfoundland )
+        //       | "local" | getTime()
+        //       | "local nsec" | getTimeNsec()
+        //       | "PST" | PST();                                                               // getTime short form
+        // sout | nl;
 
         // http://en.cppreference.com/w/cpp/chrono/duration/operator_arith4
         Duration s = 1`h + 2 * 10`m + 70`s / 10;
-        sout | "1 hour + 2*10 min + 70/10 sec = " | s | "seconds" | endl;
-        sout | "Dividing that by 2 minutes gives" | s / 2`m | endl;
-        sout | "Dividing that by 2 gives" | s / 2 | "seconds\n";
-        sout | s | "seconds is" | s`h | "hours," | (s % 1`h)`m | "minutes," | (s % 1`m)`s | "seconds" | endl;
+        sout | "1 hour + 2*10 min + 70/10 sec = " | s | "seconds";
+        sout | "Dividing that by 2 minutes gives" | s / 2`m;
+        sout | "Dividing that by 2 gives" | s / 2 | "seconds";
+        sout | s | "seconds is" | s`h | "hours," | (s % 1`h)`m | "minutes," | (s % 1`m)`s | "seconds";
 } // main
 

tests/tuple/tupleAssign.cfa

@@ -10 +10 @@
 // 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
 //
 
@@ -24 +24 @@
                 // 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
@@ -38 +38 @@
                 [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 | "]";
         }
         {
@@ -55 +55 @@
                 [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

@@ -10 +10 @@
 // Created On       : Wed Sep  6 21:40:50 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 18:02:03 2018
-// Update Count     : 55
+// Last Modified On : Tue Dec  4 22:03:10 2018
+// Update Count     : 56
 //
 
@@ -18 +18 @@
 #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; }
 
 
@@ -46 +46 @@
         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;

tests/vector.cfa

@@ -10 +10 @@
 // Created On       : Mon Jul  4 23:36:19 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 18:02:26 2018
-// Update Count     : 28
+// Last Modified On : Tue Dec  4 22:02:39 2018
+// Update Count     : 29
 //
 
@@ -21 +21 @@
         do {                                                                            \
                 if ( !(x) ) {                                                   \
-                        sout | "CHECK failed :" | #x | "at" | __FILE__ | " :" | __LINE__ | endl;        \
+                        sout | "CHECK failed :" | #x | "at" | __FILE__ | " :" | __LINE__;       \
                         abort();                                                        \
                 }                                                                               \
@@ -31 +31 @@
         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 ) );
@@ -58 +58 @@
         assert( empty( &iv ) );
         assert( size( &iv ) == 0 );
-        sout | size( &iv ) | endl;
+        sout | size( &iv );
 }
 

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

@@ -1 @@
-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

tests/withStatement.cfa

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon Dec 04 17:41:45 2017
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Dec 04 17:45:07 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Dec 24 19:08:18 2018
+// Update Count     : 5
 //
 
+#include <fstream.hfa>
+
 struct S {
-  int i;
-  // dynamically allocated member ensures ctor/dtors are called correctly on temporaries
-  int * ptr;
+        int i;
+        // dynamically allocated member ensures ctor/dtors are called correctly on temporaries
+        int * ptr;
 };
 
 // with clause on reference parameter
-void ?{}(S & this, int n) with(this) {
-  i = n;
-  ptr = (int *)malloc(sizeof(int));
+void ?{}( S & this, int n ) with( this ) {
+        i = n;
+        ptr = (int *)malloc( sizeof(int) );
 }
 
-void ?{}(S & this) {
-  this{ 0 };
+void ?{}( S & this ) {
+        this{ 0 };
 }
 
-void ?{}(S & this, S other) {
-  this{ other.i };
+void ?{}( S & this, S other ) {
+        this{ other.i };
 }
 
-S ?=?(S & this, S other) with(this) {
-  i = other.i;
-  *ptr = *other.ptr;
-  return this;
+S ?=?( S & this, S other ) with( this ) {
+        i = other.i;
+        *ptr = *other.ptr;
+        return this;
 }
 
-void ^?{}(S & this) with(this) {
-  free(ptr);
+void ^?{}( S & this ) with( this ) {
+        free( ptr );
 }
 
 struct S2 {
-  S s;
+        S s;
 };
 
-void ?{}(S2 & this, int n) {
-  (this.s){ n };
+void ?{}( S2 & this, int n ) {
+        (this.s){ n };
 }
 
-forall(otype T)
+forall( otype T )
 struct Box {
-  T x;
+        T x;
 };
 
-forall(otype T)
-void ?{}(Box(T) & this) with(this) { // with clause in polymorphic function
-  x{};
+forall( otype T )
+void ?{}( Box(T) & this ) with( this ) { // with clause in polymorphic function
+        x{};
 }
 
-void print(int i) { printf("%d", i); }
+void print( int i ) { sout | i; }
 
-forall(otype T | { void print(T); })
-void foo(T t) {
-  Box(T) b = { t };
-  with(b) {  // with statement in polymorphic function
-    print(x);
-    printf("\n");
-  }
+forall( otype T | { void print( T ); })
+void foo( T t ) {
+        Box( T ) b = { t };
+        with( b ) {  // with statement in polymorphic function
+                print( x );
+        }
 }
 
 // ensure with-statement temporary generation works correctly
 S mk() {
-  printf("called mk\n");
-  return (S) { 444 };
+        sout | "called mk";
+        return (S){ 444 };
 }
 
 // ensure with-statement temporary generation with reference-returning functions works correctly
 S & ref() {
-  static S var = { 123456789 };
-  return var;
+        static S var = { 123456789 };
+        return var;
 }
 
 int main() {
-  S2 s2 = { 12345 };
-  with (s2) {
-    with(s) { // with s2.s
-      printf("%d %d %d\n", i, s.i, s2.s.i);
-      foo(i);  // s.i
-      with(mk()) {
-        printf("%d %d %d\n", i, i, i);
-        with(ref()) {
-          printf("%d %d %d\n", i, i, i);
-        } // with ref()
-        with(ref()) {
-          printf("%d %d %d\n", i, i, i);
-        } // with ref()
-      } // with mk()
-    } // with s
-  } // with s2
+        S2 s2 = { 12345 };
+        with ( s2) {
+                with( s ) { // with s2.s
+                        sout | i | s.i | s2.s.i;
+                        foo( i );  // s.i
+                        with( mk()) {
+                                sout | i | i | i;
+                                with( ref()) {
+                                        sout | i | i | i;
+                                } // with ref()
+                                with( ref()) {
+                                        sout | i | i | i;
+                                } // with ref()
+                        } // with mk()
+                } // with s
+        } // with s2
 }