Index: Makefile.am
===================================================================
--- Makefile.am	(revision 4dd10fbd1d6b6cf437406603b466ce87ae7f2136)
+++ Makefile.am	(revision e2887a97cbde3855b9c0eeb23a3b1e7cdbd49e14)
@@ -11,13 +11,7 @@
 ## Created On       : Sun May 31 22:14:18 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon May  1 16:38:04 2023
-## Update Count     : 32
+## Last Modified On : Fri May 12 18:30:01 2023
+## Update Count     : 42
 ###############################################################################
-
-# user targets:
-#  Compile compiler/runtime and run test suite.
-#  $ make check / tests [debug=yes/no] [installed=yes/no] [arch=x86/x64/arm]
-#  
-#  $ make installcheck [debug=yes/no] installed=yes [arch=x86/x64/arm]
 
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
@@ -30,10 +24,10 @@
 DIST_SUBDIRS = driver src . libcfa tests
 
-@LIBCFA_TARGET_MAKEFILES@ : Makefile $(srcdir)/libcfa/configure
-	@$(eval config_file = $(dir $@)config.data)
-	@ls $(config_file) || (echo "Missing config.data, re-run configure script again" && false)
-	@$(eval config_data = $(shell cat $(config_file)))
-	@echo "Configuring libcfa ($(abs_top_srcdir)/libcfa/configure) with '$(config_data)' from $(shell pwd) / $(dir $@)"
-	@cd $(dir $@) && $(abs_top_srcdir)/libcfa/configure $(config_data)
+@LIBCFA_TARGET_MAKEFILES@ : Makefile ${srcdir}/libcfa/configure
+	@${eval config_file = ${dir ${@}}config.data}
+	@ls ${config_file} || (echo "Missing config.data, re-run configure script again" && false)
+	@${eval config_data = ${shell cat ${config_file}}}
+	@echo "Configuring libcfa (${abs_top_srcdir}/libcfa/configure) with '${config_data}' from ${shell pwd} / ${dir ${@}}"
+	@cd ${dir ${@}} && ${abs_top_srcdir}/libcfa/configure ${config_data}
 
 noinst_DATA = @LIBCFA_TARGET_MAKEFILES@
@@ -45,24 +39,34 @@
 debug ?= yes
 installed ?= no
-ARCH = $(if $(arch),"arch=$(arch)")
+ARCH = ${if ${arch},"arch=${arch}"}
 
-check:
-	$(MAKE) -C tests tests installed=$(installed) debug=$(debug) $(ARCH)
+check :
+	${MAKE} -C tests tests installed=${installed} debug=${debug} ${ARCH}
 
-tests: check # synonym
+tests : check # synonym
 
-installcheck:
-	$(MAKE) -C tests tests installed=yes debug=$(debug) $(ARCH)
+installcheck :
+	${MAKE} -C tests tests installed=yes debug=${debug} ${ARCH}
 
-configure-libcfa: @LIBCFA_TARGET_MAKEFILES@
+installtest : installcheck # synonym
+
+help :
+	@echo "user targets:"
+	@echo "    Compile compiler/runtime and run test suite."
+	@echo "    $$ make check / tests [debug=yes/no] [installed=yes/no] [arch=x86/x64/arm]"
+	@echo ""
+	@echo "    Compile compiler/runtime, run test suite, and install."
+	@echo "    $$ make installcheck / installtests [debug=yes/no] installed=yes [arch=x86/x64/arm]"
+
+configure-libcfa : @LIBCFA_TARGET_MAKEFILES@
 	@true
 
-status: @LIBCFA_TARGET_MAKEFILES@
+status : @LIBCFA_TARGET_MAKEFILES@
 	@echo -ne "translator\n\t"
 	@./config.status --config | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
 	@find libcfa -name config.status -printf "\n%h\n\t" -exec {} --config \; | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
 
-@LIBCFA_TARGET_DIRS@::
-	$(MAKE) -C $@ $(MAKECMDGOALS)
+@LIBCFA_TARGET_DIRS@ ::
+	${MAKE} -C ${@} ${MAKECMDGOALS}
 
-mostlyclean clean distclean maintainer-clean: @LIBCFA_TARGET_DIRS@
+mostlyclean clean distclean maintainer-clean : @LIBCFA_TARGET_DIRS@
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 4dd10fbd1d6b6cf437406603b466ce87ae7f2136)
+++ tests/Makefile.am	(revision e2887a97cbde3855b9c0eeb23a3b1e7cdbd49e14)
@@ -11,14 +11,7 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon May  1 17:25:24 2023
-## Update Count     : 145
+## Last Modified On : Fri May 12 18:03:57 2023
+## Update Count     : 176
 ###############################################################################
-
-# user targets:
-#  Run the complete test suite.
-#  $ make  / tests [debug=yes/no] [installed=yes/no] [arch=x86/x64/arm]
-#  
-#  Run the short (quick) test suite.
-#  $ make quick [debug=yes/no] [installed=yes/no] [arch=x86/x64/arm]
 
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
@@ -27,9 +20,9 @@
 include $(top_srcdir)/tools/build/cfa.make
 
-DEFAULT_INCLUDES = -I$(abs_srcdir)
+DEFAULT_INCLUDES = -I${abs_srcdir}
 
 debug ?= yes
 installed ?= no
-ARCH=$(if $(arch),"--arch=$(arch)")
+ARCH=${if ${arch},"--arch=${arch}"}
 archiveerrors=
 
@@ -41,10 +34,10 @@
 timeouts=
 
-TEST_PY = python3 $(builddir)/test.py
+TEST_PY = python3 ${builddir}/test.py
 
 # applies to both programs
 # since automake doesn't have support for CFA we have to
-AM_CFLAGS = $(if $(test), 2> $(test), ) \
-	-fdebug-prefix-map=$(abspath $(abs_srcdir))= \
+AM_CFLAGS = ${if ${test}, 2> ${test}, } \
+	-fdebug-prefix-map=${abspath ${abs_srcdir}}= \
 	-fdebug-prefix-map=/tmp= \
 	-fno-diagnostics-show-caret \
@@ -59,9 +52,9 @@
 
 # get the desired cfa to test
-TARGET_CFA = $(if $(filter $(installed),yes), @CFACC_INSTALL@, @CFACC@)
+TARGET_CFA = ${if ${filter ${installed},yes}, @CFACC_INSTALL@, @CFACC@}
 
 # adjust CC to current flags
-CC = LC_ALL=C $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) $(ARCH_FLAGS) ,$(TARGET_CFA) $(DEBUG_FLAGS) $(ARCH_FLAGS))
-CFACC = $(CC)
+CC = LC_ALL=C ${if ${DISTCC_CFA_PATH},distcc ${DISTCC_CFA_PATH} ${ARCH_FLAGS} ,${TARGET_CFA} ${DEBUG_FLAGS} ${ARCH_FLAGS}}
+CFACC = ${CC}
 
 # get local binary for depedencies
@@ -69,11 +62,11 @@
 
 # adjusted CC but without the actual distcc call
-CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) $(ARCH_FLAGS) ,$(TARGET_CFA) $(DEBUG_FLAGS) $(ARCH_FLAGS))
-CFACCLINK = $(CFACCLOCAL) -quiet $(if $(test), 2> $(test), ) $($(shell echo "$(@)_FLAGSLD" | sed 's/-\|\//_/g'))
-
-PRETTY_PATH=mkdir -p $(dir $(abspath $(@))) && cd $(srcdir) &&
-
-.PHONY: list .validate .test_makeflags
-.INTERMEDIATE: .validate .validate.cfa .test_makeflags
+CFACCLOCAL = ${if ${DISTCC_CFA_PATH},${DISTCC_CFA_PATH} ${ARCH_FLAGS} ,${TARGET_CFA} ${DEBUG_FLAGS} ${ARCH_FLAGS}}
+CFACCLINK = ${CFACCLOCAL} -quiet ${if ${test}, 2> ${test}, } ${${shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g'}}
+
+PRETTY_PATH=mkdir -p ${dir ${abspath ${@}}} && cd ${srcdir} &&
+
+.PHONY : list .validate .test_makeflags
+.INTERMEDIATE : .validate .validate.cfa .test_makeflags
 EXTRA_PROGRAMS = avl_test linkonce linking/mangling/anon .dummy_hack # build but do not install
 EXTRA_DIST = test.py \
@@ -101,11 +94,10 @@
 dist-hook:
 	echo "Gathering test files"
-	for file in `$(TEST_PY) --list-dist`; do \
-		if test -f $(srcdir)/$${file}; then \
-			$(MKDIR_P) $$(dirname $(distdir)/$${file}); \
-			cp -df $(srcdir)/$${file} $(distdir)/$${file}; \
+	for file in `${TEST_PY} --list-dist`; do \
+		if test -f ${srcdir}/$${file}; then \
+			${MKDIR_P} $$(dirname ${distdir}/$${file}); \
+			cp -df ${srcdir}/$${file} ${distdir}/$${file}; \
 		fi; \
 	done
-
 
 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
@@ -118,5 +110,5 @@
 
 all-local : # This name is important to automake and implies the default build target.
-	@+$(TEST_PY) --debug=$(debug) --install=$(installed) --archive-errors=$(archiveerrors) $(concurrent) $(timeouts) $(ARCH) --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+	@+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${ARCH} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 install : all-local # PAB only
@@ -125,42 +117,56 @@
 
 quick :
-	@+$(TEST_PY) --debug=$(debug) --install=$(installed) --archive-errors=$(archiveerrors) $(concurrent) $(timeouts) $(ARCH) $(quick_test)
+	@+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${ARCH} ${quick_test}
+
+concurrency :
+	@+${TEST_PY} --debug=${debug} --install=${installed} ${ARCH} -Iconcurrent
+
+list :
+	@+${TEST_PY} --list ${concurrent}
+
+help :
+	@echo "user targets:"
+	@echo "    Run the complete test suite."
+	@echo "    $$ make (null) / tests [debug=yes/no] [installed=yes/no] [arch=x86/x64/arm]"
+	@echo ""
+	@echo "    Run the short (quick) test suite."
+	@echo "    $$ make quick [debug=yes/no] [installed=yes/no] [arch=x86/x64/arm]"
+	@echo ""
+	@echo "    Run the concurrent test suite."
+	@echo "    $$ make concurrency [debug=yes/no] [installed=yes/no] [arch=x86/x64/arm]"
+	@echo ""
+	@echo "    List all tests in the test suite."
+	@echo "    $$ make list"
 
 mostlyclean-local :
-	find $(builddir) -not -path './__pycache__/*' -path '*.o' -delete
-	find $(builddir) -not -path './__pycache__/*' -path '*/.err/*.log' -delete
-	find $(builddir) -not -path './__pycache__/*' -path '*/.out/*.log' -delete
-	rm -f $(EXTRA_PROGRAMS)
+	find ${builddir} -not -path './__pycache__/*' -path '*.o' -delete
+	find ${builddir} -not -path './__pycache__/*' -path '*/.err/*.log' -delete
+	find ${builddir} -not -path './__pycache__/*' -path '*/.out/*.log' -delete
+	rm -f ${EXTRA_PROGRAMS}
 	rm -rf __pycache__
 
 distclean-local :
-	find $(builddir) -path '*.Po' -delete
-
-list :
-	@+$(TEST_PY) --list $(concurrent)
+	find ${builddir} -path '*.Po' -delete
 
 .test_makeflags:
-	@echo "$(MAKEFLAGS)"
+	@echo "${MAKEFLAGS}"
 
 .validate: .validate.cfa
-	$(CFACOMPILE) .validate.cfa -fsyntax-only -Wall -Wextra -Werror
+	${CFACOMPILE} .validate.cfa -fsyntax-only -Wall -Wextra -Werror
 
 .validate.cfa:
-	@echo "int main() { return 0; }" > $(@)
+	@echo "int main() { return 0; }" > ${@}
 
 # automake doesn't know we still need C rules so pretend like we have a C program
 .dummy_hack.c:
-	@echo "int main() { return 0; }" > $(@)
+	@echo "int main() { return 0; }" > ${@}
 
 .dummy_hackxx.cpp:
-	@echo "int bar() { return 0; }" > $(@)
-
-concurrency :
-	@+$(TEST_PY) --debug=$(debug)  --install=$(installed) -Iconcurrent
+	@echo "int bar() { return 0; }" > ${@}
 
 #----------------------------------------------------------------------------------------------------------------
 
 # Use for all tests, make sure the path are correct and all flags are added
-CFACOMPILETEST=$(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=$(srcdir) $(<)) $($(shell echo "$(@)_FLAGSCFA" | sed 's/-\|\//_/g'))
+CFACOMPILETEST=${PRETTY_PATH} ${CFACOMPILE} ${shell realpath --relative-to=${srcdir} ${<}} ${${shell echo "${@}_FLAGSCFA" | sed 's/-\|\//_/g'}}
 
 #----------------------------------------------------------------------------------------------------------------
@@ -169,13 +175,13 @@
 # split into two steps to support compiling remotely using distcc
 # don't use distcc to do the linking because distcc doesn't do linking
-% : %.cfa $(CFACCBIN)
-	$(CFACOMPILETEST) -c -o $(abspath $(@)).o -DIN_DIR="$(abspath $(dir $(<)))/.in/"
-	$(CFACCLINK) $(@).o -o $(abspath $(@))
-	rm $(abspath $(@)).o
+% : %.cfa ${CFACCBIN}
+	${CFACOMPILETEST} -c -o ${abspath ${@}}.o -DIN_DIR="${abspath ${dir ${<}}}/.in/"
+	${CFACCLINK} ${@}.o -o ${abspath ${@}}
+	rm ${abspath ${@}}.o
 
 # implicit rule for c++ test
 # convient for testing the testsuite itself but not actuall used
 % : %.cpp
-	$(PRETTY_PATH) $(CXXCOMPILE) $(shell realpath --relative-to=$(srcdir) $(<)) -o $(abspath $(@))
+	${PRETTY_PATH} ${CXXCOMPILE} ${shell realpath --relative-to=${srcdir} ${<}} -o ${abspath ${@}}
 
 #------------------------------------------------------------------------------
@@ -188,6 +194,6 @@
 # Generated code
 GENERATED_CODE = declarationSpecifier gccExtensions extension attributes functions KRfunctions
-$(GENERATED_CODE): % : %.cfa $(CFACCBIN)
-	$(CFACOMPILETEST) -CFA -XCFA -p -c -fsyntax-only -o $(abspath $(@))
+${GENERATED_CODE} : % : %.cfa ${CFACCBIN}
+	${CFACOMPILETEST} -CFA -XCFA -p -c -fsyntax-only -o ${abspath ${@}}
 
 #------------------------------------------------------------------------------
@@ -195,63 +201,63 @@
 #------------------------------------------------------------------------------
 # tests that just validate syntax and compiler output should be compared to stderr
-CFACOMPILE_SYNTAX = $(CFACOMPILETEST) -Wno-unused-variable -Wno-unused-label -c -fsyntax-only -o $(abspath $(@))
+CFACOMPILE_SYNTAX = ${CFACOMPILETEST} -Wno-unused-variable -Wno-unused-label -c -fsyntax-only -o ${abspath ${@}}
 
 SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator \
 	init1 limits nested-types cast labelledExit array quasiKeyword include/stdincludes include/includes builtins/sync warnings/self-assignment concurrent/waitfor/parse
-$(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX)
-	$(if $(test), cp $(test) $(abspath $(@)), )
+${SYNTAX_ONLY_CODE} : % : %.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX}
+	${if ${test}, cp ${test} ${abspath ${@}}, }
 
 # expected failures
 # use custom target since they require a custom define *and* have a name that doesn't match the file
-alloc-ERROR : alloc.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR1
-	-cp $(test) $(abspath $(@))
-
-init1-ERROR : init1.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR1
-	-cp $(test) $(abspath $(@))
-
-typedefRedef-ERR1 : typedefRedef.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR1
-	-cp $(test) $(abspath $(@))
-
-nested-types-ERR1 : nested-types.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR1
-	-cp $(test) $(abspath $(@))
-
-nested-types-ERR2 : nested-types.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR2
-	-cp $(test) $(abspath $(@))
-
-raii/memberCtors-ERR1 : raii/memberCtors.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR1
-	-cp $(test) $(abspath $(@))
-
-raii/ctor-autogen-ERR1 : raii/ctor-autogen.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR1
-	-cp $(test) $(abspath $(@))
-
-raii/dtor-early-exit-ERR1 : raii/dtor-early-exit.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR1
-	-cp $(test) $(abspath $(@))
-
-raii/dtor-early-exit-ERR2 : raii/dtor-early-exit.cfa $(CFACCBIN)
-	$(CFACOMPILE_SYNTAX) -DERR2
-	-cp $(test) $(abspath $(@))
+alloc-ERROR : alloc.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR1
+	-cp ${test} ${abspath ${@}}
+
+init1-ERROR : init1.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR1
+	-cp ${test} ${abspath ${@}}
+
+typedefRedef-ERR1 : typedefRedef.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR1
+	-cp ${test} ${abspath ${@}}
+
+nested-types-ERR1 : nested-types.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR1
+	-cp ${test} ${abspath ${@}}
+
+nested-types-ERR2 : nested-types.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR2
+	-cp ${test} ${abspath ${@}}
+
+raii/memberCtors-ERR1 : raii/memberCtors.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR1
+	-cp ${test} ${abspath ${@}}
+
+raii/ctor-autogen-ERR1 : raii/ctor-autogen.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR1
+	-cp ${test} ${abspath ${@}}
+
+raii/dtor-early-exit-ERR1 : raii/dtor-early-exit.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR1
+	-cp ${test} ${abspath ${@}}
+
+raii/dtor-early-exit-ERR2 : raii/dtor-early-exit.cfa ${CFACCBIN}
+	${CFACOMPILE_SYNTAX} -DERR2
+	-cp ${test} ${abspath ${@}}
 
 # Exception Tests
 # Test with libcfathread; it changes how storage works.
 
-exceptions/%-threads : exceptions/%.cfa $(CFACCBIN)
-	$(CFACOMPILETEST) -include exceptions/with-threads.hfa -c -o $(abspath $(@)).o
-	$(CFACCLOCAL) $($(shell echo "$(@)_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath $(@)).o -o $(abspath $(@))
+exceptions/%-threads : exceptions/%.cfa ${CFACCBIN}
+	${CFACOMPILETEST} -include exceptions/with-threads.hfa -c -o ${abspath ${@}}.o
+	${CFACCLOCAL} ${${shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g'}} ${abspath ${@}}.o -o ${abspath ${@}}
 
 # Linking tests
 # Meta tests to make sure we see linking errors (can't compile with -O2 since it may multiply number of calls)
-linking/linkerror : linking/linkerror.cfa $(CFACCBIN)
-	$(CFACOMPILETEST) -O0 -c -o $(abspath $(@)).o
-	$(CFACCLINK)  -O0 $(@).o -o $(abspath $(@))
-	rm $(abspath $(@)).o
+linking/linkerror : linking/linkerror.cfa ${CFACCBIN}
+	${CFACOMPILETEST} -O0 -c -o ${abspath ${@}}.o
+	${CFACCLINK}  -O0 ${@}.o -o ${abspath ${@}}
+	rm ${abspath ${@}}.o
 
 #------------------------------------------------------------------------------