Diff [b826e6b7674b1614df5016529521f2926b812835:fea3faac1cd99d58dc1dd738883cfb602a81f178] for / – Cforall

.gitignore

-              rb826e6b
+              rfea3faa
 src/libcfa/libcfa-prelude.c
 # generated by bison and lex from parser.yy and lex.ll
+# generated by bison and lex from cfa.yy and lex.ll, respectively
 src/Parser/parser.output
 src/Parser/lex.cc
 src/Parser/parser.cc
 src/Parser/parser.h
-src/Parser/parser.hh
-tools/prettyprinter/parser.output
-tools/prettyprinter/lex.cc
-tools/prettyprinter/parser.cc
-tools/prettyprinter/parser.h
-tools/prettyprinter/parser.hh
-tools/prettyprinter/pretty
-tools/pretty
 # generated by xfig for user manual
 …
 doc/user/pointer1.tex
 doc/user/pointer2.tex
-doc/user/EHMHierarchy.tex

Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 ###############################################################################
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
 host_triplet = @host@
 subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+        $(top_srcdir)/configure INSTALL automake/compile \
+        automake/config.guess automake/config.sub automake/depcomp \
+        automake/install-sh automake/missing automake/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-        $(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 …
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+am__v_GEN_0 = @echo "  GEN   " $@;
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
-am__v_at_1 =
 SOURCES =
 DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+        ctags-recursive dvi-recursive html-recursive info-recursive \
+        install-data-recursive install-dvi-recursive \
+        install-exec-recursive install-html-recursive \
+        install-info-recursive install-pdf-recursive \
+        install-ps-recursive install-recursive installcheck-recursive \
+        installdirs-recursive pdf-recursive ps-recursive \
+        tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+        html-recursive info-recursive install-data-recursive \
+        install-dvi-recursive install-exec-recursive \
+        install-html-recursive install-info-recursive \
+        install-pdf-recursive install-ps-recursive install-recursive \
+        installcheck-recursive installdirs-recursive pdf-recursive \
+        ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
   distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+        cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+        $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+        $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+        distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-        $(top_srcdir)/automake/compile \
-        $(top_srcdir)/automake/config.guess \
-        $(top_srcdir)/automake/config.sub \
-        $(top_srcdir)/automake/install-sh \
-        $(top_srcdir)/automake/missing INSTALL README automake/compile \
-        automake/config.guess automake/config.sub automake/depcomp \
-        automake/install-sh automake/missing automake/ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 …
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
 …
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
 config.h: stamp-h1
         @test -f $@ || rm -f stamp-h1
         @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+        @if test ! -f $@; then rm -f stamp-h1; else :; fi
+        @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 …
 # This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+        @fail=; \
+        if $(am__make_keepgoing); then \
+          failcom='fail=yes'; \
+        else \
+          failcom='exit 1'; \
+        fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+        @fail= failcom='exit 1'; \
+        for f in x $$MAKEFLAGS; do \
+          case $$f in \
+            *=* | --[!k]*);; \
+            *k*) failcom='fail=yes';; \
+          esac; \
+        done; \
         dot_seen=no; \
         target=`echo $@ | sed s/-recursive//`; \
+        case "$@" in \
+          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+          *) list='$(SUBDIRS)' ;; \
+        esac; \
+        for subdir in $$list; do \
+        list='$(SUBDIRS)'; for subdir in $$list; do \
           echo "Making $$target in $$subdir"; \
           if test "$$subdir" = "."; then \
 …
         fi; test -z "$$fail"
+ID: $(am__tagged_files)
+        $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+$(RECURSIVE_CLEAN_TARGETS):
+        @fail= failcom='exit 1'; \
+        for f in x $$MAKEFLAGS; do \
+          case $$f in \
+            *=* | --[!k]*);; \
+            *k*) failcom='fail=yes';; \
+          esac; \
+        done; \
+        dot_seen=no; \
+        case "$@" in \
+          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+          *) list='$(SUBDIRS)' ;; \
+        esac; \
+        rev=''; for subdir in $$list; do \
+          if test "$$subdir" = "."; then :; else \
+            rev="$$subdir $$rev"; \
+          fi; \
+        done; \
+        rev="$$rev ."; \
+        target=`echo $@ | sed s/-recursive//`; \
+        for subdir in $$rev; do \
+          echo "Making $$target in $$subdir"; \
+          if test "$$subdir" = "."; then \
+            local_target="$$target-am"; \
+          else \
+            local_target="$$target"; \
+          fi; \
+          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          || eval $$failcom; \
+        done && test -z "$$fail"
+tags-recursive:
+        list='$(SUBDIRS)'; for subdir in $$list; do \
+          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+        done
+ctags-recursive:
+        list='$(SUBDIRS)'; for subdir in $$list; do \
+          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+        done
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        mkid -fID $$unique
+tags: TAGS
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
         set x; \
         here=`pwd`; \
 …
           fi; \
         done; \
+        $(am__define_uniq_tagged_files); \
+        list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         shift; \
         if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 …
           fi; \
         fi
+ctags: ctags-recursive
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         test -z "$(CTAGS_ARGS)$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 …
           && $(am__cd) $(top_srcdir) \
           && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-        test ! -s cscope.files \
-          || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-        -rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-cscopelist-am: $(am__tagged_files)
-        list='$(am__tagged_files)'; \
-        case "$(srcdir)" in \
-          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-          *) sdir=$(subdir)/$(srcdir) ;; \
-        esac; \
-        for i in $$list; do \
-          if test -f "$$i"; then \
-            echo "$(subdir)/$$i"; \
-          else \
-            echo "$$sdir/$$i"; \
-          fi; \
-        done >> $(top_builddir)/cscope.files
 distclean-tags:
         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-        -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 distdir: $(DISTFILES)
 …
         @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
+            $(am__make_dryrun) \
+              || test -d "$(distdir)/$$subdir" \
+              || $(MKDIR_P) "$(distdir)/$$subdir" \
+              || exit 1; \
+            test -d "$(distdir)/$$subdir" \
+            || $(MKDIR_P) "$(distdir)/$$subdir" \
+            || exit 1; \
+          fi; \
+        done
+        @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+          if test "$$subdir" = .; then :; else \
             dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
             $(am__relativize); \
 …
 dist-gzip: distdir
         tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
         $(am__post_remove_distdir)
+        $(am__remove_distdir)
 dist-bzip2: distdir
         tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
         $(am__post_remove_distdir)
+        $(am__remove_distdir)
 dist-lzip: distdir
         tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+        $(am__post_remove_distdir)
+        $(am__remove_distdir)
+dist-lzma: distdir
+        tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+        $(am__remove_distdir)
 dist-xz: distdir
         tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
         $(am__post_remove_distdir)
+        $(am__remove_distdir)
 dist-tarZ: distdir
-        @echo WARNING: "Support for distribution archives compressed with" \
-                       "legacy program 'compress' is deprecated." >&2
-        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
         tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
         $(am__post_remove_distdir)
+        $(am__remove_distdir)
 dist-shar: distdir
-        @echo WARNING: "Support for shar distribution archives is" \
-                       "deprecated." >&2
-        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
         shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
         $(am__post_remove_distdir)
+        $(am__remove_distdir)
 dist-zip: distdir
         -rm -f $(distdir).zip
         zip -rq $(distdir).zip $(distdir)
         $(am__post_remove_distdir)
 dist dist-all:
         $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
         $(am__post_remove_distdir)
+        $(am__remove_distdir)
+dist dist-all: distdir
+        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+        $(am__remove_distdir)
 # This target untars the dist file and tries a VPATH configuration.  Then
 …
         *.tar.bz2*) \
           bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+        *.tar.lzma*) \
+          lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
         *.tar.lz*) \
           lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 …
           unzip $(distdir).zip ;;\
         esac
         chmod -R a-w $(distdir)
         chmod u+w $(distdir)
         mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+        chmod -R a-w $(distdir); chmod a+w $(distdir)
+        mkdir $(distdir)/_build
+        mkdir $(distdir)/_inst
         chmod a-w $(distdir)
         test -d $(distdir)/_build || exit 0; \
 …
           && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
           && am__cwd=`pwd` \
           && $(am__cd) $(distdir)/_build/sub \
           && ../../configure \
+          && $(am__cd) $(distdir)/_build \
+          && ../configure --srcdir=.. --prefix="$$dc_install_base" \
             $(AM_DISTCHECK_CONFIGURE_FLAGS) \
             $(DISTCHECK_CONFIGURE_FLAGS) \
-            --srcdir=../.. --prefix="$$dc_install_base" \
           && $(MAKE) $(AM_MAKEFLAGS) \
           && $(MAKE) $(AM_MAKEFLAGS) dvi \
 …
           && cd "$$am__cwd" \
           || exit 1
         $(am__post_remove_distdir)
+        $(am__remove_distdir)
         @(echo "$(distdir) archives ready for distribution: "; \
           list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 …
 uninstall-am:
+.MAKE: $(am__recursive_targets) all install-am install-strip
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+        am--refresh check check-am clean clean-cscope clean-generic \
+        cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+        dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+        ctags-recursive install-am install-strip tags-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+        all all-am am--refresh check check-am clean clean-generic \
+        ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+        dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
         distcheck distclean distclean-generic distclean-hdr \
         distclean-tags distcleancheck distdir distuninstallcheck dvi \
 …
         installcheck installcheck-am installdirs installdirs-am \
         maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+        uninstall-am
+.PRECIOUS: Makefile
+        mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+        uninstall uninstall-am

aclocal.m4

-              rb826e6b
+              rfea3faa
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 # PARTICULAR PURPOSE.
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 [m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # AM_AUTOMAKE_VERSION(VERSION)
 …
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.15'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
 m4_if([$1], [1.15], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 …
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 [AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 …
 # Figure out how to run the assembler.                      -*- Autoconf -*-
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 5
 # AM_PROG_AS
 …
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
 # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
 # Of course, Automake must honor this variable whenever it calls a
 …
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
 # harmless because $srcdir is '.', but things will broke when you
+# harmless because $srcdir is `.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
+#
 …
 AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 # AM_COND_IF                                            -*- Autoconf -*-
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 3
 # _AM_COND_IF
 …
 m4_define([_AM_COND_ELSE])
 m4_define([_AM_COND_ENDIF])
 # AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
 …
 # AM_CONDITIONAL                                            -*- Autoconf -*-
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 9
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 …
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ([2.52])dnl
  m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 …
 fi])])
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 12
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 …
 # ----------------------
 # See how the compiler implements dependency checking.
 # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
+#
 …
 AC_REQUIRE([AM_DEP_TRACK])dnl
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
 AC_CACHE_CHECK([dependency style of $depcc],
 …
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named 'D' -- because '-MD' means "put the output
   # in D".
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   rm -rf conftest.dir
   mkdir conftest.dir
 …
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
       # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
       # Solaris 10 /bin/sh.
       echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
     # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle '-M -o', and we need to detect this.  Also, some Intel
     # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
 …
       ;;
     nosideeffect)
       # After this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
         continue
 …
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok '-c -o', but also, the minuso test has
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
 …
 # -------------
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 …
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
 …
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#serial 5
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 …
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
   # Older Autoconf quotes --file arguments for eval, but not when files
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
 …
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
     # We used to match only the files named 'Makefile.in', but
+    # We used to match only the files named `Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
 …
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
     # from the Makefile without running 'make'.
+    # from the Makefile without running `make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
     test -z "$am__include" && continue
+    test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
 …
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
          sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
 …
+#
 # This code is only required when automatic dependency tracking
 # is enabled.  FIXME.  This creates each '.P' file that we will
+# is enabled.  FIXME.  This creates each `.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 …
 # Do all the work for Automake.                             -*- Autoconf -*-
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 16
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 …
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_PREREQ([2.65])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 …
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
 …
 _AM_IF_OPTION([no-define],,
 [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
  AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
 AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
 AM_MISSING_PROG([AUTOCONF], [autoconf])
 AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
 AM_MISSING_PROG([AUTOHEADER], [autoheader])
 AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 …
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
                   [_AM_DEPENDENCIES([CC])],
                   [m4_define([AC_PROG_CC],
                              m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_AM_DEPENDENCIES([CXX])],
                   [m4_define([AC_PROG_CXX],
                              m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES([OBJC])],
+                  [m4_define([AC_PROG_OBJC],
+                             m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+                  [_AM_DEPENDENCIES([OBJCXX])],
+                  [m4_define([AC_PROG_OBJCXX],
+                             m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+])
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 # When config.status generates a header, we must update the stamp-h file.
 …
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # AM_PROG_INSTALL_SH
 …
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 if test x"${install_sh+set}" != xset; then
+if test x"${install_sh}" != xset; then
   case $am_aux_dir in
   *\ * | *\     *)
 …
   esac
 fi
+AC_SUBST([install_sh])])
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+AC_SUBST(install_sh)])
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 2
 # Check whether the underlying file-system supports filenames
 …
 # From Jim Meyering
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 5
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
 # Default is to disable them, unless 'enable' is passed literally.
 # For symmetry, 'disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 …
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
 …
+)
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 # Check to see how 'make' treats includes.                  -*- Autoconf -*-
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 4
 # AM_MAKE_INCLUDE()
 …
 # First try GNU make style include.
 echo "include confinc" > confmf
 # Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 …
 ])
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 6
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 6
 # AM_MISSING_PROG(NAME, PROGRAM)
 …
 AC_SUBST($1)])
 # AM_MISSING_HAS_RUN
 # ------------------
 # Define MISSING if not defined so far and test if it is modern enough.
 # If it is, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 …
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 ])
 # Helper functions for option handling.                     -*- Autoconf -*-
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 5
 # _AM_MANGLE_OPTION(NAME)
 …
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 # _AM_SET_OPTIONS(OPTIONS)
 …
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 5
 # AM_SANITY_CHECK
 …
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 …
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \    ]]*)
     AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
 esac
 # Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 …
 # directory).
 if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+        # -L didn't work.
+        set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+        && test "$[*]" != "X conftest.file $srcdir/configure"; then
+        # If neither matched, then we have a broken ls.  This can happen
+        # if, for instance, CONFIG_SHELL is bash and it inherits a
+        # broken ls alias from the environment.  This has actually
+        # happened.  Such a system could not be considered "sane".
+        AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
    test "$[2]" = conftest.file
+   )
 …
 Check your system clock])
 fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+AC_MSG_RESULT(yes)])
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 2
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
 # ("yes" being less verbose, "no" or empty being verbose).
+# (`yes' being less verbose, `no' or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
 dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 …
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
   dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 …
 ])
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor 'install' (even GNU) is that you can't
+# One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
 # always use install-sh in "make install-strip", and initialize
+# always use install-sh in `make install-strip', and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 # Installed binaries are usually stripped using 'strip' when the user
 # run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
 # will honor the 'STRIP' environment variable to overrule this program.
 dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 …
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 3
 # _AM_SUBST_NOTMAKE(VARIABLE)
 …
 # Check how to create a tarball.                            -*- Autoconf -*-
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 2
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
 # FORMAT should be one of 'v7', 'ustar', or 'pax'.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
 # Substitute a variable $(am__tar) that is a command
 …
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
+# We'll loop over all known methods to create a tar archive until one works.
+m4_if([$1], [v7],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+  [pax],
+    [],
+  [m4_fatal([Unknown tar format])])
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+  # tar/untar a dummy directory, and stop if the command works
   rm -rf conftest.dir
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])

automake/config.guess

rb826e6b	rfea3faa
1		/usr/share/automake-1.15/config.guess
	1	/usr/share/automake-1.11/config.guess

automake/config.sub

rb826e6b	rfea3faa
1		/usr/share/automake-1.15/config.sub
	1	/usr/share/automake-1.11/config.sub

automake/missing

-              rb826e6b
+              rfea3faa
 #! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+scriptversion=2013-10-28.13; # UTC
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Common stub for a few missing GNU programs while installing.
+scriptversion=2012-01-06.13; # UTC
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
 …
 if test $# -eq 0; then
   echo 1>&2 "Try '$0 --help' for more information"
+  echo 1>&2 "Try \`$0 --help' for more information"
   exit 1
 fi
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+msg="missing on your system"
 case $1 in
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
   -h|--h|--he|--hel|--help)
 …
 $0 [OPTION]... PROGRAM [ARGUMENT]...
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
 to PROGRAM being missing or too old.
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
 Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
 Send bug reports to <bug-automake@gnu.org>."
 …
   -*)
     echo 1>&2 "$0: unknown '$1' option"
     echo 1>&2 "Try '$0 --help' for more information"
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
     exit 1
     ;;
 …
 esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+  printf '%s\n' "'$1' is $msg."
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
+    # Not GNU programs, they don't have --version.
+    ;;
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+  autoconf*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+  autoheader*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+                                       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+           sed 's/\.am$/.in/' |
+           while read f; do touch "$f"; done
+    ;;
+  autom4te*)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+        touch $file
+    else
+        test -z "$file" || exec >$file
+        echo "#! /bin/sh"
+        echo "# Created by GNU Automake missing as a replacement of"
+        echo "#  $ $@"
+        echo "exit 0"
+        chmod +x $file
+        exit 1
+    fi
+    ;;
+  bison*|yacc*)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG=\${$#}
+        case $LASTARG in
+        *.y)
+            SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+            if test -f "$SRCFILE"; then
+                 cp "$SRCFILE" y.tab.c
+            fi
+            SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+            if test -f "$SRCFILE"; then
+                 cp "$SRCFILE" y.tab.h
+            fi
+          ;;
+        esac
+    fi
+    if test ! -f y.tab.h; then
+        echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+        echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+  lex*|flex*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG=\${$#}
+        case $LASTARG in
+        *.l)
+            SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+            if test -f "$SRCFILE"; then
+                 cp "$SRCFILE" lex.yy.c
+            fi
+          ;;
+        esac
+    fi
+    if test ! -f lex.yy.c; then
+        echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+  help2man*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a dependency of a manual page.  You may need the
+         \`Help2man' package in order for those modifications to take
+         effect.  You can get \`Help2man' from any GNU archive site."
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+        touch $file
+    else
+        test -z "$file" || exec >$file
+        echo ".ab help2man is required to generate this page"
+        exit $?
+    fi
+    ;;
+  makeinfo*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+        /^@setfilename/{
+          s/.* \([^ ]*\) *$/\1/
+          p
+          q
+        }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+exit 0
 # Local variables:

config.h.in

-              rb826e6b
+              rfea3faa
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
 /* Name of package */

configure

-              rb826e6b
+              rfea3faa
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for cfa-cc 1.0.0.0.
+# Generated by GNU Autoconf 2.68 for cfa-cc 1.0.0.0.
+#
 # Report bugs to <cforall@plg.uwaterloo.ca>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 …
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
 …
   exitcode=1; echo positional parameters were not saved.
 fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 …
       if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+  # We cannot yet assume a decent shell, so we have to provide a
+        # neutralization value for shells without unset; and this also
+        # works around shells that cannot unset nonexistent variables.
+        # Preserve -v and -x to the replacement shell.
+        BASH_ENV=/dev/null
+        ENV=/dev/null
+        (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+        export CONFIG_SHELL
+        case $- in # ((((
+          *v*x* | *x*v* ) as_opts=-vx ;;
+          *v* ) as_opts=-v ;;
+          *x* ) as_opts=-x ;;
+          * ) as_opts= ;;
+        esac
+        exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 …
 } # as_fn_mkdir_p
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
+{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 …
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
 …
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
     as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
   as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 …
 fi
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+        case $1 in #(
+        -*)set "./$1";;
+        esac;
+        case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+        ???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 # Sed expression to map a string onto a valid CPP name.
 …
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 …
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 …
     silent=yes ;;
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
 …
                 datadir sysconfdir sharedstatedir localstatedir includedir \
                 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
                 libdir localedir mandir runstatedir
+                libdir localedir mandir
 do
   eval ac_val=\$$ac_var
 …
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
 …
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
 …
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --disable-maintainer-mode
+                          disable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --disable-maintainer-mode  disable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer
   --enable-target-release Build and install the release target
   --enable-target-debug   Build and install the debug target
   --enable-threading      Build and install libcfa with threading support
                           (Enabled by default)
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
 Optional Packages:
 …
   cat <<\_ACEOF
 cfa-cc configure 1.0.0.0
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
+generated by GNU Autoconf 2.68
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 …
        } && test -s conftest$ac_exeext && {
          test "$cross_compiling" = yes ||
          test -x conftest$ac_exeext
+         $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 …
+{
 static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+test_array [0] = 0;
+return test_array [0];
+test_array [0] = 0
+  ;
 …
 static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
                  < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
+test_array [0] = 0;
+return test_array [0];
+test_array [0] = 0
+  ;
 …
+{
 static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0;
+return test_array [0];
+test_array [0] = 0
+  ;
 …
 It was created by cfa-cc $as_me 1.0.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
   $ $0 $@
 …
 fi
 case $enable_silent_rules in # (((
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
     *) AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
 esac
 am_make=${MAKE-make}
 …
 am__api_version='1.15'
+am__api_version='1.11'
 # Find a good install program.  We prefer a C program (faster),
 …
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
         if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+        if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
           if test $ac_prog = install &&
             grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 …
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 …
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \     ]*)
     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 # Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 …
 # directory).
 if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+        # -L didn't work.
+        set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+        && test "$*" != "X conftest.file $srcdir/configure"; then
+        # If neither matched, then we have a broken ls.  This can happen
+        # if, for instance, CONFIG_SHELL is bash and it inherits a
+        # broken ls alias from the environment.  This has actually
+        # happened.  Such a system could not be considered "sane".
+        as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
    test "$2" = conftest.file
+   )
 …
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-rm -f conftest.file
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 …
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 # Expand $ac_aux_dir to an absolute path.
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
 if test x"${MISSING+set}" != xset; then
 …
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
   am_missing_run=
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 if test x"${install_sh+set}" != xset; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+if test x"${install_sh}" != xset; then
   case $am_aux_dir in
   *\ * | *\     *)
 …
 fi
 # Installed binaries are usually stripped using 'strip' when the user
 # run "make install-strip".  However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
 # will honor the 'STRIP' environment variable to overrule this program.
+# will honor the `STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
     for ac_prog in mkdir gmkdir; do
          for ac_exec_ext in '' $ac_executable_extensions; do
            as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+           { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
            case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
              'mkdir (GNU coreutils) '* | \
 …
 $as_echo "$MKDIR_P" >&6; }
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 for ac_prog in gawk mawk nawk awk
 do
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 …
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_BACKEND_CC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
         case $host_cpu in
                 i386)
                         CFLAGS+=" -m32 "
                         CXXFLAGS+=" -m32 "
                         CFAFLAGS+=" -m32 "
                         LDFLAGS+=" -m32 "
+                        CFLAGS+="-m32"
+                        CXXFLAGS+="-m32"
+                        CFAFLAGS+="-m32"
+                        LDFLAGS+="-m32"
                         ;;
                 i686)
                         CFLAGS+=" -m32 "
                   CXXFLAGS+=" -m32 "
                   CFAFLAGS+=" -m32 "
                   LDFLAGS+=" -m32 "
+                        CFLAGS+="-m32"
+                        CXXFLAGS+="-m32"
+                        CFAFLAGS+="-m32"
+                        LDFLAGS+="-m32"
                         ;;
                 x86_64)
                         CFLAGS+=" -m64 "
                         CXXFLAGS+=" -m64 "
                         CFAFLAGS+=" -m64 "
                         LDFLAGS+=" -m64 "
+                        CFLAGS+="-m64"
+                        CXXFLAGS+="-m64"
+                        CFAFLAGS+="-m64"
+                        LDFLAGS+="-m64"
                         ;;
         esac
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
 # First try GNU make style include.
 echo "include confinc" > confmf
 # Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 …
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named 'D' -- because '-MD' means "put the output
   # in D".
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   rm -rf conftest.dir
   mkdir conftest.dir
 …
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
       # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
       # Solaris 10 /bin/sh.
       echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
     # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle '-M -o', and we need to detect this.  Also, some Intel
     # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
 …
       ;;
     nosideeffect)
       # After this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
         continue
 …
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok '-c -o', but also, the minuso test has
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
 #include <stdarg.h>
 #include <stdio.h>
+struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 …
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int
-main ()
+{
+  ;
-  return 0;
+}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 depcc="$CC"   am_compiler_list=
 …
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named 'D' -- because '-MD' means "put the output
   # in D".
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   rm -rf conftest.dir
   mkdir conftest.dir
 …
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
       # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
       # Solaris 10 /bin/sh.
       echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
     # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle '-M -o', and we need to detect this.  Also, some Intel
     # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
 …
       ;;
     nosideeffect)
       # After this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
         continue
 …
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok '-c -o', but also, the minuso test has
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
 …
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named 'D' -- because '-MD' means "put the output
   # in D".
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
   rm -rf conftest.dir
   mkdir conftest.dir
 …
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
       # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
       # Solaris 10 /bin/sh.
       echo '/* dummy */' > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
     # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle '-M -o', and we need to detect this.  Also, some Intel
     # versions had trouble with output in subdirs.
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
 …
       ;;
     nosideeffect)
       # After this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested.
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
       if test "x$enable_dependency_tracking" = xyes; then
         continue
 …
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok '-c -o', but also, the minuso test has
+      # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
 …
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+                      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+         test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+      then
+        # cc works too.
+        :
+      else
+        # cc exists but doesn't like -o.
+        eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+fi
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
         # deprecated
 # These are often not installed and people miss seeing the "no", so stop the configure.
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LEX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
 c { yymore (); }
 d { yyless (1); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
+    yyless ((input () != 0)); }
+e { yyless (input () != 0); }
 f { unput (yytext[0]); }
 . { BEGIN INITIAL; }
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 …
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 …
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 …
 $ac_includes_default
 int
 find_stack_direction (int *addr, int depth)
+find_stack_direction ()
+{
+  int dir, dummy = 0;
+  if (! addr)
+    addr = &dummy;
+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+  return dir + dummy;
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
 int
 main (int argc, char **argv)
+main ()
+{
   return find_stack_direction (0, argc + !argv + 20) < 0;
+  return find_stack_direction () < 0;
+}
 _ACEOF
 …
 /* end confdefs.h.  */
              #include <stdbool.h>
              #ifndef bool
               "error: bool is not defined"
              #endif
              #ifndef false
               "error: false is not defined"
              #endif
              #if false
               "error: false is not 0"
              #endif
              #ifndef true
               "error: true is not defined"
              #endif
              #if true != 1
               "error: true is not 1"
              #endif
              #ifndef __bool_true_false_are_defined
               "error: __bool_true_false_are_defined is not defined"
              #endif
              struct s { _Bool s: 1; _Bool t; } s;
              char a[true == 1 ? 1 : -1];
              char b[false == 0 ? 1 : -1];
              char c[__bool_true_false_are_defined == 1 ? 1 : -1];
              char d[(bool) 0.5 == true ? 1 : -1];
              /* See body of main program for 'e'.  */
              char f[(_Bool) 0.0 == false ? 1 : -1];
              char g[true];
              char h[sizeof (_Bool)];
              char i[sizeof s.t];
              enum { j = false, k = true, l = false * true, m = true * 256 };
              /* The following fails for
                 HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
              _Bool n[m];
              char o[sizeof n == m * sizeof n[0] ? 1 : -1];
              char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
              /* Catch a bug in an HP-UX C compiler.  See
                 http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
                 http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
               */
              _Bool q = true;
              _Bool *pq = &q;
+#include <stdbool.h>
+#ifndef bool
+ "error: bool is not defined"
+#endif
+#ifndef false
+ "error: false is not defined"
+#endif
+#if false
+ "error: false is not 0"
+#endif
+#ifndef true
+ "error: true is not defined"
+#endif
+#if true != 1
+ "error: true is not 1"
+#endif
+#ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+#endif
+        struct s { _Bool s: 1; _Bool t; } s;
+        char a[true == 1 ? 1 : -1];
+        char b[false == 0 ? 1 : -1];
+        char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+        char d[(bool) 0.5 == true ? 1 : -1];
+        /* See body of main program for 'e'.  */
+        char f[(_Bool) 0.0 == false ? 1 : -1];
+        char g[true];
+        char h[sizeof (_Bool)];
+        char i[sizeof s.t];
+        enum { j = false, k = true, l = false * true, m = true * 256 };
+        /* The following fails for
+           HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+        _Bool n[m];
+        char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+        char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+        /* Catch a bug in an HP-UX C compiler.  See
+           http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+           http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+         */
+        _Bool q = true;
+        _Bool *pq = &q;
 int
 …
+{
              bool e = &s;
              *pq |= q;
              *pq |= ! q;
              /* Refer to every declared value, to avoid compiler optimizations.  */
              return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
                      + !m + !n + !o + !p + !q + !pq);
+        bool e = &s;
+        *pq |= q;
+        *pq |= ! q;
+        /* Refer to every declared value, to avoid compiler optimizations.  */
+        return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                + !m + !n + !o + !p + !q + !pq);
+  ;
 …
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
 $as_echo "$ac_cv_header_stdbool_h" >&6; }
    ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = xyes; then :
 …
 fi
 if test $ac_cv_header_stdbool_h = yes; then
 …
 ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/benchmark/Makefile src/examples/Makefile src/tests/Makefile src/tests/preempt_longrun/Makefile src/prelude/Makefile src/libcfa/Makefile tools/prettyprinter/Makefile"
+ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/benchmark/Makefile src/examples/Makefile src/tests/Makefile src/tests/preempt_longrun/Makefile src/prelude/Makefile src/libcfa/Makefile"
 …
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
 …
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
     as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
   as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 …
 fi
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+        case $1 in #(
+        -*)set "./$1";;
+        esac;
+        case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+        ???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 # Sed expression to map a string onto a valid CPP name.
 …
 ac_log="
 This file was extended by cfa-cc $as_me 1.0.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
 …
 ac_cs_version="\\
 cfa-cc config.status 1.0.0.0
 configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 …
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 …
     "src/prelude/Makefile") CONFIG_FILES="$CONFIG_FILES src/prelude/Makefile" ;;
     "src/libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcfa/Makefile" ;;
-    "tools/prettyprinter/Makefile") CONFIG_FILES="$CONFIG_FILES tools/prettyprinter/Makefile" ;;
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 …
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
   # Older Autoconf quotes --file arguments for eval, but not when files
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
 …
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
     # We used to match only the files named 'Makefile.in', but
+    # We used to match only the files named `Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
 …
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
     # from the Makefile without running 'make'.
+    # from the Makefile without running `make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
     test -z "$am__include" && continue
+    test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
 …
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
          sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue

configure.ac

-              rb826e6b
+              rfea3faa
 AM_SILENT_RULES([no])
 AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE(enable)                      # may require auto* software to be installed
 …
 AC_SUBST([MACHINE_TYPE],[$host_cpu])
 if ! test "$host_cpu" = "$build_cpu"; then
+if ! test "$host_cpu" = "$build_cpu"; then
         case $host_cpu in
                 i386)
                         CFLAGS+=" -m32 "
                         CXXFLAGS+=" -m32 "
                         CFAFLAGS+=" -m32 "
                         LDFLAGS+=" -m32 "
+                        CFLAGS+="-m32"
+                        CXXFLAGS+="-m32"
+                        CFAFLAGS+="-m32"
+                        LDFLAGS+="-m32"
                         ;;
                 i686)
                         CFLAGS+=" -m32 "
                   CXXFLAGS+=" -m32 "
                   CFAFLAGS+=" -m32 "
                   LDFLAGS+=" -m32 "
+                        CFLAGS+="-m32"
+                        CXXFLAGS+="-m32"
+                        CFAFLAGS+="-m32"
+                        LDFLAGS+="-m32"
                         ;;
                 x86_64)
                         CFLAGS+=" -m64 "
                         CXXFLAGS+=" -m64 "
                         CFAFLAGS+=" -m64 "
                         LDFLAGS+=" -m64 "
+                        CFLAGS+="-m64"
+                        CXXFLAGS+="-m64"
+                        CFAFLAGS+="-m64"
+                        LDFLAGS+="-m64"
                         ;;
         esac
 …
         src/prelude/Makefile
         src/libcfa/Makefile
-        tools/prettyprinter/Makefile
         ])

doc/LaTeXmacros/common.tex

-              rb826e6b
+              rfea3faa
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Jul 17 10:21:17 2017
 %% Update Count     : 348
+%% Last Modified On : Sun Jun 18 20:32:32 2017
+%% Update Count     : 319
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 % Names used in the document.
 \newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
+\newcommand{\CFAIcon}{\textrm{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
 \newcommand{\CFA}{\protect\CFAIcon} % safe for section/caption
 \newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall symbolic name
 …
 \setlength{\parindentlnth}{\parindent}
-\newcommand{\LstKeywordStyle}[1]{{\lst@basicstyle{\lst@keywordstyle{#1}}}}
-\newcommand{\LstCommentStyle}[1]{{\lst@basicstyle{\lst@commentstyle{#1}}}}
 \newlength{\gcolumnposn}                                % temporary hack because lstlisting does not handle tabs correctly
 \newlength{\columnposn}
 \setlength{\gcolumnposn}{2.5in}
 \setlength{\columnposn}{\gcolumnposn}
 \newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}}
+\newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@commentstyle{#2}}}
 \newcommand{\CRT}{\global\columnposn=\gcolumnposn}
 …
 % inline text and code index (cannot use ©)
 \newcommand{\Indexc}[2][\@empty]{\lstinline[#1]$#2$\index{#2@\lstinline[#1]$#2$}}
+\newcommand{\Indexc}[1]{\lstinline$#1$\index{#1@\lstinline$#1$}}
 % code index (cannot use ©)
 \newcommand{\indexc}[2][\@empty]{\index{#2@\lstinline[#1]$#2$}}
+\newcommand{\indexc}[1]{\index{#1@\lstinline$#1$}}
 % Denote newterms in particular font and index them without particular font and in lowercase, e.g., \newterm{abc}.
 …
 basicstyle=\linespread{0.9}\sf,                                                 % reduce line spacing and use sanserif font
 stringstyle=\tt,                                                                                % use typewriter font
 tabsize=6,                                                                                              % N space tabbing
+tabsize=4,                                                                                              % 4 space tabbing
 xleftmargin=\parindentlnth,                                                             % indent code to paragraph indentation
 extendedchars=true,                                                                             % allow ASCII characters in the range 128-255

doc/LaTeXmacros/lstlang.sty

-              rb826e6b
+              rfea3faa
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Wed Jul 12 22:42:09 2017
 %% Update Count     : 12
+%% Last Modified On : Fri May 26 12:47:09 2017
+%% Update Count     : 8
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
                 finally, forall, ftype, _Generic, _Imaginary, inline, __label__, lvalue, _Noreturn, one_t,
                 otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof,
                 __typeof__, with, zero_t},
+                __typeof__, zero_t},
         morekeywords=[2]{
                 _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex,
                 resume, suspend, thread, _Thread_local, yield},
-        moredirectives={defined,include_next}%
+}
-% C++ programming language
-\lstdefinelanguage{C++}[ANSI]{C++}{}
 % uC++ programming language, based on ANSI C++

doc/bibliography/cfa.bib

-              rb826e6b
+              rfea3faa
 @manual{JavaScript,
     keywords    = {JavaScript},
     contributer = {pabuhr@plg},
+    contributer = {pabuhr},
     title       = {ECMAScript 2015 Language Specification {JavaScript}},
     organization= {ECAM International},
 …
 @manual{Erlang,
     keywords    = {Erlang},
     contributer = {pabuhr@plg},
+    contributer = {pabuhr},
     title       = {Erlang Reference Manual User's Guide, Vertion 7.0},
     organization= {Erlang/OTP System Documentation},
 …
     publisher   = {ACM},
     address     = {New York, NY, USA},
+}
-@article{Yang95,
-    keywords    = {software solutions, N-thread, mutual exclusions},
-    contributer = {pabuhr@plg},
-    author      = {Jae-Heon Yang and James H. Anderson},
-    title       = {A Fast, Scalable Mutual Exclusion Algorithm},
-    journal     = {Distributed Computing},
-    publisher   = {Springer-Verlag},
-    volume      = {9},
-    number      = {1},
-    year        = {1995},
-    pages       = {51-60},
+}
 …
     contributer = {pabuhr@plg},
     author      = {Kathleen Jensen and Niklaus Wirth},
     title       = {{P}ascal User Manual and Report, ISO Pascal Standard},
+    title       = {{P}ascal User Manual and Report},
     publisher   = {Springer--Verlag},
     year        = 1991,
     edition     = {4th},
     note        = {Revised by Andrew B. Mickel and James F. Miner}
+    year        = 1985,
+    edition     = {3rd},
+    note        = {Revised by Andrew B. Mickel and James F. Miner, ISO Pascal Standard}
+}

doc/generic_types/mail

-              rb826e6b
+              rfea3faa
 - OOPSLA'17 Submissions
-From: "OOPSLA'17 HotCRP" <noreply@oopsla17.hotcrp.com>
-Subject: [OOPSLA'17] Paper #20 "Generic and Tuple Types with Efficient..."
-To: Peter Buhr <pabuhr@uwaterloo.ca>
-Cc: jonathan.aldrich@cs.cmu.edu
-Reply-To: jonathan.aldrich@cs.cmu.edu
-Date: Wed,  7 Jun 2017 13:33:40 +0000 (UTC)
-Dear Peter Buhr,
-The author response period for OOPSLA has started, and will continue until
-the end of June 10th (Anywhere on Earth).  No email with a snapshot of your
-reviews will be sent: you can see the live version of reviews (including
-current updates) on the HotCRP system (links at the bottom).
-An author response should aim to:
- -correct reviewers' mistakes or misunderstandings
- -offer new information only when this addresses reviewers' concerns (e.g.,
-"I wonder if A might work better...";  "we tried that, but...")
- -answer explicit questions by the reviewers. The key questions will be in a
-designated "Questions for Author Response" entry of a review.
-Please keep in mind that an author response is *not* a "rebuttal". You are
-not rebutting an opponent's arguments with your own, in front of an
-audience that weighs both sets of arguments. Instead, your audience is the
-same reviewers who offered the comments in the first place, and their
-subjective weighing of different factors is very unlikely to change.
-During author response, please keep in mind that the reviewers are still
-unaware of author identity. If you need to refer to author-identifying
-information during your response, the ideal course of action is to place it
-at an external location and include a URL, with an explicit warning (e.g.,
-"WARNING: following this link will reveal author identity").
-As with all external resources, your response should be self-contained,
-without consulting them. That is, the author-visible external URL is just
-evidence, but the claim that this evidence supports should be clear in the
-response text. For instance:
-"we have received public feedback from the developers of X that confirm the
-issue [supporting URL] (WARNING: following this link will reveal author
-identity)"
-Your paper's access information is below:
-       Title: Generic and Tuple Types with Efficient Dynamic Layout in C∀
-  Paper site: https://oopsla17.hotcrp.com/paper/20
-Use the link below to sign in to the site.
-https://oopsla17.hotcrp.com/?email=pabuhr%40uwaterloo.ca
-Please contact me <jonathan.aldrich@cs.cmu.edu> with any questions or
-concerns.
-Best Regards and wishes for a constructive response,
-Jonathan Aldrich
-From: "OOPSLA'17 HotCRP" <noreply@oopsla17.hotcrp.com>
-Subject: [OOPSLA'17] Paper #20 "Generic and Tuple Types with Efficient..."
-To: Peter Buhr <pabuhr@uwaterloo.ca>
-Cc: jonathan.aldrich@cs.cmu.edu
-Reply-To: jonathan.aldrich@cs.cmu.edu
-Date: Tue, 20 Jun 2017 00:33:10 +0000 (UTC)
-Dear Peter Buhr,
-I regret to inform you that your submission to OOPSLA'17 listed below has not
-been selected for the second phase of the review process. I understand this is
-not welcome news but selection was very competitive: 157 of the 223 papers
-submitted did not advance to the second phase. For several of these, there was
-a clear impression that in the future they can evolve into some of the
-strongest results of our community.
-       Title: Generic and Tuple Types with Efficient Dynamic Layout in C∀
-  Paper site: https://oopsla17.hotcrp.com/paper/20
-  Login link: https://oopsla17.hotcrp.com/?email=pabuhr%40uwaterloo.ca
-Below you will find reviews, as well as author-visible comments--the latter may
-include further communication. I hope you will find the reviewers' feedback
-useful.
-Best Regards,
-- Jonathan Aldrich <jonathan.aldrich@cs.cmu.edu>, for OOPSLA 2017
-Submissions
-===========================================================================
-                           OOPSLA'17 Review #20A
----------------------------------------------------------------------------
- Paper #20: Generic and Tuple Types with Efficient Dynamic Layout in C∀
----------------------------------------------------------------------------
-                      Overall merit: C. Weak paper, though I will not fight
-                                        strongly against it
-                         Confidence: X. I am an expert in this area
-                         ===== Paper summary =====
-This presents an extension of the C programming language that tries to preserve the character of the existing language, while adding tuples and generics. Unlike C++ templates, generics preserve separate compilation. Types are represented at runtime, if needed, by size and alignment values, along with pointers to the code for any needed operators. A microbenchmark performance comparison is provided.
-                      ===== Comments for author =====
-This is an interesting extension to C, that may be of interest to some C programmers. It generally seems to be fairly well engineered, and mostly respects C's design goals.
-Unfortunately, there have been enough proposals for extended C dialects that this sort of design is tough to sell. And I don't think the evaluation really went far enough to make that case.
-The ideas in the paper don't appear to be fundamentally new. The idea of passing types as runtime objects has certainly been explored before. An additional ancient reference is http://dl.acm.org/citation.cfm?doid=13310.13330.
-There seems to be a new idea of minimally describing types using alignment and size attributes instead of (?) pointers to assignment operators and the like. But this scheme is not very well described. Notably, it is not clear how, say, a struct with atomic field or bit-fields would be described.
-I wasn't quite clear on the extent to which operator overloading is supported. The MAX example appears to me like it would be quite controversial among C programmers.
-It is not obvious that type inference here always converges. An outline of the algorithm would be useful.
-Above all, this needs experience results from a more complete implementation.
-Details:
-Relying on TIOBE here seems a bit dubious. Since it counts web pages, and C isn't exactly new and hot, it may actually understate your case.
-The print example seems a little simplistic, since it's not clear how it handles formatting.
-"does not using the return type"
-              ===== Questions for authors’ response =====
-How are atomics, volatile, and bit-fields in structs handled?
-===========================================================================
-                           OOPSLA'17 Review #20B
----------------------------------------------------------------------------
- Paper #20: Generic and Tuple Types with Efficient Dynamic Layout in C∀
----------------------------------------------------------------------------
-                      Overall merit: D. Reject
-                         Confidence: X. I am an expert in this area
-                         ===== Paper summary =====
-The authors present an extension to C, adding universal polymorphism and tuples. These features are described in prose. There is an implementation, though this is not described in depth in the paper. There is a benchmark evaluation.
-                      ===== Comments for author =====
-The paper is well-written and the concepts explained well. It is nice to see work in the low-level/C space - I believe that it is an area that has not been well-served by the OOPSLA community. My concerns with the paper are that the contribution is rather small and the concepts are not well-evaluated; specifically this is a language design paper and there is no attempt to evaluate the actual language design.
-While it is reasonable to describe only a couple of features in a paper, I would then expect a detailed description of the implementation and/or a formalism with proven safety properties and a thorough evaluation of the design. For a paper which only describes the design of a language the bar is higher than two features - for example, a description of a 'large' language such as D or Rust, even then I would expect a stronger evaluation.
-## On the design of C-forall
-There are some interesting points in the design of generics, notably the otype/dtype distinction. The design seems reasonable and follows what I would expect from other languages. The design for tuples is more unusual - the usual design of simple anonymous records with anonymous fields is extended with a mix of 'spread'ing, variadics, and implicit conversions. Importantly, the authors neither justify nor evaluate this departure - that is a severe omission for this paper. Furthermore, the only in-depth description of the implementation in the paper concerns tuples, and it seems to me that this is only interesting because of the unusual design - further reason for justifying it.
-## Evaluation
-The paper evaluates the implementation of C-forall with (effectively) a single micro-benchmark. That benchmark seems to show that C-forall performs worse than C++ on every measure, but this is not really discussed.
-A better performance evaluation would consist of multiple tests, both micro-benchmarks and realistic code and would test C-forall compared to alternatives (D, Rust, Go, etc.) not just C/C++.
-However, performance is not the really interesting thing to test here. The authors propose a new language and while performance is an important consideration for systems languages, it is far from the most important. I would like to see the usability of the language tested with user studies of different kinds (various levels of skill-level and coding scenarios). The authors could also use case studies or programming idioms to compare programming in C-forall vs the alternatives (again, comparing with D, Rust, etc. is more interesting to me than C).
-Finally, in designing C-forall, the authors make several assumptions about why C programmers use C. These should be backed up either with evaluation or citation. Statements in the paper certainly do not reflect my experience discussing language design with C programmers, and I would like to see them verified.
-## Related work
-The related work section is broad and gives good descriptions of other languages. However, the comparisons between languages focus more on the high-level goals of the language. It would be more interesting to focus on the details of the languages - the comparisons between Cyclone, C++, Java, and C-forall generics are good, I would like to see more of this with D and Rust, which are the more modern alternatives to C-forall (for example, Rust's notion of Sized and ?Sized types seems similar to otypes/dtypes).
-The related work is really missing any discussion of why the C-forall design choices are better than other languages. To clarify, I mean the specific design of generics and tuples, c.f., the suitability of the language in general because of garbage collection or learning difficulties.
-===========================================================================
-                           OOPSLA'17 Review #20C
----------------------------------------------------------------------------
- Paper #20: Generic and Tuple Types with Efficient Dynamic Layout in C∀
----------------------------------------------------------------------------
-                      Overall merit: D. Reject
-                         Confidence: Z. I am not an expert; my evaluation
-                                        is that of an informed outsider
-                         ===== Paper summary =====
-The paper presents two language features of "Cforall": generics and tuples.
-                      ===== Comments for author =====
-The authors really need to talk about C++ as early as possible IMHO. That's the first thing that came to mind when reading the abstract: how is this different from C++?
-Comparison with C++:
-The main difference with C++ seems to be that Cforall favors separate compilation at the expense of runtime overhead while C++ systematically avoids any runtime overhead (at the expense of slow compilation times). C++ approach makes more sense IMHO. While it's true that people where using C for almost everything 30 years ago, that is just not true anymore. Most people writing C today are doing system programming, otherwise there would be using a higher level programming language (C#, Java etc ...).
-Now, when doing system programming, one needs very fine grain control over the resources: memory layout, etc ...
-It is pretty clear to me that the people writing that kind of code will favor generics that do not cost any overhead at runtime, otherwise they would be writing Java in the first place.
-The authors need to better justify the runtime overhead, or give escape hatches for those who don't want to pay that cost at runtime.
-They very often go back to the benefit of separate compilation, but that's not enough IMHO. Here is a proposal: why not have 2 modes, one called debug mode, used while developing the code, that would compile generics with a runtime overhead. Another, called production, that would unfold the world like C++ does?
-About Tuples:
-The section about tuples is too long. I would have spent more time explaining generics.
-Feedback:
-"This installation base"
-Unclear what you mean by that.
-"Prior projects ... but failed ..."
-Hummm ... What about C++.
-"... object-oriented or functional programming with garbage collection ..."
-You are really mixing apples and oranges here. Many C programmers have nothing agains object-oriented features, not even functional programming (C++ 11 adds
-a bunch of features proving my point), but it's clear that most of them feel very strongly against automated garbage collection.
-"In many cases, C++ is often ..."
-This sentence feels like it is coming out of nowhere.
-"... the polymorphic runtime-cost ..."
-Is there any way to avoid that overhead? It's true it will make the compiler faster, but there are cases where the user might not want to pay for
-the overhead at runtime. Is there a way to force the compiler to specialize the code?
-"... to write a type-safe Cforall wrapper malloc based ..."
-That cannot be true in general. Malloc produces a pointer (of any type), given an integer (the size).
-It looks like Cforall is assuming that the integer is the result of a call to sizeof (a good practice in C).
-However, if that's the case, it should be explained.
-"... allows variable overloading ..."
-How are conflict resolved? In other words, what happens when two variables could be used?
-"... reuses the generated structure declarations where appropriate."
-This is too vague.
-"... have multiple outcomes, some exceptional."
-Humm, I would say these two things are distinct. Let's just way that this way of presenting things is strange, I woulds ay that a function can either
-return one or multiple values or throw an exception. Not that some of the values returned are "exceptional".
-"The type-resolver ..."
-What's that? Type-checker? Type-inference?
-"... applies C conversions."
-Noooo! That's exactly what leads to very subtle bugs. Is there any way to stop those conversions from happening?
-"The minimal cost ..."
-In what regard? Runtime cost? How does the "resolver" know how expensive the conversions are?
-"z = 10 // mass assignments"
-That stuff is completely unreadable. Why not introduce a new operator?
-"... roughly equivalent time ..."
-Well, C++ looks faster to me.
-"... is restricted because the resolution does not using ..."
-Did you mean, does not use?
-"... D and go are garbage collected ..."
-Yes, but in D, the use of the GC is optional.
-"... while respecting the talent and skill of C programmers."
-Are you implying that other approaches are not?
-"On the surface, the project may appear as a rehash of similar mechanisms in C++."
-Absolutely.
-"... integration with C and its programmers ..."
-Bold claim. What makes you think you are integrated with programmers? Number of users?
-"... inline annotation at polymorphic function call sites to create a template-specialization ..."
-This should have been mentioned sooner. Plus conflating inlining and specialization is unfortunate.
-Does "inline" also inline the function? Or does it only specialize the code?
-If it also inline, that's a very unfortunate design. I might want to specialize the code, but without inlining ...
-How do I specialize a recursive function?

doc/proposals/references.md

-              rb826e6b
+              rfea3faa
 derived rvalue types such as pointer types may include qualifiers;
 `const int *` is a distinct type from `int *`, though the latter is safely
 convertible to the former.
+convertable to the former.
 In general, any number of qualifiers can be safely added to the
 pointed-to-type of a pointer type, e.g. `int *` converts safely to
 …
 `const volatile int *`.
 Since lvalues are precisely "addressable objects", in C, only lvalues can be
+Since lvalues are precicely "addressable objects", in C, only lvalues can be
 used as the operand of the `&` address-of operator.
 Similarly, only modifiable lvalues may be used as the assigned-to
 …
 call "lvalue of type `T`" as `T&`.
 There's also an obvious argument that lvalues of a (possibly-qualified) type
 `T` should be convertible to references of type `T`, where `T` is also
+`T` should be convertable to references of type `T`, where `T` is also
 so-qualified (e.g. lvalue `int` to `int&`, lvalue `const char` to
 `const char&`).
 By similar arguments to pointer types, qualifiers should be addable to the
 referred-to type of a reference (e.g. `int&` to `const int&`).
 As a note, since pointer arithmetic is explicitly not defined on `T&`,
+As a note, since pointer arithmetic is explictly not defined on `T&`,
 `restrict T&` should be allowable and would have alias-analysis rules that
 are actually comprehensible to mere mortals.

doc/proposals/tagged-struct.txt

-              rb826e6b
+              rfea3faa
 should be possible to do during linking.
-If a generic/polymorphic type is tagged its tagged would then be shared
-between all applications of that generic. Internal tags could be used to
-seperate these structures again, however it seems in most cases simply using
-the existing type parameters should provide the needed information.
 Traits:
 …
 To allow for growth each option would have to be a structure itself.
 Which brings us to "tagged struct union", ie. a union of tagged structures
+Which brings us to "tagget struct union", ie. a union of tagged structures
 as opposed to tagging the union itself. This extention acts as a constraint.
 If unions are declared tagged instead of creating a new tagged type, all
+possible values of the union must be of that tagged type or a child type. If
+the tagged type is omitted then they must all be tagged but of any tagged
+type.
+As a short cut union_instance->type might get the type object of the loaded
+value. It should always be the same operation regardless so it saves
+abritarly picking a branch of the union to get the type object.
+possible values of the union must be of that tagged type or a child type.
 Type Objects Fields (Extention):
+Custom Type Objects (Extention):
+Adding fields to the type object allows data to be shared between instances
+of the same type. Such behaviour could be mimiced by creating a lookup
+function on the type object pointer, but this may be cleaner and more
+efficient.
+Some method to define type objects used within a tree of types. One option is
+to allow the tree's type object to be specified by the tree root. It would
+then have to be filled in for each type in the tree, including the root.
+The type object fields follow similar rules to the fields on the tagged
+objects themselves, they must be additive. So any fields present on a
+type object will be present (and in the same place) on all of its children.
+The only required field is the parent field, a pointer to the type object's
+type. (This is also the only required field on the tagged structure itself.)
+This does mean that many type object structure types will have to be auto
+generated, and traversing up the tree might get a little wierd. That could
+be symplified by only allowing the root type to specify fields on the type
+object, so that the type object is consistant throughout that particular tree.
+And hence the type_object pointers would also be consistant as the type they
+point to would never change.
+struct Example tagged {
+        tagged char const * const type_name = "Example";
+        int data;
+};
+Creates a tagged structure that has no parent, stores an integer and the type
+object also has an extra field that stores a string on the type object.
+This can be accessed by using member access on the type object, as a regular
+structure.
+Type object fields will have to allow initialization on their declaration,
+and declarations of children as well, as they are not assotiated with the
+later instances of the tagged structure.
+        ...
+        tagged void (*dtor)(tagged Example * this);
+        ...
+Sub-Extention, not sure how it would work but some way to have a "dynamic"
+field that is considered the type of the current tagged struct might be useful
+for things like specifying a deconstructor. In this case, the following code
+will clean up any child type of Example:
+Example * ex = get_some_example();
+ex->type->dtor(ex);
+A further extention could allow expanding type objects, so child types could
+append fields to their parent's feild list. They might need their own type
+objects at that point, or maybe static checks will be enough to see the
+minimum field list.

doc/user/Makefile

-              rb826e6b
+              rfea3faa
 ## Define the appropriate configuration variables.
 TeXLIB = .:../LaTeXmacros:../bibliography/:
+TeXLIB = .:../LaTeXmacros:../LaTeXmacros/listings:../LaTeXmacros/enumitem:../bibliography/:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 …
 FIGURES = ${addsuffix .tex, \
-EHMHierarchy \
 Cdecl \
 pointer1 \

doc/user/user.tex

-              rb826e6b
+              rfea3faa
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Jul 17 13:06:40 2017
 %% Update Count     : 2825
+%% Last Modified On : Fri Jun 16 12:00:01 2017
+%% Update Count     : 2433
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \usepackage{textcomp}
 \usepackage[latin1]{inputenc}
+% Default underscore is too low and wide. Cannot use lstlisting "literate" as replacing underscore
+% removes it as a variable-name character so keyworks in variables are highlighted
+\DeclareTextCommandDefault{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}
 \usepackage{fullpage,times,comment}
 …
 \renewcommand{\UrlFont}{\small\sf}
-% Default underscore is too low and wide. Cannot use lstlisting "literate" as replacing underscore
-% removes it as a variable-name character so keywords in variables are highlighted. MUST APPEAR
-% AFTER HYPERREF.
-\renewcommand{\_}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.075ex}}}
-\renewcommand{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.075ex}}}
 \setlength{\topmargin}{-0.45in}                                                 % move running title into header
 \setlength{\headsep}{0.25in}
 …
 \CFAStyle                                                                                               % use default CFA format-style
-\lstnewenvironment{C++}[1][]
-{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{®}{®}#1}}
-{}
 % inline code ©...© (copyright symbol) emacs: C-q M-)
 …
 \renewcommand{\subsectionmark}[1]{\markboth{\thesubsection\quad #1}{\thesubsection\quad #1}}
 \pagenumbering{roman}
 \linenumbers                                            % comment out to turn off line numbering
+%\linenumbers                                            % comment out to turn off line numbering
 \maketitle
 …
 \CFA{}\index{cforall@\CFA}\footnote{Pronounced ``\Index*{C-for-all}'', and written \CFA, CFA, or \CFL.} is a modern general-purpose programming-language, designed as an evolutionary step forward for the C programming language.
 The syntax of \CFA builds from C and should look immediately familiar to C/\Index*[C++]{\CC{}} programmers.
+The syntax of the \CFA language builds from C, and should look immediately familiar to C/\Index*[C++]{\CC{}} programmers.
 % Any language feature that is not described here can be assumed to be using the standard \Celeven syntax.
 \CFA adds many modern programming-language features that directly lead to increased \emph{\Index{safety}} and \emph{\Index{productivity}}, while maintaining interoperability with existing C programs and achieving similar performance.
 Like C, \CFA is a statically typed, procedural (non-\Index{object-oriented}) language with a low-overhead runtime, meaning there is no global \Index{garbage-collection}, but \Index{regional garbage-collection}\index{garbage-collection!regional} is possible.
+\CFA adds many modern programming-language features that directly lead to increased \emph{\Index{safety}} and \emph{\Index{productivity}}, while maintaining interoperability with existing C programs and achieving C performance.
+Like C, \CFA is a statically typed, procedural language with a low-overhead runtime, meaning there is no global \Index{garbage-collection}, but \Index{regional garbage-collection}\index{garbage-collection!regional} is possible.
 The primary new features include parametric-polymorphic routines and types, exceptions, concurrency, and modules.
+One of the main design philosophies of \CFA is to ``\Index{describe not prescribe}'', which means \CFA tries to provide a pathway from low-level C programming to high-level \CFA programming, but it does not force programmers to ``do the right thing''.
+Programmers can cautiously add \CFA extensions to their C programs in any order and at any time to incrementally move towards safer, higher-level programming.
+A programmer is always free to reach back to C from \CFA, for any reason, and in many cases, new \CFA features can be locally switched back to there C counterpart.
+There is no notion or requirement for \emph{rewriting} a legacy C program in \CFA;
+instead, a programmer evolves a legacy program into \CFA by incrementally incorporating \CFA features.
+As well, new programs can be written in \CFA using a combination of C and \CFA features.
+\Index*[C++]{\CC{}} had a similar goal 30 years ago, allowing object-oriented programming to be incrementally added to C.
+However, \CC currently has the disadvantages of a strong object-oriented bias, multiple legacy design-choices that cannot be updated, and active divergence of the language model from C, all of which requires significant effort and training to incrementally add \CC to a C-based project.
+One of the main design philosophies of \CFA is to ``describe not prescribe'', which means \CFA tries to provide a pathway from low-level C programming to high-level \CFA programming, but it does not force programmers to ``do the right thing''.
+Programmers can cautiously add \CFA extensions to their C programs in any order and at any time to incrementally move towards safer, higher-level programming features.
+A programmer is always free to reach back to C from \CFA for any reason, and in many cases, new \CFA features have a fallback to a C mechanism.
+There is no notion or requirement for rewriting a legacy C program in \CFA;
+instead, a programmer evolves an existing C program into \CFA by incrementally incorporating \CFA features.
+New programs can be written in \CFA using a combination of C and \CFA features.
+\Index*[C++]{\CC{}} had a similar goal 30 years ago, but currently has the disadvantages of multiple legacy design-choices that cannot be updated and active divergence of the language model from C, requiring significant effort and training to incrementally add \CC to a C-based project.
 In contrast, \CFA has 30 years of hindsight and a clean starting point.
 …
 \begin{quote2}
 \begin{tabular}{@{}l@{\hspace{1.5em}}l@{\hspace{1.5em}}l@{}}
+\multicolumn{1}{c@{\hspace{1.5em}}}{\textbf{C}} & \multicolumn{1}{c}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{\CC}}      \\
+\begin{cfa}
+\multicolumn{1}{c@{\hspace{1.5em}}}{\textbf{\CFA}}      & \multicolumn{1}{c}{\textbf{C}}        & \multicolumn{1}{c}{\textbf{\CC}}      \\
+\begin{cfa}
+#include <fstream>§\indexc{fstream}§
+int main( void ) {
+        int x = 0, y = 1, z = 2;
+        ®sout | x | y | z | endl;®
+}
+\end{cfa}
+&
+\begin{lstlisting}
 #include <stdio.h>§\indexc{stdio.h}§
 …
         ®printf( "%d %d %d\n", x, y, z );®
+}
 \end{cfa}
+\end{lstlisting}
+&
+\begin{cfa}
+#include <fstream>§\indexc{fstream}§
+int main( void ) {
+        int x = 0, y = 1, z = 2;
+        ®sout | x | y | z | endl;®§\indexc{sout}§
+}
+\end{cfa}
+&
+\begin{cfa}
+\begin{lstlisting}
 #include <iostream>§\indexc{iostream}§
 using namespace std;
 …
         ®cout<<x<<" "<<y<<" "<<z<<endl;®
+}
 \end{cfa}
+\end{lstlisting}
 \end{tabular}
 \end{quote2}
 While the \CFA I/O looks similar to the \Index*[C++]{\CC{}} output style, there are important differences, such as automatic spacing between variables as in \Index*{Python} (see~\VRef{s:IOLibrary}).
-\subsection{Background}
 This document is a programmer reference-manual for the \CFA programming language.
 The manual covers the core features of the language and runtime-system, with simple examples illustrating syntax and semantics of each feature.
 The manual does not teach programming, i.e., how to combine the new constructs to build complex programs.
 A reader should already have an intermediate knowledge of control flow, data structures, and concurrency issues to understand the ideas presented, as well as some experience programming in C/\CC.
 Implementers should refer to the \CFA Programming Language Specification for details about the language syntax and semantics.
+A reader should already have an intermediate knowledge of control flow, data structures, and concurrency issues to understand the ideas presented as well as some experience programming in C/\CC.
+Implementers may refer to the \CFA Programming Language Specification for details about the language syntax and semantics.
 Changes to the syntax and additional features are expected to be included in later revisions.
 …
 This installation base and the programmers producing it represent a massive software-engineering investment spanning decades and likely to continue for decades more.
 Even with all its problems, C continues to be popular because it allows writing software at virtually any level in a computer system without restriction.
 For system programming, where direct access to hardware, storage management, and real-time issues are a requirement, C is usually the only language of choice.
+For system programming, where direct access to hardware and dealing with real-time issues is a requirement, C is usually the language of choice.
 The TIOBE index~\cite{TIOBE} for March 2016 showed the following programming-language popularity: \Index*{Java} 20.5\%, C 14.5\%, \Index*[C++]{\CC{}} 6.7\%, \Csharp 4.3\%, \Index*{Python} 4.3\%, where the next 50 languages are less than 3\% each with a long tail.
 As well, for 30 years, C has been the number 1 and 2 most popular programming language:
 …
 \end{center}
 Hence, C is still an extremely important programming language, with double the usage of \Index*[C++]{\CC{}}; in many cases, \CC is often used solely as a better C.
 Love it or hate it, C has been an important and influential part of computer science for 40 years and its appeal is not diminishing.
 Unfortunately, C has many problems and omissions that make it an unacceptable programming language for modern needs.
 As stated, the goal of the \CFA project is to engineer modern language-features into C in an evolutionary rather than revolutionary way.
+Love it or hate it, C has been an important and influential part of computer science for 40 years and sit appeal is not diminishing.
+Unfortunately, C has too many problems and omissions to make it an acceptable programming language for modern needs.
+As stated, the goal of the \CFA project is to engineer modern language features into C in an evolutionary rather than revolutionary way.
 \CC~\cite{C++14,C++} is an example of a similar project;
 however, it largely extended the C language, and did not address most of C's existing problems.\footnote{%
+however, it largely extended the language, and did not address many existing problems.\footnote{%
 Two important existing problems addressed were changing the type of character literals from ©int© to ©char© and enumerator from ©int© to the type of its enumerators.}
 \Index*{Fortran}~\cite{Fortran08}, \Index*{Ada}~\cite{Ada12}, and \Index*{Cobol}~\cite{Cobol14} are examples of programming languages that took an evolutionary approach, where modern language-features (\eg objects, concurrency) are added and problems fixed within the framework of the existing language.
+\Index*{Fortran}~\cite{Fortran08}, \Index*{Ada}~\cite{Ada12}, and \Index*{Cobol}~\cite{Cobol14} are examples of programming languages that took an evolutionary approach, where modern language features (\eg objects, concurrency) are added and problems fixed within the framework of the existing language.
 \Index*{Java}~\cite{Java8}, \Index*{Go}~\cite{Go}, \Index*{Rust}~\cite{Rust} and \Index*{D}~\cite{D} are examples of the revolutionary approach for modernizing C/\CC, resulting in a new language rather than an extension of the descendent.
 These languages have different syntax and semantics from C, do not interoperate directly with C, and are not systems languages because of restrictive memory-management or garbage collection.
+These languages have different syntax and semantics from C, and do not interoperate directly with C, largely because of garbage collection.
 As a result, there is a significant learning curve to move to these languages, and C legacy-code must be rewritten.
 These costs can be prohibitive for many companies with a large software-base in C/\CC, and a significant number of programmers require retraining to the new programming language.
 The result of this project is a language that is largely backwards compatible with \Index*[C11]{\Celeven{}}~\cite{C11}, but fixes many of the well known C problems while containing modern language-features.
+These costs can be prohibitive for many companies with a large software base in C/\CC, and a significant number of programmers requiring retraining to a new programming language.
+The result of this project is a language that is largely backwards compatible with \Index*[C11]{\Celeven{}}~\cite{C11}, but fixing some of the well known C problems and containing many modern language features.
 Without significant extension to the C programming language, it is becoming unable to cope with the needs of modern programming problems and programmers;
 as a result, it will fade into disuse.
 Considering the large body of existing C code and programmers, there is significant impetus to ensure C is transformed into a modern programming language.
 While \Index*[C11]{\Celeven{}} made a few simple extensions to the language, nothing was added to address existing problems in the language or to augment the language with modern language-features.
 While some may argue that modern language-features may make C complex and inefficient, it is clear a language without modern capabilities is insufficient for the advanced programming problems existing today.
+While \Index*[C11]{\Celeven{}} made a few simple extensions to the language, nothing was added to address existing problems in the language or to augment the language with modern language features.
+While some may argue that modern language features may make C complex and inefficient, it is clear a language without modern capabilities is insufficient for the advanced programming problems existing today.
 \section{History}
 The \CFA project started with \Index*{K-W C}~\cite{Buhr94a,Till89}, which extended C with new declaration syntax, multiple return values from routines, and advanced assignment capabilities using the notion of tuples.
+The \CFA project started with \Index*{K-W C}~\cite{Buhr94a,Till89}, which extended C with new declaration syntax, multiple return values from routines, and extended assignment capabilities using the notion of tuples.
 (See~\cite{Werther96} for similar work in \Index*[C++]{\CC{}}.)
+The first \CFA implementation of these extensions was by Esteves~\cite{Esteves04}.
+The signature feature of \CFA is \Index{overload}able \Index{parametric-polymorphic} functions~\cite{forceone:impl,Cormack90,Duggan96} with functions generalized using a ©forall© clause (giving the language its name):
+A first \CFA implementation of these extensions was by Esteves~\cite{Esteves04}.
+The signature feature of \CFA is parametric-polymorphic functions~\cite{forceone:impl,Cormack90,Duggan96} with functions generalized using a ©forall© clause (giving the language its name):
 \begin{lstlisting}
 ®forall( otype T )® T identity( T val ) { return val; }
 …
 \CFA{}\hspace{1pt}'s polymorphism was originally formalized by Ditchfiled~\cite{Ditchfield92}, and first implemented by Bilson~\cite{Bilson03}.
 However, at that time, there was little interesting in extending C, so work did not continue.
 As the saying goes, ``\Index*{What goes around, comes around.}'', and there is now renewed interest in the C programming language because of legacy code-bases, so the \CFA project has been restarted.
+As the saying goes, ``What goes around, comes around.'', and there is now renewed interest in the C programming language because of legacy code-bases, so the \CFA project has been restarted.
 …
 \CFA is designed to integrate directly with existing C programs and libraries.
 The most important feature of \Index{interoperability} is using the same \Index{calling convention}s, so there is no complex interface or overhead to call existing C routines.
+The most important feature of \Index{interoperability} is using the same \Index{calling convention}s, so there is no overhead to call existing C routines.
 This feature allows \CFA programmers to take advantage of the existing panoply of C libraries to access thousands of external software features.
 Language developers often state that adequate \Index{library support} takes more work than designing and implementing the language itself.
 Fortunately, \CFA, like \Index*[C++]{\CC{}}, starts with immediate access to all exiting C libraries, and in many cases, can easily wrap library routines with simpler and safer interfaces, at very low cost.
 Hence, \CFA begins by leveraging the large repository of C libraries at little cost.
+Hence, \CFA begins by leveraging the large repository of C libraries with little cost.
 \begin{comment}
 …
 \end{comment}
 However, it is necessary to differentiate between C and \CFA code because of name \Index{overload}ing, as for \CC.
+However, it is necessary to differentiate between C and \CFA code because of name overloading, as for \CC.
 For example, the C math-library provides the following routines for computing the absolute value of the basic types: ©abs©, ©labs©, ©llabs©, ©fabs©, ©fabsf©, ©fabsl©, ©cabsf©, ©cabs©, and ©cabsl©.
 Whereas, \CFA wraps each of these routines into ones with the overloaded name ©abs©:
+Whereas, \CFA wraps each of these routines into ones with the common name ©abs©:
 \begin{cfa}
 char abs( char );
 …
 Hence, there is the same need as in \CC, to know if a name is a C or \CFA name, so it can be correctly formed.
 There is no way around this problem, other than C's approach of creating unique names for each pairing of operation and type.
 This example strongly illustrates a core idea in \CFA: \emph{the \Index{power of a name}}.
+This example strongly illustrates a core idea in \CFA: \emph{the power of a name}.
 The name ``©abs©'' evokes the notion of absolute value, and many mathematical types provide the notion of absolute value.
 Hence, knowing the name ©abs© is sufficient to apply it to any type where it is applicable.
 The time savings and safety of using one name uniformly versus $N$ unique names cannot be underestimated.
 \section[Compiling a CFA Program]{Compiling a \CFA Program}
+Hence, knowing the name ©abs© should be sufficient to apply it to any type where it is applicable.
+The time savings and safety of using one name uniformly versus $N$ unique names should not be underestimated.
+\section[Compiling CFA Program]{Compiling \CFA Program}
 The command ©cfa© is used to compile \CFA program(s), and is based on the GNU \Indexc{gcc} command, \eg:
 \begin{cfa}
 cfa§\indexc{cfa}\index{compilation!cfa@©cfa©}§ [ gcc-options ] C/§\CFA{}§-files [ assembler/loader-files ]
+cfa§\indexc{cfa}\index{compilation!cfa@©cfa©}§ [ gcc-options ] C/§\CFA§-files [ assembler/loader-files ]
 \end{cfa}
 \CFA programs having the following ©gcc© flags turned on:
 …
 The 1999 C standard plus GNU extensions.
 \item
+\Indexc[deletekeywords=inline]{-fgnu89-inline}\index{compilation option!-fgnu89-inline@{\lstinline[deletekeywords=inline]$-fgnu89-inline$}}
+{\lstset{deletekeywords={inline}}
+\Indexc{-fgnu89-inline}\index{compilation option!-fgnu89-inline@{©-fgnu89-inline©}}
 Use the traditional GNU semantics for inline routines in C99 mode, which allows inline routines in header files.
+}%
 \end{description}
 The following new \CFA options are available:
 …
 \Indexc{-debug}\index{compilation option!-debug@©-debug©}
 The program is linked with the debugging version of the runtime system.
 The debug version performs runtime checks to help during the debugging phase of a \CFA program, but can substantially slow program execution.
+The debug version performs runtime checks to help during the debugging phase of a \CFA program, but substantially slows the execution of the program.
 The runtime checks should only be removed after the program is completely debugged.
 \textbf{This option is the default.}
 …
 \end{description}
 These preprocessor variables allow conditional compilation of programs that must work differently in these situations.
 For example, to toggle between C and \CFA extensions, use the following:
+For example, to toggle between C and \CFA extensions, using the following:
 \begin{cfa}
 #ifndef __CFORALL__
 …
 \section{Constant Underscores}
 Numeric constants are extended to allow \Index{underscore}s\index{constant!underscore}, \eg:
+\section{Constants Underscores}
+Numeric constants are extended to allow \Index{underscore}s within constants\index{constant!underscore}, \eg:
 \begin{cfa}
 ®_®147®_®483®_®648;                                    §\C{// decimal constant}§
 …
 L®_®§"\texttt{\textbackslash{x}}§®_®§\texttt{ff}§®_®§\texttt{ee}"§;     §\C{// wide character constant}§
 \end{cfa}
 The rules for placement of underscores are:
 \begin{enumerate}[topsep=5pt,itemsep=5pt,parsep=0pt]
+The rules for placement of underscores is as follows:
+\begin{enumerate}
 \item
 A sequence of underscores is disallowed, \eg ©12__34© is invalid.
 …
 \label{s:BackquoteIdentifiers}
+\CFA introduces in new keywords (see \VRef{s:CFAKeywords}) that can clash with existing C variable-names in legacy code.
+Keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism:
+\CFA accommodates keyword clashes with existing C variable-names by syntactic transformations using the \CFA backquote escape-mechanism:
 \begin{cfa}
 int ®`®otype®`® = 3;                    §\C{// make keyword an identifier}§
 …
 \end{cfa}
 Existing C programs with keyword clashes can be converted by enclosing keyword identifiers in backquotes, and eventually the identifier name can be changed to a non-keyword name.
 \VRef[Figure]{f:HeaderFileInterposition} shows how clashes in C header files (see~\VRef{s:StandardHeaders}) can be handled using preprocessor \newterm{interposition}: ©#include_next© and ©-I filename©:
+\VRef[Figure]{f:InterpositionHeaderFile} shows how clashes in C header files (see~\VRef{s:StandardHeaders}) can be handled using preprocessor \newterm{interposition}: ©#include_next© and ©-I filename©:
 \begin{figure}
 …
 #define otype ®`®otype®`®               §\C{// make keyword an identifier}§
 #define __CFA_BFD_H__
 #endif
 ®#include_next <bfd.h>                  §\C{// must have internal check for multiple expansion}§
+®
+#endif // ! otype
+#include_next <bfd.h>                   §\C{// must have internal check for multiple expansion}§
 #if defined( otype ) && defined( __CFA_BFD_H__ )        §\C{// reset only if set}§
 #undef otype
 #undef __CFA_BFD_H__
 #endif
 \end{cfa}
 \caption{Header-File Interposition}
 \label{f:HeaderFileInterposition}
+#endif // otype && __CFA_BFD_H__
+\end{cfa}
+\caption{Interposition of Header File}
+\label{f:InterpositionHeaderFile}
 \end{figure}
+\section{Exponentiation Operator}
+C, \CC, and Java (and many other programming languages) have no exponentiation operator\index{exponentiation!operator}\index{operator!exponentiation}, \ie $x^y$, and instead use a routine, like \Indexc{pow}, to perform the exponentiation operation.
+\CFA extends the basic operators with the exponentiation operator ©?\?©\index{?\\?@\lstinline$?\?$} and ©?\=?©\index{?\\=?@\lstinline$?\=?$}, as in, ©x \ y© and ©x \= y©, which means $x^y$ and $x \leftarrow x^y$.
+The priority of the exponentiation operator is between the cast and multiplicative operators, so that ©w * (int)x \ (int)y * z© is parenthesized as ©((w * (((int)x) \ ((int)y))) * z)©.
+As for \Index{division}, there are exponentiation operators for integral and floating-point types, including the builtin \Index{complex} types.
+Unsigned integral exponentiation\index{exponentiation!unsigned integral} is performed with repeated multiplication (or shifting if the base is 2).
+Signed integral exponentiation\index{exponentiation!signed integral} is performed with repeated multiplication (or shifting if the base is 2), but yields a floating-point result because $b^{-e}=1/b^e$.
+Hence, it is important to designate exponent integral-constants as unsigned or signed: ©3 \ 3u© return an integral result, while ©3 \ 3© returns a floating-point result.
+Floating-point exponentiation\index{exponentiation!floating point} is performed using \Index{logarithm}s\index{exponentiation!logarithm}, so the base cannot be negative.
+\begin{cfa}
+sout | 2 ®\® 8u | 4 ®\® 3u | -4 ®\® 3u | 4 ®\® -3 | -4 ®\® -3 | 4.0 ®\® 2.1 | (1.0f+2.0fi) ®\® (3.0f+2.0fi) | endl;
+64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i
+\end{cfa}
+Parenthesis are necessary for the complex constants or the expresion is parsed as ©1.0f+(2.0fi \ 3.0f)+2.0fi©.
+The exponentiation operator is available for all the basic types, but for user-defined types, only the integral version is available, if the user type defines multiplication, ©*©, and one, ©1©.
+\section{\texorpdfstring{Labelled \LstKeywordStyle{continue} / \LstKeywordStyle{break}}{Labelled continue / break}}
+\section{Declarations}
+\label{s:Declarations}
+C declaration syntax is notoriously confusing and error prone.
+For example, many C programmers are confused by a declaration as simple as:
+\begin{quote2}
+\begin{tabular}{@{}ll@{}}
+\begin{cfa}
+int * x[5]
+\end{cfa}
+&
+\raisebox{-0.75\totalheight}{\input{Cdecl}}
+\end{tabular}
+\end{quote2}
+Is this an array of 5 pointers to integers or a \Index{pointer} to an array of 5 integers?
+The fact this declaration is unclear to many C programmers means there are \Index{productivity} and \Index{safety} issues even for basic programs.
+Another example of confusion results from the fact that a routine name and its parameters are embedded within the return type, mimicking the way the return value is used at the routine's call site.
+For example, a routine returning a \Index{pointer} to an array of integers is defined and used in the following way:
+\begin{cfa}
+int ®(*®f®())[®5®]® {...};                              §\C{definition}§
+ ... ®(*®f®())[®3®]® += 1;                              §\C{usage}§
+\end{cfa}
+Essentially, the return type is wrapped around the routine name in successive layers (like an \Index{onion}).
+While attempting to make the two contexts consistent is a laudable goal, it has not worked out in practice.
+\CFA provides its own type, variable and routine declarations, using a different syntax.
+The new declarations place qualifiers to the left of the base type, while C declarations place qualifiers to the right of the base type.
+In the following example, \R{red} is the base type and \B{blue} is qualifiers.
+The \CFA declarations move the qualifiers to the left of the base type, \ie move the blue to the left of the red, while the qualifiers have the same meaning but are ordered left to right to specify a variable's type.
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+ß[5] *ß ®int® x1;
+ß* [5]ß ®int® x2;
+ß[* [5] int]ß f®( int p )®;
+\end{cfa}
+&
+\begin{cfa}
+®int® ß*ß x1 ß[5]ß;
+®int® ß(*ßx2ß)[5]ß;
+ßint (*ßf®( int p )®ß)[5]ß;
+\end{cfa}
+\end{tabular}
+\end{quote2}
+The only exception is \Index{bit field} specification, which always appear to the right of the base type.
+% Specifically, the character ©*© is used to indicate a pointer, square brackets ©[©\,©]© are used to represent an array or function return value, and parentheses ©()© are used to indicate a routine parameter.
+However, unlike C, \CFA type declaration tokens are distributed across all variables in the declaration list.
+For instance, variables ©x© and ©y© of type \Index{pointer} to integer are defined in \CFA as follows:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+®*® int x, y;
+\end{cfa}
+&
+\begin{cfa}
+int ®*®x, ®*®y;
+\end{cfa}
+\end{tabular}
+\end{quote2}
+The downside of this semantics is the need to separate regular and \Index{pointer} declarations:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+®*® int x;
+int y;
+\end{cfa}
+&
+\begin{cfa}
+int ®*®x, y;
+\end{cfa}
+\end{tabular}
+\end{quote2}
+which is \Index{prescribing} a safety benefit.
+Other examples are:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\
+\begin{cfa}
+[ 5 ] int z;
+[ 5 ] * char w;
+* [ 5 ] double v;
+struct s {
+        int f0:3;
+        * int f1;
+        [ 5 ] * int f2;
+};
+\end{cfa}
+&
+\begin{cfa}
+int z[ 5 ];
+char * w[ 5 ];
+double (* v)[ 5 ];
+struct s {
+        int f0:3;
+        int * f1;
+        int * f2[ 5 ]
+};
+\end{cfa}
+&
+\begin{cfa}
+// array of 5 integers
+// array of 5 pointers to char
+// pointer to array of 5 doubles
+// common bit field syntax
+\end{cfa}
+\end{tabular}
+\end{quote2}
+All type qualifiers, \eg ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, \eg:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}}
+\multicolumn{1}{c@{\hspace{1em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{1em}}}{\textbf{C}} \\
+\begin{cfa}
+const * const int x;
+const * [ 5 ] const int y;
+\end{cfa}
+&
+\begin{cfa}
+int const * const x;
+const int (* const y)[ 5 ]
+\end{cfa}
+&
+\begin{cfa}
+// const pointer to const integer
+// const pointer to array of 5 const integers
+\end{cfa}
+\end{tabular}
+\end{quote2}
+All declaration qualifiers, \eg ©extern©, ©static©, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier}
+The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} \eg:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\
+\begin{cfa}
+extern [ 5 ] int x;
+static * const int y;
+\end{cfa}
+&
+\begin{cfa}
+int extern x[ 5 ];
+const int static * y;
+\end{cfa}
+&
+\begin{cfa}
+// externally visible array of 5 integers
+// internally visible pointer to constant int
+\end{cfa}
+\end{tabular}
+\end{quote2}
+The new declaration syntax can be used in other contexts where types are required, \eg casts and the pseudo-routine ©sizeof©:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+y = (®* int®)x;
+i = sizeof(®[ 5 ] * int®);
+\end{cfa}
+&
+\begin{cfa}
+y = (®int *®)x;
+i = sizeof(®int * [ 5 ]®);
+\end{cfa}
+\end{tabular}
+\end{quote2}
+Finally, new \CFA declarations may appear together with C declarations in the same program block, but cannot be mixed within a specific declaration.
+Therefore, a programmer has the option of either continuing to use traditional C declarations or take advantage of the new style.
+Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX systems.
+\section{Pointer/Reference}
+C provides a \newterm{pointer type};
+\CFA adds a \newterm{reference type}.
+These types may be derived from an object or routine type, called the \newterm{referenced type}.
+Objects of these types contain an \newterm{address}, which is normally a location in memory, but may also address memory-mapped registers in hardware devices.
+An integer constant expression with the value 0, or such an expression cast to type ©void *©, is called a \newterm{null-pointer constant}.\footnote{
+One way to conceptualize the null pointer is that no variable is placed at this address, so the null-pointer address can be used to denote an uninitialized pointer/reference object;
+\ie the null pointer is guaranteed to compare unequal to a pointer to any object or routine.}
+An address is \newterm{sound}, if it points to a valid memory location in scope, \ie within the program's execution-environment and has not been freed.
+Dereferencing an \newterm{unsound} address, including the null pointer, is \Index{undefined}, often resulting in a \Index{memory fault}.
+A program \newterm{object} is a region of data storage in the execution environment, the contents of which can represent values.
+In most cases, objects are located in memory at an address, and the variable name for an object is an implicit address to the object generated by the compiler and automatically dereferenced, as in:
+\begin{quote2}
+\begin{tabular}{@{}ll@{\hspace{2em}}l@{}}
+\begin{cfa}
+int x;
+x = 3;
+int y;
+y = x;
+\end{cfa}
+&
+\raisebox{-0.45\totalheight}{\input{pointer1}}
+&
+\begin{cfa}
+int * ®const® x = (int *)100
+*x = 3;                 // implicit dereference
+int * ®const® y = (int *)104;
+*y = *x;                // implicit dereference
+\end{cfa}
+\end{tabular}
+\end{quote2}
+where the right example is how the compiler logically interprets the variables in the left example.
+Since a variable name only points to one address during its lifetime, it is an \Index{immutable} \Index{pointer};
+hence, the implicit type of pointer variables ©x© and ©y© are constant pointers in the compiler interpretation.
+In general, variable addresses are stored in instructions instead of loaded from memory, and hence may not occupy storage.
+These approaches are contrasted in the following:
+\begin{quote2}
+\begin{tabular}{@{}l|l@{}}
+\multicolumn{1}{c|}{explicit variable address} & \multicolumn{1}{c}{implicit variable address} \\
+\hline
+\begin{cfa}
+lda             r1,100                  // load address of x
+ld               r2,(r1)                  // load value of x
+lda             r3,104                  // load address of y
+st               r2,(r3)                  // store x into y
+\end{cfa}
+&
+\begin{cfa}
+ld              r2,(100)                // load value of x
+st              r2,(104)                // store x into y
+\end{cfa}
+\end{tabular}
+\end{quote2}
+Finally, the immutable nature of a variable's address and the fact that there is no storage for the variable pointer means pointer assignment\index{pointer!assignment}\index{assignment!pointer} is impossible.
+Therefore, the expression ©x = y© has only one meaning, ©*x = *y©, \ie manipulate values, which is why explicitly writing the dereferences is unnecessary even though it occurs implicitly as part of \Index{instruction decoding}.
+A \Index{pointer}/\Index{reference} object is a generalization of an object variable-name, \ie a mutable address that can point to more than one memory location during its lifetime.
+(Similarly, an integer variable can contain multiple integer literals during its lifetime versus an integer constant representing a single literal during its lifetime, and like a variable name, may not occupy storage if the literal is embedded directly into instructions.)
+Hence, a pointer occupies memory to store its current address, and the pointer's value is loaded by dereferencing, \eg:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{2em}}l@{}}
+\begin{cfa}
+int x, y, ®*® p1, ®*® p2, ®**® p3;
+p1 = ®&®x;               // p1 points to x
+p2 = p1;                 // p2 points to x
+p1 = ®&®y;               // p1 points to y
+p3 = &p2;               // p3 points to p2
+\end{cfa}
+&
+\raisebox{-0.5\totalheight}{\input{pointer2.pstex_t}}
+\end{tabular}
+\end{quote2}
+Notice, an address has a \Index{duality}\index{address!duality}: a location in memory or the value at that location.
+In many cases, a compiler might be able to infer the best meaning for these two cases.
+For example, \Index*{Algol68}~\cite{Algol68} infers pointer dereferencing to select the best meaning for each pointer usage
+\begin{cfa}
+p2 = p1 + x;                                    §\C{// compiler infers *p2 = *p1 + x;}§
+\end{cfa}
+Algol68 infers the following dereferencing ©*p2 = *p1 + x©, because adding the arbitrary integer value in ©x© to the address of ©p1© and storing the resulting address into ©p2© is an unlikely operation.
+Unfortunately, automatic dereferencing does not work in all cases, and so some mechanism is necessary to fix incorrect choices.
+Rather than inferring dereference, most programming languages pick one implicit dereferencing semantics, and the programmer explicitly indicates the other to resolve address-duality.
+In C, objects of pointer type always manipulate the pointer object's address:
+\begin{cfa}
+p1 = p2;                                                §\C{// p1 = p2\ \ rather than\ \ *p1 = *p2}§
+p2 = p1 + x;                                    §\C{// p2 = p1 + x\ \ rather than\ \ *p2 = *p1 + x}§
+\end{cfa}
+even though the assignment to ©p2© is likely incorrect, and the programmer probably meant:
+\begin{cfa}
+p1 = p2;                                                §\C{// pointer address assignment}§
+®*®p2 = ®*®p1 + x;                              §\C{// pointed-to value assignment / operation}§
+\end{cfa}
+The C semantics work well for situations where manipulation of addresses is the primary meaning and data is rarely accessed, such as storage management (©malloc©/©free©).
+However, in most other situations, the pointed-to value is requested more often than the pointer address.
+\begin{cfa}
+*p2 = ((*p1 + *p2) * (**p3 - *p1)) / (**p3 - 15);
+\end{cfa}
+In this case, it is tedious to explicitly write the dereferencing, and error prone when pointer arithmetic is allowed.
+It is better to have the compiler generate the dereferencing and have no implicit pointer arithmetic:
+\begin{cfa}
+p2 = ((p1 + p2) * (p3 - p1)) / (p3 - 15);
+\end{cfa}
+To support this common case, a reference type is introduced in \CFA, denoted by ©&©, which is the opposite dereference semantics to a pointer type, making the value at the pointed-to location the implicit semantics for dereferencing (similar but not the same as \CC \Index{reference type}s).
+\begin{cfa}
+int x, y, ®&® r1, ®&® r2, ®&&® r3;
+®&®r1 = &x;                                             §\C{// r1 points to x}§
+®&®r2 = &r1;                                    §\C{// r2 points to x}§
+®&®r1 = &y;                                             §\C{// r1 points to y}§
+®&&®r3 = ®&®&r2;                                §\C{// r3 points to r2}§
+r2 = ((r1 + r2) * (r3 - r1)) / (r3 - 15); §\C{// implicit dereferencing}§
+\end{cfa}
+Except for auto-dereferencing by the compiler, this reference example is the same as the previous pointer example.
+Hence, a reference behaves like the variable name for the current variable it is pointing-to.
+One way to conceptualize a reference is via a rewrite rule, where the compiler inserts a dereference operator before the reference variable for each reference qualifier in a declaration, so the previous example becomes:
+\begin{cfa}
+®*®r2 = ((®*®r1 + ®*®r2) ®*® (®**®r3 - ®*®r1)) / (®**®r3 - 15);
+\end{cfa}
+When a reference operation appears beside a dereference operation, \eg ©&*©, they cancel out.
+However, in C, the cancellation always yields a value (\Index{rvalue}).\footnote{
+The unary ©&© operator yields the address of its operand.
+If the operand has type ``type'', the result has type ``pointer to type''.
+If the operand is the result of a unary ©*© operator, neither that operator nor the ©&© operator is evaluated and the result is as if both were omitted, except that the constraints on the operators still apply and the result is not an lvalue.~\cite[\S~6.5.3.2--3]{C11}}
+For a \CFA reference type, the cancellation on the left-hand side of assignment leaves the reference as an address (\Index{lvalue}):
+\begin{cfa}
+(&®*®)r1 = &x;                                  §\C{// (\&*) cancel giving address in r1 not variable pointed-to by r1}§
+\end{cfa}
+Similarly, the address of a reference can be obtained for assignment or computation (\Index{rvalue}):
+\begin{cfa}
+(&(&®*®)®*®)r3 = &(&®*®)r2;             §\C{// (\&*) cancel giving address in r2, (\&(\&*)*) cancel giving address in r3}§
+\end{cfa}
+Cancellation\index{cancellation!pointer/reference}\index{pointer!cancellation} works to arbitrary depth.
+Fundamentally, pointer and reference objects are functionally interchangeable because both contain addresses.
+\begin{cfa}
+int x, *p1 = &x, **p2 = &p1, ***p3 = &p2,
+                 &r1 = x,    &&r2 = r1,   &&&r3 = r2;
+***p3 = 3;                                              §\C{// change x}§
+r3 = 3;                                                 §\C{// change x, ***r3}§
+**p3 = ...;                                             §\C{// change p1}§
+&r3 = ...;                                              §\C{// change r1, (\&*)**r3, 1 cancellation}§
+*p3 = ...;                                              §\C{// change p2}§
+&&r3 = ...;                                             §\C{// change r2, (\&(\&*)*)*r3, 2 cancellations}§
+&&&r3 = p3;                                             §\C{// change r3 to p3, (\&(\&(\&*)*)*)r3, 3 cancellations}§
+\end{cfa}
+Furthermore, both types are equally performant, as the same amount of dereferencing occurs for both types.
+Therefore, the choice between them is based solely on whether the address is dereferenced frequently or infrequently, which dictates the amount of implicit dereferencing aid from the compiler.
+As for a pointer type, a reference type may have qualifiers:
+\begin{cfa}
+const int cx = 5;                                       §\C{// cannot change cx;}§
+const int & cr = cx;                            §\C{// cannot change what cr points to}§
+®&®cr = &cx;                                            §\C{// can change cr}§
+cr = 7;                                                         §\C{// error, cannot change cx}§
+int & const rc = x;                                     §\C{// must be initialized}§
+®&®rc = &x;                                                     §\C{// error, cannot change rc}§
+const int & const crc = cx;                     §\C{// must be initialized}§
+crc = 7;                                                        §\C{// error, cannot change cx}§
+®&®crc = &cx;                                           §\C{// error, cannot change crc}§
+\end{cfa}
+Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be the null pointer unless an arbitrary pointer is coerced\index{coercion} into the reference}:
+\begin{cfa}
+int & const cr = *0;                            §\C{// where 0 is the int * zero}§
+\end{cfa}
+Note, constant reference-types do not prevent \Index{addressing errors} because of explicit storage-management:
+\begin{cfa}
+int & const cr = *malloc();
+cr = 5;
+free( &cr );
+cr = 7;                                                         §\C{// unsound pointer dereference}§
+\end{cfa}
+The position of the ©const© qualifier \emph{after} the pointer/reference qualifier causes confuse for C programmers.
+The ©const© qualifier cannot be moved before the pointer/reference qualifier for C style-declarations;
+\CFA-style declarations (see \VRef{s:Declarations}) attempt to address this issue:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+®const® * ®const® * const int ccp;
+®const® & ®const® & const int ccr;
+\end{cfa}
+&
+\begin{cfa}
+const int * ®const® * ®const® ccp;
+\end{cfa}
+\end{tabular}
+\end{quote2}
+where the \CFA declaration is read left-to-right.
+Finally, like pointers, references are usable and composable with other type operators and generators.
+\begin{cfa}
+int w, x, y, z, & ar[3] = { x, y, z }; §\C{// initialize array of references}§
+&ar[1] = &w;                                            §\C{// change reference array element}§
+typeof( ar[1] ) p;                                      §\C{// (gcc) is int, i.e., the type of referenced object}§
+typeof( &ar[1] ) q;                                     §\C{// (gcc) is int \&, i.e., the type of reference}§
+sizeof( ar[1] ) == sizeof( int );       §\C{// is true, i.e., the size of referenced object}§
+sizeof( &ar[1] ) == sizeof( int *)      §\C{// is true, i.e., the size of a reference}§
+\end{cfa}
+In contrast to \CFA reference types, \Index*[C++]{\CC{}}'s reference types are all ©const© references, preventing changes to the reference address, so only value assignment is possible, which eliminates half of the \Index{address duality}.
+Also, \CC does not allow \Index{array}s\index{array!reference} of reference\footnote{
+The reason for disallowing arrays of reference is unknown, but possibly comes from references being ethereal (like a textual macro), and hence, replaceable by the referant object.}
+\Index*{Java}'s reference types to objects (all Java objects are on the heap) are like C pointers, which always manipulate the address, and there is no (bit-wise) object assignment, so objects are explicitly cloned by shallow or deep copying, which eliminates half of the address duality.
+\subsection{Initialization}
+\Index{Initialization} is different than \Index{assignment} because initialization occurs on the empty (uninitialized) storage on an object, while assignment occurs on possibly initialized storage of an object.
+There are three initialization contexts in \CFA: declaration initialization, argument/parameter binding, return/temporary binding.
+Because the object being initialized has no value, there is only one meaningful semantics with respect to address duality: it must mean address as there is no pointed-to value.
+In contrast, the left-hand side of assignment has an address that has a duality.
+Therefore, for pointer/reference initialization, the initializing value must be an address not a value.
+\begin{cfa}
+int * p = &x;                                           §\C{// assign address of x}§
+®int * p = x;®                                          §\C{// assign value of x}§
+int & r = x;                                            §\C{// must have address of x}§
+\end{cfa}
+Like the previous example with C pointer-arithmetic, it is unlikely assigning the value of ©x© into a pointer is meaningful (again, a warning is usually given).
+Therefore, for safety, this context requires an address, so it is superfluous to require explicitly taking the address of the initialization object, even though the type is incorrect.
+Note, this is strictly a convenience and safety feature for a programmer.
+Hence, \CFA allows ©r© to be assigned ©x© because it infers a reference for ©x©, by implicitly inserting a address-of operator, ©&©, and it is an error to put an ©&© because the types no longer match due to the implicit dereference.
+Unfortunately, C allows ©p© to be assigned with ©&x© (address) or ©x© (value), but most compilers warn about the latter assignment as being potentially incorrect.
+Similarly, when a reference type is used for a parameter/return type, the call-site argument does not require a reference operator for the same reason.
+\begin{cfa}
+int & f( int & r );                                     §\C{// reference parameter and return}§
+z = f( x ) + f( y );                            §\C{// reference operator added, temporaries needed for call results}§
+\end{cfa}
+Within routine ©f©, it is possible to change the argument by changing the corresponding parameter, and parameter ©r© can be locally reassigned within ©f©.
+Since operator routine ©?+?© takes its arguments by value, the references returned from ©f© are used to initialize compiler generated temporaries with value semantics that copy from the references.
+\begin{cfa}
+int temp1 = f( x ), temp2 = f( y );
+z = temp1 + temp2;
+\end{cfa}
+This \Index{implicit referencing} is crucial for reducing the syntactic burden for programmers when using references;
+otherwise references have the same syntactic  burden as pointers in these contexts.
+When a pointer/reference parameter has a ©const© value (immutable), it is possible to pass literals and expressions.
+\begin{cfa}
+void f( ®const® int & cr );
+void g( ®const® int * cp );
+f( 3 );                   g( ®&®3 );
+f( x + y );             g( ®&®(x + y) );
+\end{cfa}
+Here, the compiler passes the address to the literal 3 or the temporary for the expression ©x + y©, knowing the argument cannot be changed through the parameter.
+The ©&© before the constant/expression for the pointer-type parameter (©g©) is a \CFA extension necessary to type match and is a common requirement before a variable in C (\eg ©scanf©).
+Importantly, ©&3© may not be equal to ©&3©, where the references occur across calls because the temporaries maybe different on each call.
+\CFA \emph{extends} this semantics to a mutable pointer/reference parameter, and the compiler implicitly creates the necessary temporary (copying the argument), which is subsequently pointed-to by the reference parameter and can be changed.\footnote{
+If whole program analysis is possible, and shows the parameter is not assigned, \ie it is ©const©, the temporary is unnecessary.}
+\begin{cfa}
+void f( int & r );
+void g( int * p );
+f( 3 );                   g( ®&®3 );            §\C{// compiler implicit generates temporaries}§
+f( x + y );             g( ®&®(x + y) );        §\C{// compiler implicit generates temporaries}§
+\end{cfa}
+Essentially, there is an implicit \Index{rvalue} to \Index{lvalue} conversion in this case.\footnote{
+This conversion attempts to address the \newterm{const hell} problem, when the innocent addition of a ©const© qualifier causes a cascade of type failures, requiring an unknown number of additional ©const© qualifiers, until it is discovered a ©const© qualifier cannot be added and all the ©const© qualifiers must be removed.}
+The implicit conversion allows seamless calls to any routine without having to explicitly name/copy the literal/expression to allow the call.
+%\CFA attempts to handle pointers and references in a uniform, symmetric manner.
+Finally, C handles \Index{routine object}s in an inconsistent way.
+A routine object is both a pointer and a reference (\Index{particle and wave}).
+\begin{cfa}
+void f( int i );
+void (*fp)( int );                                      §\C{// routine pointer}§
+fp = f;                                                         §\C{// reference initialization}§
+fp = &f;                                                        §\C{// pointer initialization}§
+fp = *f;                                                        §\C{// reference initialization}§
+fp(3);                                                          §\C{// reference invocation}§
+(*fp)(3);                                                       §\C{// pointer invocation}§
+\end{cfa}
+While C's treatment of routine objects has similarity to inferring a reference type in initialization contexts, the examples are assignment not initialization, and all possible forms of assignment are possible (©f©, ©&f©, ©*f©) without regard for type.
+Instead, a routine object should be referenced by a ©const© reference:
+\begin{cfa}
+®const® void (®&® fr)( int ) = f;       §\C{// routine reference}§
+fr = ...                                                        §\C{// error, cannot change code}§
+&fr = ...;                                                      §\C{// changing routine reference}§
+fr( 3 );                                                        §\C{// reference call to f}§
+(*fr)(3);                                                       §\C{// error, incorrect type}§
+\end{cfa}
+because the value of the routine object is a routine literal, \ie the routine code is normally immutable during execution.\footnote{
+Dynamic code rewriting is possible but only in special circumstances.}
+\CFA allows this additional use of references for routine objects in an attempt to give a more consistent meaning for them.
+\subsection{Address-of Semantics}
+In C, ©&E© is an rvalue for any expression ©E©.
+\CFA extends the ©&© (address-of) operator as follows:
+\begin{itemize}
+\item
+if ©R© is an \Index{rvalue} of type ©T &$_1$...&$_r$© where $r \ge 1$ references (©&© symbols) than ©&R© has type ©T ®*®&$_{\color{red}2}$...&$_{\color{red}r}$©, \ie ©T© pointer with $r-1$ references (©&© symbols).
+\item
+if ©L© is an \Index{lvalue} of type ©T &$_1$...&$_l$© where $l \ge 0$ references (©&© symbols) then ©&L© has type ©T ®*®&$_{\color{red}1}$...&$_{\color{red}l}$©, \ie ©T© pointer with $l$ references (©&© symbols).
+\end{itemize}
+The following example shows the first rule applied to different \Index{rvalue} contexts:
+\begin{cfa}
+int x, * px, ** ppx, *** pppx, **** ppppx;
+int & rx = x, && rrx = rx, &&& rrrx = rrx ;
+x = rrrx;               // rrrx is an lvalue with type int &&& (equivalent to x)
+px = &rrrx;             // starting from rrrx, &rrrx is an rvalue with type int *&&& (&x)
+ppx = &&rrrx;   // starting from &rrrx, &&rrrx is an rvalue with type int **&& (&rx)
+pppx = &&&rrrx; // starting from &&rrrx, &&&rrrx is an rvalue with type int ***& (&rrx)
+ppppx = &&&&rrrx; // starting from &&&rrrx, &&&&rrrx is an rvalue with type int **** (&rrrx)
+\end{cfa}
+The following example shows the second rule applied to different \Index{lvalue} contexts:
+\begin{cfa}
+int x, * px, ** ppx, *** pppx;
+int & rx = x, && rrx = rx, &&& rrrx = rrx ;
+rrrx = 2;               // rrrx is an lvalue with type int &&& (equivalent to x)
+&rrrx = px;             // starting from rrrx, &rrrx is an rvalue with type int *&&& (rx)
+&&rrrx = ppx;   // starting from &rrrx, &&rrrx is an rvalue with type int **&& (rrx)
+&&&rrrx = pppx; // starting from &&rrrx, &&&rrrx is an rvalue with type int ***& (rrrx)
+\end{cfa}
+\subsection{Conversions}
+C provides a basic implicit conversion to simplify variable usage:
+\begin{enumerate}
+\setcounter{enumi}{-1}
+\item
+lvalue to rvalue conversion: ©cv T© converts to ©T©, which allows implicit variable dereferencing.
+\begin{cfa}
+int x;
+x + 1;                  // lvalue variable (int) converts to rvalue for expression
+\end{cfa}
+An rvalue has no type qualifiers (©cv©), so the lvalue qualifiers are dropped.
+\end{enumerate}
+\CFA provides three new implicit conversion for reference types to simplify reference usage.
+\begin{enumerate}
+\item
+reference to rvalue conversion: ©cv T &© converts to ©T©, which allows implicit reference dereferencing.
+\begin{cfa}
+int x, &r = x, f( int p );
+x = ®r® + f( ®r® );  // lvalue reference converts to rvalue
+\end{cfa}
+An rvalue has no type qualifiers (©cv©), so the reference qualifiers are dropped.
+\item
+lvalue to reference conversion: \lstinline[deletekeywords={lvalue}]@lvalue-type cv1 T@ converts to ©cv2 T &©, which allows implicitly converting variables to references.
+\begin{cfa}
+int x, &r = ®x®, f( int & p ); // lvalue variable (int) convert to reference (int &)
+f( ®x® );               // lvalue variable (int) convert to reference (int &)
+\end{cfa}
+Conversion can restrict a type, where ©cv1© $\le$ ©cv2©, \eg passing an ©int© to a ©const volatile int &©, which has low cost.
+Conversion can expand a type, where ©cv1© $>$ ©cv2©, \eg passing a ©const volatile int© to an ©int &©, which has high cost (\Index{warning});
+furthermore, if ©cv1© has ©const© but not ©cv2©, a temporary variable is created to preserve the immutable lvalue.
+\item
+rvalue to reference conversion: ©T© converts to ©cv T &©, which allows binding references to temporaries.
+\begin{cfa}
+int x, & f( int & p );
+f( ®x + 3® );   // rvalue parameter (int) implicitly converts to lvalue temporary reference (int &)
+®&f®(...) = &x; // rvalue result (int &) implicitly converts to lvalue temporary reference (int &)
+\end{cfa}
+In both case, modifications to the temporary are inaccessible (\Index{warning}).
+Conversion expands the temporary-type with ©cv©, which is low cost since the temporary is inaccessible.
+\end{enumerate}
+\begin{comment}
+From: Richard Bilson <rcbilson@gmail.com>
+Date: Wed, 13 Jul 2016 01:58:58 +0000
+Subject: Re: pointers / references
+To: "Peter A. Buhr" <pabuhr@plg2.cs.uwaterloo.ca>
+As a general comment I would say that I found the section confusing, as you move back and forth
+between various real and imagined programming languages. If it were me I would rewrite into two
+subsections, one that specifies precisely the syntax and semantics of reference variables and
+another that provides the rationale.
+I don't see any obvious problems with the syntax or semantics so far as I understand them. It's not
+obvious that the description you're giving is complete, but I'm sure you'll find the special cases
+as you do the implementation.
+My big gripes are mostly that you're not being as precise as you need to be in your terminology, and
+that you say a few things that aren't actually true even though I generally know what you mean.
+C provides a pointer type; CFA adds a reference type. Both types contain an address, which is normally a
+location in memory.
+An address is not a location in memory; an address refers to a location in memory. Furthermore it
+seems weird to me to say that a type "contains" an address; rather, objects of that type do.
+Special addresses are used to denote certain states or access co-processor memory. By
+convention, no variable is placed at address 0, so addresses like 0, 1, 2, 3 are often used to denote no-value
+or other special states.
+This isn't standard C at all. There has to be one null pointer representation, but it doesn't have
+to be a literal zero representation and there doesn't have to be more than one such representation.
+Often dereferencing a special state causes a memory fault, so checking is necessary
+during execution.
+I don't see the connection between the two clauses here. I feel like if a bad pointer will not cause
+a memory fault then I need to do more checking, not less.
+If the programming language assigns addresses, a program's execution is sound, \ie all
+addresses are to valid memory locations.
+You haven't said what it means to "assign" an address, but if I use my intuitive understanding of
+the term I don't see how this can be true unless you're assuming automatic storage management.
+Program variables are implicit pointers to memory locations generated by the compiler and automatically
+dereferenced, as in:
+There is no reason why a variable needs to have a location in memory, and indeed in a typical
+program many variables will not. In standard terminology an object identifier refers to data in the
+execution environment, but not necessarily in memory.
+A pointer/reference is a generalization of a variable name, \ie a mutable address that can point to more
+than one memory location during its lifetime.
+I feel like you're off the reservation here. In my world there are objects of pointer type, which
+seem to be what you're describing here, but also pointer values, which can be stored in an object of
+pointer type but don't necessarily have to be. For example, how would you describe the value denoted
+by "&main" in a C program? I would call it a (function) pointer, but that doesn't satisfy your
+definition.
+not occupy storage as the literal is embedded directly into instructions.) Hence, a pointer occupies memory
+to store its current address, and the pointer's value is loaded by dereferencing, e.g.:
+As with my general objection regarding your definition of variables, there is no reason why a
+pointer variable (object of pointer type) needs to occupy memory.
+p2 = p1 + x; // compiler infers *p2 = *p1 + x;
+What language are we in now?
+pointer usage. However, in C, the following cases are ambiguous, especially with pointer arithmetic:
+p1 = p2; // p1 = p2 or *p1 = *p2
+This isn't ambiguous. it's defined to be the first option.
+p1 = p1 + 1; // p1 = p1 + 1 or *p1 = *p1 + 1
+Again, this statement is not ambiguous.
+example. Hence, a reference behaves like the variable name for the current variable it is pointing-to. The
+simplest way to understand a reference is to imagine the compiler inserting a dereference operator before
+the reference variable for each reference qualifier in a declaration, e.g.:
+It's hard for me to understand who the audience for this part is. I think a practical programmer is
+likely to be satisfied with "a reference behaves like the variable name for the current variable it
+is pointing-to," maybe with some examples. Your "simplest way" doesn't strike me as simpler than
+that. It feels like you're trying to provide a more precise definition for the semantics of
+references, but it isn't actually precise enough to be a formal specification. If you want to
+express the semantics of references using rewrite rules that's a great way to do it, but lay the
+rules out clearly, and when you're showing an example of rewriting keep your
+references/pointers/values separate (right now, you use \eg "r3" to mean a reference, a pointer,
+and a value).
+Cancellation works to arbitrary depth, and pointer and reference values are interchangeable because both
+contain addresses.
+Except they're not interchangeable, because they have different and incompatible types.
+Interestingly, C++ deals with the address duality by making the pointed-to value the default, and prevent-
+ing changes to the reference address, which eliminates half of the duality. Java deals with the address duality
+by making address assignment the default and requiring field assignment (direct or indirect via methods),
+\ie there is no builtin bit-wise or method-wise assignment, which eliminates half of the duality.
+I can follow this but I think that's mostly because I already understand what you're trying to
+say. I don't think I've ever heard the term "method-wise assignment" and I don't see you defining
+it. Furthermore Java does have value assignment of basic (non-class) types, so your summary here
+feels incomplete. (If it were me I'd drop this paragraph rather than try to save it.)
+Hence, for type & const, there is no pointer assignment, so &rc = &x is disallowed, and the address value
+cannot be 0 unless an arbitrary pointer is assigned to the reference.
+Given the pains you've taken to motivate every little bit of the semantics up until now, this last
+clause ("the address value cannot be 0") comes out of the blue. It seems like you could have
+perfectly reasonable semantics that allowed the initialization of null references.
+In effect, the compiler is managing the
+addresses for type & const not the programmer, and by a programming discipline of only using references
+with references, address errors can be prevented.
+Again, is this assuming automatic storage management?
+rary binding. For reference initialization (like pointer), the initializing value must be an address (lvalue) not
+a value (rvalue).
+This sentence appears to suggest that an address and an lvalue are the same thing.
+int * p = &x; // both &x and x are possible interpretations
+Are you saying that we should be considering "x" as a possible interpretation of the initializer
+"&x"? It seems to me that this expression has only one legitimate interpretation in context.
+int & r = x; // x unlikely interpretation, because of auto-dereferencing
+You mean, we can initialize a reference using an integer value? Surely we would need some sort of
+cast to induce that interpretation, no?
+Hence, the compiler implicitly inserts a reference operator, &, before the initialization expression.
+But then the expression would have pointer type, which wouldn't be compatible with the type of r.
+Similarly,
+when a reference is used for a parameter/return type, the call-site argument does not require a reference
+operator.
+Furthermore, it would not be correct to use a reference operator.
+The implicit conversion allows
+seamless calls to any routine without having to explicitly name/copy the literal/expression to allow the call.
+While C' attempts to handle pointers and references in a uniform, symmetric manner, C handles routine
+variables in an inconsistent way: a routine variable is both a pointer and a reference (particle and wave).
+After all this talk of how expressions can have both pointer and value interpretations, you're
+disparaging C because it has expressions that have both pointer and value interpretations?
+On Sat, Jul 9, 2016 at 4:18 PM Peter A. Buhr <pabuhr@plg.uwaterloo.ca> wrote:
+> Aaron discovered a few places where "&"s are missing and where there are too many "&", which are
+> corrected in the attached updated. None of the text has changed, if you have started reading
+> already.
+\end{comment}
+\section{Routine Definition}
+\CFA also supports a new syntax for routine definition, as well as \Celeven and K\&R routine syntax.
+The point of the new syntax is to allow returning multiple values from a routine~\cite{Galletly96,CLU}, \eg:
+\begin{cfa}
+®[ int o1, int o2, char o3 ]® f( int i1, char i2, char i3 ) {
+        §\emph{routine body}§
+}
+\end{cfa}
+where routine ©f© has three output (return values) and three input parameters.
+Existing C syntax cannot be extended with multiple return types because it is impossible to embed a single routine name within multiple return type specifications.
+In detail, the brackets, ©[]©, enclose the result type, where each return value is named and that name is a local variable of the particular return type.\footnote{
+\Index*{Michael Tiemann}, with help from \Index*{Doug Lea}, provided named return values in g++, circa 1989.}
+The value of each local return variable is automatically returned at routine termination.
+Declaration qualifiers can only appear at the start of a routine definition, \eg:
+\begin{cfa}
+®extern® [ int x ] g( int y ) {§\,§}
+\end{cfa}
+Lastly, if there are no output parameters or input parameters, the brackets and/or parentheses must still be specified;
+in both cases the type is assumed to be void as opposed to old style C defaults of int return type and unknown parameter types, respectively, as in:
+\begin{cfa}
+[§\,§] g();                                                     §\C{// no input or output parameters}§
+[ void ] g( void );                                     §\C{// no input or output parameters}§
+\end{cfa}
+Routine f is called as follows:
+\begin{cfa}
+[ i, j, ch ] = f( 3, 'a', ch );
+\end{cfa}
+The list of return values from f and the grouping on the left-hand side of the assignment is called a \newterm{return list} and discussed in Section 12.
+\CFA style declarations cannot be used to declare parameters for K\&R style routine definitions because of the following ambiguity:
+\begin{cfa}
+int (*f(x))[ 5 ] int x; {}
+\end{cfa}
+The string ``©int (*f(x))[ 5 ]©'' declares a K\&R style routine of type returning a pointer to an array of 5 integers, while the string ``©[ 5 ] int x©'' declares a \CFA style parameter x of type array of 5 integers.
+Since the strings overlap starting with the open bracket, ©[©, there is an ambiguous interpretation for the string.
+As well, \CFA-style declarations cannot be used to declare parameters for C-style routine-definitions because of the following ambiguity:
+\begin{cfa}
+typedef int foo;
+int f( int (* foo) );                           §\C{// foo is redefined as a parameter name}§
+\end{cfa}
+The string ``©int (* foo)©'' declares a C-style named-parameter of type pointer to an integer (the parenthesis are superfluous), while the same string declares a \CFA style unnamed parameter of type routine returning integer with unnamed parameter of type pointer to foo.
+The redefinition of a type name in a parameter list is the only context in C where the character ©*© can appear to the left of a type name, and \CFA relies on all type qualifier characters appearing to the right of the type name.
+The inability to use \CFA declarations in these two contexts is probably a blessing because it precludes programmers from arbitrarily switching between declarations forms within a declaration contexts.
+C-style declarations can be used to declare parameters for \CFA style routine definitions, \eg:
+\begin{cfa}
+[ int ] f( * int, int * );                      §\C{// returns an integer, accepts 2 pointers to integers}§
+[ * int, int * ] f( int );                      §\C{// returns 2 pointers to integers, accepts an integer}§
+\end{cfa}
+The reason for allowing both declaration styles in the new context is for backwards compatibility with existing preprocessor macros that generate C-style declaration-syntax, as in:
+\begin{cfa}
+#define ptoa( n, d ) int (*n)[ d ]
+int f( ptoa( p, 5 ) ) ...                       §\C{// expands to int f( int (*p)[ 5 ] )}§
+[ int ] f( ptoa( p, 5 ) ) ...           §\C{// expands to [ int ] f( int (*p)[ 5 ] )}§
+\end{cfa}
+Again, programmers are highly encouraged to use one declaration form or the other, rather than mixing the forms.
+\subsection{Named Return Values}
+\Index{Named return values} handle the case where it is necessary to define a local variable whose value is then returned in a ©return© statement, as in:
+\begin{cfa}
+int f() {
+        int x;
+        ... x = 0; ... x = y; ...
+        return x;
+}
+\end{cfa}
+Because the value in the return variable is automatically returned when a \CFA routine terminates, the ©return© statement \emph{does not} contain an expression, as in:
+\newline
+\begin{minipage}{\linewidth}
+\begin{cfa}
+®[ int x, int y ]® f() {
+        int z;
+        ... x = 0; ... y = z; ...
+        ®return;®                                                       §\C{// implicitly return x, y}§
+}
+\end{cfa}
+\end{minipage}
+\newline
+When the return is encountered, the current values of ©x© and ©y© are returned to the calling routine.
+As well, ``falling off the end'' of a routine without a ©return© statement is permitted, as in:
+\begin{cfa}
+[ int x, int y ] f() {
+        ...
+}                                                                               §\C{// implicitly return x, y}§
+\end{cfa}
+In this case, the current values of ©x© and ©y© are returned to the calling routine just as if a ©return© had been encountered.
+Named return values may be used in conjunction with named parameter values;
+specifically, a return and parameter can have the same name.
+\begin{cfa}
+[ int x, int y ] f( int, x, int y ) {
+        ...
+}                                                                               §\C{// implicitly return x, y}§
+\end{cfa}
+This notation allows the compiler to eliminate temporary variables in nested routine calls.
+\begin{cfa}
+[ int x, int y ] f( int, x, int y );    §\C{// prototype declaration}§
+int a, b;
+[a, b] = f( f( f( a, b ) ) );
+\end{cfa}
+While the compiler normally ignores parameters names in prototype declarations, here they are used to eliminate temporary return-values by inferring that the results of each call are the inputs of the next call, and ultimately, the left-hand side of the assignment.
+Hence, even without the body of routine ©f© (separate compilation), it is possible to perform a global optimization across routine calls.
+The compiler warns about naming inconsistencies between routine prototype and definition in this case, and behaviour is \Index{undefined} if the programmer is inconsistent.
+\subsection{Routine Prototype}
+The syntax of the new routine prototype declaration follows directly from the new routine definition syntax;
+as well, parameter names are optional, \eg:
+\begin{cfa}
+[ int x ] f ();                                                 §\C{// returning int with no parameters}§
+[ * int ] g (int y);                                    §\C{// returning pointer to int with int parameter}§
+[ ] h ( int, char );                                    §\C{// returning no result with int and char parameters}§
+[ * int, int ] j ( int );                               §\C{// returning pointer to int and int, with int parameter}§
+\end{cfa}
+This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa).
+It is possible to declare multiple routine-prototypes in a single declaration, but the entire type specification is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), \eg:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+[ int ] f( int ), g;
+\end{cfa}
+&
+\begin{cfa}
+int f( int ), g( int );
+\end{cfa}
+\end{tabular}
+\end{quote2}
+Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} \eg:
+\begin{cfa}
+extern [ int ] f ( int );
+static [ int ] g ( int );
+\end{cfa}
+\section{Routine Pointers}
+The syntax for pointers to \CFA routines specifies the pointer name on the right, \eg:
+\begin{cfa}
+* [ int x ] () fp;                                              §\C{// pointer to routine returning int with no parameters}§
+* [ * int ] (int y) gp;                                 §\C{// pointer to routine returning pointer to int with int parameter}§
+* [ ] (int,char) hp;                                    §\C{// pointer to routine returning no result with int and char parameters}§
+* [ * int,int ] ( int ) jp;                             §\C{// pointer to routine returning pointer to int and int, with int parameter}§
+\end{cfa}
+While parameter names are optional, \emph{a routine name cannot be specified};
+for example, the following is incorrect:
+\begin{cfa}
+* [ int x ] f () fp;                                    §\C{// routine name "f" is not allowed}§
+\end{cfa}
+\section{Named and Default Arguments}
+Named\index{named arguments}\index{arguments!named} and default\index{default arguments}\index{arguments!default} arguments~\cite{Hardgrave76}\footnote{
+Francez~\cite{Francez77} proposed a further extension to the named-parameter passing style, which specifies what type of communication (by value, by reference, by name) the argument is passed to the routine.}
+are two mechanisms to simplify routine call.
+Both mechanisms are discussed with respect to \CFA.
+\begin{description}
+\item[Named (or Keyword) Arguments:]
+provide the ability to specify an argument to a routine call using the parameter name rather than the position of the parameter.
+For example, given the routine:
+\begin{cfa}
+void p( int x, int y, int z ) {...}
+\end{cfa}
+a positional call is:
+\begin{cfa}
+p( 4, 7, 3 );
+\end{cfa}
+whereas a named (keyword) call may be:
+\begin{cfa}
+p( z : 3, x : 4, y : 7 );       §\C{// rewrite $\Rightarrow$ p( 4, 7, 3 )}§
+\end{cfa}
+Here the order of the arguments is unimportant, and the names of the parameters are used to associate argument values with the corresponding parameters.
+The compiler rewrites a named call into a positional call.
+The advantages of named parameters are:
+\begin{itemize}
+\item
+Remembering the names of the parameters may be easier than the order in the routine definition.
+\item
+Parameter names provide documentation at the call site (assuming the names are descriptive).
+\item
+Changes can be made to the order or number of parameters without affecting the call (although the call must still be recompiled).
+\end{itemize}
+Unfortunately, named arguments do not work in C-style programming-languages because a routine prototype is not required to specify parameter names, nor do the names in the prototype have to match with the actual definition.
+For example, the following routine prototypes and definition are all valid.
+\begin{cfa}
+void p( int, int, int );                        §\C{// equivalent prototypes}§
+void p( int x, int y, int z );
+void p( int y, int x, int z );
+void p( int z, int y, int x );
+void p( int q, int r, int s ) {}        §\C{// match with this definition}§
+\end{cfa}
+Forcing matching parameter names in routine prototypes with corresponding routine definitions is possible, but goes against a strong tradition in C programming.
+Alternatively, prototype definitions can be eliminated by using a two-pass compilation, and implicitly creating header files for exports.
+The former is easy to do, while the latter is more complex.
+Furthermore, named arguments do not work well in a \CFA-style programming-languages because they potentially introduces a new criteria for type matching.
+For example, it is technically possible to disambiguate between these two overloaded definitions of ©f© based on named arguments at the call site:
+\begin{cfa}
+int f( int i, int j );
+int f( int x, double y );
+f( j : 3, i : 4 );                              §\C{// 1st f}§
+f( x : 7, y : 8.1 );                    §\C{// 2nd f}§
+f( 4, 5 );                                              §\C{// ambiguous call}§
+\end{cfa}
+However, named arguments compound routine resolution in conjunction with conversions:
+\begin{cfa}
+f( i : 3, 5.7 );                                §\C{// ambiguous call ?}§
+\end{cfa}
+Depending on the cost associated with named arguments, this call could be resolvable or ambiguous.
+Adding named argument into the routine resolution algorithm does not seem worth the complexity.
+Therefore, \CFA does \emph{not} attempt to support named arguments.
+\item[Default Arguments]
+provide the ability to associate a default value with a parameter so it can be optionally specified in the argument list.
+For example, given the routine:
+\begin{cfa}
+void p( int x = 1, int y = 2, int z = 3 ) {...}
+\end{cfa}
+the allowable positional calls are:
+\begin{cfa}
+p();                                                    §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§
+p( 4 );                                                 §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§
+p( 4, 4 );                                              §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§
+p( 4, 4, 4 );                                   §\C{// rewrite $\Rightarrow$ p( 4, 4, 4 )}§
+// empty arguments
+p(  , 4, 4 );                                   §\C{// rewrite $\Rightarrow$ p( 1, 4, 4 )}§
+p( 4,  , 4 );                                   §\C{// rewrite $\Rightarrow$ p( 4, 2, 4 )}§
+p( 4, 4,   );                                   §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§
+p( 4,  ,   );                                   §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§
+p(  , 4,   );                                   §\C{// rewrite $\Rightarrow$ p( 1, 4, 3 )}§
+p(  ,  , 4 );                                   §\C{// rewrite $\Rightarrow$ p( 1, 2, 4 )}§
+p(  ,  ,   );                                   §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§
+\end{cfa}
+Here the missing arguments are inserted from the default values in the parameter list.
+The compiler rewrites missing default values into explicit positional arguments.
+The advantages of default values are:
+\begin{itemize}
+\item
+Routines with a large number of parameters are often very generalized, giving a programmer a number of different options on how a computation is performed.
+For many of these kinds of routines, there are standard or default settings that work for the majority of computations.
+Without default values for parameters, a programmer is forced to specify these common values all the time, resulting in long argument lists that are error prone.
+\item
+When a routine's interface is augmented with new parameters, it extends the interface providing generalizability\footnote{
+``It should be possible for the implementor of an abstraction to increase its generality.
+So long as the modified abstraction is a generalization of the original, existing uses of the abstraction will not require change.
+It might be possible to modify an abstraction in a manner which is not a generalization without affecting existing uses, but, without inspecting the modules in which the uses occur, this possibility cannot be determined.
+This criterion precludes the addition of parameters, unless these parameters have default or inferred values that are valid for all possible existing applications.''~\cite[p.~128]{Cormack90}}
+(somewhat like the generalization provided by inheritance for classes).
+That is, all existing calls are still valid, although the call must still be recompiled.
+\end{itemize}
+The only disadvantage of default arguments is that unintentional omission of an argument may not result in a compiler-time error.
+Instead, a default value is used, which may not be the programmer's intent.
+Default values may only appear in a prototype versus definition context:
+\begin{cfa}
+void p( int x, int y = 2, int z = 3 );          §\C{// prototype: allowed}§
+void p( int, int = 2, int = 3 );                        §\C{// prototype: allowed}§
+void p( int x, int y = 2, int z = 3 ) {}        §\C{// definition: not allowed}§
+\end{cfa}
+The reason for this restriction is to allow separate compilation.
+Multiple prototypes with different default values is an error.
+\end{description}
+Ellipse (``...'') arguments present problems when used with default arguments.
+The conflict occurs because both named and ellipse arguments must appear after positional arguments, giving two possibilities:
+\begin{cfa}
+p( /* positional */, ... , /* named */ );
+p( /* positional */, /* named */, ... );
+\end{cfa}
+While it is possible to implement both approaches, the first possibly is more complex than the second, \eg:
+\begin{cfa}
+p( int x, int y, int z, ... );
+p( 1, 4, 5, 6, z : 3, y : 2 ); §\C{// assume p( /* positional */, ... , /* named */ );}§
+p( 1, z : 3, y : 2, 4, 5, 6 ); §\C{// assume p( /* positional */, /* named */, ... );}§
+\end{cfa}
+In the first call, it is necessary for the programmer to conceptually rewrite the call, changing named arguments into positional, before knowing where the ellipse arguments begin.
+Hence, this approach seems significantly more difficult, and hence, confusing and error prone.
+In the second call, the named arguments separate the positional and ellipse arguments, making it trivial to read the call.
+The problem is exacerbated with default arguments, \eg:
+\begin{cfa}
+void p( int x, int y = 2, int z = 3... );
+p( 1, 4, 5, 6, z : 3 );         §\C{// assume p( /* positional */, ... , /* named */ );}§
+p( 1, z : 3, 4, 5, 6 );         §\C{// assume p( /* positional */, /* named */, ... );}§
+\end{cfa}
+The first call is an error because arguments 4 and 5 are actually positional not ellipse arguments;
+therefore, argument 5 subsequently conflicts with the named argument z : 3.
+In the second call, the default value for y is implicitly inserted after argument 1 and the named arguments separate the positional and ellipse arguments, making it trivial to read the call.
+For these reasons, \CFA requires named arguments before ellipse arguments.
+Finally, while ellipse arguments are needed for a small set of existing C routines, like printf, the extended \CFA type system largely eliminates the need for ellipse arguments (see Section 24), making much of this discussion moot.
+Default arguments and overloading (see Section 24) are complementary.
+While in theory default arguments can be simulated with overloading, as in:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{default arguments}}   & \multicolumn{1}{c}{\textbf{overloading}}      \\
+\begin{cfa}
+void p( int x, int y = 2, int z = 3 ) {...}
+\end{cfa}
+&
+\begin{cfa}
+void p( int x, int y, int z ) {...}
+void p( int x ) { p( x, 2, 3 ); }
+void p( int x, int y ) { p( x, y, 3 ); }
+\end{cfa}
+\end{tabular}
+\end{quote2}
+the number of required overloaded routines is linear in the number of default values, which is unacceptable growth.
+In general, overloading should only be used over default arguments if the body of the routine is significantly different.
+Furthermore, overloading cannot handle accessing default arguments in the middle of a positional list, via a missing argument, such as:
+\begin{cfa}
+p( 1, /* default */, 5 );               §\C{// rewrite $\Rightarrow$ p( 1, 2, 5 )}§
+\end{cfa}
+Given the \CFA restrictions above, both named and default arguments are backwards compatible.
+\Index*[C++]{\CC{}} only supports default arguments;
+\Index*{Ada} supports both named and default arguments.
+\section{Unnamed Structure Fields}
+C requires each field of a structure to have a name, except for a bit field associated with a basic type, \eg:
+\begin{cfa}
+struct {
+        int f1;                                 §\C{// named field}§
+        int f2 : 4;                             §\C{// named field with bit field size}§
+        int : 3;                                §\C{// unnamed field for basic type with bit field size}§
+        int ;                                   §\C{// disallowed, unnamed field}§
+        int *;                                  §\C{// disallowed, unnamed field}§
+        int (*)( int );                 §\C{// disallowed, unnamed field}§
+};
+\end{cfa}
+This requirement is relaxed by making the field name optional for all field declarations; therefore, all the field declarations in the example are allowed.
+As for unnamed bit fields, an unnamed field is used for padding a structure to a particular size.
+A list of unnamed fields is also supported, \eg:
+\begin{cfa}
+struct {
+        int , , ;                               §\C{// 3 unnamed fields}§
+}
+\end{cfa}
+\section{Nesting}
+Nesting of types and routines is useful for controlling name visibility (\newterm{name hiding}).
+\subsection{Type Nesting}
+\CFA allows \Index{type nesting}, and type qualification of the nested types (see \VRef[Figure]{f:TypeNestingQualification}), where as C hoists\index{type hoisting} (refactors) nested types into the enclosing scope and has no type qualification.
+\begin{figure}
+\centering
+\begin{tabular}{@{}l@{\hspace{3em}}l|l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C Type Nesting}}      & \multicolumn{1}{c}{\textbf{C Implicit Hoisting}}      & \multicolumn{1}{|c}{\textbf{\CFA}}    \\
+\hline
+\begin{cfa}
+struct S {
+        enum C { R, G, B };
+        struct T {
+                union U { int i, j; };
+                enum C c;
+                short int i, j;
+        };
+        struct T t;
+} s;
+int fred() {
+        s.t.c = R;
+        struct T t = { R, 1, 2 };
+        enum C c;
+        union U u;
+}
+\end{cfa}
+&
+\begin{cfa}
+enum C { R, G, B };
+union U { int i, j; };
+struct T {
+        enum C c;
+        short int i, j;
+};
+struct S {
+        struct T t;
+} s;
+\end{cfa}
+&
+\begin{cfa}
+struct S {
+        enum C { R, G, B };
+        struct T {
+                union U { int i, j; };
+                enum C c;
+                short int i, j;
+        };
+        struct T t;
+} s;
+int fred() {
+        s.t.c = ®S.®R;  // type qualification
+        struct ®S.®T t = { ®S.®R, 1, 2 };
+        enum ®S.®C c;
+        union ®S.T.®U u;
+}
+\end{cfa}
+\end{tabular}
+\caption{Type Nesting / Qualification}
+\label{f:TypeNestingQualification}
+\end{figure}
+In the left example in C, types ©C©, ©U© and ©T© are implicitly hoisted outside of type ©S© into the containing block scope.
+In the right example in \CFA, the types are not hoisted and accessed using the field-selection operator ``©.©'' for type qualification, as does \Index*{Java}, rather than the \CC type-selection operator ``©::©''.
+\subsection{Routine Nesting}
+While \CFA does not provide object programming by putting routines into structures, it does rely heavily on locally nested routines to redefine operations at or close to a call site.
+For example, the C quick-sort is wrapped into the following polymorphic \CFA routine:
+\begin{cfa}
+forall( otype T | { int ?<?( T, T ); } )
+void qsort( const T * arr, size_t dimension );
+\end{cfa}
+which can be used to sort in ascending and descending order by locally redefining the less-than operator into greater-than.
+\begin{cfa}
+const unsigned int size = 5;
+int ia[size];
+...                                             §\C{// assign values to array ia}§
+qsort( ia, size );              §\C{// sort ascending order using builtin ?<?}§
+{
+        ®int ?<?( int x, int y ) { return x > y; }® §\C{// nested routine}§
+        qsort( ia, size );      §\C{// sort descending order by local redefinition}§
+}
+\end{cfa}
+Nested routines are not first-class, meaning a nested routine cannot be returned if it has references to variables in its enclosing blocks;
+the only exception is references to the external block of the translation unit, as these variables persist for the duration of the program.
+The following program in undefined in \CFA (and Indexc{gcc})
+\begin{cfa}
+[* [int]( int )] foo() {                §\C{// int (*foo())( int )}§
+        int ®i® = 7;
+        int bar( int p ) {
+                ®i® += 1;                               §\C{// dependent on local variable}§
+                sout | ®i® | endl;
+        }
+        return bar;                                     §\C{// undefined because of local dependence}§
+}
+int main() {
+        * [int]( int ) fp = foo();      §\C{// int (*fp)( int )}§
+        sout | fp( 3 ) | endl;
+}
+\end{cfa}
+because
+Currently, there are no \Index{lambda} expressions, \ie unnamed routines because routine names are very important to properly select the correct routine.
+\section{Tuples}
+In C and \CFA, lists of elements appear in several contexts, such as the parameter list for a routine call.
+(More contexts are added shortly.)
+A list of such elements is called a \newterm{lexical list}.
+The general syntax of a lexical list is:
+\begin{cfa}
+[ §\emph{exprlist}§ ]
+\end{cfa}
+where ©$\emph{exprlist}$© is a list of one or more expressions separated by commas.
+The brackets, ©[]©, allow differentiating between lexical lists and expressions containing the C comma operator.
+The following are examples of lexical lists:
+\begin{cfa}
+[ x, y, z ]
+[ 2 ]
+[ v+w, x*y, 3.14159, f() ]
+\end{cfa}
+Tuples are permitted to contain sub-tuples (\ie nesting), such as ©[ [ 14, 21 ], 9 ]©, which is a 2-element tuple whose first element is itself a tuple.
+Note, a tuple is not a record (structure);
+a record denotes a single value with substructure, whereas a tuple is multiple values with no substructure (see flattening coercion in Section 12.1).
+In essence, tuples are largely a compile time phenomenon, having little or no runtime presence.
+Tuples can be organized into compile-time tuple variables;
+these variables are of \newterm{tuple type}.
+Tuple variables and types can be used anywhere lists of conventional variables and types can be used.
+The general syntax of a tuple type is:
+\begin{cfa}
+[ §\emph{typelist}§ ]
+\end{cfa}
+where ©$\emph{typelist}$© is a list of one or more legal \CFA or C type specifications separated by commas, which may include other tuple type specifications.
+Examples of tuple types include:
+\begin{cfa}
+[ unsigned int, char ]
+[ double, double, double ]
+[ * int, int * ]                §\C{// mix of CFA and ANSI}§
+[ * [ 5 ] int, * * char, * [ [ int, int ] ] (int, int) ]
+\end{cfa}
+Like tuples, tuple types may be nested, such as ©[ [ int, int ], int ]©, which is a 2-element tuple type whose first element is itself a tuple type.
+Examples of declarations using tuple types are:
+\begin{cfa}
+[ int, int ] x;                 §\C{// 2 element tuple, each element of type int}§
+* [ char, char ] y;             §\C{// pointer to a 2 element tuple}§
+[ [ int, int ] ] z ([ int, int ]);
+\end{cfa}
+The last example declares an external routine that expects a 2 element tuple as an input parameter and returns a 2 element tuple as its result.
+As mentioned, tuples can appear in contexts requiring a list of value, such as an argument list of a routine call.
+In unambiguous situations, the tuple brackets may be omitted, \eg a tuple that appears as an argument may have its
+square brackets omitted for convenience; therefore, the following routine invocations are equivalent:
+\begin{cfa}
+f( [ 1, x+2, fred() ] );
+f( 1, x+2, fred() );
+\end{cfa}
+Also, a tuple or a tuple variable may be used to supply all or part of an argument list for a routine expecting multiple input parameters or for a routine expecting a tuple as an input parameter.
+For example, the following are all legal:
+\begin{cfa}
+[ int, int ] w1;
+[ int, int, int ] w2;
+[ void ] f (int, int, int); /* three input parameters of type int */
+[ void ] g ([ int, int, int ]); /* 3 element tuple as input */
+f( [ 1, 2, 3 ] );
+f( w1, 3 );
+f( 1, w1 );
+f( w2 );
+g( [ 1, 2, 3 ] );
+g( w1, 3 );
+g( 1, w1 );
+g( w2 );
+\end{cfa}
+Note, in all cases 3 arguments are supplied even though the syntax may appear to supply less than 3. As mentioned, a
+tuple does not have structure like a record; a tuple is simply converted into a list of components.
+\begin{rationale}
+The present implementation of \CFA does not support nested routine calls when the inner routine returns multiple values; \ie a statement such as ©g( f() )© is not supported.
+Using a temporary variable to store the  results of the inner routine and then passing this variable to the outer routine works, however.
+\end{rationale}
+A tuple can contain a C comma expression, provided the expression containing the comma operator is enclosed in parentheses.
+For instance, the following tuples are equivalent:
+\begin{cfa}
+[ 1, 3, 5 ]
+[ 1, (2, 3), 5 ]
+\end{cfa}
+The second element of the second tuple is the expression (2, 3), which yields the result 3.
+This requirement is the same as for comma expressions in argument lists.
+Type qualifiers, \ie const and volatile, may modify a tuple type.
+The meaning is the same as for a type qualifier modifying an aggregate type [Int99, x 6.5.2.3(7),x 6.7.3(11)], \ie the qualifier is distributed across all of the types in the tuple, \eg:
+\begin{cfa}
+const volatile [ int, float, const int ] x;
+\end{cfa}
+is equivalent to:
+\begin{cfa}
+[ const volatile int, const volatile float, const volatile int ] x;
+\end{cfa}
+Declaration qualifiers can only appear at the start of a \CFA tuple declaration4, \eg:
+\begin{cfa}
+extern [ int, int ] w1;
+static [ int, int, int ] w2;
+\end{cfa}
+\begin{rationale}
+Unfortunately, C's syntax for subscripts precluded treating them as tuples.
+The C subscript list has the form ©[i][j]...© and not ©[i, j, ...]©.
+Therefore, there is no syntactic way for a routine returning multiple values to specify the different subscript values, \eg ©f[g()]© always means a single subscript value because there is only one set of brackets.
+Fixing this requires a major change to C because the syntactic form ©M[i, j, k]© already has a particular meaning: ©i, j, k© is a comma expression.
+\end{rationale}
+\subsection{Tuple Coercions}
+There are four coercions that can be performed on tuples and tuple variables: closing, opening, flattening and structuring.
+In addition, the coercion of dereferencing can be performed on a tuple variable to yield its value(s), as for other variables.
+A \newterm{closing coercion} takes a set of values and converts it into a tuple value, which is a contiguous set of values, as in:
+\begin{cfa}
+[ int, int, int, int ] w;
+w = [ 1, 2, 3, 4 ];
+\end{cfa}
+First the right-hand tuple is closed into a tuple value and then the tuple value is assigned.
+An \newterm{opening coercion} is the opposite of closing; a tuple value is converted into a tuple of values, as in:
+\begin{cfa}
+[ a, b, c, d ] = w
+\end{cfa}
+©w© is implicitly opened to yield a tuple of four values, which are then assigned individually.
+A \newterm{flattening coercion} coerces a nested tuple, \ie a tuple with one or more components, which are themselves tuples, into a flattened tuple, which is a tuple whose components are not tuples, as in:
+\begin{cfa}
+[ a, b, c, d ] = [ 1, [ 2, 3 ], 4 ];
+\end{cfa}
+First the right-hand tuple is flattened and then the values are assigned individually.
+Flattening is also performed on tuple types.
+For example, the type ©[ int, [ int, int ], int ]© can be coerced, using flattening, into the type ©[ int, int, int, int ]©.
+A \newterm{structuring coercion} is the opposite of flattening;
+a tuple is structured into a more complex nested tuple.
+For example, structuring the tuple ©[ 1, 2, 3, 4 ]© into the tuple ©[ 1, [ 2, 3 ], 4 ]© or the tuple type ©[ int, int, int, int ]© into the tuple type ©[ int, [ int, int ], int ]©.
+In the following example, the last assignment illustrates all the tuple coercions:
+\begin{cfa}
+[ int, int, int, int ] w = [ 1, 2, 3, 4 ];
+int x = 5;
+[ x, w ] = [ w, x ];            §\C{// all four tuple coercions}§
+\end{cfa}
+Starting on the right-hand tuple in the last assignment statement, w is opened, producing a tuple of four values;
+therefore, the right-hand tuple is now the tuple ©[ [ 1, 2, 3, 4 ], 5 ]©.
+This tuple is then flattened, yielding ©[ 1, 2, 3, 4, 5 ]©, which is structured into ©[ 1, [ 2, 3, 4, 5 ] ]© to match the tuple type of the left-hand side.
+The tuple ©[ 2, 3, 4, 5 ]© is then closed to create a tuple value.
+Finally, ©x© is assigned ©1© and ©w© is assigned the tuple value using multiple assignment (see Section 14).
+\begin{rationale}
+A possible additional language extension is to use the structuring coercion for tuples to initialize a complex record with a tuple.
+\end{rationale}
+\section{Mass Assignment}
+\CFA permits assignment to several variables at once using mass assignment~\cite{CLU}.
+Mass assignment has the following form:
+\begin{cfa}
+[ §\emph{lvalue}§, ... , §\emph{lvalue}§ ] = §\emph{expr}§;
+\end{cfa}
+\index{lvalue}
+The left-hand side is a tuple of \emph{lvalues}, which is a list of expressions each yielding an address, \ie any data object that can appear on the left-hand side of a conventional assignment statement.
+©$\emph{expr}$© is any standard arithmetic expression.
+Clearly, the types of the entities being assigned must be type compatible with the value of the expression.
+Mass assignment has parallel semantics, \eg the statement:
+\begin{cfa}
+[ x, y, z ] = 1.5;
+\end{cfa}
+is equivalent to:
+\begin{cfa}
+x = 1.5; y = 1.5; z = 1.5;
+\end{cfa}
+This semantics is not the same as the following in C:
+\begin{cfa}
+x = y = z = 1.5;
+\end{cfa}
+as conversions between intermediate assignments may lose information.
+A more complex example is:
+\begin{cfa}
+[ i, y[i], z ] = a + b;
+\end{cfa}
+which is equivalent to:
+\begin{cfa}
+t = a + b;
+a1 = &i; a2 = &y[i]; a3 = &z;
+*a1 = t; *a2 = t; *a3 = t;
+\end{cfa}
+The temporary ©t© is necessary to store the value of the expression to eliminate conversion issues.
+The temporaries for the addresses are needed so that locations on the left-hand side do not change as the values are assigned.
+In this case, ©y[i]© uses the previous value of ©i© and not the new value set at the beginning of the mass assignment.
+\section{Multiple Assignment}
+\CFA also supports the assignment of several values at once, known as multiple assignment~\cite{CLU,Galletly96}.
+Multiple assignment has the following form:
+\begin{cfa}
+[ §\emph{lvalue}§, ... , §\emph{lvalue}§ ] = [ §\emph{expr}§, ... , §\emph{expr}§ ];
+\end{cfa}
+\index{lvalue}
+The left-hand side is a tuple of \emph{lvalues}, and the right-hand side is a tuple of \emph{expr}s.
+Each \emph{expr} appearing on the right-hand side of a multiple assignment statement is assigned to the corresponding \emph{lvalues} on the left-hand side of the statement using parallel semantics for each assignment.
+An example of multiple assignment is:
+\begin{cfa}
+[ x, y, z ] = [ 1, 2, 3 ];
+\end{cfa}
+Here, the values ©1©, ©2© and ©3© are assigned, respectively, to the variables ©x©, ©y© and ©z©.
+ A more complex example is:
+\begin{cfa}
+[ i, y[ i ], z ] = [ 1, i, a + b ];
+\end{cfa}
+Here, the values ©1©, ©i© and ©a + b© are assigned to the variables ©i©, ©y[i]© and ©z©, respectively.
+ Note, the parallel semantics of
+multiple assignment ensures:
+\begin{cfa}
+[ x, y ] = [ y, x ];
+\end{cfa}
+correctly interchanges (swaps) the values stored in ©x© and ©y©.
+The following cases are errors:
+\begin{cfa}
+[ a, b, c ] = [ 1, 2, 3, 4 ];
+[ a, b, c ] = [ 1, 2 ];
+\end{cfa}
+because the number of entities in the left-hand tuple is unequal with the right-hand tuple.
+As for all tuple contexts in C, side effects should not be used because C does not define an ordering for the evaluation of the elements of a tuple;
+both these examples produce indeterminate results:
+\begin{cfa}
+f( x++, x++ );                          §\C{// C routine call with side effects in arguments}§
+[ v1, v2 ] = [ x++, x++ ];      §\C{// side effects in righthand side of multiple assignment}§
+\end{cfa}
+\section{Cascade Assignment}
+As in C, \CFA mass and multiple assignments can be cascaded, producing cascade assignment.
+Cascade assignment has the following form:
+\begin{cfa}
+§\emph{tuple}§ = §\emph{tuple}§ = ... = §\emph{tuple}§;
+\end{cfa}
+and it has the same parallel semantics as for mass and multiple assignment.
+Some examples of cascade assignment are:
+\begin{cfa}
+x1 = y1 = x2 = y2 = 0;
+[ x1, y1 ] = [ x2, y2 ] = [ x3, y3 ];
+[ x1, y1 ] = [ x2, y2 ] = 0;
+[ x1, y1 ] = z = 0;
+\end{cfa}
+As in C, the rightmost assignment is performed first, \ie assignment parses right to left.
+\section{Field Tuples}
+Tuples may be used to select multiple fields of a record by field name.
+Its general form is:
+\begin{cfa}
+§\emph{expr}§ . [ §\emph{fieldlist}§ ]
+§\emph{expr}§ -> [ §\emph{fieldlist}§ ]
+\end{cfa}
+\emph{expr} is any expression yielding a value of type record, \eg ©struct©, ©union©.
+Each element of \emph{ fieldlist} is an element of the record specified by \emph{expr}.
+A record-field tuple may be used anywhere a tuple can be used. An example of the use of a record-field tuple is
+the following:
+\begin{cfa}
+struct s {
+        int f1, f2;
+        char f3;
+        double f4;
+} v;
+v.[ f3, f1, f2 ] = ['x', 11, 17 ];      §\C{// equivalent to v.f3 = 'x', v.f1 = 11, v.f2 = 17}§
+f( v.[ f3, f1, f2 ] );                          §\C{// equivalent to f( v.f3, v.f1, v.f2 )}§
+\end{cfa}
+Note, the fields appearing in a record-field tuple may be specified in any order;
+also, it is unnecessary to specify all the fields of a struct in a multiple record-field tuple.
+If a field of a ©struct© is itself another ©struct©, multiple fields of this subrecord can be specified using a nested record-field tuple, as in the following example:
+\begin{cfa}
+struct inner {
+        int f2, f3;
+};
+struct outer {
+        int f1;
+        struct inner i;
+        double f4;
+} o;
+o.[ f1, i.[ f2, f3 ], f4 ] = [ 11, 12, 13, 3.14159 ];
+\end{cfa}
+\section{Labelled Continue/Break}
 While C provides ©continue© and ©break© statements for altering control flow, both are restricted to one level of nesting for a particular control structure.
 Unfortunately, this restriction forces programmers to use \Indexc{goto} to achieve the equivalent control-flow for more than one level of nesting.
 To prevent having to switch to the ©goto©, \CFA extends the \Indexc{continue}\index{continue@\lstinline $continue$!labelled}\index{labelled!continue@©continue©} and \Indexc{break}\index{break@\lstinline $break$!labelled}\index{labelled!break@©break©} with a target label to support static multi-level exit\index{multi-level exit}\index{static multi-level exit}~\cite{Buhr85}.
+To prevent having to switch to the ©goto©, \CFA extends the \Indexc{continue}\index{continue@\lstinline $continue$!labelled}\index{labelled!continue@©continue©} and \Indexc{break}\index{break@\lstinline $break$!labelled}\index{labelled!break@©break©} with a target label to support static multi-level exit\index{multi-level exit}\index{static multi-level exit}~\cite{Buhr85,Java}.
 For both ©continue© and ©break©, the target label must be directly associated with a ©for©, ©while© or ©do© statement;
 for ©break©, the target label can also be associated with a ©switch©, ©if© or compound (©{}©) statement.
 \VRef[Figure]{f:MultiLevelResumeTermination} shows the labelled ©continue© and ©break©, specifying which control structure is the target for exit, and the corresponding C program using only ©goto©.
 The innermost loop has 7 exit points, which cause resumption or termination of one or more of the 7 \Index{nested control-structure}s.
-Java supports both labelled ©continue© and ©break© statements.
 \begin{figure}
 …
 \section{\texorpdfstring{\LstKeywordStyle{switch} Statement}{switch Statement}}
+\section{Switch Statement}
 C allows a number of questionable forms for the ©switch© statement:
 …
         ®// open input file
 ®} else if ( argc == 2 ) {
         ®// open input file (duplicate)
+        ®// open input file
 ®} else {
 …
 \begin{cfa}
 switch ( i ) {
   ®case 1: case 3: case 5:®     // odd values
         // odd action
+  case 1: case 3: case 5:       // odd values
+        // same action
         break;
   ®case 2: case 4: case 6:®     // even values
         // even action
+  case 2: case 4: case 6:       // even values
+        // same action
         break;
+}
 …
 However, this situation is handled in other languages without fall-through by allowing a list of case values.
 While fall-through itself is not a problem, the problem occurs when fall-through is the default, as this semantics is unintuitive to many programmers and is different from virtually all other programming languages with a ©switch© statement.
 Hence, default fall-through semantics results in a large number of programming errors as programmers often \emph{forget} the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through.
+Hence, default fall-through semantics results in a large number of programming errors as programmers often forget the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through.
 \item
 …
 and there is only a medium amount of fall-through from one ©case© clause to the next, and most of these result from a list of case values executing common code, rather than a sequence of case actions that compound.
 \end{itemize}
 These observations put into perspective the \CFA changes to the ©switch©.
+These observations help to put the \CFA changes to the ©switch© into perspective.
 \begin{enumerate}
 \item
 …
 still works.
 Nevertheless, reversing the default action would have a non-trivial effect on case actions that compound, such as the above example of processing shell arguments.
 Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthrough©/©fallthru©, \eg:
+Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthrough©/©fallthru©, e.g.:
 \begin{cfa}
 ®choose® ( i ) {
 …
   case 7:
         ...
         ®break®                                         §\C{// redundant explicit end of switch}§
+        ®break®                                         §\C{// explicit end of switch}§
   default:
         j = 3;
 …
 \end{cfa}
 Like the ©switch© statement, the ©choose© statement retains the fall-through semantics for a list of ©case© clauses;
 An implicit ©break© is applied only at the end of the \emph{statements} following a ©case© clause.
 An explicit ©fallthru© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement.
+the implicit ©break© is applied only at the end of the \emph{statements} following a ©case© clause.
+The explicit ©fallthru© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement.
 As well, allowing an explicit ©break© from the ©choose© is a carry over from the ©switch© statement, and expected by C programmers.
 \item
 …
 \section{\texorpdfstring{\LstKeywordStyle{case} Clause}{case Clause}}
+\section{Case Clause}
 C restricts the ©case© clause of a ©switch© statement to a single value.
 …
-\section{\texorpdfstring{\LstKeywordStyle{with} Clause / Statement}{with Clause / Statement}}
-\label{s:WithClauseStatement}
-In \Index{object-oriented} programming, there is an implicit first parameter, often names \textbf{©self©} or \textbf{©this©}, which is elided.
-\begin{C++}
-class C {
-        int i, j;
-        int mem() {              ®// implicit "this" parameter
-®               i = 1;          ®// this->i
-®               j = 3;          ®// this->j
-®       }
+}
-\end{C++}
-Since CFA is non-object-oriented, the equivalent object-oriented program looks like:
-\begin{cfa}
-struct S { int i, j; };
-int mem( S &this ) {    // explicit "this" parameter
-        ®this.®i = 1;                     // "this" is not elided
-        ®this.®j = 2;
+}
-\end{cfa}
-but it is cumbersome having to write "©this.©" many times in a member.
-\CFA provides a ©with© clause/statement to elided the "©this.©" by opening a scope containing field identifiers and changing the qualified fields into variables, giving an opportunity for optimizing qualified references.\footnote{
-The ©with© statement comes from Pascal~\cite[\S~4.F]{Pascal}.}
-\begin{cfa}
-int mem( S &this ) ®with this® {
-        i = 1;                  ®// this.i
-®       j = 2;                  ®// this.j
-®}
-\end{cfa}
-which extends to multiple routine parameters:
-\begin{cfa}
-struct T { double m, n; };
-int mem2( S &this1, T &this2 ) ®with this1, this2® {
-        i = 1; j = 2;
-        m = 1.0; n = 2.0;
+}
-\end{cfa}
-The statement form is used within a block:
-\begin{cfa}
-int foo() {
-        struct S1 { ... } s1;
-        struct S2 { ... } s2;
-        ®with s1® {
-                // access fields of s1 without qualification
-                ®with s2® {  // nesting
-                        // access fields of s1 and s2 without qualification
+                }
+        }
-        ®with s1, s2® {
-                // access unambiguous fields of s1 and s2 without qualification
+        }
+}
-\end{cfa}
-When opening multiple structures, fields with the same name and type are ambiguous and must be fully qualified.
-For fields with the same name but different type, context/cast can be used to disambiguate.
-\begin{cfa}
-struct S { int i; int j; double m; } a, c;
-struct T { int i; int k; int m } b, c;
-®with a, b® {
-        j + k;                                          §\C{// unambiguous, unique names define unique type}§
-        i;                                                      §\C{// ambiguous, same name and type}§
-        a.i + b.i;                                      §\C{// unambiguous, qualification defines unique type}§
-        m;                                                      §\C{// ambiguous, no context to define unique type}§
-        m = 5.0;                                        §\C{// unambiguous, context defines unique type}§
-        m = 1;                                          §\C{// unambiguous, context defines unique type}§
+}
-®with c® { ... }                                §\C{// ambiguous, no context}§
-®with (S)c® { ... }                             §\C{// unambiguous, cast defines unique type}§
-\end{cfa}
 \section{Exception Handling}
-\label{s:ExceptionHandling}
 Exception handling provides two mechanism: change of control flow from a raise to a handler, and communication from the raise to the handler.
+Transfer of control can be local, within a routine, or non-local, among routines.
+Non-local transfer can cause stack unwinding, i.e., non-local routine termination, depending on the kind of raise.
+\begin{cfa}
+exception_t E {};                               §\C{// exception type}§
+\begin{cfa}
+exception void h( int i );
+exception int h( int i, double d );
 void f(...) {
+        ... throw E{}; ...                      §\C{// termination}§
+        ... throwResume E{}; ...        §\C{// resumption}§
+}
+        ... throw h( 3 );
+        ... i = resume h( 3, 5.1 );
+}
 try {
         f(...);
 } catch( E e : §boolean-predicate§ ) {                  §\C{// termination handler}§
         // recover and continue
 } catchResume( E e : §boolean-predicate§ ) {    §\C{// resumption handler}§
         // repair and return
+} catch h( int w ) {
+        // reset
+} resume h( int p, double x ) {
+        return 17;  // recover
 } finally {
+        // always executed
+}
+\end{cfa}
+The kind of raise and handler match: ©throw© with ©catch© and @throwResume@ with @catchResume@.
+Then the exception type must match along with any additonal predicate must be true.
+The ©catch© and ©catchResume© handlers may appear in any oder.
+However, the ©finally© clause must
+\subsection{Exception Hierarchy}
+An exception type can be derived from another exception type, just like deriving a subclass from a class, providing a kind of polymorphism among exception types.
+The exception-type hierarchy that is created is used to organize exception types, similar to a class hierarchy in object-oriented languages, \eg:
+\begin{center}
+\input{EHMHierarchy}
+\end{center}
+A programmer can then choose to handle an exception at different degrees of specificity along the hierarchy;
+derived exception-types support a more flexible programming style.
+For example, higher-level code should catch general exceptions to reduce coupling to the specific implementation at the lower levels;
+unnecessary coupling may force changes in higher-level code when low-level code changes.
+A consequence of derived exception-types is that multiple exceptions may match, \eg:
+\begin{cfa}
+catch( Arithmetic )
+\end{cfa}
+matches all three derived exception-types: ©DivideByZero©, ©Overflow©, and ©Underflow©.
+Because the propagation mechanisms perform a simple linear search of the handler clause for a guarded block, and selects the first matching handler, the order of catch clauses in the handler clause becomes important, \eg:
+\begin{cfa}
+try {
+        ...
+} catch( Overflow ) {   // must appear first
+        // handle overflow
+} catch( Arithmetic )
+        // handle other arithmetic issues
+}
+\end{cfa}
+\newterm{Multiple derivation} among exception is not supported.
+\section{Declarations}
+\label{s:Declarations}
+C declaration syntax is notoriously confusing and error prone.
+For example, many C programmers are confused by a declaration as simple as:
+\begin{quote2}
+\begin{tabular}{@{}ll@{}}
+\begin{cfa}
+int * x[5]
+\end{cfa}
+&
+\raisebox{-0.75\totalheight}{\input{Cdecl}}
+\end{tabular}
+\end{quote2}
+Is this an array of 5 pointers to integers or a \Index{pointer} to an array of 5 integers?
+The fact this declaration is unclear to many C programmers means there are \Index{productivity} and \Index{safety} issues even for basic programs.
+Another example of confusion results from the fact that a routine name and its parameters are embedded within the return type, mimicking the way the return value is used at the routine's call site.
+For example, a routine returning a \Index{pointer} to an array of integers is defined and used in the following way:
+\begin{cfa}
+int ®(*®f®())[®5®]® {...};                              §\C{definition}§
+ ... ®(*®f®())[®3®]® += 1;                              §\C{usage}§
+\end{cfa}
+Essentially, the return type is wrapped around the routine name in successive layers (like an \Index{onion}).
+While attempting to make the two contexts consistent is a laudable goal, it has not worked out in practice.
+\CFA provides its own type, variable and routine declarations, using a different syntax.
+The new declarations place qualifiers to the left of the base type, while C declarations place qualifiers to the right of the base type.
+In the following example, \R{red} is the base type and \B{blue} is qualifiers.
+The \CFA declarations move the qualifiers to the left of the base type, \ie move the blue to the left of the red, while the qualifiers have the same meaning but are ordered left to right to specify a variable's type.
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+ß[5] *ß ®int® x1;
+ß* [5]ß ®int® x2;
+ß[* [5] int]ß f®( int p )®;
+\end{cfa}
+&
+\begin{cfa}
+®int® ß*ß x1 ß[5]ß;
+®int® ß(*ßx2ß)[5]ß;
+ßint (*ßf®( int p )®ß)[5]ß;
+\end{cfa}
+\end{tabular}
+\end{quote2}
+The only exception is \Index{bit field} specification, which always appear to the right of the base type.
+% Specifically, the character ©*© is used to indicate a pointer, square brackets ©[©\,©]© are used to represent an array or function return value, and parentheses ©()© are used to indicate a routine parameter.
+However, unlike C, \CFA type declaration tokens are distributed across all variables in the declaration list.
+For instance, variables ©x© and ©y© of type \Index{pointer} to integer are defined in \CFA as follows:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+®*® int x, y;
+\end{cfa}
+&
+\begin{cfa}
+int ®*®x, ®*®y;
+\end{cfa}
+\end{tabular}
+\end{quote2}
+The downside of this semantics is the need to separate regular and \Index{pointer} declarations:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+®*® int x;
+int y;
+\end{cfa}
+&
+\begin{cfa}
+int ®*®x, y;
+\end{cfa}
+\end{tabular}
+\end{quote2}
+which is \Index{prescribing} a safety benefit.
+Other examples are:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\
+\begin{cfa}
+[ 5 ] int z;
+[ 5 ] * char w;
+* [ 5 ] double v;
+struct s {
+        int f0:3;
+        * int f1;
+        [ 5 ] * int f2;
+};
+\end{cfa}
+&
+\begin{cfa}
+int z[ 5 ];
+char * w[ 5 ];
+double (* v)[ 5 ];
+struct s {
+        int f0:3;
+        int * f1;
+        int * f2[ 5 ]
+};
+\end{cfa}
+&
+\begin{cfa}
+// array of 5 integers
+// array of 5 pointers to char
+// pointer to array of 5 doubles
+// common bit field syntax
+\end{cfa}
+\end{tabular}
+\end{quote2}
+All type qualifiers, \eg ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, \eg:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}}
+\multicolumn{1}{c@{\hspace{1em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{1em}}}{\textbf{C}} \\
+\begin{cfa}
+const * const int x;
+const * [ 5 ] const int y;
+\end{cfa}
+&
+\begin{cfa}
+int const * const x;
+const int (* const y)[ 5 ]
+\end{cfa}
+&
+\begin{cfa}
+// const pointer to const integer
+// const pointer to array of 5 const integers
+\end{cfa}
+\end{tabular}
+\end{quote2}
+All declaration qualifiers, \eg ©extern©, ©static©, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier}
+The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} \eg:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\
+\begin{cfa}
+extern [ 5 ] int x;
+static * const int y;
+\end{cfa}
+&
+\begin{cfa}
+int extern x[ 5 ];
+const int static * y;
+\end{cfa}
+&
+\begin{cfa}
+// externally visible array of 5 integers
+// internally visible pointer to constant int
+\end{cfa}
+\end{tabular}
+\end{quote2}
+The new declaration syntax can be used in other contexts where types are required, \eg casts and the pseudo-routine ©sizeof©:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+y = (®* int®)x;
+i = sizeof(®[ 5 ] * int®);
+\end{cfa}
+&
+\begin{cfa}
+y = (®int *®)x;
+i = sizeof(®int * [ 5 ]®);
+\end{cfa}
+\end{tabular}
+\end{quote2}
+Finally, new \CFA declarations may appear together with C declarations in the same program block, but cannot be mixed within a specific declaration.
+Therefore, a programmer has the option of either continuing to use traditional C declarations or take advantage of the new style.
+Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX systems.
+\section{Pointer / Reference}
+C provides a \newterm{pointer type};
+\CFA adds a \newterm{reference type}.
+These types may be derived from an object or routine type, called the \newterm{referenced type}.
+Objects of these types contain an \newterm{address}, which is normally a location in memory, but may also address memory-mapped registers in hardware devices.
+An integer constant expression with the value 0, or such an expression cast to type ©void *©, is called a \newterm{null-pointer constant}.\footnote{
+One way to conceptualize the null pointer is that no variable is placed at this address, so the null-pointer address can be used to denote an uninitialized pointer/reference object;
+\ie the null pointer is guaranteed to compare unequal to a pointer to any object or routine.}
+An address is \newterm{sound}, if it points to a valid memory location in scope, \ie within the program's execution-environment and has not been freed.
+Dereferencing an \newterm{unsound} address, including the null pointer, is \Index{undefined}, often resulting in a \Index{memory fault}.
+A program \newterm{object} is a region of data storage in the execution environment, the contents of which can represent values.
+In most cases, objects are located in memory at an address, and the variable name for an object is an implicit address to the object generated by the compiler and automatically dereferenced, as in:
+\begin{quote2}
+\begin{tabular}{@{}ll@{\hspace{2em}}l@{}}
+\begin{cfa}
+int x;
+x = 3;
+int y;
+y = x;
+\end{cfa}
+&
+\raisebox{-0.45\totalheight}{\input{pointer1}}
+&
+\begin{cfa}
+int * ®const® x = (int *)100
+*x = 3;                 // implicit dereference
+int * ®const® y = (int *)104;
+*y = *x;                // implicit dereference
+\end{cfa}
+\end{tabular}
+\end{quote2}
+where the right example is how the compiler logically interprets the variables in the left example.
+Since a variable name only points to one address during its lifetime, it is an \Index{immutable} \Index{pointer};
+hence, the implicit type of pointer variables ©x© and ©y© are constant pointers in the compiler interpretation.
+In general, variable addresses are stored in instructions instead of loaded from memory, and hence may not occupy storage.
+These approaches are contrasted in the following:
+\begin{quote2}
+\begin{tabular}{@{}l|l@{}}
+\multicolumn{1}{c|}{explicit variable address} & \multicolumn{1}{c}{implicit variable address} \\
+\hline
+\begin{cfa}
+lda             r1,100                  // load address of x
+ld               r2,(r1)                  // load value of x
+lda             r3,104                  // load address of y
+st               r2,(r3)                  // store x into y
+\end{cfa}
+&
+\begin{cfa}
+ld              r2,(100)                // load value of x
+st              r2,(104)                // store x into y
+\end{cfa}
+\end{tabular}
+\end{quote2}
+Finally, the immutable nature of a variable's address and the fact that there is no storage for the variable pointer means pointer assignment\index{pointer!assignment}\index{assignment!pointer} is impossible.
+Therefore, the expression ©x = y© has only one meaning, ©*x = *y©, \ie manipulate values, which is why explicitly writing the dereferences is unnecessary even though it occurs implicitly as part of \Index{instruction decoding}.
+A \Index{pointer}/\Index{reference} object is a generalization of an object variable-name, \ie a mutable address that can point to more than one memory location during its lifetime.
+(Similarly, an integer variable can contain multiple integer literals during its lifetime versus an integer constant representing a single literal during its lifetime, and like a variable name, may not occupy storage if the literal is embedded directly into instructions.)
+Hence, a pointer occupies memory to store its current address, and the pointer's value is loaded by dereferencing, \eg:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{2em}}l@{}}
+\begin{cfa}
+int x, y, ®*® p1, ®*® p2, ®**® p3;
+p1 = ®&®x;               // p1 points to x
+p2 = p1;                 // p2 points to x
+p1 = ®&®y;               // p1 points to y
+p3 = &p2;               // p3 points to p2
+\end{cfa}
+&
+\raisebox{-0.5\totalheight}{\input{pointer2.pstex_t}}
+\end{tabular}
+\end{quote2}
+Notice, an address has a \Index{duality}\index{address!duality}: a location in memory or the value at that location.
+In many cases, a compiler might be able to infer the best meaning for these two cases.
+For example, \Index*{Algol68}~\cite{Algol68} infers pointer dereferencing to select the best meaning for each pointer usage
+\begin{cfa}
+p2 = p1 + x;                                    §\C{// compiler infers *p2 = *p1 + x;}§
+\end{cfa}
+Algol68 infers the following dereferencing ©*p2 = *p1 + x©, because adding the arbitrary integer value in ©x© to the address of ©p1© and storing the resulting address into ©p2© is an unlikely operation.
+Unfortunately, automatic dereferencing does not work in all cases, and so some mechanism is necessary to fix incorrect choices.
+Rather than inferring dereference, most programming languages pick one implicit dereferencing semantics, and the programmer explicitly indicates the other to resolve address-duality.
+In C, objects of pointer type always manipulate the pointer object's address:
+\begin{cfa}
+p1 = p2;                                                §\C{// p1 = p2\ \ rather than\ \ *p1 = *p2}§
+p2 = p1 + x;                                    §\C{// p2 = p1 + x\ \ rather than\ \ *p2 = *p1 + x}§
+\end{cfa}
+even though the assignment to ©p2© is likely incorrect, and the programmer probably meant:
+\begin{cfa}
+p1 = p2;                                                §\C{// pointer address assignment}§
+®*®p2 = ®*®p1 + x;                              §\C{// pointed-to value assignment / operation}§
+\end{cfa}
+The C semantics work well for situations where manipulation of addresses is the primary meaning and data is rarely accessed, such as storage management (©malloc©/©free©).
+However, in most other situations, the pointed-to value is requested more often than the pointer address.
+\begin{cfa}
+*p2 = ((*p1 + *p2) * (**p3 - *p1)) / (**p3 - 15);
+\end{cfa}
+In this case, it is tedious to explicitly write the dereferencing, and error prone when pointer arithmetic is allowed.
+It is better to have the compiler generate the dereferencing and have no implicit pointer arithmetic:
+\begin{cfa}
+p2 = ((p1 + p2) * (p3 - p1)) / (p3 - 15);
+\end{cfa}
+To support this common case, a reference type is introduced in \CFA, denoted by ©&©, which is the opposite dereference semantics to a pointer type, making the value at the pointed-to location the implicit semantics for dereferencing (similar but not the same as \CC \Index{reference type}s).
+\begin{cfa}
+int x, y, ®&® r1, ®&® r2, ®&&® r3;
+®&®r1 = &x;                                             §\C{// r1 points to x}§
+®&®r2 = &r1;                                    §\C{// r2 points to x}§
+®&®r1 = &y;                                             §\C{// r1 points to y}§
+®&&®r3 = ®&®&r2;                                §\C{// r3 points to r2}§
+r2 = ((r1 + r2) * (r3 - r1)) / (r3 - 15); §\C{// implicit dereferencing}§
+\end{cfa}
+Except for auto-dereferencing by the compiler, this reference example is the same as the previous pointer example.
+Hence, a reference behaves like the variable name for the current variable it is pointing-to.
+One way to conceptualize a reference is via a rewrite rule, where the compiler inserts a dereference operator before the reference variable for each reference qualifier in a declaration, so the previous example becomes:
+\begin{cfa}
+®*®r2 = ((®*®r1 + ®*®r2) ®*® (®**®r3 - ®*®r1)) / (®**®r3 - 15);
+\end{cfa}
+When a reference operation appears beside a dereference operation, \eg ©&*©, they cancel out.
+However, in C, the cancellation always yields a value (\Index{rvalue}).\footnote{
+The unary ©&© operator yields the address of its operand.
+If the operand has type ``type'', the result has type ``pointer to type''.
+If the operand is the result of a unary ©*© operator, neither that operator nor the ©&© operator is evaluated and the result is as if both were omitted, except that the constraints on the operators still apply and the result is not an lvalue.~\cite[\S~6.5.3.2--3]{C11}}
+For a \CFA reference type, the cancellation on the left-hand side of assignment leaves the reference as an address (\Index{lvalue}):
+\begin{cfa}
+(&®*®)r1 = &x;                                  §\C{// (\&*) cancel giving address in r1 not variable pointed-to by r1}§
+\end{cfa}
+Similarly, the address of a reference can be obtained for assignment or computation (\Index{rvalue}):
+\begin{cfa}
+(&(&®*®)®*®)r3 = &(&®*®)r2;             §\C{// (\&*) cancel giving address in r2, (\&(\&*)*) cancel giving address in r3}§
+\end{cfa}
+Cancellation\index{cancellation!pointer/reference}\index{pointer!cancellation} works to arbitrary depth.
+Fundamentally, pointer and reference objects are functionally interchangeable because both contain addresses.
+\begin{cfa}
+int x, *p1 = &x, **p2 = &p1, ***p3 = &p2,
+                 &r1 = x,    &&r2 = r1,   &&&r3 = r2;
+***p3 = 3;                                              §\C{// change x}§
+r3 = 3;                                                 §\C{// change x, ***r3}§
+**p3 = ...;                                             §\C{// change p1}§
+&r3 = ...;                                              §\C{// change r1, (\&*)**r3, 1 cancellation}§
+*p3 = ...;                                              §\C{// change p2}§
+&&r3 = ...;                                             §\C{// change r2, (\&(\&*)*)*r3, 2 cancellations}§
+&&&r3 = p3;                                             §\C{// change r3 to p3, (\&(\&(\&*)*)*)r3, 3 cancellations}§
+\end{cfa}
+Furthermore, both types are equally performant, as the same amount of dereferencing occurs for both types.
+Therefore, the choice between them is based solely on whether the address is dereferenced frequently or infrequently, which dictates the amount of implicit dereferencing aid from the compiler.
+As for a pointer type, a reference type may have qualifiers:
+\begin{cfa}
+const int cx = 5;                                       §\C{// cannot change cx;}§
+const int & cr = cx;                            §\C{// cannot change what cr points to}§
+®&®cr = &cx;                                            §\C{// can change cr}§
+cr = 7;                                                         §\C{// error, cannot change cx}§
+int & const rc = x;                                     §\C{// must be initialized}§
+®&®rc = &x;                                                     §\C{// error, cannot change rc}§
+const int & const crc = cx;                     §\C{// must be initialized}§
+crc = 7;                                                        §\C{// error, cannot change cx}§
+®&®crc = &cx;                                           §\C{// error, cannot change crc}§
+\end{cfa}
+Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be the null pointer unless an arbitrary pointer is coerced\index{coercion} into the reference}:
+\begin{cfa}
+int & const cr = *0;                            §\C{// where 0 is the int * zero}§
+\end{cfa}
+Note, constant reference-types do not prevent \Index{addressing errors} because of explicit storage-management:
+\begin{cfa}
+int & const cr = *malloc();
+cr = 5;
+free( &cr );
+cr = 7;                                                         §\C{// unsound pointer dereference}§
+\end{cfa}
+The position of the ©const© qualifier \emph{after} the pointer/reference qualifier causes confuse for C programmers.
+The ©const© qualifier cannot be moved before the pointer/reference qualifier for C style-declarations;
+\CFA-style declarations (see \VRef{s:Declarations}) attempt to address this issue:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+®const® * ®const® * const int ccp;
+®const® & ®const® & const int ccr;
+\end{cfa}
+&
+\begin{cfa}
+const int * ®const® * ®const® ccp;
+\end{cfa}
+\end{tabular}
+\end{quote2}
+where the \CFA declaration is read left-to-right.
+Finally, like pointers, references are usable and composable with other type operators and generators.
+\begin{cfa}
+int w, x, y, z, & ar[3] = { x, y, z }; §\C{// initialize array of references}§
+&ar[1] = &w;                                            §\C{// change reference array element}§
+typeof( ar[1] ) p;                                      §\C{// (gcc) is int, i.e., the type of referenced object}§
+typeof( &ar[1] ) q;                                     §\C{// (gcc) is int \&, i.e., the type of reference}§
+sizeof( ar[1] ) == sizeof( int );       §\C{// is true, i.e., the size of referenced object}§
+sizeof( &ar[1] ) == sizeof( int *)      §\C{// is true, i.e., the size of a reference}§
+\end{cfa}
+In contrast to \CFA reference types, \Index*[C++]{\CC{}}'s reference types are all ©const© references, preventing changes to the reference address, so only value assignment is possible, which eliminates half of the \Index{address duality}.
+Also, \CC does not allow \Index{array}s\index{array!reference} of reference\footnote{
+The reason for disallowing arrays of reference is unknown, but possibly comes from references being ethereal (like a textual macro), and hence, replaceable by the referant object.}
+\Index*{Java}'s reference types to objects (all Java objects are on the heap) are like C pointers, which always manipulate the address, and there is no (bit-wise) object assignment, so objects are explicitly cloned by shallow or deep copying, which eliminates half of the address duality.
+\subsection{Initialization}
+\Index{Initialization} is different than \Index{assignment} because initialization occurs on the empty (uninitialized) storage on an object, while assignment occurs on possibly initialized storage of an object.
+There are three initialization contexts in \CFA: declaration initialization, argument/parameter binding, return/temporary binding.
+Because the object being initialized has no value, there is only one meaningful semantics with respect to address duality: it must mean address as there is no pointed-to value.
+In contrast, the left-hand side of assignment has an address that has a duality.
+Therefore, for pointer/reference initialization, the initializing value must be an address not a value.
+\begin{cfa}
+int * p = &x;                                           §\C{// assign address of x}§
+®int * p = x;®                                          §\C{// assign value of x}§
+int & r = x;                                            §\C{// must have address of x}§
+\end{cfa}
+Like the previous example with C pointer-arithmetic, it is unlikely assigning the value of ©x© into a pointer is meaningful (again, a warning is usually given).
+Therefore, for safety, this context requires an address, so it is superfluous to require explicitly taking the address of the initialization object, even though the type is incorrect.
+Note, this is strictly a convenience and safety feature for a programmer.
+Hence, \CFA allows ©r© to be assigned ©x© because it infers a reference for ©x©, by implicitly inserting a address-of operator, ©&©, and it is an error to put an ©&© because the types no longer match due to the implicit dereference.
+Unfortunately, C allows ©p© to be assigned with ©&x© (address) or ©x© (value), but most compilers warn about the latter assignment as being potentially incorrect.
+Similarly, when a reference type is used for a parameter/return type, the call-site argument does not require a reference operator for the same reason.
+\begin{cfa}
+int & f( int & r );                                     §\C{// reference parameter and return}§
+z = f( x ) + f( y );                            §\C{// reference operator added, temporaries needed for call results}§
+\end{cfa}
+Within routine ©f©, it is possible to change the argument by changing the corresponding parameter, and parameter ©r© can be locally reassigned within ©f©.
+Since operator routine ©?+?© takes its arguments by value, the references returned from ©f© are used to initialize compiler generated temporaries with value semantics that copy from the references.
+\begin{cfa}
+int temp1 = f( x ), temp2 = f( y );
+z = temp1 + temp2;
+\end{cfa}
+This \Index{implicit referencing} is crucial for reducing the syntactic burden for programmers when using references;
+otherwise references have the same syntactic  burden as pointers in these contexts.
+When a pointer/reference parameter has a ©const© value (immutable), it is possible to pass literals and expressions.
+\begin{cfa}
+void f( ®const® int & cr );
+void g( ®const® int * cp );
+f( 3 );                   g( ®&®3 );
+f( x + y );             g( ®&®(x + y) );
+\end{cfa}
+Here, the compiler passes the address to the literal 3 or the temporary for the expression ©x + y©, knowing the argument cannot be changed through the parameter.
+The ©&© before the constant/expression for the pointer-type parameter (©g©) is a \CFA extension necessary to type match and is a common requirement before a variable in C (\eg ©scanf©).
+Importantly, ©&3© may not be equal to ©&3©, where the references occur across calls because the temporaries maybe different on each call.
+\CFA \emph{extends} this semantics to a mutable pointer/reference parameter, and the compiler implicitly creates the necessary temporary (copying the argument), which is subsequently pointed-to by the reference parameter and can be changed.\footnote{
+If whole program analysis is possible, and shows the parameter is not assigned, \ie it is ©const©, the temporary is unnecessary.}
+\begin{cfa}
+void f( int & r );
+void g( int * p );
+f( 3 );                   g( ®&®3 );            §\C{// compiler implicit generates temporaries}§
+f( x + y );             g( ®&®(x + y) );        §\C{// compiler implicit generates temporaries}§
+\end{cfa}
+Essentially, there is an implicit \Index{rvalue} to \Index{lvalue} conversion in this case.\footnote{
+This conversion attempts to address the \newterm{const hell} problem, when the innocent addition of a ©const© qualifier causes a cascade of type failures, requiring an unknown number of additional ©const© qualifiers, until it is discovered a ©const© qualifier cannot be added and all the ©const© qualifiers must be removed.}
+The implicit conversion allows seamless calls to any routine without having to explicitly name/copy the literal/expression to allow the call.
+%\CFA attempts to handle pointers and references in a uniform, symmetric manner.
+Finally, C handles \Index{routine object}s in an inconsistent way.
+A routine object is both a pointer and a reference (\Index{particle and wave}).
+\begin{cfa}
+void f( int i );
+void (*fp)( int );                                      §\C{// routine pointer}§
+fp = f;                                                         §\C{// reference initialization}§
+fp = &f;                                                        §\C{// pointer initialization}§
+fp = *f;                                                        §\C{// reference initialization}§
+fp(3);                                                          §\C{// reference invocation}§
+(*fp)(3);                                                       §\C{// pointer invocation}§
+\end{cfa}
+While C's treatment of routine objects has similarity to inferring a reference type in initialization contexts, the examples are assignment not initialization, and all possible forms of assignment are possible (©f©, ©&f©, ©*f©) without regard for type.
+Instead, a routine object should be referenced by a ©const© reference:
+\begin{cfa}
+®const® void (®&® fr)( int ) = f;       §\C{// routine reference}§
+fr = ...                                                        §\C{// error, cannot change code}§
+&fr = ...;                                                      §\C{// changing routine reference}§
+fr( 3 );                                                        §\C{// reference call to f}§
+(*fr)(3);                                                       §\C{// error, incorrect type}§
+\end{cfa}
+because the value of the routine object is a routine literal, \ie the routine code is normally immutable during execution.\footnote{
+Dynamic code rewriting is possible but only in special circumstances.}
+\CFA allows this additional use of references for routine objects in an attempt to give a more consistent meaning for them.
+\subsection{Address-of Semantics}
+In C, ©&E© is an rvalue for any expression ©E©.
+\CFA extends the ©&© (address-of) operator as follows:
+\begin{itemize}
+\item
+if ©R© is an \Index{rvalue} of type ©T &$_1$...&$_r$© where $r \ge 1$ references (©&© symbols) than ©&R© has type ©T ®*®&$_{\color{red}2}$...&$_{\color{red}r}$©, \ie ©T© pointer with $r-1$ references (©&© symbols).
+\item
+if ©L© is an \Index{lvalue} of type ©T &$_1$...&$_l$© where $l \ge 0$ references (©&© symbols) then ©&L© has type ©T ®*®&$_{\color{red}1}$...&$_{\color{red}l}$©, \ie ©T© pointer with $l$ references (©&© symbols).
+\end{itemize}
+The following example shows the first rule applied to different \Index{rvalue} contexts:
+\begin{cfa}
+int x, * px, ** ppx, *** pppx, **** ppppx;
+int & rx = x, && rrx = rx, &&& rrrx = rrx ;
+x = rrrx;               // rrrx is an lvalue with type int &&& (equivalent to x)
+px = &rrrx;             // starting from rrrx, &rrrx is an rvalue with type int *&&& (&x)
+ppx = &&rrrx;   // starting from &rrrx, &&rrrx is an rvalue with type int **&& (&rx)
+pppx = &&&rrrx; // starting from &&rrrx, &&&rrrx is an rvalue with type int ***& (&rrx)
+ppppx = &&&&rrrx; // starting from &&&rrrx, &&&&rrrx is an rvalue with type int **** (&rrrx)
+\end{cfa}
+The following example shows the second rule applied to different \Index{lvalue} contexts:
+\begin{cfa}
+int x, * px, ** ppx, *** pppx;
+int & rx = x, && rrx = rx, &&& rrrx = rrx ;
+rrrx = 2;               // rrrx is an lvalue with type int &&& (equivalent to x)
+&rrrx = px;             // starting from rrrx, &rrrx is an rvalue with type int *&&& (rx)
+&&rrrx = ppx;   // starting from &rrrx, &&rrrx is an rvalue with type int **&& (rrx)
+&&&rrrx = pppx; // starting from &&rrrx, &&&rrrx is an rvalue with type int ***& (rrrx)
+\end{cfa}
+\subsection{Conversions}
+C provides a basic implicit conversion to simplify variable usage:
+\begin{enumerate}
+\setcounter{enumi}{-1}
+\item
+lvalue to rvalue conversion: ©cv T© converts to ©T©, which allows implicit variable dereferencing.
+\begin{cfa}
+int x;
+x + 1;                  // lvalue variable (int) converts to rvalue for expression
+\end{cfa}
+An rvalue has no type qualifiers (©cv©), so the lvalue qualifiers are dropped.
+\end{enumerate}
+\CFA provides three new implicit conversion for reference types to simplify reference usage.
+\begin{enumerate}
+\item
+reference to rvalue conversion: ©cv T &© converts to ©T©, which allows implicit reference dereferencing.
+\begin{cfa}
+int x, &r = x, f( int p );
+x = ®r® + f( ®r® );  // lvalue reference converts to rvalue
+\end{cfa}
+An rvalue has no type qualifiers (©cv©), so the reference qualifiers are dropped.
+\item
+lvalue to reference conversion: \lstinline[deletekeywords=lvalue]$lvalue-type cv1 T$ converts to ©cv2 T &©, which allows implicitly converting variables to references.
+\begin{cfa}
+int x, &r = ®x®, f( int & p ); // lvalue variable (int) convert to reference (int &)
+f( ®x® );               // lvalue variable (int) convert to reference (int &)
+\end{cfa}
+Conversion can restrict a type, where ©cv1© $\le$ ©cv2©, \eg passing an ©int© to a ©const volatile int &©, which has low cost.
+Conversion can expand a type, where ©cv1© $>$ ©cv2©, \eg passing a ©const volatile int© to an ©int &©, which has high cost (\Index{warning});
+furthermore, if ©cv1© has ©const© but not ©cv2©, a temporary variable is created to preserve the immutable lvalue.
+\item
+rvalue to reference conversion: ©T© converts to ©cv T &©, which allows binding references to temporaries.
+\begin{cfa}
+int x, & f( int & p );
+f( ®x + 3® );   // rvalue parameter (int) implicitly converts to lvalue temporary reference (int &)
+®&f®(...) = &x; // rvalue result (int &) implicitly converts to lvalue temporary reference (int &)
+\end{cfa}
+In both case, modifications to the temporary are inaccessible (\Index{warning}).
+Conversion expands the temporary-type with ©cv©, which is low cost since the temporary is inaccessible.
+\end{enumerate}
+\begin{comment}
+From: Richard Bilson <rcbilson@gmail.com>
+Date: Wed, 13 Jul 2016 01:58:58 +0000
+Subject: Re: pointers / references
+To: "Peter A. Buhr" <pabuhr@plg2.cs.uwaterloo.ca>
+As a general comment I would say that I found the section confusing, as you move back and forth
+between various real and imagined programming languages. If it were me I would rewrite into two
+subsections, one that specifies precisely the syntax and semantics of reference variables and
+another that provides the rationale.
+I don't see any obvious problems with the syntax or semantics so far as I understand them. It's not
+obvious that the description you're giving is complete, but I'm sure you'll find the special cases
+as you do the implementation.
+My big gripes are mostly that you're not being as precise as you need to be in your terminology, and
+that you say a few things that aren't actually true even though I generally know what you mean.
+C provides a pointer type; CFA adds a reference type. Both types contain an address, which is normally a
+location in memory.
+An address is not a location in memory; an address refers to a location in memory. Furthermore it
+seems weird to me to say that a type "contains" an address; rather, objects of that type do.
+Special addresses are used to denote certain states or access co-processor memory. By
+convention, no variable is placed at address 0, so addresses like 0, 1, 2, 3 are often used to denote no-value
+or other special states.
+This isn't standard C at all. There has to be one null pointer representation, but it doesn't have
+to be a literal zero representation and there doesn't have to be more than one such representation.
+Often dereferencing a special state causes a memory fault, so checking is necessary
+during execution.
+I don't see the connection between the two clauses here. I feel like if a bad pointer will not cause
+a memory fault then I need to do more checking, not less.
+If the programming language assigns addresses, a program's execution is sound, \ie all
+addresses are to valid memory locations.
+You haven't said what it means to "assign" an address, but if I use my intuitive understanding of
+the term I don't see how this can be true unless you're assuming automatic storage management.
+Program variables are implicit pointers to memory locations generated by the compiler and automatically
+dereferenced, as in:
+There is no reason why a variable needs to have a location in memory, and indeed in a typical
+program many variables will not. In standard terminology an object identifier refers to data in the
+execution environment, but not necessarily in memory.
+A pointer/reference is a generalization of a variable name, \ie a mutable address that can point to more
+than one memory location during its lifetime.
+I feel like you're off the reservation here. In my world there are objects of pointer type, which
+seem to be what you're describing here, but also pointer values, which can be stored in an object of
+pointer type but don't necessarily have to be. For example, how would you describe the value denoted
+by "&main" in a C program? I would call it a (function) pointer, but that doesn't satisfy your
+definition.
+not occupy storage as the literal is embedded directly into instructions.) Hence, a pointer occupies memory
+to store its current address, and the pointer's value is loaded by dereferencing, \eg:
+As with my general objection regarding your definition of variables, there is no reason why a
+pointer variable (object of pointer type) needs to occupy memory.
+p2 = p1 + x; // compiler infers *p2 = *p1 + x;
+What language are we in now?
+pointer usage. However, in C, the following cases are ambiguous, especially with pointer arithmetic:
+p1 = p2; // p1 = p2 or *p1 = *p2
+This isn't ambiguous. it's defined to be the first option.
+p1 = p1 + 1; // p1 = p1 + 1 or *p1 = *p1 + 1
+Again, this statement is not ambiguous.
+example. Hence, a reference behaves like the variable name for the current variable it is pointing-to. The
+simplest way to understand a reference is to imagine the compiler inserting a dereference operator before
+the reference variable for each reference qualifier in a declaration, \eg:
+It's hard for me to understand who the audience for this part is. I think a practical programmer is
+likely to be satisfied with "a reference behaves like the variable name for the current variable it
+is pointing-to," maybe with some examples. Your "simplest way" doesn't strike me as simpler than
+that. It feels like you're trying to provide a more precise definition for the semantics of
+references, but it isn't actually precise enough to be a formal specification. If you want to
+express the semantics of references using rewrite rules that's a great way to do it, but lay the
+rules out clearly, and when you're showing an example of rewriting keep your
+references/pointers/values separate (right now, you use \eg "r3" to mean a reference, a pointer,
+and a value).
+Cancellation works to arbitrary depth, and pointer and reference values are interchangeable because both
+contain addresses.
+Except they're not interchangeable, because they have different and incompatible types.
+Interestingly, C++ deals with the address duality by making the pointed-to value the default, and prevent-
+ing changes to the reference address, which eliminates half of the duality. Java deals with the address duality
+by making address assignment the default and requiring field assignment (direct or indirect via methods),
+\ie there is no builtin bit-wise or method-wise assignment, which eliminates half of the duality.
+I can follow this but I think that's mostly because I already understand what you're trying to
+say. I don't think I've ever heard the term "method-wise assignment" and I don't see you defining
+it. Furthermore Java does have value assignment of basic (non-class) types, so your summary here
+feels incomplete. (If it were me I'd drop this paragraph rather than try to save it.)
+Hence, for type & const, there is no pointer assignment, so &rc = &x is disallowed, and the address value
+cannot be 0 unless an arbitrary pointer is assigned to the reference.
+Given the pains you've taken to motivate every little bit of the semantics up until now, this last
+clause ("the address value cannot be 0") comes out of the blue. It seems like you could have
+perfectly reasonable semantics that allowed the initialization of null references.
+In effect, the compiler is managing the
+addresses for type & const not the programmer, and by a programming discipline of only using references
+with references, address errors can be prevented.
+Again, is this assuming automatic storage management?
+rary binding. For reference initialization (like pointer), the initializing value must be an address (lvalue) not
+a value (rvalue).
+This sentence appears to suggest that an address and an lvalue are the same thing.
+int * p = &x; // both &x and x are possible interpretations
+Are you saying that we should be considering "x" as a possible interpretation of the initializer
+"&x"? It seems to me that this expression has only one legitimate interpretation in context.
+int & r = x; // x unlikely interpretation, because of auto-dereferencing
+You mean, we can initialize a reference using an integer value? Surely we would need some sort of
+cast to induce that interpretation, no?
+Hence, the compiler implicitly inserts a reference operator, &, before the initialization expression.
+But then the expression would have pointer type, which wouldn't be compatible with the type of r.
+Similarly,
+when a reference is used for a parameter/return type, the call-site argument does not require a reference
+operator.
+Furthermore, it would not be correct to use a reference operator.
+The implicit conversion allows
+seamless calls to any routine without having to explicitly name/copy the literal/expression to allow the call.
+While C' attempts to handle pointers and references in a uniform, symmetric manner, C handles routine
+variables in an inconsistent way: a routine variable is both a pointer and a reference (particle and wave).
+After all this talk of how expressions can have both pointer and value interpretations, you're
+disparaging C because it has expressions that have both pointer and value interpretations?
+On Sat, Jul 9, 2016 at 4:18 PM Peter A. Buhr <pabuhr@plg.uwaterloo.ca> wrote:
+> Aaron discovered a few places where "&"s are missing and where there are too many "&", which are
+> corrected in the attached updated. None of the text has changed, if you have started reading
+> already.
+\end{comment}
+\section{Routine Definition}
+\CFA also supports a new syntax for routine definition, as well as \Celeven and K\&R routine syntax.
+The point of the new syntax is to allow returning multiple values from a routine~\cite{Galletly96,CLU}, \eg:
+\begin{cfa}
+®[ int o1, int o2, char o3 ]® f( int i1, char i2, char i3 ) {
+        §\emph{routine body}§
+}
+\end{cfa}
+where routine ©f© has three output (return values) and three input parameters.
+Existing C syntax cannot be extended with multiple return types because it is impossible to embed a single routine name within multiple return type specifications.
+In detail, the brackets, ©[]©, enclose the result type, where each return value is named and that name is a local variable of the particular return type.\footnote{
+\Index*{Michael Tiemann}, with help from \Index*{Doug Lea}, provided named return values in g++, circa 1989.}
+The value of each local return variable is automatically returned at routine termination.
+Declaration qualifiers can only appear at the start of a routine definition, \eg:
+\begin{cfa}
+®extern® [ int x ] g( int y ) {§\,§}
+\end{cfa}
+Lastly, if there are no output parameters or input parameters, the brackets and/or parentheses must still be specified;
+in both cases the type is assumed to be void as opposed to old style C defaults of int return type and unknown parameter types, respectively, as in:
+\begin{cfa}
+[§\,§] g();                                                     §\C{// no input or output parameters}§
+[ void ] g( void );                                     §\C{// no input or output parameters}§
+\end{cfa}
+Routine f is called as follows:
+\begin{cfa}
+[ i, j, ch ] = f( 3, 'a', ch );
+\end{cfa}
+The list of return values from f and the grouping on the left-hand side of the assignment is called a \newterm{return list} and discussed in Section 12.
+\CFA style declarations cannot be used to declare parameters for K\&R style routine definitions because of the following ambiguity:
+\begin{cfa}
+int (*f(x))[ 5 ] int x; {}
+\end{cfa}
+The string ``©int (*f(x))[ 5 ]©'' declares a K\&R style routine of type returning a pointer to an array of 5 integers, while the string ``©[ 5 ] int x©'' declares a \CFA style parameter x of type array of 5 integers.
+Since the strings overlap starting with the open bracket, ©[©, there is an ambiguous interpretation for the string.
+As well, \CFA-style declarations cannot be used to declare parameters for C-style routine-definitions because of the following ambiguity:
+\begin{cfa}
+typedef int foo;
+int f( int (* foo) );                           §\C{// foo is redefined as a parameter name}§
+\end{cfa}
+The string ``©int (* foo)©'' declares a C-style named-parameter of type pointer to an integer (the parenthesis are superfluous), while the same string declares a \CFA style unnamed parameter of type routine returning integer with unnamed parameter of type pointer to foo.
+The redefinition of a type name in a parameter list is the only context in C where the character ©*© can appear to the left of a type name, and \CFA relies on all type qualifier characters appearing to the right of the type name.
+The inability to use \CFA declarations in these two contexts is probably a blessing because it precludes programmers from arbitrarily switching between declarations forms within a declaration contexts.
+C-style declarations can be used to declare parameters for \CFA style routine definitions, \eg:
+\begin{cfa}
+[ int ] f( * int, int * );                      §\C{// returns an integer, accepts 2 pointers to integers}§
+[ * int, int * ] f( int );                      §\C{// returns 2 pointers to integers, accepts an integer}§
+\end{cfa}
+The reason for allowing both declaration styles in the new context is for backwards compatibility with existing preprocessor macros that generate C-style declaration-syntax, as in:
+\begin{cfa}
+#define ptoa( n, d ) int (*n)[ d ]
+int f( ptoa( p, 5 ) ) ...                       §\C{// expands to int f( int (*p)[ 5 ] )}§
+[ int ] f( ptoa( p, 5 ) ) ...           §\C{// expands to [ int ] f( int (*p)[ 5 ] )}§
+\end{cfa}
+Again, programmers are highly encouraged to use one declaration form or the other, rather than mixing the forms.
+\subsection{Named Return Values}
+\Index{Named return values} handle the case where it is necessary to define a local variable whose value is then returned in a ©return© statement, as in:
+\begin{cfa}
+int f() {
+        int x;
+        ... x = 0; ... x = y; ...
+        return x;
+}
+\end{cfa}
+Because the value in the return variable is automatically returned when a \CFA routine terminates, the ©return© statement \emph{does not} contain an expression, as in:
+\newline
+\begin{minipage}{\linewidth}
+\begin{cfa}
+®[ int x, int y ]® f() {
+        int z;
+        ... x = 0; ... y = z; ...
+        ®return;®                                                       §\C{// implicitly return x, y}§
+}
+\end{cfa}
+\end{minipage}
+\newline
+When the return is encountered, the current values of ©x© and ©y© are returned to the calling routine.
+As well, ``falling off the end'' of a routine without a ©return© statement is permitted, as in:
+\begin{cfa}
+[ int x, int y ] f() {
+        ...
+}                                                                               §\C{// implicitly return x, y}§
+\end{cfa}
+In this case, the current values of ©x© and ©y© are returned to the calling routine just as if a ©return© had been encountered.
+Named return values may be used in conjunction with named parameter values;
+specifically, a return and parameter can have the same name.
+\begin{cfa}
+[ int x, int y ] f( int, x, int y ) {
+        ...
+}                                                                               §\C{// implicitly return x, y}§
+\end{cfa}
+This notation allows the compiler to eliminate temporary variables in nested routine calls.
+\begin{cfa}
+[ int x, int y ] f( int, x, int y );    §\C{// prototype declaration}§
+int a, b;
+[a, b] = f( f( f( a, b ) ) );
+\end{cfa}
+While the compiler normally ignores parameters names in prototype declarations, here they are used to eliminate temporary return-values by inferring that the results of each call are the inputs of the next call, and ultimately, the left-hand side of the assignment.
+Hence, even without the body of routine ©f© (separate compilation), it is possible to perform a global optimization across routine calls.
+The compiler warns about naming inconsistencies between routine prototype and definition in this case, and behaviour is \Index{undefined} if the programmer is inconsistent.
+\subsection{Routine Prototype}
+The syntax of the new routine prototype declaration follows directly from the new routine definition syntax;
+as well, parameter names are optional, \eg:
+\begin{cfa}
+[ int x ] f ();                                                 §\C{// returning int with no parameters}§
+[ * int ] g (int y);                                    §\C{// returning pointer to int with int parameter}§
+[ ] h ( int, char );                                    §\C{// returning no result with int and char parameters}§
+[ * int, int ] j ( int );                               §\C{// returning pointer to int and int, with int parameter}§
+\end{cfa}
+This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa).
+It is possible to declare multiple routine-prototypes in a single declaration, but the entire type specification is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), \eg:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{cfa}
+[ int ] f( int ), g;
+\end{cfa}
+&
+\begin{cfa}
+int f( int ), g( int );
+\end{cfa}
+\end{tabular}
+\end{quote2}
+Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} \eg:
+\begin{cfa}
+extern [ int ] f ( int );
+static [ int ] g ( int );
+\end{cfa}
+\section{Routine Pointers}
+The syntax for pointers to \CFA routines specifies the pointer name on the right, \eg:
+\begin{cfa}
+* [ int x ] () fp;                                              §\C{// pointer to routine returning int with no parameters}§
+* [ * int ] (int y) gp;                                 §\C{// pointer to routine returning pointer to int with int parameter}§
+* [ ] (int,char) hp;                                    §\C{// pointer to routine returning no result with int and char parameters}§
+* [ * int,int ] ( int ) jp;                             §\C{// pointer to routine returning pointer to int and int, with int parameter}§
+\end{cfa}
+While parameter names are optional, \emph{a routine name cannot be specified};
+for example, the following is incorrect:
+\begin{cfa}
+* [ int x ] f () fp;                                    §\C{// routine name "f" is not allowed}§
+\end{cfa}
+\section{Named and Default Arguments}
+Named\index{named arguments}\index{arguments!named} and default\index{default arguments}\index{arguments!default} arguments~\cite{Hardgrave76}\footnote{
+Francez~\cite{Francez77} proposed a further extension to the named-parameter passing style, which specifies what type of communication (by value, by reference, by name) the argument is passed to the routine.}
+are two mechanisms to simplify routine call.
+Both mechanisms are discussed with respect to \CFA.
+\begin{description}
+\item[Named (or Keyword) Arguments:]
+provide the ability to specify an argument to a routine call using the parameter name rather than the position of the parameter.
+For example, given the routine:
+\begin{cfa}
+void p( int x, int y, int z ) {...}
+\end{cfa}
+a positional call is:
+\begin{cfa}
+p( 4, 7, 3 );
+\end{cfa}
+whereas a named (keyword) call may be:
+\begin{cfa}
+p( z : 3, x : 4, y : 7 );       §\C{// rewrite $\Rightarrow$ p( 4, 7, 3 )}§
+\end{cfa}
+Here the order of the arguments is unimportant, and the names of the parameters are used to associate argument values with the corresponding parameters.
+The compiler rewrites a named call into a positional call.
+The advantages of named parameters are:
+\begin{itemize}
+\item
+Remembering the names of the parameters may be easier than the order in the routine definition.
+\item
+Parameter names provide documentation at the call site (assuming the names are descriptive).
+\item
+Changes can be made to the order or number of parameters without affecting the call (although the call must still be recompiled).
+\end{itemize}
+Unfortunately, named arguments do not work in C-style programming-languages because a routine prototype is not required to specify parameter names, nor do the names in the prototype have to match with the actual definition.
+For example, the following routine prototypes and definition are all valid.
+\begin{cfa}
+void p( int, int, int );                        §\C{// equivalent prototypes}§
+void p( int x, int y, int z );
+void p( int y, int x, int z );
+void p( int z, int y, int x );
+void p( int q, int r, int s ) {}        §\C{// match with this definition}§
+\end{cfa}
+Forcing matching parameter names in routine prototypes with corresponding routine definitions is possible, but goes against a strong tradition in C programming.
+Alternatively, prototype definitions can be eliminated by using a two-pass compilation, and implicitly creating header files for exports.
+The former is easy to do, while the latter is more complex.
+Furthermore, named arguments do not work well in a \CFA-style programming-languages because they potentially introduces a new criteria for type matching.
+For example, it is technically possible to disambiguate between these two overloaded definitions of ©f© based on named arguments at the call site:
+\begin{cfa}
+int f( int i, int j );
+int f( int x, double y );
+f( j : 3, i : 4 );                              §\C{// 1st f}§
+f( x : 7, y : 8.1 );                    §\C{// 2nd f}§
+f( 4, 5 );                                              §\C{// ambiguous call}§
+\end{cfa}
+However, named arguments compound routine resolution in conjunction with conversions:
+\begin{cfa}
+f( i : 3, 5.7 );                                §\C{// ambiguous call ?}§
+\end{cfa}
+Depending on the cost associated with named arguments, this call could be resolvable or ambiguous.
+Adding named argument into the routine resolution algorithm does not seem worth the complexity.
+Therefore, \CFA does \emph{not} attempt to support named arguments.
+\item[Default Arguments]
+provide the ability to associate a default value with a parameter so it can be optionally specified in the argument list.
+For example, given the routine:
+\begin{cfa}
+void p( int x = 1, int y = 2, int z = 3 ) {...}
+\end{cfa}
+the allowable positional calls are:
+\begin{cfa}
+p();                                                    §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§
+p( 4 );                                                 §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§
+p( 4, 4 );                                              §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§
+p( 4, 4, 4 );                                   §\C{// rewrite $\Rightarrow$ p( 4, 4, 4 )}§
+// empty arguments
+p(  , 4, 4 );                                   §\C{// rewrite $\Rightarrow$ p( 1, 4, 4 )}§
+p( 4,  , 4 );                                   §\C{// rewrite $\Rightarrow$ p( 4, 2, 4 )}§
+p( 4, 4,   );                                   §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§
+p( 4,  ,   );                                   §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§
+p(  , 4,   );                                   §\C{// rewrite $\Rightarrow$ p( 1, 4, 3 )}§
+p(  ,  , 4 );                                   §\C{// rewrite $\Rightarrow$ p( 1, 2, 4 )}§
+p(  ,  ,   );                                   §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§
+\end{cfa}
+Here the missing arguments are inserted from the default values in the parameter list.
+The compiler rewrites missing default values into explicit positional arguments.
+The advantages of default values are:
+\begin{itemize}
+\item
+Routines with a large number of parameters are often very generalized, giving a programmer a number of different options on how a computation is performed.
+For many of these kinds of routines, there are standard or default settings that work for the majority of computations.
+Without default values for parameters, a programmer is forced to specify these common values all the time, resulting in long argument lists that are error prone.
+\item
+When a routine's interface is augmented with new parameters, it extends the interface providing generalizability\footnote{
+``It should be possible for the implementor of an abstraction to increase its generality.
+So long as the modified abstraction is a generalization of the original, existing uses of the abstraction will not require change.
+It might be possible to modify an abstraction in a manner which is not a generalization without affecting existing uses, but, without inspecting the modules in which the uses occur, this possibility cannot be determined.
+This criterion precludes the addition of parameters, unless these parameters have default or inferred values that are valid for all possible existing applications.''~\cite[p.~128]{Cormack90}}
+(somewhat like the generalization provided by inheritance for classes).
+That is, all existing calls are still valid, although the call must still be recompiled.
+\end{itemize}
+The only disadvantage of default arguments is that unintentional omission of an argument may not result in a compiler-time error.
+Instead, a default value is used, which may not be the programmer's intent.
+Default values may only appear in a prototype versus definition context:
+\begin{cfa}
+void p( int x, int y = 2, int z = 3 );          §\C{// prototype: allowed}§
+void p( int, int = 2, int = 3 );                        §\C{// prototype: allowed}§
+void p( int x, int y = 2, int z = 3 ) {}        §\C{// definition: not allowed}§
+\end{cfa}
+The reason for this restriction is to allow separate compilation.
+Multiple prototypes with different default values is an error.
+\end{description}
+Ellipse (``...'') arguments present problems when used with default arguments.
+The conflict occurs because both named and ellipse arguments must appear after positional arguments, giving two possibilities:
+\begin{cfa}
+p( /* positional */, ... , /* named */ );
+p( /* positional */, /* named */, ... );
+\end{cfa}
+While it is possible to implement both approaches, the first possibly is more complex than the second, \eg:
+\begin{cfa}
+p( int x, int y, int z, ... );
+p( 1, 4, 5, 6, z : 3, y : 2 ); §\C{// assume p( /* positional */, ... , /* named */ );}§
+p( 1, z : 3, y : 2, 4, 5, 6 ); §\C{// assume p( /* positional */, /* named */, ... );}§
+\end{cfa}
+In the first call, it is necessary for the programmer to conceptually rewrite the call, changing named arguments into positional, before knowing where the ellipse arguments begin.
+Hence, this approach seems significantly more difficult, and hence, confusing and error prone.
+In the second call, the named arguments separate the positional and ellipse arguments, making it trivial to read the call.
+The problem is exacerbated with default arguments, \eg:
+\begin{cfa}
+void p( int x, int y = 2, int z = 3... );
+p( 1, 4, 5, 6, z : 3 );         §\C{// assume p( /* positional */, ... , /* named */ );}§
+p( 1, z : 3, 4, 5, 6 );         §\C{// assume p( /* positional */, /* named */, ... );}§
+\end{cfa}
+The first call is an error because arguments 4 and 5 are actually positional not ellipse arguments;
+therefore, argument 5 subsequently conflicts with the named argument z : 3.
+In the second call, the default value for y is implicitly inserted after argument 1 and the named arguments separate the positional and ellipse arguments, making it trivial to read the call.
+For these reasons, \CFA requires named arguments before ellipse arguments.
+Finally, while ellipse arguments are needed for a small set of existing C routines, like printf, the extended \CFA type system largely eliminates the need for ellipse arguments (see Section 24), making much of this discussion moot.
+Default arguments and overloading (see Section 24) are complementary.
+While in theory default arguments can be simulated with overloading, as in:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{default arguments}}   & \multicolumn{1}{c}{\textbf{overloading}}      \\
+\begin{cfa}
+void p( int x, int y = 2, int z = 3 ) {...}
+\end{cfa}
+&
+\begin{cfa}
+void p( int x, int y, int z ) {...}
+void p( int x ) { p( x, 2, 3 ); }
+void p( int x, int y ) { p( x, y, 3 ); }
+\end{cfa}
+\end{tabular}
+\end{quote2}
+the number of required overloaded routines is linear in the number of default values, which is unacceptable growth.
+In general, overloading should only be used over default arguments if the body of the routine is significantly different.
+Furthermore, overloading cannot handle accessing default arguments in the middle of a positional list, via a missing argument, such as:
+\begin{cfa}
+p( 1, /* default */, 5 );               §\C{// rewrite $\Rightarrow$ p( 1, 2, 5 )}§
+\end{cfa}
+Given the \CFA restrictions above, both named and default arguments are backwards compatible.
+\Index*[C++]{\CC{}} only supports default arguments;
+\Index*{Ada} supports both named and default arguments.
+\section{Unnamed Structure Fields}
+C requires each field of a structure to have a name, except for a bit field associated with a basic type, \eg:
+\begin{cfa}
+struct {
+        int f1;                                 §\C{// named field}§
+        int f2 : 4;                             §\C{// named field with bit field size}§
+        int : 3;                                §\C{// unnamed field for basic type with bit field size}§
+        int ;                                   §\C{// disallowed, unnamed field}§
+        int *;                                  §\C{// disallowed, unnamed field}§
+        int (*)( int );                 §\C{// disallowed, unnamed field}§
+};
+\end{cfa}
+This requirement is relaxed by making the field name optional for all field declarations; therefore, all the field declarations in the example are allowed.
+As for unnamed bit fields, an unnamed field is used for padding a structure to a particular size.
+A list of unnamed fields is also supported, \eg:
+\begin{cfa}
+struct {
+        int , , ;                               §\C{// 3 unnamed fields}§
+}
+\end{cfa}
+\section{Nesting}
+Nesting of types and routines is useful for controlling name visibility (\newterm{name hiding}).
+\subsection{Type Nesting}
+\CFA allows \Index{type nesting}, and type qualification of the nested types (see \VRef[Figure]{f:TypeNestingQualification}), where as C hoists\index{type hoisting} (refactors) nested types into the enclosing scope and has no type qualification.
+\begin{figure}
+\centering
+\begin{tabular}{@{}l@{\hspace{3em}}l|l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C Type Nesting}}      & \multicolumn{1}{c}{\textbf{C Implicit Hoisting}}      & \multicolumn{1}{|c}{\textbf{\CFA}}    \\
+\hline
+\begin{cfa}
+struct S {
+        enum C { R, G, B };
+        struct T {
+                union U { int i, j; };
+                enum C c;
+                short int i, j;
+        };
+        struct T t;
+} s;
+int fred() {
+        s.t.c = R;
+        struct T t = { R, 1, 2 };
+        enum C c;
+        union U u;
+}
+\end{cfa}
+&
+\begin{cfa}
+enum C { R, G, B };
+union U { int i, j; };
+struct T {
+        enum C c;
+        short int i, j;
+};
+struct S {
+        struct T t;
+} s;
+\end{cfa}
+&
+\begin{cfa}
+struct S {
+        enum C { R, G, B };
+        struct T {
+                union U { int i, j; };
+                enum C c;
+                short int i, j;
+        };
+        struct T t;
+} s;
+int fred() {
+        s.t.c = ®S.®R;  // type qualification
+        struct ®S.®T t = { ®S.®R, 1, 2 };
+        enum ®S.®C c;
+        union ®S.T.®U u;
+}
+\end{cfa}
+\end{tabular}
+\caption{Type Nesting / Qualification}
+\label{f:TypeNestingQualification}
+\end{figure}
+In the left example in C, types ©C©, ©U© and ©T© are implicitly hoisted outside of type ©S© into the containing block scope.
+In the right example in \CFA, the types are not hoisted and accessed using the field-selection operator ``©.©'' for type qualification, as does \Index*{Java}, rather than the \CC type-selection operator ``©::©''.
+\subsection{Routine Nesting}
+While \CFA does not provide object programming by putting routines into structures, it does rely heavily on locally nested routines to redefine operations at or close to a call site.
+For example, the C quick-sort is wrapped into the following polymorphic \CFA routine:
+\begin{cfa}
+forall( otype T | { int ?<?( T, T ); } )
+void qsort( const T * arr, size_t dimension );
+\end{cfa}
+which can be used to sort in ascending and descending order by locally redefining the less-than operator into greater-than.
+\begin{cfa}
+const unsigned int size = 5;
+int ia[size];
+...                                             §\C{// assign values to array ia}§
+qsort( ia, size );              §\C{// sort ascending order using builtin ?<?}§
+{
+        ®int ?<?( int x, int y ) { return x > y; }® §\C{// nested routine}§
+        qsort( ia, size );      §\C{// sort descending order by local redefinition}§
+}
+\end{cfa}
+Nested routines are not first-class, meaning a nested routine cannot be returned if it has references to variables in its enclosing blocks;
+the only exception is references to the external block of the translation unit, as these variables persist for the duration of the program.
+The following program in undefined in \CFA (and Indexc{gcc})
+\begin{cfa}
+[* [int]( int )] foo() {                §\C{// int (*foo())( int )}§
+        int ®i® = 7;
+        int bar( int p ) {
+                ®i® += 1;                               §\C{// dependent on local variable}§
+                sout | ®i® | endl;
+        }
+        return bar;                                     §\C{// undefined because of local dependence}§
+}
+int main() {
+        * [int]( int ) fp = foo();      §\C{// int (*fp)( int )}§
+        sout | fp( 3 ) | endl;
+}
+\end{cfa}
+because
+Currently, there are no \Index{lambda} expressions, \ie unnamed routines because routine names are very important to properly select the correct routine.
+\section{Tuples}
+In C and \CFA, lists of elements appear in several contexts, such as the parameter list for a routine call.
+(More contexts are added shortly.)
+A list of such elements is called a \newterm{lexical list}.
+The general syntax of a lexical list is:
+\begin{cfa}
+[ §\emph{exprlist}§ ]
+\end{cfa}
+where ©$\emph{exprlist}$© is a list of one or more expressions separated by commas.
+The brackets, ©[]©, allow differentiating between lexical lists and expressions containing the C comma operator.
+The following are examples of lexical lists:
+\begin{cfa}
+[ x, y, z ]
+[ 2 ]
+[ v+w, x*y, 3.14159, f() ]
+\end{cfa}
+Tuples are permitted to contain sub-tuples (\ie nesting), such as ©[ [ 14, 21 ], 9 ]©, which is a 2-element tuple whose first element is itself a tuple.
+Note, a tuple is not a record (structure);
+a record denotes a single value with substructure, whereas a tuple is multiple values with no substructure (see flattening coercion in Section 12.1).
+In essence, tuples are largely a compile time phenomenon, having little or no runtime presence.
+Tuples can be organized into compile-time tuple variables;
+these variables are of \newterm{tuple type}.
+Tuple variables and types can be used anywhere lists of conventional variables and types can be used.
+The general syntax of a tuple type is:
+\begin{cfa}
+[ §\emph{typelist}§ ]
+\end{cfa}
+where ©$\emph{typelist}$© is a list of one or more legal \CFA or C type specifications separated by commas, which may include other tuple type specifications.
+Examples of tuple types include:
+\begin{cfa}
+[ unsigned int, char ]
+[ double, double, double ]
+[ * int, int * ]                §\C{// mix of CFA and ANSI}§
+[ * [ 5 ] int, * * char, * [ [ int, int ] ] (int, int) ]
+\end{cfa}
+Like tuples, tuple types may be nested, such as ©[ [ int, int ], int ]©, which is a 2-element tuple type whose first element is itself a tuple type.
+Examples of declarations using tuple types are:
+\begin{cfa}
+[ int, int ] x;                 §\C{// 2 element tuple, each element of type int}§
+* [ char, char ] y;             §\C{// pointer to a 2 element tuple}§
+[ [ int, int ] ] z ([ int, int ]);
+\end{cfa}
+The last example declares an external routine that expects a 2 element tuple as an input parameter and returns a 2 element tuple as its result.
+As mentioned, tuples can appear in contexts requiring a list of value, such as an argument list of a routine call.
+In unambiguous situations, the tuple brackets may be omitted, \eg a tuple that appears as an argument may have its
+square brackets omitted for convenience; therefore, the following routine invocations are equivalent:
+\begin{cfa}
+f( [ 1, x+2, fred() ] );
+f( 1, x+2, fred() );
+\end{cfa}
+Also, a tuple or a tuple variable may be used to supply all or part of an argument list for a routine expecting multiple input parameters or for a routine expecting a tuple as an input parameter.
+For example, the following are all legal:
+\begin{cfa}
+[ int, int ] w1;
+[ int, int, int ] w2;
+[ void ] f (int, int, int); /* three input parameters of type int */
+[ void ] g ([ int, int, int ]); /* 3 element tuple as input */
+f( [ 1, 2, 3 ] );
+f( w1, 3 );
+f( 1, w1 );
+f( w2 );
+g( [ 1, 2, 3 ] );
+g( w1, 3 );
+g( 1, w1 );
+g( w2 );
+\end{cfa}
+Note, in all cases 3 arguments are supplied even though the syntax may appear to supply less than 3. As mentioned, a
+tuple does not have structure like a record; a tuple is simply converted into a list of components.
+\begin{rationale}
+The present implementation of \CFA does not support nested routine calls when the inner routine returns multiple values; \ie a statement such as ©g( f() )© is not supported.
+Using a temporary variable to store the  results of the inner routine and then passing this variable to the outer routine works, however.
+\end{rationale}
+A tuple can contain a C comma expression, provided the expression containing the comma operator is enclosed in parentheses.
+For instance, the following tuples are equivalent:
+\begin{cfa}
+[ 1, 3, 5 ]
+[ 1, (2, 3), 5 ]
+\end{cfa}
+The second element of the second tuple is the expression (2, 3), which yields the result 3.
+This requirement is the same as for comma expressions in argument lists.
+Type qualifiers, \ie const and volatile, may modify a tuple type.
+The meaning is the same as for a type qualifier modifying an aggregate type [Int99, x 6.5.2.3(7),x 6.7.3(11)], \ie the qualifier is distributed across all of the types in the tuple, \eg:
+\begin{cfa}
+const volatile [ int, float, const int ] x;
+\end{cfa}
+is equivalent to:
+\begin{cfa}
+[ const volatile int, const volatile float, const volatile int ] x;
+\end{cfa}
+Declaration qualifiers can only appear at the start of a \CFA tuple declaration4, \eg:
+\begin{cfa}
+extern [ int, int ] w1;
+static [ int, int, int ] w2;
+\end{cfa}
+\begin{rationale}
+Unfortunately, C's syntax for subscripts precluded treating them as tuples.
+The C subscript list has the form ©[i][j]...© and not ©[i, j, ...]©.
+Therefore, there is no syntactic way for a routine returning multiple values to specify the different subscript values, \eg ©f[g()]© always means a single subscript value because there is only one set of brackets.
+Fixing this requires a major change to C because the syntactic form ©M[i, j, k]© already has a particular meaning: ©i, j, k© is a comma expression.
+\end{rationale}
+\subsection{Tuple Coercions}
+There are four coercions that can be performed on tuples and tuple variables: closing, opening, flattening and structuring.
+In addition, the coercion of dereferencing can be performed on a tuple variable to yield its value(s), as for other variables.
+A \newterm{closing coercion} takes a set of values and converts it into a tuple value, which is a contiguous set of values, as in:
+\begin{cfa}
+[ int, int, int, int ] w;
+w = [ 1, 2, 3, 4 ];
+\end{cfa}
+First the right-hand tuple is closed into a tuple value and then the tuple value is assigned.
+An \newterm{opening coercion} is the opposite of closing; a tuple value is converted into a tuple of values, as in:
+\begin{cfa}
+[ a, b, c, d ] = w
+\end{cfa}
+©w© is implicitly opened to yield a tuple of four values, which are then assigned individually.
+A \newterm{flattening coercion} coerces a nested tuple, \ie a tuple with one or more components, which are themselves tuples, into a flattened tuple, which is a tuple whose components are not tuples, as in:
+\begin{cfa}
+[ a, b, c, d ] = [ 1, [ 2, 3 ], 4 ];
+\end{cfa}
+First the right-hand tuple is flattened and then the values are assigned individually.
+Flattening is also performed on tuple types.
+For example, the type ©[ int, [ int, int ], int ]© can be coerced, using flattening, into the type ©[ int, int, int, int ]©.
+A \newterm{structuring coercion} is the opposite of flattening;
+a tuple is structured into a more complex nested tuple.
+For example, structuring the tuple ©[ 1, 2, 3, 4 ]© into the tuple ©[ 1, [ 2, 3 ], 4 ]© or the tuple type ©[ int, int, int, int ]© into the tuple type ©[ int, [ int, int ], int ]©.
+In the following example, the last assignment illustrates all the tuple coercions:
+\begin{cfa}
+[ int, int, int, int ] w = [ 1, 2, 3, 4 ];
+int x = 5;
+[ x, w ] = [ w, x ];            §\C{// all four tuple coercions}§
+\end{cfa}
+Starting on the right-hand tuple in the last assignment statement, w is opened, producing a tuple of four values;
+therefore, the right-hand tuple is now the tuple ©[ [ 1, 2, 3, 4 ], 5 ]©.
+This tuple is then flattened, yielding ©[ 1, 2, 3, 4, 5 ]©, which is structured into ©[ 1, [ 2, 3, 4, 5 ] ]© to match the tuple type of the left-hand side.
+The tuple ©[ 2, 3, 4, 5 ]© is then closed to create a tuple value.
+Finally, ©x© is assigned ©1© and ©w© is assigned the tuple value using multiple assignment (see Section 14).
+\begin{rationale}
+A possible additional language extension is to use the structuring coercion for tuples to initialize a complex record with a tuple.
+\end{rationale}
+\section{Mass Assignment}
+\CFA permits assignment to several variables at once using mass assignment~\cite{CLU}.
+Mass assignment has the following form:
+\begin{cfa}
+[ §\emph{lvalue}§, ... , §\emph{lvalue}§ ] = §\emph{expr}§;
+\end{cfa}
+\index{lvalue}
+The left-hand side is a tuple of \emph{lvalues}, which is a list of expressions each yielding an address, \ie any data object that can appear on the left-hand side of a conventional assignment statement.
+©$\emph{expr}$© is any standard arithmetic expression.
+Clearly, the types of the entities being assigned must be type compatible with the value of the expression.
+Mass assignment has parallel semantics, \eg the statement:
+\begin{cfa}
+[ x, y, z ] = 1.5;
+\end{cfa}
+is equivalent to:
+\begin{cfa}
+x = 1.5; y = 1.5; z = 1.5;
+\end{cfa}
+This semantics is not the same as the following in C:
+\begin{cfa}
+x = y = z = 1.5;
+\end{cfa}
+as conversions between intermediate assignments may lose information.
+A more complex example is:
+\begin{cfa}
+[ i, y[i], z ] = a + b;
+\end{cfa}
+which is equivalent to:
+\begin{cfa}
+t = a + b;
+a1 = &i; a2 = &y[i]; a3 = &z;
+*a1 = t; *a2 = t; *a3 = t;
+\end{cfa}
+The temporary ©t© is necessary to store the value of the expression to eliminate conversion issues.
+The temporaries for the addresses are needed so that locations on the left-hand side do not change as the values are assigned.
+In this case, ©y[i]© uses the previous value of ©i© and not the new value set at the beginning of the mass assignment.
+\section{Multiple Assignment}
+\CFA also supports the assignment of several values at once, known as multiple assignment~\cite{CLU,Galletly96}.
+Multiple assignment has the following form:
+\begin{cfa}
+[ §\emph{lvalue}§, ... , §\emph{lvalue}§ ] = [ §\emph{expr}§, ... , §\emph{expr}§ ];
+\end{cfa}
+\index{lvalue}
+The left-hand side is a tuple of \emph{lvalues}, and the right-hand side is a tuple of \emph{expr}s.
+Each \emph{expr} appearing on the right-hand side of a multiple assignment statement is assigned to the corresponding \emph{lvalues} on the left-hand side of the statement using parallel semantics for each assignment.
+An example of multiple assignment is:
+\begin{cfa}
+[ x, y, z ] = [ 1, 2, 3 ];
+\end{cfa}
+Here, the values ©1©, ©2© and ©3© are assigned, respectively, to the variables ©x©, ©y© and ©z©.
+ A more complex example is:
+\begin{cfa}
+[ i, y[ i ], z ] = [ 1, i, a + b ];
+\end{cfa}
+Here, the values ©1©, ©i© and ©a + b© are assigned to the variables ©i©, ©y[i]© and ©z©, respectively.
+ Note, the parallel semantics of
+multiple assignment ensures:
+\begin{cfa}
+[ x, y ] = [ y, x ];
+\end{cfa}
+correctly interchanges (swaps) the values stored in ©x© and ©y©.
+The following cases are errors:
+\begin{cfa}
+[ a, b, c ] = [ 1, 2, 3, 4 ];
+[ a, b, c ] = [ 1, 2 ];
+\end{cfa}
+because the number of entities in the left-hand tuple is unequal with the right-hand tuple.
+As for all tuple contexts in C, side effects should not be used because C does not define an ordering for the evaluation of the elements of a tuple;
+both these examples produce indeterminate results:
+\begin{cfa}
+f( x++, x++ );                          §\C{// C routine call with side effects in arguments}§
+[ v1, v2 ] = [ x++, x++ ];      §\C{// side effects in righthand side of multiple assignment}§
+\end{cfa}
+\section{Cascade Assignment}
+As in C, \CFA mass and multiple assignments can be cascaded, producing cascade assignment.
+Cascade assignment has the following form:
+\begin{cfa}
+§\emph{tuple}§ = §\emph{tuple}§ = ... = §\emph{tuple}§;
+\end{cfa}
+and it has the same parallel semantics as for mass and multiple assignment.
+Some examples of cascade assignment are:
+\begin{cfa}
+x1 = y1 = x2 = y2 = 0;
+[ x1, y1 ] = [ x2, y2 ] = [ x3, y3 ];
+[ x1, y1 ] = [ x2, y2 ] = 0;
+[ x1, y1 ] = z = 0;
+\end{cfa}
+As in C, the rightmost assignment is performed first, \ie assignment parses right to left.
+\section{Field Tuples}
+Tuples may be used to select multiple fields of a record by field name.
+Its general form is:
+\begin{cfa}
+§\emph{expr}§ . [ §\emph{fieldlist}§ ]
+§\emph{expr}§ -> [ §\emph{fieldlist}§ ]
+\end{cfa}
+\emph{expr} is any expression yielding a value of type record, \eg ©struct©, ©union©.
+Each element of \emph{ fieldlist} is an element of the record specified by \emph{expr}.
+A record-field tuple may be used anywhere a tuple can be used. An example of the use of a record-field tuple is
+the following:
+\begin{cfa}
+struct s {
+        int f1, f2;
+        char f3;
+        double f4;
+} v;
+v.[ f3, f1, f2 ] = ['x', 11, 17 ];      §\C{// equivalent to v.f3 = 'x', v.f1 = 11, v.f2 = 17}§
+f( v.[ f3, f1, f2 ] );                          §\C{// equivalent to f( v.f3, v.f1, v.f2 )}§
+\end{cfa}
+Note, the fields appearing in a record-field tuple may be specified in any order;
+also, it is unnecessary to specify all the fields of a struct in a multiple record-field tuple.
+If a field of a ©struct© is itself another ©struct©, multiple fields of this subrecord can be specified using a nested record-field tuple, as in the following example:
+\begin{cfa}
+struct inner {
+        int f2, f3;
+};
+struct outer {
+        int f1;
+        struct inner i;
+        double f4;
+} o;
+o.[ f1, i.[ f2, f3 ], f4 ] = [ 11, 12, 13, 3.14159 ];
+\end{cfa}
+}
+\end{cfa}
+So the type raised would be the mangled name of the exception prototype and that name would be matched at the handler clauses by comparing the strings.
+The arguments for the call would have to be packed in a message and unpacked at handler clause and then a call made to the handler.
 …
 The goal of \CFA I/O is to simplify the common cases\index{I/O!common case}, while fully supporting polymorphism and user defined types in a consistent way.
-The approach combines ideas from \CC and Python.
 The \CFA header file for the I/O library is \Indexc{fstream}.
 …
 \end{cfa}
 \\
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 ® ®2® ®3
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+ 2 3
 \end{cfa}
+&
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 2 3
 \end{cfa}
 \end{tabular}
 \end{quote2}
 The \CFA form has half the characters of the \CC form, and is similar to \Index*{Python} I/O with respect to implicit separators.
 Similar simplification occurs for \Index{tuple} I/O, which prints all tuple values separated by ``\lstinline[showspaces=true]@, @''.
 \begin{cfa}
 [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
+The \CFA form has half as many characters as the \CC form, and is similar to \Index*{Python} I/O with respect to implicit separators.
+A tuple prints all the tuple's values, each separated by ©", "©.
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+[int, int] t1 = [1, 2], t2 = [3, 4];
 sout | t1 | t2 | endl;                                  §\C{// print tuples}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 ®, ®2®, ®3 4®, ®5®, ®6
 \end{cfa}
 Finally, \CFA uses the logical-or operator for I/O as it is the lowest-priority overloadable operator, other than assignment.
+\begin{cfa}[mathescape=off,showspaces=true,belowskip=0pt]
+, 2, 3, 4
+\end{cfa}
+\CFA uses the logical-or operator for I/O because it is the lowest-priority overloadable operator, other than assignment.
 Therefore, fewer output expressions require parenthesis.
 \begin{quote2}
 …
 \\
+&
 \begin{cfa}[showspaces=true,aboveskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 3 12 0 3 1 2
 \end{cfa}
 \end{tabular}
 \end{quote2}
+There is a weak similarity between the \CFA logical-or operator and the Shell pipe-operator for moving data, where data flows in the correct direction for input but the opposite direction for output.
+\subsection{Implicit Separator}
+The \Index{implicit separator}\index{I/O!separator} character (space/blank) is a separator not a terminator.
+Finally, the logical-or operator has a link with the Shell pipe-operator for moving data, where data flows in the correct direction for input but the opposite direction for output.
+The implicit separator\index{I/O!separator} character (space/blank) is a separator not a terminator.
 The rules for implicitly adding the separator are:
 \begin{enumerate}
 …
 sout | 1 | 2 | 3 | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 2 3
 \end{cfa}
 …
 \end{enumerate}
+\subsection{Manipulator}
+The following \CC-style \Index{manipulator}s and routines control implicit seperation.
+The following routines and \CC-style \Index{manipulator}s control implicit seperation.
 \begin{enumerate}
 \item
 Routines \Indexc{sepSet}\index{manipulator!sepSet@©sepSet©} and \Indexc{sep}\index{manipulator!sep@©sep©}/\Indexc{sepGet}\index{manipulator!sepGet@©sepGet©} set and get the separator string.
+Routines \Indexc{sepSet}\index{manipulator!sepSet@©sepSet©} and \Indexc{sepGet}\index{manipulator!sepGet@©sepGet©} set and get the separator string.
 The separator string can be at most 16 characters including the ©'\0'© string terminator (15 printable characters).
 \begin{cfa}[mathescape=off,belowskip=0pt]
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
 sepSet( sout, ", $" );                                          §\C{// set separator from " " to ", \$"}§
 sout | 1 | 2 | 3 | " \"" | ®sep® | "\"" | endl;
+sout | 1 | 2 | 3 | " \"" | ®sepGet( sout )® | "\"" | endl;
 \end{cfa}
 %$
 \begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt]
 ®, $®2®, $®3 ®", $"®
+, $2, $3 ®", $"®
 \end{cfa}
 %$
 \begin{cfa}[belowskip=0pt]
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
 sepSet( sout, " " );                                            §\C{// reset separator to " "}§
 sout | 1 | 2 | 3 | " \"" | ®sepGet( sout )® | "\"" | endl;
 \end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt]
+® ®2® ®3 ®" "®
+\end{cfa}
+©sepGet© can be used to store a separator and then restore it:
+\begin{cfa}[belowskip=0pt]
+char store[®sepSize®];                                          §\C{// sepSize is the maximum separator size}§
+strcpy( store, sepGet( sout ) );                          §\C{// copy current separator}§
+sepSet( sout, "_" );                                            §\C{// change separator to underscore}§
+sout | 1 | 2 | 3 | endl;
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®_®2®_®3
+\end{cfa}
+\begin{cfa}[belowskip=0pt]
+sepSet( sout, store );                                          §\C{// change separator back to original}§
+sout | 1 | 2 | 3 | endl;
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt]
+® ®2® ®3
+\end{cfa}
+\item
+Routine \Indexc{sepSetTuple}\index{manipulator!sepSetTuple@©sepSetTuple©} and \Indexc{sepTuple}\index{manipulator!sepTuple@©sepTuple©}/\Indexc{sepGetTuple}\index{manipulator!sepGetTuple@©sepGetTuple©} get and set the tuple separator-string.
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt]
+2 3 ®" "®
+\end{cfa}
+\item
+Manipulators \Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} \emph{locally} toggle printing the separator, \ie the seperator is adjusted only with respect to the next printed item.
+\begin{cfa}[mathescape=off,belowskip=0pt]
+sout | sepOn | 1 | 2 | 3 | sepOn | endl;        §\C{// separator at start of line}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+2 3
+\end{cfa}
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | 1 | sepOff | 2 | 3 | endl;                       §\C{// locally turn off implicit separator}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+3
+\end{cfa}
+\item
+Manipulators \Indexc{sepDisable}\index{manipulator!sepDisable@©sepDisable©} and \Indexc{sepEnable}\index{manipulator!sepEnable@©sepEnable©} \emph{globally} toggle printing the separator, \ie the seperator is adjusted with respect to all subsequent printed items, unless locally adjusted.
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | sepDisable | 1 | 2 | 3 | endl;           §\C{// globally turn off implicit separation}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+\end{cfa}
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | 1 | sepOn | 2 | 3 | endl;                        §\C{// locally turn on implicit separator}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+23
+\end{cfa}
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | sepEnable | 1 | 2 | 3 | endl;            §\C{// globally turn on implicit separation}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+2 3
+\end{cfa}
+\item
+Routine \Indexc{sepSetTuple}\index{manipulator!sepSetTuple@©sepSetTuple©} and \Indexc{sepGetTuple}\index{manipulator!sepGetTuple@©sepGetTuple©} get and set the tuple separator-string.
 The tuple separator-string can be at most 16 characters including the ©'\0'© string terminator (15 printable characters).
 \begin{cfa}[belowskip=0pt]
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
 sepSetTuple( sout, " " );                                       §\C{// set tuple separator from ", " to " "}§
 sout | t1 | t2 | " \"" | ®sepTuple® | "\"" | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 2 3 4 5 6 ®" "®
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
+sout | t1 | t2 | " \"" | ®sepGetTuple( sout )® | "\"" | endl;
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt]
+2 3 4 ®" "®
+\end{cfa}
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
 sepSetTuple( sout, ", " );                                      §\C{// reset tuple separator to ", "}§
 sout | t1 | t2 | " \"" | ®sepGetTuple( sout )® | "\"" | endl;
 \end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt]
+, 2, 3 4, 5, 6 ®", "®
+\end{cfa}
+As for ©sepGet©, ©sepGetTuple© can be use to store a tuple separator and then restore it.
+\item
+Manipulators \Indexc{sepDisable}\index{manipulator!sepDisable@©sepDisable©} and \Indexc{sepEnable}\index{manipulator!sepEnable@©sepEnable©} \emph{globally} toggle printing the separator, \ie the seperator is adjusted with respect to all subsequent printed items.
+\begin{cfa}[belowskip=0pt]
+sout | sepDisable | 1 | 2 | 3 | endl;           §\C{// globally turn off implicit separator}§
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+\end{cfa}
+\begin{cfa}[belowskip=0pt]
+sout | sepEnable | 1 | 2 | 3 | endl;            §\C{// globally turn on implicit separator}§
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt]
+, 2, 3, 4 ®", "®
+\end{cfa}
+\item
+The tuple separator can also be turned on and off.
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | sepOn | t1 | sepOff | t2 | endl;         §\C{// locally turn on/off implicit separation}§
 \end{cfa}
 \begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+2 3
+\end{cfa}
+\item
+Manipulators \Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} \emph{locally} toggle printing the separator, \ie the seperator is adjusted only with respect to the next printed item.
+\begin{cfa}[belowskip=0pt]
+sout | 1 | sepOff | 2 | 3 | endl;                       §\C{// locally turn off implicit separator}§
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+3
+\end{cfa}
+\begin{cfa}[belowskip=0pt]
+sout | sepDisable | 1 | sepOn | 2 | 3 | endl; §\C{// locally turn on implicit separator}§
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+23
+\end{cfa}
+The tuple separator also responses to being turned on and off.
+\begin{cfa}[belowskip=0pt]
+sout | t1 | sepOff | t2 | endl;                         §\C{// locally turn on/off implicit separator}§
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+, 2, 34, 5, 6
+\end{cfa}
+©sepOn© \emph{cannot} be used to start/end a line with a separator because separators do not appear at the start/end of a line;
+use ©sep© to accomplish this functionality.
+\begin{cfa}[belowskip=0pt]
+sout | sepOn | 1 | 2 | 3 | sepOn | endl ;       §\C{// sepOn does nothing at start/end of line}§
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+2 3
+\end{cfa}
+\begin{cfa}[belowskip=0pt]
+sout | sep | 1 | 2 | 3 | sep | endl ;           §\C{// use sep to print separator at start/end of line}§
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+® ®1 2 3® ®
+\end{cfa}
+, 1, 23, 4
+\end{cfa}
+Notice a tuple seperator starts the line because the next item is a tuple.
 \end{enumerate}
 \begin{comment}
 #include <fstream>
-#include <string.h>                                                                             // strcpy
 int main( void ) {
         int x = 1, y = 2, z = 3;
         sout | x | y | z | endl;
         [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
         sout | t1 | t2 | endl;                                          // print tuples
+        [int, int] t1 = [1, 2], t2 = [3, 4];
+        sout | t1 | t2 | endl;                                          // print tuple
         sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
         sout | 1 | 2 | 3 | endl;
 …
         sepSet( sout, ", $" );                                          // set separator from " " to ", $"
         sout | 1 | 2 | 3 | " \"" | sep | "\"" | endl;
+        sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
         sepSet( sout, " " );                                            // reset separator to " "
         sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
         char store[sepSize];
         strcpy( store, sepGet( sout ) );
+        sepSet( sout, "_" );
         sout | 1 | 2 | 3 | endl;
         sepSet( sout, store );
         sout | 1 | 2 | 3 | endl;
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl;        // separator at start of line
+        sout | 1 | sepOff | 2 | 3 | endl;                       // locally turn off implicit separator
+        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;            // globally turn on implicit separation
         sepSetTuple( sout, " " );                                       // set tuple separator from ", " to " "
         sout | t1 | t2 | " \"" | sepTuple | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sepSetTuple( sout, ", " );                                      // reset tuple separator to ", "
         sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
+        sout | sepDisable | 1 | 2 | 3 | endl;           // globally turn off implicit separator
+        sout | sepEnable | 1 | 2 | 3 | endl;            // globally turn on implicit separator
+        sout | 1 | sepOff | 2 | 3 | endl;                       // locally turn on implicit separator
+        sout | sepDisable | 1 | sepOn | 2 | 3 | endl; // globally turn off implicit separator
+        sout | sepEnable;
+        sout | t1 | sepOff | t2 | endl;                         // locally turn on/off implicit separator
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl ;       // sepOn does nothing at start/end of line
+        sout | sep | 1 | 2 | 3 | sep | endl ;           // use sep to print separator at start/end of line
+        sout | t1 | t2 | endl;                                          // print tuple
+        sout | sepOn | t1 | sepOff | t2 | endl;         // locally turn on/off implicit separation
+}
 …
 \section{\texorpdfstring{\CFA Keywords}{Cforall Keywords}}
+\section{\protect\CFA Keywords}
 \label{s:CFAKeywords}
-\CFA introduces the following new keywords.
 \begin{quote2}
 \begin{tabular}{lllll}
+\begin{tabular}{llll}
 \begin{tabular}{@{}l@{}}
 ©_At©                   \\
+©_AT©                   \\
 ©catch©                 \\
 ©catchResume©   \\
 ©choose©                \\
 ©coroutine©             \\
+©disable©               \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©disable©               \\
 ©dtype©                 \\
 ©enable©                \\
 ©fallthrough©   \\
 ©fallthru©              \\
+©finally©               \\
+©forall©                \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©finally©               \\
-©forall©                \\
 ©ftype©                 \\
 ©lvalue©                \\
 ©monitor©               \\
+©mutex©                 \\
+©one_t©                 \\
+©otype©                 \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©mutex©                 \\
-©one_t©                 \\
-©otype©                 \\
 ©throw©                 \\
 ©throwResume©   \\
-\end{tabular}
+&
-\begin{tabular}{@{}l@{}}
 ©trait©                 \\
 ©try©                   \\
 ©ttype©                 \\
 ©zero_t©                \\
-                                \\
 \end{tabular}
 \end{tabular}
 …
 \Celeven prescribes the following standard header-files~\cite[\S~7.1.2]{C11} and \CFA adds to this list:
 \begin{quote2}
+\begin{tabular}{@{}lllll|l@{}}
+\multicolumn{5}{c|}{C11} & \multicolumn{1}{c}{\CFA}             \\
+\lstset{deletekeywords={float}}
+\begin{tabular}{@{}llll|l@{}}
+\multicolumn{4}{c|}{C11} & \multicolumn{1}{c}{\CFA}             \\
 \hline
 \begin{tabular}{@{}l@{}}
 …
 \Indexc{errno.h}                \\
 \Indexc{fenv.h}                 \\
+\Indexc[deletekeywords=float]{float.h} \\
+\Indexc{float.h}                \\
+\Indexc{inttypes.h}             \\
+\Indexc{iso646.h}               \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-\Indexc{inttypes.h}             \\
-\Indexc{iso646.h}               \\
 \Indexc{limits.h}               \\
 \Indexc{locale.h}               \\
 \Indexc{math.h}                 \\
 \Indexc{setjmp.h}               \\
-\end{tabular}
+&
-\begin{tabular}{@{}l@{}}
 \Indexc{signal.h}               \\
 \Indexc{stdalign.h}             \\
 \Indexc{stdarg.h}               \\
 \Indexc{stdatomic.h}    \\
-\Indexc{stdbool.h}              \\
-\Indexc{stddef.h}               \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
+\Indexc{stdbool.h}              \\
+\Indexc{stddef.h}               \\
 \Indexc{stdint.h}               \\
 \Indexc{stdio.h}                \\
 …
 \Indexc{wctype.h}               \\
                                                 \\
+                                                \\
+                                                \\
 \end{tabular}
+&
 …
 \Indexc{unistd.h}               \\
 \Indexc{gmp.h}                  \\
+                                                \\
+                                                \\
                                                 \\
                                                 \\
 …
 For an increase in storage size, new storage after the copied data may be filled.
 \item[alignment]
 an allocation starts on a specified memory boundary, \eg, an address multiple of 64 or 128 for cache-line purposes.
+an allocation starts on a specified memory boundary, e.g., an address multiple of 64 or 128 for cache-line purposes.
 \item[array]
 the allocation size is scaled to the specified number of array elements.
 …
 The table shows allocation routines supporting different combinations of storage-management capabilities:
 \begin{center}
 \begin{tabular}{@{}r|r|l|l|l|l@{}}
 \multicolumn{1}{c}{}&           & \multicolumn{1}{c|}{fill}     & resize        & alignment     & array \\
+\begin{tabular}{@{}lr|l|l|l|l@{}}
+                &                                       & \multicolumn{1}{c|}{fill}     & resize        & alignment     & array \\
 \hline
 C               & ©malloc©                      & no                    & no            & no            & no    \\
 …
                 & ©memalign©            & no                    & no            & yes           & no    \\
                 & ©posix_memalign©      & no                    & no            & yes           & no    \\
-\hline
 C11             & ©aligned_alloc©       & no                    & no            & yes           & no    \\
-\hline
 \CFA    & ©alloc©                       & no/copy/yes   & no/yes        & no            & yes   \\
                 & ©align_alloc©         & no/yes                & no            & yes           & yes   \\
 …
 // C unsafe allocation
 extern "C" {
 void * malloc( size_t size );§\indexc{memset}§
+void * mallac( size_t size );§\indexc{memset}§
 void * calloc( size_t dim, size_t size );§\indexc{calloc}§
 void * realloc( void * ptr, size_t size );§\indexc{realloc}§

src/CodeGen/CodeGenerator.cc

-              rb826e6b
+              rfea3faa
 //
+#include <cassert>                   // for assert, assertf
+#include <list>                      // for _List_iterator, list, list<>::it...
+#include <algorithm>
+#include <iostream>
+#include <cassert>
+#include <list>
+#include "Parser/ParseNode.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Initializer.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
+#include "SynTree/Attribute.h"
+#include "Common/utility.h"
+#include "Common/UnimplementedError.h"
 #include "CodeGenerator.h"
+#include "Common/SemanticError.h"    // for SemanticError
+#include "Common/UniqueName.h"       // for UniqueName
+#include "Common/utility.h"          // for CodeLocation, toString
+#include "GenType.h"                 // for genType
+#include "InitTweak/InitTweak.h"     // for getPointerBase
+#include "OperatorTable.h"           // for OperatorInfo, operatorLookup
+#include "Parser/LinkageSpec.h"      // for Spec, Intrinsic
+#include "SynTree/Attribute.h"       // for Attribute
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Constant.h"        // for Constant
+#include "SynTree/Declaration.h"     // for DeclarationWithType, TypeDecl
+#include "SynTree/Expression.h"      // for Expression, UntypedExpr, Applica...
+#include "SynTree/Initializer.h"     // for Initializer, ListInit, Designation
+#include "SynTree/Label.h"           // for Label, operator<<
+#include "SynTree/Statement.h"       // for Statement, AsmStmt, BranchStmt
+#include "SynTree/Type.h"            // for Type, Type::StorageClasses, Func...
+#include "OperatorTable.h"
+#include "GenType.h"
+#include "InitTweak/InitTweak.h"
 using namespace std;
 …
+        }
         void CodeGenerator::visit( Designation * designation ) {
                 std::list< Expression * > designators = designation->get_designators();
+        void CodeGenerator::printDesignators( std::list< Expression * > & designators ) {
+                typedef std::list< Expression * > DesignatorList;
                 if ( designators.size() == 0 ) return;
                 for ( Expression * des : designators ) {
                         if ( dynamic_cast< NameExpr * >( des ) || dynamic_cast< VariableExpr * >( des ) ) {
                                 // if expression is a NameExpr or VariableExpr, then initializing aggregate member
+                for ( DesignatorList::iterator iter = designators.begin(); iter != designators.end(); ++iter ) {
+                        if ( dynamic_cast< NameExpr * >( *iter ) ) {
+                                // if expression is a name, then initializing aggregate member
                                 output << ".";
                                 des->accept( *this );
+                                (*iter)->accept( *this );
                         } else {
                                 // otherwise, it has to be a ConstantExpr or CastExpr, initializing array eleemnt
+                                // if not a simple name, it has to be a constant expression, i.e. an array designator
                                 output << "[";
                                 des->accept( *this );
+                                (*iter)->accept( *this );
                                 output << "]";
                         } // if
 …
         void CodeGenerator::visit( SingleInit * init ) {
+                printDesignators( init->get_designators() );
                 init->get_value()->accept( *this );
+        }
         void CodeGenerator::visit( ListInit * init ) {
+                auto initBegin = init->begin();
+                auto initEnd = init->end();
+                auto desigBegin = init->get_designations().begin();
+                auto desigEnd = init->get_designations().end();
+                printDesignators( init->get_designators() );
                 output << "{ ";
+                for ( ; initBegin != initEnd && desigBegin != desigEnd; ) {
+                        (*desigBegin)->accept( *this );
+                        (*initBegin)->accept( *this );
+                        ++initBegin, ++desigBegin;
+                        if ( initBegin != initEnd ) {
+                                output << ", ";
+                        }
+                }
+                genCommaList( init->begin(), init->end() );
                 output << " }";
-                assertf( initBegin == initEnd && desigBegin == desigEnd, "Initializers and designators not the same length. %s", toString( init ).c_str() );
+        }
 …
         void CodeGenerator::visit( TypeExpr * typeExpr ) {
+                // if ( genC ) std::cerr << "typeexpr still exists: " << typeExpr << std::endl;
+                // assertf( ! genC, "TypeExpr should not reach code generation." );
+                if ( ! genC ) {
+                        output<< genType( typeExpr->get_type(), "", pretty, genC );
+                }
+                assertf( ! genC, "TypeExpr should not reach code generation." );
+                output<< genType( typeExpr->get_type(), "", pretty, genC );
+        }

src/CodeGen/CodeGenerator.h

-              rb826e6b
+              rfea3faa
 #define CODEGENV_H
+#include <list>                   // for list
+#include <ostream>                // for ostream, operator<<
+#include <string>                 // for string
+#include <list>
+#include "SynTree/Declaration.h"  // for DeclarationWithType (ptr only), Fun...
+#include "SynTree/Visitor.h"      // for Visitor
+#include "SynTree/SynTree.h"      // for Visitor Nodes
+#include "SynTree/Declaration.h"
+#include "SynTree/SynTree.h"
+#include "SynTree/Visitor.h"
+#include "SymTab/Indexer.h"
+#include "Common/utility.h"
 namespace CodeGen {
 …
                 //*** Initializer
-                virtual void visit( Designation * );
                 virtual void visit( SingleInit * );
                 virtual void visit( ListInit * );
 …
                 bool lineMarks = false;
+                void printDesignators( std::list< Expression * > & );
                 void handleStorageClass( DeclarationWithType *decl );
                 void handleAggregate( AggregateDecl *aggDecl, const std::string & kind );

src/CodeGen/FixMain.cc

-              rb826e6b
+              rfea3faa
 // file "LICENCE" distributed with Cforall.
 //
 // FixMain.cc --
+// FixMain.cc --
 //
 // Author           : Thierry Delisle
 // Created On       : Thr Jan 12 14:11:09 2017
 // Last Modified By :
 // Last Modified On :
+// Last Modified By :
+// Last Modified On :
 // Update Count     : 0
 //
 #include "FixMain.h"
+#include "FixMain.h"
+#include <cassert>                 // for assert, assertf
+#include <fstream>                 // for operator<<, basic_ostream::operator<<
+#include <list>                    // for list
+#include <string>                  // for operator<<
+#include <fstream>
+#include <iostream>
+#include "Common/SemanticError.h"  // for SemanticError
+#include "SynTree/Declaration.h"   // for FunctionDecl, operator<<
+#include "SynTree/Type.h"          // for FunctionType
+#include "Common/SemanticError.h"
+#include "SynTree/Declaration.h"
 namespace CodeGen {
         bool FixMain::replace_main = false;
         std::unique_ptr<FunctionDecl> FixMain::main_signature = nullptr;
         void FixMain::registerMain(FunctionDecl* functionDecl)
+        void FixMain::registerMain(FunctionDecl* functionDecl)
+        {
                 if(main_signature) {
                         throw SemanticError("Multiple definition of main routine\n", functionDecl);
+                if(main_signature) {
+                        throw SemanticError("Multiple definition of main routine\n", functionDecl);
+                }
                 main_signature.reset( functionDecl->clone() );

src/CodeGen/FixNames.cc

-              rb826e6b
+              rfea3faa
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Wed Jun 28 15:26:00 2017
 // Update Count     : 20
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 21 14:22:59 2017
+// Update Count     : 19
 //
+#include <memory>
 #include "FixNames.h"
+#include <memory>                  // for unique_ptr
+#include <string>                  // for string, operator!=, operator==
+#include "Common/SemanticError.h"  // for SemanticError
+#include "FixMain.h"               // for FixMain
+#include "Parser/LinkageSpec.h"    // for Cforall, isMangled
+#include "SymTab/Mangler.h"        // for Mangler
+#include "SynTree/Constant.h"      // for Constant
+#include "SynTree/Declaration.h"   // for FunctionDecl, ObjectDecl, Declarat...
+#include "SynTree/Expression.h"    // for ConstantExpr
+#include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Statement.h"     // for ReturnStmt, CompoundStmt
+#include "SynTree/Type.h"          // for Type, BasicType, Type::Qualifiers
+#include "SynTree/Visitor.h"       // for Visitor, acceptAll
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Visitor.h"
+#include "SymTab/Mangler.h"
+#include "OperatorTable.h"
+#include "FixMain.h"
 namespace CodeGen {
 …
                                                                                                                                    main_type = new FunctionType( Type::Qualifiers(), true ), nullptr )
                                 };
                 main_type->get_returnVals().push_back(
+                main_type->get_returnVals().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 …
         std::string mangle_main_args() {
                 FunctionType* main_type;
                 std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", Type::StorageClasses(), LinkageSpec::Cforall,
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", Type::StorageClasses(), LinkageSpec::Cforall,
                                                                                                                                    main_type = new FunctionType( Type::Qualifiers(), false ), nullptr )
                                 };
                 main_type->get_returnVals().push_back(
+                main_type->get_returnVals().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
                 mainDecl->get_functionType()->get_parameters().push_back(
+                mainDecl->get_functionType()->get_parameters().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
                 mainDecl->get_functionType()->get_parameters().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0,
                         new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ),
+                mainDecl->get_functionType()->get_parameters().push_back(
+                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0,
+                        new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ),
                         nullptr )
                 );
 …
         bool is_main(const std::string& name) {
                 static std::string mains[] = {
                         mangle_main(),
+                static std::string mains[] = {
+                        mangle_main(),
                         mangle_main_args()
                 };
 …
         void FixNames::fixDWT( DeclarationWithType *dwt ) {
                 if ( dwt->get_name() != "" ) {
                         if ( LinkageSpec::isMangled( dwt->get_linkage() ) ) {
+                        if ( LinkageSpec::isDecoratable( dwt->get_linkage() ) ) {
                                 dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
                                 dwt->set_scopeLevel( scopeLevel );
 …
                         int nargs = functionDecl->get_functionType()->get_parameters().size();
                         if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
                                 throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
+                                throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
+                        }
                         functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant::from_int( 0 ) ) ) );

src/CodeGen/FixNames.h

-              rb826e6b
+              rfea3faa
 #define FIXNAMES_H
+#include <list>  // for list
+class Declaration;
+#include "SynTree/SynTree.h"
 namespace CodeGen {

src/CodeGen/GenType.cc

-              rb826e6b
+              rfea3faa
 //
+#include <cassert>                // for assert, assertf
+#include <list>                   // for _List_iterator, _List_const_iterator
+#include <sstream>                // for operator<<, ostringstream, basic_os...
+#include "CodeGenerator.h"        // for CodeGenerator
+#include <sstream>
+#include <cassert>
 #include "GenType.h"
+#include "SynTree/Declaration.h"  // for DeclarationWithType
+#include "SynTree/Expression.h"   // for Expression
+#include "SynTree/Type.h"         // for PointerType, Type, FunctionType
+#include "SynTree/Visitor.h"      // for Visitor
+#include "CodeGenerator.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
+#include "SynTree/Visitor.h"
 namespace CodeGen {

src/CodeGen/GenType.h

-              rb826e6b
+              rfea3faa
 #define _GENTYPE_H
+#include <string>  // for string
+class Type;
+#include <string>
+#include "SynTree/SynTree.h"
 namespace CodeGen {

src/CodeGen/Generate.cc

-              rb826e6b
+              rfea3faa
 //
+#include <iostream>                  // for ostream, endl, operator<<
+#include <list>                      // for list
+#include <string>                    // for operator<<
+#include <algorithm>
+#include <iostream>
+#include <cassert>
+#include <list>
-#include "CodeGenerator.h"           // for CodeGenerator, doSemicolon, oper...
-#include "GenType.h"                 // for genPrettyType
 #include "Generate.h"
+#include "Parser/LinkageSpec.h"      // for isBuiltin, isGeneratable
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Declaration.h"     // for Declaration
+#include "SynTree/Type.h"            // for Type
+#include "SynTree/Declaration.h"
+#include "CodeGenerator.h"
+#include "GenType.h"
+#include "SynTree/SynTree.h"
+#include "SynTree/Type.h"
+#include "SynTree/BaseSyntaxNode.h"
+// #include "Tuples/Tuples.h"
 using namespace std;

src/CodeGen/Generate.h

-              rb826e6b
+              rfea3faa
 #define GENERATE_H
 #include <iostream>  // for ostream
 #include <list>      // for list
+#include <list>
+#include <iostream>
+class BaseSyntaxNode;
+class Declaration;
+#include "SynTree/SynTree.h"
 namespace CodeGen {

src/CodeGen/OperatorTable.cc

-              rb826e6b
+              rfea3faa
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 15 17:12:22 2017
 // Update Count     : 15
+// Last Modified On : Tue Dec 13 14:33:05 2016
+// Update Count     : 10
 //
+#include <map>      // for map, _Rb_tree_const_iterator, map<>::const_iterator
+#include <utility>  // for pair
+#include <map>
 #include "OperatorTable.h"
 …
                         {       "++?",          "++",   "_operator_preincr",                    OT_PREFIXASSIGN         },
                         {       "--?",          "--",   "_operator_predecr",                    OT_PREFIXASSIGN         },
-                        {       "?\\?",         "\\",   "_operator_exponential",                OT_INFIX                        },
                         {       "?*?",          "*",    "_operator_multiply",                   OT_INFIX                        },
                         {       "?/?",          "/",    "_operator_divide",                             OT_INFIX                        },
 …
                         {       "?|?",          "|",    "_operator_bitor",                              OT_INFIX                        },
                         {       "?=?",          "=",    "_operator_assign",                             OT_INFIXASSIGN          },
-                        {       "?\\=?",        "\\=",  "_operator_expassign",                  OT_INFIXASSIGN          },
                         {       "?*=?",         "*=",   "_operator_multassign",                 OT_INFIXASSIGN          },
                         {       "?/=?",         "/=",   "_operator_divassign",                  OT_INFIXASSIGN          },

src/CodeTools/DeclStats.cc

-              rb826e6b
+              rfea3faa
 #include "DeclStats.h"
+#include <iostream>                // for operator<<, basic_ostream, cout
+#include <map>                     // for map
+#include <string>                  // for string, operator+, operator<<, cha...
+#include <unordered_map>           // for unordered_map
+#include <unordered_set>           // for unordered_set
+#include <utility>                 // for pair, make_pair
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/VectorMap.h"      // for VectorMap
+#include "GenPoly/GenPoly.h"       // for hasPolyBase
+#include "Parser/LinkageSpec.h"    // for ::NoOfSpecs, Spec
+#include "SynTree/Declaration.h"   // for FunctionDecl, TypeDecl, Declaration
+#include "SynTree/Expression.h"    // for UntypedExpr, Expression
+#include "SynTree/Statement.h"     // for CompoundStmt
+#include "SynTree/Type.h"          // for Type, FunctionType, PointerType
+#include "SynTree/Visitor.h"       // for maybeAccept, Visitor, acceptAll
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include "Common/VectorMap.h"
+#include "GenPoly/GenPoly.h"
+#include "Parser/LinkageSpec.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Visitor.h"
 namespace CodeTools {
         class DeclStats : public Visitor {
                 template<typename T>
 …
                                 sum(n_types, o.n_types);
                                 sum(p_new, o.p_new);
                                 return *this;
+                        }
                 };
                 struct Stats {
                         unsigned n_decls;     ///< Total number of declarations
 …
                         /// Stats for the return list
                         ArgPackStats returns;
                         /// Count of declarations with each number of assertions
                         std::map<unsigned, unsigned> n_assns;
 …
                         /// Stats for the assertions' return types
                         ArgPackStats assn_returns;
                         Stats() : n_decls(0), n_type_params(), by_name(), basic_type_names(), compound_type_names(), basic_type_decls(), compound_type_decls(), params(), returns(), n_assns(), assn_params(), assn_returns() {}
 …
                                 sum( assn_params, o.assn_params );
                                 sum( assn_returns, o.assn_returns );
                                 return *this;
+                        }
 …
                                 n += dt->size();
                                 std::stringstream ss;
                                 dt->print( ss );
 …
                         ++pstats.n_types.at( types.size() );
+                }
                 void analyzeFunc( FunctionType* fnTy, Stats& stats, ArgPackStats& params, ArgPackStats& returns ) {
                         std::unordered_set<std::string> seen;
 …
                         auto& args = expr->get_args();
                         unsigned fanout = args.size();
                         ++exprs_by_fanout_at_depth[ std::make_pair(depth, fanout) ];
                         for ( Expression* arg : args ) {
 …
                                 return;
+                        }
                         Stats& stats = for_linkage[ decl->get_linkage() ];
 …
+                }
                 void printPairMap( const std::string& name,
+                void printPairMap( const std::string& name,
                                    const std::map<std::pair<unsigned, unsigned>, unsigned>& map ) {
                         for ( const auto& entry : map ) {
                                 const auto& key = entry.first;
                                 std::cout << "\"" << name << "\"," << key.first << "," << key.second << ","
+                                std::cout << "\"" << name << "\"," << key.first << "," << key.second << ","
                                           << entry.second << std::endl;
+                        }
+                }
         public:
                 void print() {
 …
                 stats.print();
+        }
 } // namespace CodeTools

src/CodeTools/DeclStats.h

-              rb826e6b
+              rfea3faa
 #define DECLSTATS_H
+#include <list>  // for list
+class Declaration;
+#include "SynTree/SynTree.h"
 namespace CodeTools {

src/CodeTools/TrackLoc.cc

-              rb826e6b
+              rfea3faa
 #include "TrackLoc.h"
+#include <cstdlib>                    // for size_t, exit, EXIT_FAILURE
+#include <iostream>                   // for operator<<, ostream, basic_ostream
+#include <iterator>                   // for back_inserter, inserter
+#include <stack>                      // for stack
+#include <string>                     // for operator<<, string
+#include <typeindex>                  // for type_index
+#include <cstdlib>
+#include "Common/PassVisitor.h"       // for PassVisitor
+#include "Common/PassVisitor.impl.h"  // for acceptAll
+#include "Common/SemanticError.h"     // for SemanticError
+#include "Common/utility.h"           // for CodeLocation
+#include "SynTree/BaseSyntaxNode.h"   // for BaseSyntaxNode
+#include "SynTree/Mutator.h"          // for mutateAll
+#include "SynTree/Visitor.h"          // for acceptAll
+#include <iostream>
+#include <sstream>
+#include <stack>
+#include <string>
+#include <typeindex>
+class Declaration;
+#include "Common/utility.h"
+#include "Common/PassVisitor.h"
+#include "Common/VectorMap.h"
+#include "GenPoly/GenPoly.h"
+#include "Parser/LinkageSpec.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Initializer.h"
 namespace CodeTools {

src/CodeTools/TrackLoc.h

-              rb826e6b
+              rfea3faa
 #define TRACKLOC_H
+#include <cstddef>   // for size_t
+#include <list>      // for list
+class Declaration;
+#include "SynTree/SynTree.h"
 namespace CodeTools {

src/Common/Assert.cc

-              rb826e6b
+              rfea3faa
 //
+#include <cstdarg>  // for va_end, va_list, va_start
+#include <cstdio>   // for fprintf, stderr, vfprintf
+#include <cstdlib>  // for abort
+#include <assert.h>
+#include <cstdarg>                                                                              // varargs
+#include <cstdio>                                                                               // fprintf
+#include <cstdlib>                                                                              // abort
 extern const char * __progname;                                                 // global name of running executable (argv[0])

src/Common/PassVisitor.h

-              rb826e6b
+              rfea3faa
 #include "SynTree/Expression.h"
 #include "SynTree/Constant.h"
-#include "SynTree/TypeSubstitution.h"
 #include "PassVisitor.proto.h"
 …
 //                          stmtsToAddBefore or stmtsToAddAfter respectively.
 // | WithShortCircuiting  - provides the ability to skip visiting child nodes; set visit_children to false in pre{visit,mutate} to skip visiting children
 // | WithGuards           - provides the ability to save/restore data like a LIFO stack; to save, call GuardValue with the variable to save, the variable
+// | WithScopes           - provides the ability to save/restore data like a LIFO stack; to save, call GuardValue with the variable to save, the variable
 //                          will automatically be restored to its previous value after the corresponding postvisit/postmutate teminates.
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 …
 class PassVisitor final : public Visitor, public Mutator {
 public:
+        PassVisitor() = default;
         template< typename... Args >
 …
         void set_visit_children( bool& ref ) { bool_ref * ptr = visit_children_impl(pass, 0); if(ptr) ptr->set( ref ); }
+        guard_value_impl init_guard() {
+                guard_value_impl guard;
+                auto at_cleanup = at_cleanup_impl(pass, 0);
+                if( at_cleanup ) {
+                        *at_cleanup = [&guard]( cleanup_func_t && func, void* val ) {
+                                guard.push( std::move( func ), val );
+                        };
+                }
+                return guard;
+        }
 };
 …
 public:
         TypeSubstitution * env = nullptr;
+        TypeSubstitution * env;
 };
 …
         std::list< Statement* > stmtsToAddAfter;
 };
-class WithDeclsToAdd {
-protected:
-        WithDeclsToAdd() = default;
-        ~WithDeclsToAdd() = default;
-public:
-        std::list< Declaration* > declsToAddBefore;
-        std::list< Declaration* > declsToAddAfter;
-};
 class WithShortCircuiting {
 protected:
 …
 };
 class WithGuards {
 protected:
         WithGuards() = default;
         ~WithGuards() = default;
+class WithScopes {
+protected:
+        WithScopes() = default;
+        ~WithScopes() = default;
 public:
 …
                 }, static_cast< void * >( & val ) );
+        }
-        template< typename T >
-        void GuardScope( T& val ) {
-                val.beginScope();
-                at_cleanup( []( void * val ) {
-                        static_cast< T * >( val )->endScope();
-                }, static_cast< void * >( & val ) );
+        }
-        template< typename Func >
-        void GuardAction( Func func ) {
-                at_cleanup( [func](__attribute__((unused)) void *) { func(); }, nullptr );
+        }
 };
 …
 class WithVisitorRef {
 protected:
         WithVisitorRef() {}
         ~WithVisitorRef() {}
 public:
         PassVisitor<pass_type> * const visitor = nullptr;
+        WithVisitorRef() = default;
+        ~WithVisitorRef() = default;
+public:
+        PassVisitor<pass_type> * const visitor;
 };

src/Common/PassVisitor.impl.h

-              rb826e6b
+              rfea3faa
 #define VISIT_START( node )                     \
         __attribute__((unused))                   \
         guard_value_impl guard( at_cleanup_impl(pass, 0) );       \
+        const auto & guard = init_guard();        \
         bool visit_children = true;               \
         set_visit_children( visit_children );   \
 …
 #define MUTATE_START( node )                    \
         __attribute__((unused))                   \
         guard_value_impl guard( at_cleanup_impl(pass, 0) );       \
+        const auto & guard = init_guard();        \
         bool visit_children = true;               \
         set_visit_children( visit_children );   \
 …
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
                 if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
+                if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
                 if ( i == decls.end() ) break;
 …
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
                 if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
+                if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
                 if ( i == decls.end() ) break;
 …
 void PassVisitor< pass_type >::handleStatementList( std::list< Statement * > & statements, func_t func ) {
         SemanticError errors;
-        // don't want statements from outer CompoundStmts to be added to this CompoundStmt
-        ValueGuardPtr< StmtList_t > oldBeforeStmts( get_beforeStmts() );
-        ValueGuardPtr< StmtList_t > oldAfterStmts ( get_afterStmts () );
-        ValueGuardPtr< DeclList_t > oldBeforeDecls( get_beforeDecls() );
-        ValueGuardPtr< DeclList_t > oldAfterDecls ( get_afterDecls () );
         StmtList_t* beforeStmts = get_beforeStmts();
 …
 Statement * PassVisitor< pass_type >::visitStatement( Statement * stmt ) {
         return handleStatement( stmt, [this]( Statement * stmt ) {
                 maybeAccept( stmt, *this );
+                maybeAccept( stmt, *this );
                 return stmt;
         });
 …
                 expr->accept( *this );
                 return expr;
         });
+        });
+}
 …
         VISIT_START( node );
-        // maybeAccept( node->get_env(), *this );
-        maybeAccept( node->get_result(), *this );
         for ( auto expr : node->get_args() ) {
                 visitExpression( expr );
 …
 Expression * PassVisitor< pass_type >::mutate( UntypedExpr * node ) {
         MUTATE_START( node );
-        node->set_env( maybeMutate( node->get_env(), *this ) );
-        node->set_result( maybeMutate( node->get_result(), *this ) );
         for ( auto& expr : node->get_args() ) {

src/Common/PassVisitor.proto.h

-              rb826e6b
+              rfea3faa
 typedef std::function<void( void * )> cleanup_func_t;
-typedef std::function< void( cleanup_func_t, void * ) > at_cleanup_t;
 class guard_value_impl {
 public:
+        guard_value_impl( at_cleanup_t * at_cleanup ) {
+                if( at_cleanup ) {
+                        *at_cleanup = [this]( cleanup_func_t && func, void* val ) {
+                                push( std::move( func ), val );
+                        };
+                }
+        }
+        guard_value_impl() = default;
         ~guard_value_impl() {
 …
 };
+typedef std::function< void( cleanup_func_t, void * ) > at_cleanup_t;
 class bool_ref {
 …
 // Deep magic (a.k.a template meta programming) to make the templated visitor work
 // Basically the goal is to make 2 previsit_impl
 // 1 - Use when a pass implements a valid previsit. This uses overloading which means the any overload of
+// 1 - Use when a pass implements a valid previsit. This uses overloading which means the any overload of
 //     'pass.previsit( node )' that compiles will be used for that node for that type
 //     This requires that this option only compile for passes that actually define an appropriate visit.

src/Common/SemanticError.cc

-              rb826e6b
+              rfea3faa
 //
 #include <cstdio>            // for fileno, stderr
 #include <unistd.h>          // for isatty
 #include <iostream>          // for basic_ostream, operator<<, ostream
 #include <list>              // for list, _List_iterator
 #include <string>            // for string, operator<<, operator+, to_string
+#include <iostream>
+#include <list>
+#include <string>
+#include <algorithm>
+#include <iterator>
-#include "Common/utility.h"  // for to_string, CodeLocation (ptr only)
 #include "SemanticError.h"
+#include <unistd.h>
 inline const std::string& error_str() {

src/Common/SemanticError.h

-              rb826e6b
+              rfea3faa
 #define SEMANTICERROR_H
+#include <exception>  // for exception
+#include <iostream>   // for ostream
+#include <list>       // for list
+#include <string>     // for string
+#include <exception>
+#include <string>
+#include <sstream>
+#include <list>
+#include <iostream>
 #include "utility.h"  // for CodeLocation, toString
+#include "utility.h"
 struct error {

src/Common/utility.h

rb826e6b	rfea3faa
305	305	// for ( val : group_iterate( container1, container2, ... ) ) {}
306	306	// syntax to have a for each that iterates multiple containers of the same length
307		// TODO: update to use variadic arguments~~, perfect forwarding~~
	307	// TODO: update to use variadic arguments
308	308
309	309	template< typename T1, typename T2 >

src/Concurrency/Keywords.cc

-              rb826e6b
+              rfea3faa
 #include "Concurrency/Keywords.h"
+#include <cassert>                 // for assert
+#include <string>                  // for string, operator==
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/utility.h"        // for deleteAll, map_range
+#include "InitTweak/InitTweak.h"   // for isConstructor
+#include "Parser/LinkageSpec.h"    // for Cforall
+#include "SymTab/AddVisit.h"       // for acceptAndAdd
+#include "SynTree/Constant.h"      // for Constant
+#include "SynTree/Declaration.h"   // for StructDecl, FunctionDecl, ObjectDecl
+#include "SynTree/Expression.h"    // for VariableExpr, ConstantExpr, Untype...
+#include "SynTree/Initializer.h"   // for SingleInit, ListInit, Initializer ...
+#include "SynTree/Label.h"         // for Label
+#include "SynTree/Statement.h"     // for CompoundStmt, DeclStmt, ExprStmt
+#include "SynTree/Type.h"          // for StructInstType, Type, PointerType
+#include "SynTree/Visitor.h"       // for Visitor, acceptAll
+class Attribute;
+#include "InitTweak/InitTweak.h"
+#include "SymTab/AddVisit.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Initializer.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
+#include "SynTree/Visitor.h"
 namespace Concurrency {
 …
                 if( needs_main ) {
                         FunctionType * main_type = new FunctionType( noQualifiers, false );
                         main_type->get_parameters().push_back( this_decl->clone() );
 …
         void ConcurrentSueKeyword::addRoutines( ObjectDecl * field, FunctionDecl * func ) {
                 CompoundStmt * statement = new CompoundStmt( noLabels );
                 statement->push_back(
+                statement->push_back(
                         new ReturnStmt(
                                 noLabels,
 …
         //=============================================================================================
         void MutexKeyword::visit(FunctionDecl* decl) {
                 Visitor::visit(decl);
+                Visitor::visit(decl);
                 std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl );
 …
         void ThreadStarter::visit(FunctionDecl * decl) {
                 Visitor::visit(decl);
                 if( ! InitTweak::isConstructor(decl->get_name()) ) return;
 …
                 if( ! stmt ) return;
                 stmt->push_back(
+                stmt->push_back(
                         new ExprStmt(
                                 noLabels,

src/Concurrency/Keywords.h

-              rb826e6b
+              rfea3faa
 #define KEYWORDS_H
 #include <list>  // for list
+#include <list>
+class Declaration;
+#include "SynTree/Declaration.h"
 namespace Concurrency {

src/ControlStruct/ExceptTranslate.cc

-              rb826e6b
+              rfea3faa
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
 // Last Modified On : Tus Jul 18 10:09:00 2017
 // Update Count     : 4
+// Last Modified On : Thr Jun 22 15:57:00 2017
+// Update Count     : 0
 //
 #include "ExceptTranslate.h"
 #include "Common/PassVisitor.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
+#include "SynTree/Attribute.h"
+namespace ControlStruct {
+namespace ControlFlow {
         // This (large) section could probably be moved out of the class
 …
         // Type(Qualifiers &, false, std::list<Attribute *> &)
         // void (*function)();
         static FunctionType try_func_t(Type::Qualifiers(), false);
+        // void (*function)()
+        static FunctionType void_func_t(Type::Qualifiers(), false);
         // void (*function)(int, exception);
         static FunctionType catch_func_t(Type::Qualifiers(), false);
 …
         // bool (*function)(exception);
         static FunctionType handle_func_t(Type::Qualifiers(), false);
-        // void (*function)(__attribute__((unused)) void *);
-        static FunctionType finally_func_t(Type::Qualifiers(), false);
         static void init_func_types() {
                 static bool init_complete = false;
+                static init_complete = false;
                 if (init_complete) {
                         return;
+                }
                 ObjectDecl index_obj(
                         "__handler_index",
+                        "index_t",
                         Type::StorageClasses(),
                         LinkageSpec::Cforall,
                         /*bitfieldWidth*/ NULL,
                         new BasicType( noQualifiers, BasicType::SignedInt ),
+                        new BasicType(emptyQualifiers, BasicType::UnsignedInt),
                         /*init*/ NULL
                         );
+                );
                 ObjectDecl exception_obj(
                         "__exception_inst",
+                        "exception_t",
                         Type::StorageClasses(),
                         LinkageSpec::Cforall,
                         /*bitfieldWidth*/ NULL,
+                        new PointerType(
+                                noQualifiers,
+                                new BasicType( noQualifiers, BasicType::SignedInt )
+                                ),
+                        new BasicType(emptyQualifiers, BasicType::UnsignedInt),
                         /*init*/ NULL
                         );
+                );
                 ObjectDecl bool_obj(
                         "__ret_bool",
+                        "bool_t",
                         Type::StorageClasses(),
                         LinkageSpec::Cforall,
                         /*bitfieldWidth*/ NULL,
                         new BasicType(noQualifiers, BasicType::Bool),
+                        new BasicType(emptyQualifiers, BasicType::Bool),
                         /*init*/ NULL
+                        );
+                ObjectDecl voidptr_obj(
+                        "__hook",
+                        Type::StorageClasses(),
+                        LinkageSpec::Cforall,
+                        NULL,
+                        new PointerType(
+                                noQualifiers,
+                                new VoidType(
+                                        noQualifiers
+                                        ),
+                                std::list<Attribute *>{new Attribute("unused")}
+                                ),
+                        NULL
+                        );
+                catch_func_t.get_parameters().push_back( index_obj.clone() );
+                catch_func_t.get_parameters().push_back( exception_obj.clone() );
+                match_func_t.get_returnVals().push_back( index_obj.clone() );
+                match_func_t.get_parameters().push_back( exception_obj.clone() );
+                handle_func_t.get_returnVals().push_back( bool_obj.clone() );
+                handle_func_t.get_parameters().push_back( exception_obj.clone() );
+                finally_func_t.get_parameters().push_back( voidptr_obj.clone() );
+                );
+                catch_func_t.get_parameters().push_back(index_obj.clone());
+                catch_func_t.get_parameters().push_back(exception_obj.clone());
+                match_func_t.get_returnVals().push_back(index_obj.clone());
+                match_func_t.get_parameters().push_back(exception_obj.clone());
+                handle_func_t.get_returnVals().push_back(bool_obj.clone());
+                handle_func_t.get_parameters().push_back(exception_obj.clone());
                 init_complete = true;
 …
         void split( CatchList& allHandlers, CatchList& terHandlers,
                                 CatchList& resHandlers ) {
+                    CatchList& resHandlers ) {
                 while ( !allHandlers.empty() ) {
                         CatchStmt * stmt = allHandlers.front();
+                        Statement * stmt = allHandlers.front();
                         allHandlers.pop_front();
                         if (CatchStmt::Terminate == stmt->get_kind()) {
+                        if (CaseStmt::Terminate == stmt->get_kind()) {
                                 terHandlers.push_back(stmt);
                         } else {
 …
         template<typename T>
         void free_all( std::list<T *> &list ) {
                 typename std::list<T *>::iterator it;
+                std::list<T *>::iterator it;
                 for ( it = list.begin() ; it != list.end() ; ++it ) {
                         delete *it;
 …
         void appendDeclStmt( CompoundStmt * block, Declaration * item ) {
                 block->push_back(new DeclStmt(noLabels, item));
+        }
         Expression * nameOf( DeclarationWithType * decl ) {
                 return new VariableExpr( decl );
+                block->push_back(new DeclStmt(no_labels, item));
+        }
+        Expression * nameOf( FunctionDecl * function ) {
+                return new VariableExpr( function );
+        }
         // ThrowStmt Mutation Helpers
+        Statement * create_given_throw(
+                        const char * throwFunc, ThrowStmt * throwStmt ) {
+                // { int NAME = EXPR; throwFunc( &NAME ); }
+                CompoundStmt * result = new CompoundStmt( noLabels );
+                ObjectDecl * local = new ObjectDecl(
+                        "__local_exception_copy",
+                        Type::StorageClasses(),
+                        LinkageSpec::Cforall,
+                        NULL,
+                        new BasicType( noQualifiers, BasicType::SignedInt ),
+                        new SingleInit( throwStmt->get_expr() )
+                        );
+                appendDeclStmt( result, local );
+                UntypedExpr * call = new UntypedExpr( new NameExpr( throwFunc ) );
+                call->get_args().push_back( new AddressExpr( nameOf( local ) ) );
+                result->push_back( new ExprStmt( throwStmt->get_labels(), call ) );
+        Statement * create_terminate_throw( ThrowStmt *throwStmt ) {
+                // __throw_terminate( EXPR );
+                ApplicationExpr * call = new ApplicationExpr( /* ... */ );
+                call->get_args.push_back( throwStmt->get_expr() );
+                Statement * result = new ExprStmt( throwStmt->get_labels(), call );
                 throwStmt->set_expr( nullptr );
                 delete throwStmt;
                 return result;
+        }
-        Statement * create_terminate_throw( ThrowStmt *throwStmt ) {
-                // { int NAME = EXPR; __throw_terminate( &NAME ); }
-                return create_given_throw( "__cfaehm__throw_terminate", throwStmt );
+        }
         Statement * create_terminate_rethrow( ThrowStmt *throwStmt ) {
                 // __rethrow_terminate();
-                assert( nullptr == throwStmt->get_expr() );
                 Statement * result = new ExprStmt(
                         throwStmt->get_labels(),
                         new UntypedExpr( new NameExpr( "__cfaehm__rethrow_terminate" ) )
+                        new ApplicationExpr( /* ... */ );
                         );
                 delete throwStmt;
 …
         Statement * create_resume_throw( ThrowStmt *throwStmt ) {
                 // __throw_resume( EXPR );
+                return create_given_throw( "__cfaehm__throw_resume", throwStmt );
+                ApplicationExpr * call = new ApplicationExpr( /* ... */ );
+                call->get_args.push_back( throwStmt->get_expr() );
+                Statement * result = new ExprStmt( throwStmt->get_labels(), call );
+                throwStmt->set_expr( nullptr );
+                delete throwStmt;
+                return result;
+        }
         Statement * create_resume_rethrow( ThrowStmt *throwStmt ) {
 …
                 Statement * result = new ReturnStmt(
                         throwStmt->get_labels(),
+                        new ConstantExpr( Constant::from_bool( false ) )
+                        new ConstantExpr(
+                                Constant(
+                                        new BasicType(
+                                                Type::Qualifiers(),
+                                                BasicType::Bool
+                                                ),
+                                        "0")
+                                )
                         );
                 delete throwStmt;
 …
                 return block;
+        }
+        FunctionDecl * create_try_wrapper( CompoundStmt *body ) {
+                return new FunctionDecl( "try", Type::StorageClasses(),
+                        LinkageSpec::Cforall, try_func_t.clone(), body );
+        FunctionDecl * create_try_wrapper( TryStmt *tryStmt ) {
+                CompoundStmt * body = base_try->get_block();
+                base_try->set_block(nullptr);
+                return new FunctionDecl("try", Type::StorageClasses(),
+                        LinkageSpec::Cforall, void_func_t, body);
+        }
         FunctionDecl * create_terminate_catch( CatchList &handlers ) {
                 std::list<CaseStmt *> handler_wrappers;
-                FunctionType *func_type = catch_func_t.clone();
-                DeclarationWithType * index_obj = func_type->get_parameters().front();
-        //      DeclarationWithType * except_obj = func_type->get_parameters().back();
                 // Index 1..{number of handlers}
 …
                         CatchStmt * handler = *it;
+                        // INTEGERconstant Version
+                        // case `index`:
+                        // {
+                        //     `handler.body`
+                        // }
+                        // return;
+                        std::list<Statement *> caseBody;
+                        caseBody.push_back( handler->get_body() );
+                        handler->set_body( nullptr );
+                        caseBody.push_back( new ReturnStmt( noLabels, nullptr ) );
+                        handler_wrappers.push_back( new CaseStmt(
+                        std::list<Statement *> core;
+                        if ( /*the exception is named*/ ) {
+                                ObjectDecl * local_except = /* Dynamic case, same */;
+                                core->push_back( new DeclStmt( noLabel, local_except ) );
+                        }
+                        // Append the provided statement to the handler.
+                        core->push_back( cur_handler->get_body() );
+                        // Append return onto the inner block? case stmt list?
+                        CaseStmt * wrapper = new CaseStmt(
                                 noLabels,
                                 new ConstantExpr( Constant::from_int( index ) ),
+                                caseBody
+                                ) );
+                                core
+                                );
+                        handler_wrappers.push_back(wrapper);
+                }
                 // TODO: Some sort of meaningful error on default perhaps?
-                std::list<Statement*> stmt_handlers;
-                while ( !handler_wrappers.empty() ) {
-                        stmt_handlers.push_back( handler_wrappers.front() );
-                        handler_wrappers.pop_front();
+                }
                 SwitchStmt * handler_lookup = new SwitchStmt(
                         noLabels,
+                        nameOf( index_obj ),
+                        stmt_handlers
+                        /*parameter 0: index*/,
+                        handler_wrappers,
+                        false
                         );
                 CompoundStmt * body = new CompoundStmt( noLabels );
 …
                 return new FunctionDecl("catch", Type::StorageClasses(),
                         LinkageSpec::Cforall, func_type, body);
+                        LinkageSpec::Cforall, catch_func_t, body);
+        }
         // Create a single check from a moddified handler.
+        // except_obj is referenced, modded_handler will be freed.
+        CompoundStmt *create_single_matcher(
+                        DeclarationWithType * except_obj, CatchStmt * modded_handler ) {
+                CompoundStmt * block = new CompoundStmt( noLabels );
+                // INTEGERconstant Version
+                assert( nullptr == modded_handler->get_decl() );
+                ConstantExpr * number =
+                        dynamic_cast<ConstantExpr*>( modded_handler->get_cond() );
+                assert( number );
+                modded_handler->set_cond( nullptr );
+                Expression * cond;
+                {
+                        std::list<Expression *> args;
+                        args.push_back( number );
+                        std::list<Expression *> rhs_args;
+                        rhs_args.push_back( nameOf( except_obj ) );
+                        Expression * rhs = new UntypedExpr(
+                                new NameExpr( "*?" ), rhs_args );
+                        args.push_back( rhs );
+                        cond = new UntypedExpr( new NameExpr( "?==?" /*???*/), args );
+                }
+        CompoundStmt *create_single_matcher( CatchStmt * modded_handler ) {
+                CompoundStmt * block = new CompoundStmt( noLables );
+                appendDeclStmt( block, modded_handler->get_decl() );
+                // TODO: This is not the actual check.
+                LogicalExpr * cond = new ConstantExpr( Constant::from_bool( false ) );
                 if ( modded_handler->get_cond() ) {
                         cond = new LogicalExpr( cond, modded_handler->get_cond() );
+                        cond = new LogicalExpr( cond, modded_handler->get_cond() )q
+                }
                 block->push_back( new IfStmt( noLabels,
                         cond, modded_handler->get_body(), nullptr ) );
+                        cond, modded_handler->get_body() );
                 modded_handler->set_decl( nullptr );
 …
         FunctionDecl * create_terminate_match( CatchList &handlers ) {
                 CompoundStmt * body = new CompoundStmt( noLabels );
-                FunctionType * func_type = match_func_t.clone();
-                DeclarationWithType * except_obj = func_type->get_parameters().back();
                 // Index 1..{number of handlers}
 …
                         CatchStmt * handler = *it;
+                        // Body should have been taken by create_terminate_catch.
+                        assert( nullptr == handler->get_body() );
+                        // Create new body.
+                        // body should have been taken by create_terminate_catch.
+                        // assert( nullptr == handler->get_body() );
                         handler->set_body( new ReturnStmt( noLabels,
                                 new ConstantExpr( Constant::from_int( index ) ) ) );
+                        // Create the handler.
+                        body->push_back( create_single_matcher( except_obj, handler ) );
+                        *it = nullptr;
+                }
+                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
+                        Constant::from_int( 0 ) ) ) );
+                        body->push_back( create_single_matcher( handler ) );
+                }
                 return new FunctionDecl("match", Type::StorageClasses(),
                         LinkageSpec::Cforall, func_type, body);
+        }
         CompoundStmt * create_terminate_caller(
+                        LinkageSpec::Cforall, match_func_t, body);
+        }
+        Statement * create_terminate_caller(
                         FunctionDecl * try_wrapper,
                         FunctionDecl * terminate_catch,
                         FunctionDecl * terminate_match) {
+                UntypedExpr * caller = new UntypedExpr( new NameExpr(
+                        "__cfaehm__try_terminate" ) );
+                std::list<Expression *>& args = caller->get_args();
+                ApplicationExpr * caller = new ApplicationExpr( /* ... */ );
+                std::list<Expression *>& args = caller.get_args();
                 args.push_back( nameOf( try_wrapper ) );
                 args.push_back( nameOf( terminate_catch ) );
                 args.push_back( nameOf( terminate_match ) );
+                CompoundStmt * callStmt = new CompoundStmt( noLabels );
+                callStmt->push_back( new ExprStmt( noLabels, caller ) );
+                return callStmt;
+                return new ExprStmt( noLabels, caller );
+        }
         FunctionDecl * create_resume_handler( CatchList &handlers ) {
+                CompoundStmt * body = new CompoundStmt( noLabels );
+                FunctionType * func_type = match_func_t.clone();
+                DeclarationWithType * except_obj = func_type->get_parameters().back();
+                CompoundStmt * body = new CompountStmt( noLabels );
                 CatchList::iterator it;
 …
                                 handling_code->push_back( handler->get_body() );
+                        }
                         handling_code->push_back( new ReturnStmt( noLabels,
                                 new ConstantExpr( Constant::from_bool( true ) ) ) );
+                        handling_code->push_back( new ReturnStmt( noLabel,
+                                new ConstantExpr( Constant::from_bool( false ) ) ) );
                         handler->set_body( handling_code );
                         // Create the handler.
+                        body->push_back( create_single_matcher( except_obj, handler ) );
+                        *it = nullptr;
+                }
+                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
+                        Constant::from_bool( false ) ) ) );
+                        body->push_back( create_single_matcher( handler ) );
+                }
                 return new FunctionDecl("handle", Type::StorageClasses(),
+                        LinkageSpec::Cforall, func_type, body);
+        }
+        CompoundStmt * create_resume_wrapper(
+                        StructDecl * node_decl,
+                        LinkageSpec::Cforall, handle_func_t, body);
+        }
+        Statement * create_resume_wrapper(
                         Statement * wraps,
                         FunctionDecl * resume_handler ) {
                 CompoundStmt * body = new CompoundStmt( noLabels );
+                // struct __try_resume_node __resume_node
+                //      __attribute__((cleanup( __cfaehm__try_resume_cleanup )));
+                // ** unwinding of the stack here could cause problems **
+                // ** however I don't think that can happen currently **
+                // __cfaehm__try_resume_setup( &__resume_node, resume_handler );
+                // struct node = {current top resume handler, call to resume_handler};
+                // __attribute__((cleanup( ... )));
+                // set top resume handler to node.
+                // The wrapped statement.
+                ListInit * node_init;
+                {
+                        std::list<Initializer*> field_inits;
+                        field_inits.push_back( new SingleInit( /* ... */ ) );
+                        field_inits.push_back( new SingleInit( nameOf( resume_handler ) ) );
+                        node_init = new ListInit( field_inits );
+                }
                 std::list< Attribute * > attributes;
+                {
                         std::list< Expression * > attr_params;
                         attr_params.push_back( new NameExpr(
                                 "__cfaehm__try_resume_cleanup" ) );
                         attributes.push_back( new Attribute( "cleanup", attr_params ) );
+                }
                 ObjectDecl * obj = new ObjectDecl(
                         "__resume_node",
+                        attr_params.push_back( nameOf( /* ... deconstructor ... */ ) );
+                        attrributes.push_back( new Attribute( "cleanup", attr_params ) );
+                }
+                appendDeclStmt( body,
+                /**/ ObjectDecl(
+                        "resume_node",
                         Type::StorageClasses(),
                         LinkageSpec::Cforall,
                         nullptr,
+                        new StructInstType(
+                                Type::Qualifiers(),
+                                node_decl
+                                ),
+                        nullptr,
+                        /* Type* = resume_node */,
+                        node_init,
                         attributes
+                        );
+                appendDeclStmt( body, obj );
+                UntypedExpr *setup = new UntypedExpr( new NameExpr(
+                        "__cfaehm__try_resume_setup" ) );
+                setup->get_args().push_back( new AddressExpr( nameOf( obj ) ) );
+                setup->get_args().push_back( nameOf( resume_handler ) );
+                body->push_back( new ExprStmt( noLabels, setup ) );
+                        )
+                );
                 body->push_back( wraps );
                 return body;
 …
         FunctionDecl * create_finally_wrapper( TryStmt * tryStmt ) {
+                FinallyStmt * finally = tryStmt->get_finally();
+                CompoundStmt * body = finally->get_block();
+                finally->set_block( nullptr );
+                delete finally;
+                CompoundStmt * body = tryStmt->get_finally();
                 tryStmt->set_finally( nullptr );
                 return new FunctionDecl("finally", Type::StorageClasses(),
+                        LinkageSpec::Cforall, finally_func_t.clone(), body);
+        }
+        ObjectDecl * create_finally_hook(
+                        StructDecl * hook_decl, FunctionDecl * finally_wrapper ) {
+                // struct __cfaehm__cleanup_hook __finally_hook
+                //      __attribute__((cleanup( finally_wrapper )));
+                        LinkageSpec::Cforall, void_func_t, body);
+        }
+        ObjectDecl * create_finally_hook( FunctionDecl * finally_wrapper ) {
+                // struct _cleanup_hook NAME __attribute__((cleanup( ... )));
                 // Make Cleanup Attribute.
 …
                         std::list< Expression * > attr_params;
                         attr_params.push_back( nameOf( finally_wrapper ) );
                         attributes.push_back( new Attribute( "cleanup", attr_params ) );
+                }
                 return new ObjectDecl(
                         "__finally_hook",
+                        attrributes.push_back( new Attribute( "cleanup", attr_params ) );
+                }
+                return ObjectDecl( /* ... */
+                        const std::string &name "finally_hook",
                         Type::StorageClasses(),
                         LinkageSpec::Cforall,
                         nullptr,
+                        new StructInstType(
+                                noQualifiers,
+                                hook_decl
+                                ),
+                        /* ... Type * ... */,
                         nullptr,
                         attributes
 …
         class ExceptionMutatorCore : public WithGuards {
+        class ExceptionMutatorCore : public WithScoping {
                 enum Context { NoHandler, TerHandler, ResHandler };
 …
                 // loop, switch or the goto stays within the function.
                 Context cur_context;
+                Context curContext;
                 // We might not need this, but a unique base for each try block's
 …
                 //unsigned int try_count = 0;
-                StructDecl *node_decl;
-                StructDecl *hook_decl;
         public:
                 ExceptionMutatorCore() :
+                        cur_context(NoHandler),
+                        node_decl(nullptr), hook_decl(nullptr)
+                        curContext(NoHandler)
                 {}
+                void premutate( CatchStmt *catchStmt );
+                void premutate( StructDecl *structDecl );
+                void premutate( CatchStmt *tryStmt );
                 Statement * postmutate( ThrowStmt *throwStmt );
                 Statement * postmutate( TryStmt *tryStmt );
 …
                         if ( throwStmt->get_expr() ) {
                                 return create_terminate_throw( throwStmt );
                         } else if ( TerHandler == cur_context ) {
+                        } else if ( TerHandler == curContext ) {
                                 return create_terminate_rethrow( throwStmt );
                         } else {
                                 assertf(false, "Invalid throw in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
+                                        throwStmt->location.filename,
                                         throwStmt->location.linenumber);
                                 return nullptr;
 …
                         if ( throwStmt->get_expr() ) {
                                 return create_resume_throw( throwStmt );
                         } else if ( ResHandler == cur_context ) {
+                        } else if ( ResHandler == curContext ) {
                                 return create_resume_rethrow( throwStmt );
                         } else {
                                 assertf(false, "Invalid throwResume in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
+                                        throwStmt->location.filename,
                                         throwStmt->location.linenumber);
                                 return nullptr;
 …
         Statement * ExceptionMutatorCore::postmutate( TryStmt *tryStmt ) {
-                assert( node_decl );
-                assert( hook_decl );
                 // Generate a prefix for the function names?
                 CompoundStmt * block = new CompoundStmt( noLabels );
                 CompoundStmt * inner = take_try_block( tryStmt );
+                CompoundStmt * block = new CompoundStmt();
+                Statement * inner = take_try_block( tryStmt );
                 if ( tryStmt->get_finally() ) {
 …
                         appendDeclStmt( block, finally_block );
                         // Create and add the finally cleanup hook.
+                        appendDeclStmt( block,
+                                create_finally_hook( hook_decl, finally_block ) );
+                }
+                CatchList termination_handlers;
+                CatchList resumption_handlers;
+                split( tryStmt->get_catchers(),
+                           termination_handlers, resumption_handlers );
+                if ( resumption_handlers.size() ) {
+                        appendDeclStmt( block, create_finally_hook( finally_block ) );
+                }
+                StatementList termination_handlers;
+                StatementList resumption_handlers;
+                split( tryStmt->get_handlers(),
+                       termination_handlers, resumption_handlers );
+                if ( resumeption_handlers.size() ) {
                         // Define the helper function.
                         FunctionDecl * resume_handler =
 …
                         appendDeclStmt( block, resume_handler );
                         // Prepare hooks
                         inner = create_resume_wrapper( node_decl, inner, resume_handler );
+                        inner = create_resume_wrapper( inner, resume_handler );
+                }
 …
                 block->push_back( inner );
                 //free_all( termination_handlers );
                 //free_all( resumption_handlers );
+                free_all( termination_handlers );
+                free_all( resumption_handlers );
                 return block;
 …
         void ExceptionMutatorCore::premutate( CatchStmt *catchStmt ) {
                 GuardValue( cur_context );
                 if ( CatchStmt::Terminate == catchStmt->get_kind() ) {
                         cur_context = TerHandler;
+                GuardValue( curContext );
+                if ( CatchStmt::Termination == catchStmt->get_kind() ) {
+                        curContext = TerHandler;
                 } else {
+                        cur_context = ResHandler;
+                }
+        }
+        void ExceptionMutatorCore::premutate( StructDecl *structDecl ) {
+                if ( !structDecl->has_body() ) {
+                        // Skip children?
+                        return;
+                } else if ( structDecl->get_name() == "__cfaehm__try_resume_node" ) {
+                        assert( nullptr == node_decl );
+                        node_decl = structDecl;
+                } else if ( structDecl->get_name() == "__cfaehm__cleanup_hook" ) {
+                        assert( nullptr == hook_decl );
+                        hook_decl = structDecl;
+                }
+                // Later we might get the exception type as well.
+        }
+        void translateEHM( std::list< Declaration *> & translationUnit ) {
+                init_func_types();
+                        curContext = ResHandler;
+                }
+        }
+    void translateEHM( std::list< Declaration *> & translationUnit ) {
                 PassVisitor<ExceptionMutatorCore> translator;
+                mutateAll( translationUnit, translator );
+                for ( Declaration * decl : translationUnit ) {
+                        decl->mutate( translator );
+                }
+        }
+}

src/ControlStruct/ExceptTranslate.h

-              rb826e6b
+              rfea3faa
 // Created On       : Tus Jun 06 10:13:00 2017
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jun 30 10:20:00 2017
 // Update Count     : 2
+// Last Modified On : Thr Jun 22 15:57:00 2017
+// Update Count     : 0
 //
 …
 #define EXCEPT_TRANSLATE_H
+#include <list>
+#include "SynTree/SynTree.h"
+namespace ControlStruct {
+namespace ControlFlow {
         void translateEHM( std::list< Declaration *> & translationUnit );
         /* Converts exception handling structures into their underlying C code.

src/ControlStruct/module.mk

-              rb826e6b
+              rfea3faa
 ## Author           : Richard C. Bilson
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Andrew Beach
 ## Last Modified On : Wed Jun 28 16:15:00 2017
 ## Update Count     : 4
+## Last Modified By : Peter A. Buhr
+## Last Modified On : Thu Aug  4 11:38:06 2016
+## Update Count     : 3
 ###############################################################################
 SRC +=  ControlStruct/LabelGenerator.cc \
         ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc \
+        ControlStruct/MLEMutator.cc \
         ControlStruct/Mutate.cc \
         ControlStruct/ForExprMutator.cc \
+        ControlStruct/ExceptTranslate.cc
+        ControlStruct/ForExprMutator.cc

src/GenPoly/Box.cc

-              rb826e6b
+              rfea3faa
                 DeclarationWithType *Pass1::mutate( FunctionDecl *functionDecl ) {
                         if ( functionDecl->get_statements() ) {         // empty routine body ?
-                                // std::cerr << "mutating function: " << functionDecl->get_mangleName() << std::endl;
                                 doBeginScope();
                                 scopeTyVars.beginScope();
 …
                                 retval = oldRetval;
                                 doEndScope();
-                                // std::cerr << "end function: " << functionDecl->get_mangleName() << std::endl;
                         } // if
                         return functionDecl;
 …
                 Expression *Pass1::mutate( ApplicationExpr *appExpr ) {
                         // std::cerr << "mutate appExpr: " << InitTweak::getFunctionName( appExpr ) << std::endl;
+                        // std::cerr << "mutate appExpr: ";
                         // for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) {
                         //      std::cerr << i->first << " ";
 …
                         ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
-                        // std::cerr << function << std::endl;
-                        // std::cerr << "scopeTyVars: ";
-                        // printTyVarMap( std::cerr, scopeTyVars );
-                        // std::cerr << "exprTyVars: ";
-                        // printTyVarMap( std::cerr, exprTyVars );
-                        // std::cerr << "env: " << *env << std::endl;
-                        // std::cerr << needsAdapter( function, scopeTyVars ) << ! needsAdapter( function, exprTyVars) << std::endl;
                         // NOTE: addDynRetParam needs to know the actual (generated) return type so it can make a temp variable, so pass the result type from the appExpr
                         // passTypeVars needs to know the program-text return type (i.e. the distinction between _conc_T30 and T3(int))
                         // concRetType may not be a good name in one or both of these places. A more appropriate name change is welcome.
                         if ( dynRetType ) {
-                                // std::cerr << "dynRetType: " << dynRetType << std::endl;
                                 Type *concRetType = appExpr->get_result()->isVoid() ? nullptr : appExpr->get_result();
                                 ret = addDynRetParam( appExpr, concRetType, arg ); // xxx - used to use dynRetType instead of concRetType

src/GenPoly/InstantiateGeneric.cc

-              rb826e6b
+              rfea3faa
 #include "InstantiateGeneric.h"
+#include "DeclMutator.h"
 #include "GenPoly.h"
 #include "ScopedSet.h"
 #include "ScrubTyVars.h"
+#include "Common/PassVisitor.h"
+#include "PolyMutator.h"
+#include "ResolvExpr/typeops.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
 #include "Common/ScopedMap.h"
 #include "Common/UniqueName.h"
 #include "Common/utility.h"
-#include "ResolvExpr/typeops.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Type.h"
-#include "InitTweak/InitTweak.h"
 namespace GenPoly {
 …
+        }
+        // collect the environments of each TypeInstType so that type variables can be replaced
+        // xxx - possibly temporary solution. Access to type environments is required in GenericInstantiator, but it needs to be a DeclMutator which does not provide easy access to the type environments.
+        class EnvFinder final : public GenPoly::PolyMutator {
+        public:
+                using GenPoly::PolyMutator::mutate;
+                virtual Type * mutate( TypeInstType * inst ) override {
+                        if ( env ) envMap[inst] = env;
+                        return inst;
+                }
+                // don't want to associate an environment with TypeInstTypes that occur in function types - this may actually only apply to function types belonging to DeclarationWithTypes (or even just FunctionDecl)?
+                virtual Type * mutate( FunctionType * ftype ) override {
+                        return ftype;
+                }
+                std::unordered_map< ReferenceToType *, TypeSubstitution * > envMap;
+        };
         /// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately
         struct GenericInstantiator final : public WithTypeSubstitution, public WithDeclsToAdd, public WithVisitorRef<GenericInstantiator>, public WithGuards {
+        class GenericInstantiator final : public DeclMutator {
                 /// Map of (generic type, parameter list) pairs to concrete type instantiations
                 InstantiationMap< AggregateDecl, AggregateDecl > instantiations;
 …
                 /// Namer for concrete types
                 UniqueName typeNamer;
+                /// Should not make use of type environment to replace types of function parameter and return values.
+                bool inFunctionType = false;
+                GenericInstantiator() : instantiations(), dtypeStatics(), typeNamer("_conc_") {}
+                Type* postmutate( StructInstType *inst );
+                Type* postmutate( UnionInstType *inst );
+                void premutate( __attribute__((unused)) FunctionType * ftype ) {
+                        GuardValue( inFunctionType );
+                        inFunctionType = true;
+                }
+                void beginScope();
+                void endScope();
+                /// Reference to mapping of environments
+                const std::unordered_map< ReferenceToType *, TypeSubstitution * > & envMap;
+        public:
+                GenericInstantiator( const std::unordered_map< ReferenceToType *, TypeSubstitution * > & envMap ) : DeclMutator(), instantiations(), dtypeStatics(), typeNamer("_conc_"), envMap( envMap ) {}
+                using DeclMutator::mutate;
+                virtual Type* mutate( StructInstType *inst ) override;
+                virtual Type* mutate( UnionInstType *inst ) override;
+                virtual void doBeginScope() override;
+                virtual void doEndScope() override;
         private:
                 /// Wrap instantiation lookup for structs
 …
         void instantiateGeneric( std::list< Declaration* > &translationUnit ) {
+                PassVisitor<GenericInstantiator> instantiator;
+                mutateAll( translationUnit, instantiator );
+                EnvFinder finder;
+                mutateAll( translationUnit, finder );
+                GenericInstantiator instantiator( finder.envMap );
+                instantiator.mutateDeclarationList( translationUnit );
+        }
 …
         Type *GenericInstantiator::replaceWithConcrete( Type *type, bool doClone ) {
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
+                        if ( env && ! inFunctionType ) {
+                        if ( envMap.count( typeInst ) ) {
+                                TypeSubstitution * env = envMap.at( typeInst );
                                 Type *concrete = env->lookup( typeInst->get_name() );
                                 if ( concrete ) {
 …
+        Type* GenericInstantiator::postmutate( StructInstType *inst ) {
+        Type* GenericInstantiator::mutate( StructInstType *inst ) {
+                // mutate subtypes
+                Type *mutated = Mutator::mutate( inst );
+                inst = dynamic_cast< StructInstType* >( mutated );
+                if ( ! inst ) return mutated;
                 // exit early if no need for further mutation
                 if ( inst->get_parameters().empty() ) return inst;
 …
                                 substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
                                 insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *visitor ); // recursively instantiate members
                                 declsToAddBefore.push_back( concDecl ); // must occur before declaration is added so that member instantiations appear first
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
+                                DeclMutator::addDeclaration( concDecl ); // must occur before declaration is added so that member instantiations appear first
+                        }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
 …
+        }
+        Type* GenericInstantiator::postmutate( UnionInstType *inst ) {
+        Type* GenericInstantiator::mutate( UnionInstType *inst ) {
+                // mutate subtypes
+                Type *mutated = Mutator::mutate( inst );
+                inst = dynamic_cast< UnionInstType* >( mutated );
+                if ( ! inst ) return mutated;
                 // exit early if no need for further mutation
                 if ( inst->get_parameters().empty() ) return inst;
 …
                                 substituteMembers( inst->get_baseUnion()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
                                 insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *visitor ); // recursively instantiate members
                                 declsToAddBefore.push_back( concDecl ); // must occur before declaration is added so that member instantiations appear first
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
+                                DeclMutator::addDeclaration( concDecl ); // must occur before declaration is added so that member instantiations appear first
+                        }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );
 …
+        }
+        void GenericInstantiator::beginScope() {
+        void GenericInstantiator::doBeginScope() {
+                DeclMutator::doBeginScope();
                 instantiations.beginScope();
                 dtypeStatics.beginScope();
+        }
+        void GenericInstantiator::endScope() {
+        void GenericInstantiator::doEndScope() {
+                DeclMutator::doEndScope();
                 instantiations.endScope();
                 dtypeStatics.endScope();

src/InitTweak/FixInit.cc

-              rb826e6b
+              rfea3faa
                         typedef AddStmtVisitor Parent;
                         using Parent::visit;
+                        // use ordered data structure to maintain ordering for set_difference and for consistent error messages
+                        typedef std::list< ObjectDecl * > ObjectSet;
+                        typedef std::set< ObjectDecl * > ObjectSet;
                         virtual void visit( CompoundStmt *compoundStmt ) override;
                         virtual void visit( DeclStmt *stmt ) override;
 …
                 // debug
                 template<typename ObjectSet>
                 struct PrintSet {
                         PrintSet( const ObjectSet & objs ) : objs( objs ) {}
+                struct printSet {
+                        typedef ObjDeclCollector::ObjectSet ObjectSet;
+                        printSet( const ObjectSet & objs ) : objs( objs ) {}
                         const ObjectSet & objs;
                 };
+                template<typename ObjectSet>
+                PrintSet<ObjectSet> printSet( const ObjectSet & objs ) { return PrintSet<ObjectSet>( objs ); }
+                template<typename ObjectSet>
+                std::ostream & operator<<( std::ostream & out, const PrintSet<ObjectSet> & set) {
+                std::ostream & operator<<( std::ostream & out, const printSet & set) {
                         out << "{ ";
                         for ( ObjectDecl * obj : set.objs ) {
 …
                                                 // static bool __objName_uninitialized = true
                                                 BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
                                                 SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant::from_int( 1 ) ) );
+                                                SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant::from_int( 1 ) ), noDesignators );
                                                 ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, boolType, boolInitExpr );
                                                 isUninitializedVar->fixUniqueId();
 …
                                                 Statement * dtor = ctorInit->get_dtor();
                                                 objDecl->set_init( nullptr );
                                                 ctorInit->set_ctor( nullptr );
+                                                objDecl->set_init( NULL );
+                                                ctorInit->set_ctor( NULL );
                                                 ctorInit->set_dtor( nullptr );
                                                 if ( dtor ) {
 …
                                                 } else {
                                                         stmtsToAddAfter.push_back( ctor );
                                                         objDecl->set_init( nullptr );
                                                         ctorInit->set_ctor( nullptr );
+                                                        objDecl->set_init( NULL );
+                                                        ctorInit->set_ctor( NULL );
+                                                }
                                         } // if
                                 } else if ( Initializer * init = ctorInit->get_init() ) {
                                         objDecl->set_init( init );
                                         ctorInit->set_init( nullptr );
+                                        ctorInit->set_init( NULL );
                                 } else {
                                         // no constructor and no initializer, which is okay
                                         objDecl->set_init( nullptr );
+                                        objDecl->set_init( NULL );
                                 } // if
                                 delete ctorInit;
 …
                 void ObjDeclCollector::visit( CompoundStmt * compoundStmt ) {
                         ObjectSet prevVars = curVars;
+                        std::set< ObjectDecl * > prevVars = curVars;
                         Parent::visit( compoundStmt );
                         curVars = prevVars;
 …
                         // keep track of all variables currently in scope
                         if ( ObjectDecl * objDecl = dynamic_cast< ObjectDecl * > ( stmt->get_decl() ) ) {
                                 curVars.push_back( objDecl );
+                                curVars.insert( objDecl );
                         } // if
                         Parent::visit( stmt );
 …
+                        )
                         if ( ! diff.empty() ) {
-                                // create an auxilliary set for fast lookup -- can't make diff a set, because diff ordering should be consistent for error messages.
-                                std::unordered_set<ObjectDecl *> needsDestructor( diff.begin(), diff.end() );
                                 // go through decl ordered list of objectdecl. for each element that occurs in diff, output destructor
                                 OrderedDecls ordered;
                                 for ( OrderedDecls & rdo : reverseDeclOrder ) {
                                         // add elements from reverseDeclOrder into ordered if they occur in diff - it is key that this happens in reverse declaration order.
                                         copy_if( rdo.begin(), rdo.end(), back_inserter( ordered ), [&]( ObjectDecl * objDecl ) { return needsDestructor.count( objDecl ); } );
+                                        copy_if( rdo.begin(), rdo.end(), back_inserter( ordered ), [&]( ObjectDecl * objDecl ) { return diff.count( objDecl ); } );
                                 } // for
                                 insertDtors( ordered.begin(), ordered.end(), back_inserter( stmtsToAdd ) );

src/InitTweak/GenInit.cc

-              rb826e6b
+              rfea3faa
+        }
+        struct ReturnFixer : public WithStmtsToAdd, public WithGuards {
+        class ReturnFixer : public WithStmtsToAdd, public WithScopes {
+          public:
                 /// consistently allocates a temporary variable for the return value
                 /// of a function so that anything which the resolver decides can be constructed
 …
         };
+        struct CtorDtor : public WithGuards, public WithShortCircuiting  {
+        class CtorDtor final : public GenPoly::PolyMutator {
+          public:
+                typedef GenPoly::PolyMutator Parent;
+                using Parent::mutate;
                 /// create constructor and destructor statements for object declarations.
                 /// the actual call statements will be added in after the resolver has run
 …
                 static void generateCtorDtor( std::list< Declaration * > &translationUnit );
+                void previsit( ObjectDecl * );
+                void previsit( FunctionDecl *functionDecl );
+                virtual DeclarationWithType * mutate( ObjectDecl * ) override;
+                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl ) override;
                 // should not traverse into any of these declarations to find objects
                 // that need to be constructed or destructed
+                void previsit( StructDecl *aggregateDecl );
+                void previsit( __attribute__((unused)) UnionDecl    * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) EnumDecl     * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) TraitDecl    * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) TypeDecl     * typeDecl )      { visit_children = false; }
+                void previsit( __attribute__((unused)) TypedefDecl  * typeDecl )      { visit_children = false; }
+                void previsit( __attribute__((unused)) FunctionType * funcType )      { visit_children = false; }
+                void previsit( CompoundStmt * compoundStmt );
+                virtual Declaration* mutate( StructDecl *aggregateDecl ) override;
+                virtual Declaration* mutate( UnionDecl *aggregateDecl ) override { return aggregateDecl; }
+                virtual Declaration* mutate( EnumDecl *aggregateDecl ) override { return aggregateDecl; }
+                virtual Declaration* mutate( TraitDecl *aggregateDecl ) override { return aggregateDecl; }
+                virtual TypeDecl* mutate( TypeDecl *typeDecl ) override { return typeDecl; }
+                virtual Declaration* mutate( TypedefDecl *typeDecl ) override { return typeDecl; }
+                virtual Type * mutate( FunctionType *funcType ) override { return funcType; }
+                virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) override;
           private:
 …
         void CtorDtor::generateCtorDtor( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<CtorDtor> ctordtor;
                 acceptAll( translationUnit, ctordtor );
+                CtorDtor ctordtor;
+                mutateAll( translationUnit, ctordtor );
+        }
 …
+        }
         void CtorDtor::previsit( ObjectDecl * objDecl ) {
+        DeclarationWithType * CtorDtor::mutate( ObjectDecl * objDecl ) {
                 handleDWT( objDecl );
                 // hands off if @=, extern, builtin, etc.
 …
                         objDecl->set_init( genCtorInit( objDecl ) );
+                }
+        }
+        void CtorDtor::previsit( FunctionDecl *functionDecl ) {
+                GuardValue( inFunction );
+                return Parent::mutate( objDecl );
+        }
+        DeclarationWithType * CtorDtor::mutate( FunctionDecl *functionDecl ) {
+                ValueGuard< bool > oldInFunc = inFunction;
                 inFunction = true;
                 handleDWT( functionDecl );
                 GuardScope( managedTypes );
+                managedTypes.beginScope();
                 // go through assertions and recursively add seen ctor/dtors
                 for ( auto & tyDecl : functionDecl->get_functionType()->get_forall() ) {
 …
+                        }
+                }
+                PassVisitor<CtorDtor> newCtorDtor;
+                newCtorDtor.pass = *this;
+                maybeAccept( functionDecl->get_statements(), newCtorDtor );
+                visit_children = false;  // do not try and construct parameters or forall parameters - must happen after maybeAccept
+        }
+        void CtorDtor::previsit( StructDecl *aggregateDecl ) {
+                visit_children = false; // do not try to construct and destruct aggregate members
+                // parameters should not be constructed and destructed, so don't mutate FunctionType
+                functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
+                managedTypes.endScope();
+                return functionDecl;
+        }
+        Declaration* CtorDtor::mutate( StructDecl *aggregateDecl ) {
                 // don't construct members, but need to take note if there is a managed member,
                 // because that means that this type is also managed
 …
+                        }
+                }
+        }
+        void CtorDtor::previsit( __attribute__((unused)) CompoundStmt * compoundStmt ) {
+                GuardScope( managedTypes );
+        }
+                return aggregateDecl;
+        }
+        CompoundStmt * CtorDtor::mutate( CompoundStmt * compoundStmt ) {
+                managedTypes.beginScope();
+                CompoundStmt * stmt = Parent::mutate( compoundStmt );
+                managedTypes.endScope();
+                return stmt;
+        }
 } // namespace InitTweak

src/InitTweak/InitTweak.cc

-              rb826e6b
+              rfea3faa
                 public:
                         bool hasDesignations = false;
+                        virtual void visit( Designation * des ) {
+                                if ( ! des->get_designators().empty() ) hasDesignations = true;
+                                else Visitor::visit( des );
+                        }
+                        template<typename Init>
+                        void handleInit( Init * init ) {
+                                if ( ! init->get_designators().empty() ) hasDesignations = true;
+                                else Visitor::visit( init );
+                        }
+                        virtual void visit( SingleInit * singleInit ) { handleInit( singleInit); }
+                        virtual void visit( ListInit * listInit ) { handleInit( listInit); }
                 };

src/MakeLibCfa.cc

-              rb826e6b
+              rfea3faa
 #include "MakeLibCfa.h"
+#include <cassert>                 // for assert
+#include <string>                   // for operator==, string
+#include "CodeGen/OperatorTable.h"  // for OperatorInfo, operatorLookup, Ope...
+#include "Common/SemanticError.h"   // for SemanticError
+#include "Common/UniqueName.h"      // for UniqueName
+#include "Parser/LinkageSpec.h"     // for Spec, Intrinsic, C
+#include "SynTree/Declaration.h"    // for FunctionDecl, ObjectDecl, Declara...
+#include "SynTree/Expression.h"     // for NameExpr, UntypedExpr, VariableExpr
+#include "SynTree/Initializer.h"    // for SingleInit
+#include "SynTree/Label.h"          // for Label
+#include "SynTree/Statement.h"      // for CompoundStmt, ReturnStmt
+#include "SynTree/Type.h"           // for FunctionType
+#include "SynTree/Visitor.h"        // for acceptAll, Visitor
+#include "SynTree/Visitor.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Type.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Initializer.h"
+#include "CodeGen/OperatorTable.h"
+#include "Common/UniqueName.h"
 namespace LibCfa {
 …
                 assert( ! objDecl->get_init() );
                 std::list< Expression* > noDesignators;
                 objDecl->set_init( new SingleInit( new NameExpr( objDecl->get_name() ), false ) ); // cannot be constructed
+                objDecl->set_init( new SingleInit( new NameExpr( objDecl->get_name() ), noDesignators, false ) ); // cannot be constructed
                 newDecls.push_back( objDecl );
+        }

src/MakeLibCfa.h

-              rb826e6b
+              rfea3faa
 #define LIBCFA_MAKELIBCFA_H
+#include <list>  // for list
+class Declaration;
+#include <list>
+#include <SynTree/SynTree.h>
 namespace LibCfa {

src/Makefile.am

rb826e6b	rfea3faa
43	43	driver_cfa_cpp_SOURCES = ${SRC}
44	44	driver_cfa_cpp_LDADD = ${LEXLIB} -ldl # yywrap
45		driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -~~Wextra -~~DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
	45	driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
46	46	driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
47	47

src/Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
 build_triplet = @build@
 host_triplet = @host@
+DIST_COMMON = $(srcdir)/CodeGen/module.mk \
+        $(srcdir)/CodeTools/module.mk $(srcdir)/Common/module.mk \
+        $(srcdir)/Concurrency/module.mk \
+        $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk \
+        $(srcdir)/InitTweak/module.mk $(srcdir)/Makefile.am \
+        $(srcdir)/Makefile.in $(srcdir)/Parser/module.mk \
+        $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk \
+        $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk \
+        Parser/lex.cc Parser/parser.cc Parser/parser.h
 cfa_cpplib_PROGRAMS = driver/cfa-cpp$(EXEEXT)
 subdir = src
 …
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 …
         ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) \
-        ControlStruct/driver_cfa_cpp-ExceptTranslate.$(OBJEXT) \
         GenPoly/driver_cfa_cpp-Box.$(OBJEXT) \
         GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT) \
 …
         Parser/driver_cfa_cpp-TypeData.$(OBJEXT) \
         Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT) \
         Parser/driver_cfa_cpp-parserutility.$(OBJEXT) \
+        Parser/driver_cfa_cpp-parseutility.$(OBJEXT) \
         ResolvExpr/driver_cfa_cpp-AlternativeFinder.$(OBJEXT) \
         ResolvExpr/driver_cfa_cpp-Alternative.$(OBJEXT) \
 …
         ResolvExpr/driver_cfa_cpp-Occurs.$(OBJEXT) \
         ResolvExpr/driver_cfa_cpp-TypeEnvironment.$(OBJEXT) \
-        ResolvExpr/driver_cfa_cpp-CurrentObject.$(OBJEXT) \
         SymTab/driver_cfa_cpp-Indexer.$(OBJEXT) \
         SymTab/driver_cfa_cpp-Mangler.$(OBJEXT) \
 …
         SymTab/driver_cfa_cpp-TypeEquality.$(OBJEXT) \
         SymTab/driver_cfa_cpp-Autogen.$(OBJEXT) \
-        SymTab/driver_cfa_cpp-TreeStruct.$(OBJEXT) \
         SynTree/driver_cfa_cpp-Type.$(OBJEXT) \
         SynTree/driver_cfa_cpp-VoidType.$(OBJEXT) \
 …
 driver_cfa_cpp_LINK = $(CXXLD) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) \
         $(driver_cfa_cpp_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
 …
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-am__v_lt_1 =
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 =
+am__v_CXX_0 = @echo "  CXX   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 …
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 =
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
 @MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
 AM_V_LEX = $(am__v_LEX_@AM_V@)
 am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
+am__v_LEX_0 = @echo "  LEX     " $@;
+am__v_LEX_1 =
+am__v_LEX_0 = @echo "  LEX   " $@;
 YLWRAP = $(top_srcdir)/automake/ylwrap
 @MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
-am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
-                   -e s/c++$$/h++/ -e s/c$$/h/
 YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
 AM_V_YACC = $(am__v_YACC_@AM_V@)
 am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
+am__v_YACC_0 = @echo "  YACC    " $@;
+am__v_YACC_1 =
+am__v_YACC_0 = @echo "  YACC  " $@;
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 =
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 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 =
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(driver_cfa_cpp_SOURCES)
 DIST_SOURCES = $(driver_cfa_cpp_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
+'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/CodeGen/module.mk \
-        $(srcdir)/CodeTools/module.mk $(srcdir)/Common/module.mk \
-        $(srcdir)/Concurrency/module.mk \
-        $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk \
-        $(srcdir)/InitTweak/module.mk $(srcdir)/Makefile.in \
-        $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk \
-        $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk \
-        $(srcdir)/Tuples/module.mk $(top_srcdir)/automake/depcomp \
-        $(top_srcdir)/automake/ylwrap Parser/lex.cc Parser/parser.cc \
-        Parser/parser.hh
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
+        ControlStruct/ForExprMutator.cc \
+        ControlStruct/ExceptTranslate.cc GenPoly/Box.cc \
+        ControlStruct/ForExprMutator.cc GenPoly/Box.cc \
         GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
         GenPoly/ScrubTyVars.cc GenPoly/Lvalue.cc GenPoly/Specialize.cc \
 …
         Parser/ExpressionNode.cc Parser/StatementNode.cc \
         Parser/InitializerNode.cc Parser/TypeData.cc \
         Parser/LinkageSpec.cc Parser/parserutility.cc \
+        Parser/LinkageSpec.cc Parser/parseutility.cc \
         ResolvExpr/AlternativeFinder.cc ResolvExpr/Alternative.cc \
         ResolvExpr/Unify.cc ResolvExpr/PtrsAssignable.cc \
 …
         ResolvExpr/RenameVars.cc ResolvExpr/FindOpenVars.cc \
         ResolvExpr/PolyCost.cc ResolvExpr/Occurs.cc \
         ResolvExpr/TypeEnvironment.cc ResolvExpr/CurrentObject.cc \
         SymTab/Indexer.cc SymTab/Mangler.cc SymTab/Validate.cc \
         SymTab/FixFunction.cc SymTab/ImplementationType.cc \
         SymTab/TypeEquality.cc SymTab/Autogen.cc SymTab/TreeStruct.cc \
         SynTree/Type.cc SynTree/VoidType.cc SynTree/BasicType.cc \
         SynTree/PointerType.cc SynTree/ArrayType.cc \
         SynTree/FunctionType.cc SynTree/ReferenceToType.cc \
         SynTree/TupleType.cc SynTree/TypeofType.cc SynTree/AttrType.cc \
+        ResolvExpr/TypeEnvironment.cc SymTab/Indexer.cc \
+        SymTab/Mangler.cc SymTab/Validate.cc SymTab/FixFunction.cc \
+        SymTab/ImplementationType.cc SymTab/TypeEquality.cc \
+        SymTab/Autogen.cc SynTree/Type.cc SynTree/VoidType.cc \
+        SynTree/BasicType.cc SynTree/PointerType.cc \
+        SynTree/ArrayType.cc SynTree/FunctionType.cc \
+        SynTree/ReferenceToType.cc SynTree/TupleType.cc \
+        SynTree/TypeofType.cc SynTree/AttrType.cc \
         SynTree/VarArgsType.cc SynTree/ZeroOneType.cc \
         SynTree/Constant.cc SynTree/Expression.cc SynTree/TupleExpr.cc \
 …
 MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
         ${cfa_cpplib_PROGRAMS}}
 BUILT_SOURCES = Parser/parser.hh
+BUILT_SOURCES = Parser/parser.h
 AM_YFLAGS = -d -t -v
 …
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap
 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
 driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
 all: $(BUILT_SOURCES)
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
         esac;
 $(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(am__empty):
+$(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk:
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 …
 install-cfa_cpplibPROGRAMS: $(cfa_cpplib_PROGRAMS)
         @$(NORMAL_INSTALL)
+        test -z "$(cfa_cpplibdir)" || $(MKDIR_P) "$(DESTDIR)$(cfa_cpplibdir)"
         @list='$(cfa_cpplib_PROGRAMS)'; test -n "$(cfa_cpplibdir)" || list=; \
-        if test -n "$$list"; then \
-          echo " $(MKDIR_P) '$(DESTDIR)$(cfa_cpplibdir)'"; \
-          $(MKDIR_P) "$(DESTDIR)$(cfa_cpplibdir)" || exit 1; \
-        fi; \
         for p in $$list; do echo "$$p $$p"; done | \
         sed 's/$(EXEEXT)$$//' | \
         while read p p1; do if test -f $$p \
           ; then echo "$$p"; echo "$$p"; else :; fi; \
+        while read p p1; do if test -f $$p; \
+          then echo "$$p"; echo "$$p"; else :; fi; \
         done | \
+        sed -e 'p;s,.*/,,;n;h' \
+            -e 's|.*|.|' \
+        sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
             -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
         sed 'N;N;N;s,\n, ,g' | \
 …
         files=`for p in $$list; do echo "$$p"; done | \
           sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+              -e 's/$$/$(EXEEXT)/' \
+        `; \
+              -e 's/$$/$(EXEEXT)/' `; \
         test -n "$$list" || exit 0; \
         echo " ( cd '$(DESTDIR)$(cfa_cpplibdir)' && rm -f" $$files ")"; \
 …
         ControlStruct/$(am__dirstamp) \
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
-ControlStruct/driver_cfa_cpp-ExceptTranslate.$(OBJEXT):  \
-        ControlStruct/$(am__dirstamp) \
-        ControlStruct/$(DEPDIR)/$(am__dirstamp)
 GenPoly/$(am__dirstamp):
         @$(MKDIR_P) GenPoly
 …
 InitTweak/driver_cfa_cpp-InitTweak.$(OBJEXT):  \
         InitTweak/$(am__dirstamp) InitTweak/$(DEPDIR)/$(am__dirstamp)
 Parser/parser.hh: Parser/parser.cc
+Parser/parser.h: Parser/parser.cc
         @if test ! -f $@; then rm -f Parser/parser.cc; else :; fi
         @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) Parser/parser.cc; else :; fi
 …
 Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
 Parser/driver_cfa_cpp-parserutility.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/driver_cfa_cpp-parseutility.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
 ResolvExpr/$(am__dirstamp):
 …
         ResolvExpr/$(am__dirstamp) \
         ResolvExpr/$(DEPDIR)/$(am__dirstamp)
-ResolvExpr/driver_cfa_cpp-CurrentObject.$(OBJEXT):  \
-        ResolvExpr/$(am__dirstamp) \
-        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
 SymTab/$(am__dirstamp):
         @$(MKDIR_P) SymTab
 …
         SymTab/$(DEPDIR)/$(am__dirstamp)
 SymTab/driver_cfa_cpp-Autogen.$(OBJEXT): SymTab/$(am__dirstamp) \
-        SymTab/$(DEPDIR)/$(am__dirstamp)
-SymTab/driver_cfa_cpp-TreeStruct.$(OBJEXT): SymTab/$(am__dirstamp) \
         SymTab/$(DEPDIR)/$(am__dirstamp)
 SynTree/$(am__dirstamp):
 …
         @$(MKDIR_P) driver
         @: > driver/$(am__dirstamp)
 driver/cfa-cpp$(EXEEXT): $(driver_cfa_cpp_OBJECTS) $(driver_cfa_cpp_DEPENDENCIES) $(EXTRA_driver_cfa_cpp_DEPENDENCIES) driver/$(am__dirstamp)
         @rm -f driver/cfa-cpp$(EXEEXT)
 …
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
+        -rm -f CodeGen/*.$(OBJEXT)
+        -rm -f CodeTools/*.$(OBJEXT)
+        -rm -f Common/*.$(OBJEXT)
+        -rm -f Concurrency/*.$(OBJEXT)
+        -rm -f ControlStruct/*.$(OBJEXT)
+        -rm -f GenPoly/*.$(OBJEXT)
+        -rm -f InitTweak/*.$(OBJEXT)
+        -rm -f Parser/*.$(OBJEXT)
+        -rm -f ResolvExpr/*.$(OBJEXT)
+        -rm -f SymTab/*.$(OBJEXT)
+        -rm -f SynTree/*.$(OBJEXT)
+        -rm -f Tuples/*.$(OBJEXT)
+        -rm -f CodeGen/driver_cfa_cpp-CodeGenerator.$(OBJEXT)
+        -rm -f CodeGen/driver_cfa_cpp-FixMain.$(OBJEXT)
+        -rm -f CodeGen/driver_cfa_cpp-FixNames.$(OBJEXT)
+        -rm -f CodeGen/driver_cfa_cpp-GenType.$(OBJEXT)
+        -rm -f CodeGen/driver_cfa_cpp-Generate.$(OBJEXT)
+        -rm -f CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT)
+        -rm -f CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT)
+        -rm -f CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT)
+        -rm -f Common/driver_cfa_cpp-Assert.$(OBJEXT)
+        -rm -f Common/driver_cfa_cpp-DebugMalloc.$(OBJEXT)
+        -rm -f Common/driver_cfa_cpp-SemanticError.$(OBJEXT)
+        -rm -f Common/driver_cfa_cpp-UniqueName.$(OBJEXT)
+        -rm -f Concurrency/driver_cfa_cpp-Keywords.$(OBJEXT)
+        -rm -f ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT)
+        -rm -f ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT)
+        -rm -f ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT)
+        -rm -f ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT)
+        -rm -f ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-Box.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-CopyParams.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-DeclMutator.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-FindFunction.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-InstantiateGeneric.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-Lvalue.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-PolyMutator.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-ScrubTyVars.$(OBJEXT)
+        -rm -f GenPoly/driver_cfa_cpp-Specialize.$(OBJEXT)
+        -rm -f InitTweak/driver_cfa_cpp-FixGlobalInit.$(OBJEXT)
+        -rm -f InitTweak/driver_cfa_cpp-FixInit.$(OBJEXT)
+        -rm -f InitTweak/driver_cfa_cpp-GenInit.$(OBJEXT)
+        -rm -f InitTweak/driver_cfa_cpp-InitTweak.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-DeclarationNode.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-ExpressionNode.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-InitializerNode.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-ParseNode.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-StatementNode.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-TypeData.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-TypedefTable.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-lex.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-parser.$(OBJEXT)
+        -rm -f Parser/driver_cfa_cpp-parseutility.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-AdjustExprType.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-Alternative.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-AlternativeFinder.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-AlternativePrinter.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-CastCost.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-CommonType.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-ConversionCost.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-FindOpenVars.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-Occurs.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-PolyCost.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-PtrsAssignable.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-PtrsCastable.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-RenameVars.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-ResolveTypeof.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-Resolver.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-TypeEnvironment.$(OBJEXT)
+        -rm -f ResolvExpr/driver_cfa_cpp-Unify.$(OBJEXT)
+        -rm -f SymTab/driver_cfa_cpp-Autogen.$(OBJEXT)
+        -rm -f SymTab/driver_cfa_cpp-FixFunction.$(OBJEXT)
+        -rm -f SymTab/driver_cfa_cpp-ImplementationType.$(OBJEXT)
+        -rm -f SymTab/driver_cfa_cpp-Indexer.$(OBJEXT)
+        -rm -f SymTab/driver_cfa_cpp-Mangler.$(OBJEXT)
+        -rm -f SymTab/driver_cfa_cpp-TypeEquality.$(OBJEXT)
+        -rm -f SymTab/driver_cfa_cpp-Validate.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-AddStmtVisitor.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-AddressExpr.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-AggregateDecl.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-ApplicationExpr.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-ArrayType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-AttrType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Attribute.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-BasicType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-CommaExpr.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-CompoundStmt.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Constant.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-DeclStmt.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Declaration.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-DeclarationWithType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Expression.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-FunctionDecl.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-FunctionType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Initializer.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Mutator.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-NamedTypeDecl.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-ObjectDecl.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-PointerType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-ReferenceToType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Statement.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-TupleExpr.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-TupleType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Type.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-TypeDecl.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-TypeExpr.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-TypeofType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-VarArgsType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-VarExprReplacer.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-Visitor.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-VoidType.$(OBJEXT)
+        -rm -f SynTree/driver_cfa_cpp-ZeroOneType.$(OBJEXT)
+        -rm -f Tuples/driver_cfa_cpp-Explode.$(OBJEXT)
+        -rm -f Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT)
+        -rm -f Tuples/driver_cfa_cpp-TupleExpansion.$(OBJEXT)
 distclean-compile:
 …
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Po@am__quote@
 …
 @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-lex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-parseutility.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AdjustExprType.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Alternative.Po@am__quote@
 …
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CommonType.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ConversionCost.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-FindOpenVars.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Occurs.Po@am__quote@
 …
 @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-TreeStruct.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Po@am__quote@
 …
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ForExprMutator.obj `if test -f 'ControlStruct/ForExprMutator.cc'; then $(CYGPATH_W) 'ControlStruct/ForExprMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ForExprMutator.cc'; fi`
-ControlStruct/driver_cfa_cpp-ExceptTranslate.o: ControlStruct/ExceptTranslate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-ExceptTranslate.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Tpo -c -o ControlStruct/driver_cfa_cpp-ExceptTranslate.o `test -f 'ControlStruct/ExceptTranslate.cc' || echo '$(srcdir)/'`ControlStruct/ExceptTranslate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/ExceptTranslate.cc' object='ControlStruct/driver_cfa_cpp-ExceptTranslate.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ExceptTranslate.o `test -f 'ControlStruct/ExceptTranslate.cc' || echo '$(srcdir)/'`ControlStruct/ExceptTranslate.cc
-ControlStruct/driver_cfa_cpp-ExceptTranslate.obj: ControlStruct/ExceptTranslate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-ExceptTranslate.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Tpo -c -o ControlStruct/driver_cfa_cpp-ExceptTranslate.obj `if test -f 'ControlStruct/ExceptTranslate.cc'; then $(CYGPATH_W) 'ControlStruct/ExceptTranslate.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ExceptTranslate.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/ExceptTranslate.cc' object='ControlStruct/driver_cfa_cpp-ExceptTranslate.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ExceptTranslate.obj `if test -f 'ControlStruct/ExceptTranslate.cc'; then $(CYGPATH_W) 'ControlStruct/ExceptTranslate.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ExceptTranslate.cc'; fi`
 GenPoly/driver_cfa_cpp-Box.o: GenPoly/Box.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Box.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo -c -o GenPoly/driver_cfa_cpp-Box.o `test -f 'GenPoly/Box.cc' || echo '$(srcdir)/'`GenPoly/Box.cc
 …
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-LinkageSpec.obj `if test -f 'Parser/LinkageSpec.cc'; then $(CYGPATH_W) 'Parser/LinkageSpec.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/LinkageSpec.cc'; fi`
 Parser/driver_cfa_cpp-parserutility.o: Parser/parserutility.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-parserutility.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Tpo -c -o Parser/driver_cfa_cpp-parserutility.o `test -f 'Parser/parserutility.cc' || echo '$(srcdir)/'`Parser/parserutility.cc
 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/parserutility.cc' object='Parser/driver_cfa_cpp-parserutility.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parserutility.o `test -f 'Parser/parserutility.cc' || echo '$(srcdir)/'`Parser/parserutility.cc
 Parser/driver_cfa_cpp-parserutility.obj: Parser/parserutility.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-parserutility.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Tpo -c -o Parser/driver_cfa_cpp-parserutility.obj `if test -f 'Parser/parserutility.cc'; then $(CYGPATH_W) 'Parser/parserutility.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parserutility.cc'; fi`
 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/parserutility.cc' object='Parser/driver_cfa_cpp-parserutility.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parserutility.obj `if test -f 'Parser/parserutility.cc'; then $(CYGPATH_W) 'Parser/parserutility.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parserutility.cc'; fi`
+Parser/driver_cfa_cpp-parseutility.o: Parser/parseutility.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-parseutility.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-parseutility.Tpo -c -o Parser/driver_cfa_cpp-parseutility.o `test -f 'Parser/parseutility.cc' || echo '$(srcdir)/'`Parser/parseutility.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-parseutility.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-parseutility.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/parseutility.cc' object='Parser/driver_cfa_cpp-parseutility.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parseutility.o `test -f 'Parser/parseutility.cc' || echo '$(srcdir)/'`Parser/parseutility.cc
+Parser/driver_cfa_cpp-parseutility.obj: Parser/parseutility.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-parseutility.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-parseutility.Tpo -c -o Parser/driver_cfa_cpp-parseutility.obj `if test -f 'Parser/parseutility.cc'; then $(CYGPATH_W) 'Parser/parseutility.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parseutility.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-parseutility.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-parseutility.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/parseutility.cc' object='Parser/driver_cfa_cpp-parseutility.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parseutility.obj `if test -f 'Parser/parseutility.cc'; then $(CYGPATH_W) 'Parser/parseutility.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parseutility.cc'; fi`
 ResolvExpr/driver_cfa_cpp-AlternativeFinder.o: ResolvExpr/AlternativeFinder.cc
 …
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-TypeEnvironment.obj `if test -f 'ResolvExpr/TypeEnvironment.cc'; then $(CYGPATH_W) 'ResolvExpr/TypeEnvironment.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/TypeEnvironment.cc'; fi`
-ResolvExpr/driver_cfa_cpp-CurrentObject.o: ResolvExpr/CurrentObject.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-CurrentObject.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Tpo -c -o ResolvExpr/driver_cfa_cpp-CurrentObject.o `test -f 'ResolvExpr/CurrentObject.cc' || echo '$(srcdir)/'`ResolvExpr/CurrentObject.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/CurrentObject.cc' object='ResolvExpr/driver_cfa_cpp-CurrentObject.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-CurrentObject.o `test -f 'ResolvExpr/CurrentObject.cc' || echo '$(srcdir)/'`ResolvExpr/CurrentObject.cc
-ResolvExpr/driver_cfa_cpp-CurrentObject.obj: ResolvExpr/CurrentObject.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-CurrentObject.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Tpo -c -o ResolvExpr/driver_cfa_cpp-CurrentObject.obj `if test -f 'ResolvExpr/CurrentObject.cc'; then $(CYGPATH_W) 'ResolvExpr/CurrentObject.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/CurrentObject.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/CurrentObject.cc' object='ResolvExpr/driver_cfa_cpp-CurrentObject.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-CurrentObject.obj `if test -f 'ResolvExpr/CurrentObject.cc'; then $(CYGPATH_W) 'ResolvExpr/CurrentObject.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/CurrentObject.cc'; fi`
 SymTab/driver_cfa_cpp-Indexer.o: SymTab/Indexer.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Indexer.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Tpo -c -o SymTab/driver_cfa_cpp-Indexer.o `test -f 'SymTab/Indexer.cc' || echo '$(srcdir)/'`SymTab/Indexer.cc
 …
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Autogen.obj `if test -f 'SymTab/Autogen.cc'; then $(CYGPATH_W) 'SymTab/Autogen.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Autogen.cc'; fi`
-SymTab/driver_cfa_cpp-TreeStruct.o: SymTab/TreeStruct.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-TreeStruct.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-TreeStruct.Tpo -c -o SymTab/driver_cfa_cpp-TreeStruct.o `test -f 'SymTab/TreeStruct.cc' || echo '$(srcdir)/'`SymTab/TreeStruct.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-TreeStruct.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-TreeStruct.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/TreeStruct.cc' object='SymTab/driver_cfa_cpp-TreeStruct.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-TreeStruct.o `test -f 'SymTab/TreeStruct.cc' || echo '$(srcdir)/'`SymTab/TreeStruct.cc
-SymTab/driver_cfa_cpp-TreeStruct.obj: SymTab/TreeStruct.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-TreeStruct.obj -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-TreeStruct.Tpo -c -o SymTab/driver_cfa_cpp-TreeStruct.obj `if test -f 'SymTab/TreeStruct.cc'; then $(CYGPATH_W) 'SymTab/TreeStruct.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/TreeStruct.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-TreeStruct.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-TreeStruct.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/TreeStruct.cc' object='SymTab/driver_cfa_cpp-TreeStruct.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-TreeStruct.obj `if test -f 'SymTab/TreeStruct.cc'; then $(CYGPATH_W) 'SymTab/TreeStruct.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/TreeStruct.cc'; fi`
 SynTree/driver_cfa_cpp-Type.o: SynTree/Type.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Type.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Type.Tpo -c -o SynTree/driver_cfa_cpp-Type.o `test -f 'SynTree/Type.cc' || echo '$(srcdir)/'`SynTree/Type.cc
 …
 .yy.cc:
+        $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+ID: $(am__tagged_files)
+        $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        mkid -fID $$unique
+tags: TAGS
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
         set x; \
         here=`pwd`; \
+        $(am__define_uniq_tagged_files); \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         shift; \
         if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 …
           fi; \
         fi
+ctags: ctags-am
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         test -z "$(CTAGS_ARGS)$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 …
           && $(am__cd) $(top_srcdir) \
           && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-cscopelist-am: $(am__tagged_files)
-        list='$(am__tagged_files)'; \
-        case "$(srcdir)" in \
-          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-          *) sdir=$(subdir)/$(srcdir) ;; \
-        esac; \
-        for i in $$list; do \
-          if test -f "$$i"; then \
-            echo "$(subdir)/$$i"; \
-          else \
-            echo "$$sdir/$$i"; \
-          fi; \
-        done >> $(top_builddir)/cscope.files
 distclean-tags:
 …
         -rm -f Parser/lex.cc
         -rm -f Parser/parser.cc
         -rm -f Parser/parser.hh
+        -rm -f Parser/parser.h
         -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
         -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 …
 .MAKE: all check install install-am install-strip
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+        clean-cfa_cpplibPROGRAMS clean-generic 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-cfa_cpplibPROGRAMS 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 tags tags-am uninstall \
+        uninstall-am uninstall-cfa_cpplibPROGRAMS
+.PRECIOUS: Makefile
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+        clean-cfa_cpplibPROGRAMS clean-generic ctags distclean \
+        distclean-compile distclean-generic distclean-tags distdir dvi \
+        dvi-am html html-am info info-am install install-am \
+        install-cfa_cpplibPROGRAMS 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 tags uninstall uninstall-am \
+        uninstall-cfa_cpplibPROGRAMS

src/Parser/DeclarationNode.cc

-              rb826e6b
+              rfea3faa
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul 14 16:55:00 2017
 // Update Count     : 1020
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 17 15:46:33 2017
+// Update Count     : 1018
 //
 …
         newnode->type->aggregate.fields = fields;
         newnode->type->aggregate.body = body;
-        newnode->type->aggregate.tagged = false;
-        newnode->type->aggregate.parent = nullptr;
         return newnode;
 } // DeclarationNode::newAggregate
 …
         return newnode;
 } // DeclarationNode::newEnumConstant
-DeclarationNode * DeclarationNode::newTreeStruct( Aggregate kind, const string * name, const string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
-        assert( name );
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Aggregate );
-        newnode->type->aggregate.kind = kind;
-        newnode->type->aggregate.name = name;
-        newnode->type->aggregate.actuals = actuals;
-        newnode->type->aggregate.fields = fields;
-        newnode->type->aggregate.body = body;
-        newnode->type->aggregate.tagged = true;
-        newnode->type->aggregate.parent = parent;
-        return newnode;
-} // DeclarationNode::newTreeStruct
 DeclarationNode * DeclarationNode::newName( string * name ) {
 …
           case TypeData::Enum:
           case TypeData::Aggregate: {
                   ReferenceToType * ret = buildComAggInst( type, attributes, linkage );
+                  ReferenceToType * ret = buildComAggInst( type, attributes );
                   buildList( type->aggregate.actuals, ret->get_parameters() );
                   return ret;

src/Parser/ExpressionNode.cc

-              rb826e6b
+              rfea3faa
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Tus Jul 18 10:08:00 2017
 // Update Count     : 550
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 21 16:44:46 2017
+// Update Count     : 541
 //
 …
 #include "SynTree/Declaration.h"
 #include "Common/UnimplementedError.h"
 #include "parserutility.h"
+#include "parseutility.h"
 #include "Common/utility.h"
 …
 // type.
 Type::Qualifiers noQualifiers;                          // no qualifiers on constants
+Type::Qualifiers emptyQualifiers;                               // no qualifiers on constants
 static inline bool checkU( char c ) { return c == 'u' || c == 'U'; }
 …
         } // if
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
 …
         } // if
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
 …
 Expression *build_constantChar( const std::string & str ) {
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
         delete &str;                                                                            // created by lex
         return ret;
 …
 ConstantExpr *build_constantStr( const std::string & str ) {
         // string should probably be a primitive type
         ArrayType *at = new ArrayType( noQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
+        ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
                                                                    new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ),  // +1 for '\0' and -2 for '"'
                                                                    false, false );
 …
 Expression *build_constantZeroOne( const std::string & str ) {
         Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( noQualifiers ) : (Type*)new OneType( noQualifiers ), str,
+        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str,
                                                                                                    str == "0" ? (unsigned long long int)0 : (unsigned long long int)1 ) );
         delete &str;                                                                            // created by lex
 …
+}
-// Must harmonize with OperKinds.
 static const char *OperName[] = {
         // diadic
         "SizeOf", "AlignOf", "OffsetOf", "?+?", "?-?", "?\\?", "?*?", "?/?", "?%?", "||", "&&",
+        "SizeOf", "AlignOf", "OffsetOf", "?+?", "?-?", "?*?", "?/?", "?%?", "||", "&&",
         "?|?", "?&?", "?^?", "Cast", "?<<?", "?>>?", "?<?", "?>?", "?<=?", "?>=?", "?==?", "?!=?",
         "?=?", "?@=?", "?\\=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?",
+        "?=?", "?@=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?",
         "?[?]", "...",
         // monadic

src/Parser/InitializerNode.cc

-              rb826e6b
+              rfea3faa
         InitializerNode *moreInit;
         if ( (moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) ) {
+        if  ( get_next() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) != 0) )
                 moreInit->printOneLine( os );
+        }
+}
 Initializer *InitializerNode::build() const {
         if ( aggregate ) {
-                // steal designators from children
-                std::list< Designation * > designlist;
-                InitializerNode * child = next_init();
-                for ( ; child != nullptr; child = dynamic_cast< InitializerNode * >( child->get_next() ) ) {
-                        std::list< Expression * > desList;
-                        buildList< Expression, ExpressionNode >( child->designator, desList );
-                        designlist.push_back( new Designation( desList ) );
-                } // for
                 std::list< Initializer * > initlist;
                 buildList< Initializer, InitializerNode >( next_init(), initlist );
+                std::list< Expression * > designlist;
+                if ( designator != 0 ) {
+                        buildList< Expression, ExpressionNode >( designator, designlist );
+                } // if
                 return new ListInit( initlist, designlist, maybeConstructed );
         } else {
+                if ( get_expression() != 0) {
+                        return new SingleInit( maybeBuild< Expression >( get_expression() ), maybeConstructed );
+                }
+                std::list< Expression * > designators;
+                if ( designator != 0 )
+                        buildList< Expression, ExpressionNode >( designator, designators );
+                if ( get_expression() != 0)
+                        return new SingleInit( maybeBuild< Expression >( get_expression() ), designators, maybeConstructed );
         } // if
         return 0;
+}

src/Parser/LinkageSpec.cc

-              rb826e6b
+              rfea3faa
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:22:09 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul  7 11:11:00 2017
 // Update Count     : 25
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Oct  2 23:16:21 2016
+// Update Count     : 23
 //
 …
 #include "Common/SemanticError.h"
+namespace LinkageSpec {
+Spec linkageCheck( const string * spec ) {
+        assert( spec );
+LinkageSpec::Spec LinkageSpec::linkageCheck( const string * spec ) {
         unique_ptr<const string> guard( spec ); // allocated by lexer
         if ( *spec == "\"Cforall\"" ) {
 …
         } else if ( *spec == "\"C\"" ) {
                 return C;
-        } else if ( *spec == "\"BuiltinC\"" ) {
-                return BuiltinC;
         } else {
                 throw SemanticError( "Invalid linkage specifier " + *spec );
 …
+}
+Spec linkageUpdate( Spec old_spec, const string * cmd ) {
+        assert( cmd );
+        unique_ptr<const string> guard( cmd ); // allocated by lexer
+        if ( *cmd == "\"Cforall\"" ) {
+                old_spec.is_mangled = true;
+                return old_spec;
+        } else if ( *cmd == "\"C\"" ) {
+                old_spec.is_mangled = false;
+                return old_spec;
+        } else {
+                throw SemanticError( "Invalid linkage specifier " + *cmd );
+        } // if
+string LinkageSpec::linkageName( LinkageSpec::Spec linkage ) {
+        assert( 0 <= linkage && linkage < LinkageSpec::NoOfSpecs );
+        static const char *linkageKinds[LinkageSpec::NoOfSpecs] = {
+                "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in",
+        };
+        return linkageKinds[linkage];
+}
+std::string linkageName( Spec linkage ) {
+    switch ( linkage ) {
+    case Intrinsic:
+        return "intrinsic";
+    case C:
+        return "C";
+    case Cforall:
+        return "Cforall";
+    case AutoGen:
+        return "autogenerated cfa";
+    case Compiler:
+        return "compiler built-in";
+    case BuiltinCFA:
+        return "cfa built-in";
+    case BuiltinC:
+        return "c built-in";
+    default:
+        return "<unnamed linkage spec>";
+    }
+bool LinkageSpec::isDecoratable( Spec spec ) {
+        assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs );
+        static bool decoratable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           false,  true,           false,
+        };
+        return decoratable[spec];
+}
+} // LinkageSpec
+bool LinkageSpec::isGeneratable( Spec spec ) {
+        assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs );
+        static bool generatable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           true,   true,           false,
+        };
+        return generatable[spec];
+}
+bool LinkageSpec::isOverridable( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
+        static bool overridable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           false,          false,  true,           false,
+        };
+        return overridable[spec];
+}
+bool LinkageSpec::isBuiltin( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
+        static bool builtin[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           false,          false,  false,          true,
+        };
+        return builtin[spec];
+}
 // Local Variables: //

src/Parser/LinkageSpec.h

-              rb826e6b
+              rfea3faa
 // file "LICENCE" distributed with Cforall.
 //
 // LinkageSpec.h --
+// LinkageSpec.h --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul  7 11:03:00 2017
 // Update Count     : 13
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Oct  1 23:03:17 2016
+// Update Count     : 11
 //
 …
 #include <string>
+namespace LinkageSpec {
+        // All linkage specs are some combination of these flags:
+        enum {
+                Mangle = 1 << 0,
+                Generate = 1 << 1,
+                Overrideable = 1 << 2,
+                Builtin = 1 << 3,
+                NoOfSpecs = 1 << 4,
+struct LinkageSpec {
+        enum Spec {
+                Intrinsic,                                                                              // C built-in defined in prelude
+                Cforall,                                                                                // ordinary
+                C,                                                                                              // not overloadable, not mangled
+                AutoGen,                                                                                // built by translator (struct assignment)
+                Compiler,                                                                               // gcc internal
+                NoOfSpecs
         };
+        union Spec {
+                unsigned int val;
+                struct {
+                        bool is_mangled : 1;
+                        bool is_generatable : 1;
+                        bool is_overridable : 1;
+                        bool is_builtin : 1;
+                };
+                constexpr Spec( unsigned int val ) : val( val ) {}
+                constexpr Spec( Spec const &other ) : val( other.val ) {}
+                // Operators may go here.
+                // Supports == and !=
+                constexpr operator unsigned int () const { return val; }
+        };
+        Spec linkageCheck( const std::string * );
+        // Returns the Spec with the given name (limited to C, Cforall & BuiltinC)
+        Spec linkageUpdate( Spec old_spec, const std::string * cmd );
+        /* If cmd = "C" returns a Spec that is old_spec with is_mangled = false
+         * If cmd = "Cforall" returns old_spec Spec with is_mangled = true
+         */
+        std::string linkageName( Spec );
+        // To Update: LinkageSpec::isXyz( cur_spec ) -> cur_spec.is_xyz
+        inline bool isMangled( Spec spec ) { return spec.is_mangled; }
+        inline bool isGeneratable( Spec spec ) { return spec.is_generatable; }
+        inline bool isOverridable( Spec spec ) { return spec.is_overridable; }
+        inline bool isBuiltin( Spec spec ) { return spec.is_builtin; }
+        // Pre-defined flag combinations:
+        // C built-in defined in prelude
+        constexpr Spec const Intrinsic = { Mangle | Generate | Overrideable | Builtin };
+        // ordinary
+        constexpr Spec const Cforall = { Mangle | Generate };
+        // not overloadable, not mangled
+        constexpr Spec const C = { Generate };
+        // built by translator (struct assignment)
+        constexpr Spec const AutoGen = { Mangle | Generate | Overrideable };
+        // gcc internal
+        constexpr Spec const Compiler = { Builtin };
+        // mangled builtins
+        constexpr Spec const BuiltinCFA = { Mangle | Generate | Builtin };
+        // non-mangled builtins
+        constexpr Spec const BuiltinC = { Generate | Builtin };
+        static Spec linkageCheck( const std::string * );
+        static std::string linkageName( Spec );
+        static bool isDecoratable( Spec );
+        static bool isGeneratable( Spec );
+        static bool isOverridable( Spec );
+        static bool isBuiltin( Spec );
 };

src/Parser/ParseNode.h

-              rb826e6b
+              rfea3faa
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 15 16:00:48 2017
 // Update Count     : 785
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 12 13:00:00 2017
+// Update Count     : 779
 //
 …
 };
-// Must harmonize with OperName.
 enum class OperKinds {
         // diadic
         SizeOf, AlignOf, OffsetOf, Plus, Minus, Exp, Mul, Div, Mod, Or, And,
+        SizeOf, AlignOf, OffsetOf, Plus, Minus, Mul, Div, Mod, Or, And,
         BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq,
         Assign, AtAssn, ExpAssn, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
+        Assign, AtAssn, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
         Index, Range,
         // monadic
 …
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
-        // Perhaps this would best fold into newAggragate.
-        static DeclarationNode * newTreeStruct( Aggregate kind, const std::string * name, const std::string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body );
         DeclarationNode();
         ~DeclarationNode();
 …
         static UniqueName anonymous;
-        // Temp to test TreeStruct
-        const std::string * parent_name;
 }; // DeclarationNode

src/Parser/StatementNode.cc

-              rb826e6b
+              rfea3faa
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Jul 11 21:23:15 2017
 // Update Count     : 331
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 12 13:03:00 2017
+// Update Count     : 329
 //
 …
 #include "SynTree/Statement.h"
 #include "SynTree/Expression.h"
 #include "parserutility.h"
+#include "parseutility.h"
 #include "Common/utility.h"
 …
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
         // branches.size() == 0 for switch (...) {}, i.e., no declaration or statements
+        assert( branches.size() >= 0 );                                         // size == 0 for switch (...) {}, i.e., no declaration or statements
         return new SwitchStmt( noLabels, maybeMoveBuild< Expression >(ctl), branches );
+}

src/Parser/TypeData.cc

-              rb826e6b
+              rfea3faa
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Tus Jul 18 10:10:00 2017
 // Update Count     : 566
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 17 15:52:43 2017
+// Update Count     : 563
 //
 …
                 aggregate.fields = nullptr;
                 aggregate.body = false;
-                aggregate.tagged = false;
-                aggregate.parent = nullptr;
                 break;
           case AggregateInst:
 …
                 delete aggregate.actuals;
                 delete aggregate.fields;
-                delete aggregate.parent;
                 // delete aggregate;
                 break;
 …
                 newtype->aggregate.kind = aggregate.kind;
                 newtype->aggregate.body = aggregate.body;
-                newtype->aggregate.tagged = aggregate.tagged;
-                newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr;
                 break;
           case AggregateInst:
 …
           case TypeData::Builtin:
                 if(td->builtintype == DeclarationNode::Zero) {
                         return new ZeroType( noQualifiers );
+                        return new ZeroType( emptyQualifiers );
+                }
                 else if(td->builtintype == DeclarationNode::One) {
                         return new OneType( noQualifiers );
+                        return new OneType( emptyQualifiers );
+                }
                 else {
 …
 } // buildPointer
 AggregateDecl * buildAggregate( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
+AggregateDecl * buildAggregate( const TypeData * td, std::list< Attribute * > attributes ) {
         assert( td->kind == TypeData::Aggregate );
         AggregateDecl * at;
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
-                if ( td->aggregate.tagged ) {
-                        at = new StructDecl( *td->aggregate.name, td->aggregate.parent, attributes, linkage );
-                        buildForall( td->aggregate.params, at->get_parameters() );
-                        break;
+                }
           case DeclarationNode::Coroutine:
           case DeclarationNode::Monitor:
           case DeclarationNode::Thread:
                 at = new StructDecl( *td->aggregate.name, td->aggregate.kind, attributes, linkage );
+                at = new StructDecl( *td->aggregate.name, td->aggregate.kind, attributes );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
 …
 } // buildAggregate
 ReferenceToType * buildComAggInst( const TypeData * type, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
+ReferenceToType * buildComAggInst( const TypeData * type, std::list< Attribute * > attributes ) {
         switch ( type->kind ) {
           case TypeData::Enum: {
 …
                   ReferenceToType * ret;
                   if ( type->aggregate.body ) {
                           AggregateDecl * typedecl = buildAggregate( type, attributes, linkage );
+                          AggregateDecl * typedecl = buildAggregate( type, attributes );
                           switch ( type->aggregate.kind ) {
                                 case DeclarationNode::Struct:
 …
                 if ( cur->has_enumeratorValue() ) {
                         ObjectDecl * member = dynamic_cast< ObjectDecl * >(* members);
                         member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ) ) );
+                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), list< Expression * >() ) );
                 } // if
         } // for
 …
 TupleType * buildTuple( const TypeData * td ) {
         assert( td->kind == TypeData::Tuple );
+        std::list< Type * > types;
+        buildTypeList( td->tuple, types );
+        TupleType * ret = new TupleType( buildQualifiers( td ), types );
+        TupleType * ret = new TupleType( buildQualifiers( td ) );
+        buildTypeList( td->tuple, ret->get_types() );
         buildForall( td->forall, ret->get_forall() );
         return ret;
 …
                 return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {
                 return buildAggregate( td, attributes, linkage );
+                return buildAggregate( td, attributes );
         } else if ( td->kind == TypeData::Enum ) {
                 return buildEnum( td, attributes );

src/Parser/TypeData.h

-              rb826e6b
+              rfea3faa
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul 14 16:57:00 2017
 // Update Count     : 187
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Mar 16 08:32:39 2017
+// Update Count     : 185
 //
 …
                 DeclarationNode * fields;
                 bool body;
-                bool tagged;
-                const std::string * parent;
         };
 …
 ArrayType * buildArray( const TypeData * );
 AggregateDecl * buildAggregate( const TypeData *, std::list< Attribute * > );
 ReferenceToType * buildComAggInst( const TypeData *, std::list< Attribute * > attributes, LinkageSpec::Spec linkage );
+ReferenceToType * buildComAggInst( const TypeData *, std::list< Attribute * > attributes );
 ReferenceToType * buildAggInst( const TypeData * );
 TypeDecl * buildVariable( const TypeData * );

src/Parser/TypedefTable.h

-              rb826e6b
+              rfea3faa
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jun 28 21:56:34 2017
 // Update Count     : 33
+// Last Modified On : Mon Aug 15 18:25:04 2016
+// Update Count     : 28
 //
 …
 #include <stack>
 #include "ParserTypes.h"
 #include "parser.hh"
+#include "lex.h"
+#include "parser.h"
 class TypedefTable {

src/Parser/lex.ll

-              rb826e6b
+              rfea3faa
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
  * Last Modified On : Tue Jul 18 07:11:48 2017
  * Update Count     : 544
+ * Last Modified On : Tue May 30 22:00:48 2017
+ * Update Count     : 527
  */
 …
 #include <cstdio>                                                                               // FILENAME_MAX
+#include "lex.h"
+#include "parser.h"                                                                             // YACC generated definitions based on C++ grammar
 #include "ParseNode.h"
 #include "TypedefTable.h"
 …
+}
-// Stop warning due to incorrectly generated flex code.
-#pragma GCC diagnostic ignored "-Wsign-compare"
 %}
 …
 op_unary {op_unary_only}|{op_unary_binary}|{op_unary_pre_post}
 op_binary_only "/"|"%"|"\\"|"^"|"&"|"|"|"<"|">"|"="|"=="|"!="|"<<"|">>"|"<="|">="|"+="|"-="|"*="|"/="|"%="|"\\="|"&="|"|="|"^="|"<<="|">>="
+op_binary_only "/"|"%"|"^"|"&"|"|"|"<"|">"|"="|"=="|"!="|"<<"|">>"|"<="|">="|"+="|"-="|"*="|"/="|"%="|"&="|"|="|"^="|"<<="|">>="
 op_binary_over {op_unary_binary}|{op_binary_only}
                                 // op_binary_not_over "?"|"->"|"."|"&&"|"||"|"@="
 …
 %%
                                 /* line directives */
+                                   /* line directives */
 ^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["].*"\n" {
         /* " stop highlighting */
 …
 int                             { KEYWORD_RETURN(INT); }
 __int128                { KEYWORD_RETURN(INT); }                                // GCC
-__int128_t              { KEYWORD_RETURN(INT); }                                // GCC
 __label__               { KEYWORD_RETURN(LABEL); }                              // GCC
 long                    { KEYWORD_RETURN(LONG); }
 …
 __typeof                { KEYWORD_RETURN(TYPEOF); }                             // GCC
 __typeof__              { KEYWORD_RETURN(TYPEOF); }                             // GCC
-__uint128_t             { KEYWORD_RETURN(INT); }                                // GCC
 union                   { KEYWORD_RETURN(UNION); }
 unsigned                { KEYWORD_RETURN(UNSIGNED); }
 …
 __volatile__    { KEYWORD_RETURN(VOLATILE); }                   // GCC
 while                   { KEYWORD_RETURN(WHILE); }
-with                    { KEYWORD_RETURN(WITH); }                               // CFA
 zero_t                  { NUMERIC_RETURN(ZERO_T); }                             // CFA
 …
 "-"                             { ASCIIOP_RETURN(); }
 "*"                             { ASCIIOP_RETURN(); }
-"\\"                    { ASCIIOP_RETURN(); }                                   // CFA, exponentiation
 "/"                             { ASCIIOP_RETURN(); }
 "%"                             { ASCIIOP_RETURN(); }
 …
 "+="                    { NAMEDOP_RETURN(PLUSassign); }
 "-="                    { NAMEDOP_RETURN(MINUSassign); }
-"\\="                   { NAMEDOP_RETURN(EXPassign); }                  // CFA, exponentiation
 "*="                    { NAMEDOP_RETURN(MULTassign); }
 "/="                    { NAMEDOP_RETURN(DIVassign); }

src/Parser/module.mk

-              rb826e6b
+              rfea3faa
 ## Created On       : Sat May 16 15:29:09 2015
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Wed Jun 28 21:58:29 2017
 ## Update Count     : 104
+## Last Modified On : Tue Aug 16 17:28:34 2016
+## Update Count     : 101
 ###############################################################################
 BUILT_SOURCES = Parser/parser.hh
+BUILT_SOURCES = Parser/parser.h
 AM_YFLAGS = -d -t -v
 …
        Parser/TypeData.cc \
        Parser/LinkageSpec.cc \
        Parser/parserutility.cc
+       Parser/parseutility.cc
 MAINTAINERCLEANFILES += Parser/parser.output

src/Parser/parser.yy

-              rb826e6b
+              rfea3faa
 // file "LICENCE" distributed with Cforall.
 //
 // parser.yy --
+// cfa.y --
 //
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Andrew Beach
 // Last Modified On : Mon Jul 17 12:17:00 2017
 // Update Count     : 2455
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun 12 12:59:00 2017
+// Update Count     : 2402
 //
 …
 #include <cstdio>
 #include <stack>
+#include "lex.h"
+#include "parser.h"
 #include "ParseNode.h"
 #include "TypedefTable.h"
 …
 bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 %}
-// Types declaration
-%union
+{
-        Token tok;
-        ParseNode * pn;
-        ExpressionNode * en;
-        DeclarationNode * decl;
-        DeclarationNode::Aggregate aggKey;
-        DeclarationNode::TypeClass tclass;
-        StatementNode * sn;
-        ConstantExpr * constant;
-        ForCtl * fctl;
-        LabelNode * label;
-        InitializerNode * in;
-        OperKinds op;
-        std::string * str;
-        bool flag;
-        CatchStmt::Kind catch_kind;
+}
 //************************* TERMINAL TOKENS ********************************
 …
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
 %token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT WITH   // CFA
+%token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT        // CFA
 %token ASM                                                                                              // C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
 %token ALIGNAS ALIGNOF GENERIC STATICASSERT                             // C11
 …
 %token ELLIPSIS                                                                                 // ...
 %token EXPassign        MULTassign      DIVassign       MODassign       // \=   *=      /=      %=
+%token MULTassign       DIVassign       MODassign                               // *=   /=      %=/
 %token PLUSassign       MINUSassign                                                     // +=   -=
 %token LSassign         RSassign                                                        // <<=  >>=
 …
 %token ATassign                                                                                 // @=
+// Types declaration
+%union
+{
+        Token tok;
+        ParseNode * pn;
+        ExpressionNode * en;
+        DeclarationNode * decl;
+        DeclarationNode::Aggregate aggKey;
+        DeclarationNode::TypeClass tclass;
+        StatementNode * sn;
+        ConstantExpr * constant;
+        ForCtl * fctl;
+        LabelNode * label;
+        InitializerNode * in;
+        OperKinds op;
+        std::string * str;
+        bool flag;
+}
 %type<tok> identifier  no_attr_identifier  zero_one
 …
 %type<op> ptrref_operator                               unary_operator                          assignment_operator
 %type<en> primary_expression                    postfix_expression                      unary_expression
+%type<en> cast_expression                               exponential_expression          multiplicative_expression       additive_expression
+%type<en> shift_expression                              relational_expression           equality_expression
+%type<en> AND_expression                                exclusive_OR_expression         inclusive_OR_expression
+%type<en> logical_AND_expression                logical_OR_expression
+%type<en> conditional_expression                constant_expression                     assignment_expression           assignment_expression_opt
+%type<en> cast_expression                               multiplicative_expression       additive_expression                     shift_expression
+%type<en> relational_expression                 equality_expression                     AND_expression                          exclusive_OR_expression
+%type<en> inclusive_OR_expression               logical_AND_expression          logical_OR_expression           conditional_expression
+%type<en> constant_expression                   assignment_expression           assignment_expression_opt
 %type<en> comma_expression                              comma_expression_opt
 %type<en> argument_expression_list              argument_expression                     default_initialize_opt
+%type<en> argument_expression_list              argument_expression                     assignment_opt
 %type<fctl> for_control_expression
 %type<en> subrange
 …
 // statements
 %type<sn> labeled_statement                             compound_statement                      expression_statement            selection_statement
+%type<sn> iteration_statement                   jump_statement
+%type<sn> with_statement                                exception_statement                     asm_statement
+%type<sn> iteration_statement                   jump_statement                          exception_statement                     asm_statement
 %type<sn> fall_through_opt                              fall_through
 %type<sn> statement                                             statement_list
 %type<sn> block_item_list                               block_item
 %type<sn> with_clause_opt
+%type<sn> case_clause
 %type<en> case_value
 %type<sn> case_clause                                   case_value_list                         case_label                                      case_label_list
+%type<sn> case_value_list                               case_label                                      case_label_list
 %type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
 %type<sn> /* handler_list */                    handler_clause                          finally_clause
-%type<catch_kind> handler_key
 // declarations
 …
+        ;
 exponential_expression:
+multiplicative_expression:
         cast_expression
+        | exponential_expression '\\' cast_expression
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Exp, $1, $3 ) ); }
+        ;
+multiplicative_expression:
+        exponential_expression
+        | multiplicative_expression '*' exponential_expression
+        | multiplicative_expression '*' cast_expression
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Mul, $1, $3 ) ); }
         | multiplicative_expression '/' exponential_expression
+        | multiplicative_expression '/' cast_expression
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Div, $1, $3 ) ); }
         | multiplicative_expression '%' exponential_expression
+        | multiplicative_expression '%' cast_expression
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Mod, $1, $3 ) ); }
+        ;
 …
         '='                                                                                     { $$ = OperKinds::Assign; }
         | ATassign                                                                      { $$ = OperKinds::AtAssn; }
-        | EXPassign                                                                     { $$ = OperKinds::ExpAssn; }
         | MULTassign                                                            { $$ = OperKinds::MulAssn; }
         | DIVassign                                                                     { $$ = OperKinds::DivAssn; }
 …
         | iteration_statement
         | jump_statement
-        | with_statement
         | exception_statement
         | asm_statement
 …
+        ;
-with_statement:
-        WITH '(' tuple_expression_list ')' compound_statement
-                { $$ = (StatementNode *)0; }                                    // FIX ME
+        ;
 exception_statement:
         TRY compound_statement handler_clause
 …
 handler_clause:
+        // TEMPORARY, TEST EXCEPTIONS
+        handler_key '(' push push INTEGERconstant pop ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( $1, nullptr, new ExpressionNode( build_constantInteger( *$5 ) ), $8 ) ); }
+        | handler_clause handler_key '(' push push INTEGERconstant pop ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, nullptr, new ExpressionNode( build_constantInteger( *$6 ) ), $9 ) ) ); }
+        | handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( $1, $5, nullptr, $9 ) ); }
+        | handler_clause handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, nullptr, $10 ) ) ); }
+        ;
+handler_predicate_opt:
+        //empty
+        | ';' conditional_expression
+        ;
+handler_key:
+        CATCH
+                { $$ = CatchStmt::Terminate; }
+        | CATCHRESUME
+                { $$ = CatchStmt::Resume; }
+        CATCH '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( CatchStmt::Terminate, $5, nullptr, $8 ) ); }
+        | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Terminate, $6, nullptr, $9 ) ) ); }
+        | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( CatchStmt::Resume, $5, nullptr, $8 ) ); }
+        | handler_clause CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Resume, $6, nullptr, $9 ) ) ); }
+        ;
 …
         | aggregate_key attribute_list_opt typegen_name         // CFA
                 { $$ = $3->addQualifiers( $2 ); }
-// Temp, testing TreeStruct
-    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name
+        {
-            typedefTable.makeTypedef( *$4 );            // create typedef
-            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
-            forall = false;                             // reset
+        }
-      '{' field_declaration_list '}'
+        {
-            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
-                $4, nullptr, nullptr, $7, true )->addQualifiers( $3 );
+        }
-    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name TYPEDEFname
+        {
-            typedefTable.makeTypedef( *$4 );            // create typedef
-            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
-            forall = false;                             // reset
+        }
-      '{' field_declaration_list '}'
+        {
-            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
-                $4, $5, nullptr, $8, true )->addQualifiers( $3 );
+        }
+        ;
 …
 cfa_parameter_declaration:                                                              // CFA, new & old style parameter declaration
         parameter_declaration
         | cfa_identifier_parameter_declarator_no_tuple identifier_or_type_name default_initialize_opt
+        | cfa_identifier_parameter_declarator_no_tuple identifier_or_type_name assignment_opt
                 { $$ = $1->addName( $2 ); }
         | cfa_abstract_tuple identifier_or_type_name default_initialize_opt
+        | cfa_abstract_tuple identifier_or_type_name assignment_opt
                 // To obtain LR(1), these rules must be duplicated here (see cfa_abstract_declarator).
                 { $$ = $1->addName( $2 ); }
         | type_qualifier_list cfa_abstract_tuple identifier_or_type_name default_initialize_opt
+        | type_qualifier_list cfa_abstract_tuple identifier_or_type_name assignment_opt
                 { $$ = $2->addName( $3 )->addQualifiers( $1 ); }
         | cfa_function_specifier
 …
 parameter_declaration:
                 // No SUE declaration in parameter list.
         declaration_specifier_nobody identifier_parameter_declarator default_initialize_opt
+        declaration_specifier_nobody identifier_parameter_declarator assignment_opt
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
+                }
         | declaration_specifier_nobody type_parameter_redeclarator default_initialize_opt
+        | declaration_specifier_nobody type_parameter_redeclarator assignment_opt
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 abstract_parameter_declaration:
         declaration_specifier_nobody default_initialize_opt
+        declaration_specifier_nobody assignment_opt
                 { $$ = $1->addInitializer( $2 ? new InitializerNode( $2 ) : nullptr ); }
         | declaration_specifier_nobody abstract_parameter_declarator default_initialize_opt
+        | declaration_specifier_nobody abstract_parameter_declarator assignment_opt
                 { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
+        ;
 …
+                {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
                         linkage = LinkageSpec::linkageUpdate( linkage, $2 );
+                        linkage = LinkageSpec::linkageCheck( $2 );
+                }
           '{' external_definition_list_opt '}'
 …
+        ;
-with_clause_opt:
-        // empty
-                { $$ = (StatementNode *)0; }                                    // FIX ME
-        | WITH '(' tuple_expression_list ')'
-                { $$ = (StatementNode *)0; }                                    // FIX ME
+        ;
 function_definition:
         cfa_function_declaration with_clause_opt compound_statement     // CFA
+        cfa_function_declaration compound_statement                     // CFA
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $1->addFunctionBody( $3 );
+                }
         | declaration_specifier function_declarator with_clause_opt compound_statement
+                        $$ = $1->addFunctionBody( $2 );
+                }
+        | declaration_specifier function_declarator compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addFunctionBody( $4 )->addType( $1 );
+                }
         | type_qualifier_list function_declarator with_clause_opt compound_statement
+                        $$ = $2->addFunctionBody( $3 )->addType( $1 );
+                }
+        | type_qualifier_list function_declarator compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
+                }
         | declaration_qualifier_list function_declarator with_clause_opt compound_statement
+                        $$ = $2->addFunctionBody( $3 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list function_declarator compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
+                }
         | declaration_qualifier_list type_qualifier_list function_declarator with_clause_opt compound_statement
+                        $$ = $2->addFunctionBody( $3 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list type_qualifier_list function_declarator compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $3->addFunctionBody( $5 )->addQualifiers( $2 )->addQualifiers( $1 );
+                        $$ = $3->addFunctionBody( $4 )->addQualifiers( $2 )->addQualifiers( $1 );
+                }
                 // Old-style K&R function definition, OBSOLESCENT (see 4)
         | declaration_specifier KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+        | declaration_specifier KR_function_declarator push KR_declaration_list_opt compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addType( $1 );
+                }
         | type_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $5 )->addType( $1 );
+                }
+        | type_qualifier_list KR_function_declarator push KR_declaration_list_opt compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $1 );
+                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $5 )->addQualifiers( $1 );
+                }
                 // Old-style K&R function definition with "implicit int" type_specifier, OBSOLESCENT (see 4)
         | declaration_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+        | declaration_qualifier_list KR_function_declarator push KR_declaration_list_opt compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $1 );
+                }
         | declaration_qualifier_list type_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $5 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list type_qualifier_list KR_function_declarator push KR_declaration_list_opt compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $3->addOldDeclList( $5 )->addFunctionBody( $7 )->addQualifiers( $2 )->addQualifiers( $1 );
+                        $$ = $3->addOldDeclList( $5 )->addFunctionBody( $6 )->addQualifiers( $2 )->addQualifiers( $1 );
+                }
+        ;
 …
         | TYPEGENname
         | CONST
                 { $$ = Token{ new string( "__const__" ), { nullptr, -1 } }; }
+                { $$ = Token{ new string( "__const__" ) }; }
+        ;
 …
+        ;
 default_initialize_opt:
+assignment_opt:
         // empty
                 { $$ = nullptr; }

src/ResolvExpr/AlternativeFinder.cc

-              rb826e6b
+              rfea3faa
 //          )
                 SymTab::Indexer decls( indexer );
                 // PRINT(
                 //      std::cerr << "============= original indexer" << std::endl;
                 //      indexer.print( std::cerr );
                 //      std::cerr << "============= new indexer" << std::endl;
                 //      decls.print( std::cerr );
                 // )
+                PRINT(
+                        std::cerr << "============= original indexer" << std::endl;
+                        indexer.print( std::cerr );
+                        std::cerr << "============= new indexer" << std::endl;
+                        decls.print( std::cerr );
+                )
                 addToIndexer( have, decls );
                 AssertionSet newNeed;
 …
+        }
-        Expression * restructureCast( Expression * argExpr, Type * toType ) {
-                if ( argExpr->get_result()->size() > 1 && ! toType->isVoid() ) {
-                        // Argument expression is a tuple and the target type is not void. Cast each member of the tuple
-                        // to its corresponding target type, producing the tuple of those cast expressions. If there are
-                        // more components of the tuple than components in the target type, then excess components do not
-                        // come out in the result expression (but UniqueExprs ensure that side effects will still be done).
-                        if ( Tuples::maybeImpure( argExpr ) && ! dynamic_cast< UniqueExpr * >( argExpr ) ) {
-                                // expressions which may contain side effects require a single unique instance of the expression.
-                                argExpr = new UniqueExpr( argExpr );
+                        }
-                        std::list< Expression * > componentExprs;
-                        for ( unsigned int i = 0; i < toType->size(); i++ ) {
-                                // cast each component
-                                TupleIndexExpr * idx = new TupleIndexExpr( argExpr->clone(), i );
-                                componentExprs.push_back( restructureCast( idx, toType->getComponent( i ) ) );
+                        }
-                        delete argExpr;
-                        assert( componentExprs.size() > 0 );
-                        // produce the tuple of casts
-                        return new TupleExpr( componentExprs );
-                } else {
-                        // handle normally
-                        return new CastExpr( argExpr, toType->clone() );
+                }
+        }
         void AlternativeFinder::visit( CastExpr *castExpr ) {
                 Type *& toType = castExpr->get_result();
 …
                                 thisCost += Cost( 0, 0, discardedValues );
+                                candidates.push_back( Alternative( restructureCast( i->expr->clone(), toType ), i->env, i->cost, thisCost ) );
+                                Expression * argExpr = i->expr->clone();
+                                if ( argExpr->get_result()->size() > 1 && ! castExpr->get_result()->isVoid() ) {
+                                        // Argument expression is a tuple and the target type is not void. Cast each member of the tuple
+                                        // to its corresponding target type, producing the tuple of those cast expressions. If there are
+                                        // more components of the tuple than components in the target type, then excess components do not
+                                        // come out in the result expression (but UniqueExprs ensure that side effects will still be done).
+                                        if ( Tuples::maybeImpure( argExpr ) && ! dynamic_cast< UniqueExpr * >( argExpr ) ) {
+                                                // expressions which may contain side effects require a single unique instance of the expression.
+                                                argExpr = new UniqueExpr( argExpr );
+                                        }
+                                        std::list< Expression * > componentExprs;
+                                        for ( unsigned int i = 0; i < castExpr->get_result()->size(); i++ ) {
+                                                // cast each component
+                                                TupleIndexExpr * idx = new TupleIndexExpr( argExpr->clone(), i );
+                                                componentExprs.push_back( new CastExpr( idx, castExpr->get_result()->getComponent( i )->clone() ) );
+                                        }
+                                        delete argExpr;
+                                        assert( componentExprs.size() > 0 );
+                                        // produce the tuple of casts
+                                        candidates.push_back( Alternative( new TupleExpr( componentExprs ), i->env, i->cost, thisCost ) );
+                                } else {
+                                        // handle normally
+                                        candidates.push_back( Alternative( new CastExpr( argExpr->clone(), toType->clone() ), i->env, i->cost, thisCost ) );
+                                }
                         } // if
                 } // for
 …
+        }
-        void AlternativeFinder::visit( UntypedInitExpr *initExpr ) {
-                // handle each option like a cast
-                AltList candidates;
-                PRINT( std::cerr << "untyped init expr: " << initExpr << std::endl; )
-                // O(N^2) checks of d-types with e-types
-                for ( InitAlternative & initAlt : initExpr->get_initAlts() ) {
-                        Type * toType = resolveTypeof( initAlt.type, indexer );
-                        SymTab::validateType( toType, &indexer );
-                        adjustExprType( toType, env, indexer );
-                        // Ideally the call to findWithAdjustment could be moved out of the loop, but unfortunately it currently has to occur inside or else
-                        // polymorphic return types are not properly bound to the initialization type, since return type variables are only open for the duration of resolving
-                        // the UntypedExpr. This is only actually an issue in initialization contexts that allow more than one possible initialization type, but it is still suboptimal.
-                        AlternativeFinder finder( indexer, env );
-                        finder.targetType = toType;
-                        finder.findWithAdjustment( initExpr->get_expr() );
-                        for ( Alternative & alt : finder.get_alternatives() ) {
-                                TypeEnvironment newEnv( alt.env );
-                                AssertionSet needAssertions, haveAssertions;
-                                OpenVarSet openVars;  // find things in env that don't have a "representative type" and claim those are open vars?
-                                PRINT( std::cerr << "  @ " << toType << " " << initAlt.designation << std::endl; )
-                                // It's possible that a cast can throw away some values in a multiply-valued expression.  (An example is a
-                                // cast-to-void, which casts from one value to zero.)  Figure out the prefix of the subexpression results
-                                // that are cast directly.  The candidate is invalid if it has fewer results than there are types to cast
-                                // to.
-                                int discardedValues = alt.expr->get_result()->size() - toType->size();
-                                if ( discardedValues < 0 ) continue;
-                                // xxx - may need to go into tuple types and extract relevant types and use unifyList. Note that currently, this does not
-                                // allow casting a tuple to an atomic type (e.g. (int)([1, 2, 3]))
-                                // unification run for side-effects
-                                unify( toType, alt.expr->get_result(), newEnv, needAssertions, haveAssertions, openVars, indexer ); // xxx - do some inspecting on this line... why isn't result bound to initAlt.type??
-                                Cost thisCost = castCost( alt.expr->get_result(), toType, indexer, newEnv );
-                                if ( thisCost != Cost::infinity ) {
-                                        // count one safe conversion for each value that is thrown away
-                                        thisCost += Cost( 0, 0, discardedValues );
-                                        candidates.push_back( Alternative( new InitExpr( restructureCast( alt.expr->clone(), toType ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost ) );
+                                }
+                        }
+                }
-                // findMinCost selects the alternatives with the lowest "cost" members, but has the side effect of copying the
-                // cvtCost member to the cost member (since the old cost is now irrelevant).  Thus, calling findMinCost twice
-                // selects first based on argument cost, then on conversion cost.
-                AltList minArgCost;
-                findMinCost( candidates.begin(), candidates.end(), std::back_inserter( minArgCost ) );
-                findMinCost( minArgCost.begin(), minArgCost.end(), std::back_inserter( alternatives ) );
+        }
 } // namespace ResolvExpr

src/ResolvExpr/AlternativeFinder.h

rb826e6b	rfea3faa
73	73	virtual void visit( UniqueExpr *unqExpr );
74	74	virtual void visit( StmtExpr *stmtExpr );
75		~~virtual void visit( UntypedInitExpr *initExpr );~~
76	75	/// Runs a new alternative finder on each element in [begin, end)
77	76	/// and writes each alternative finder to out.

src/ResolvExpr/Resolver.cc

-              rb826e6b
+              rfea3faa
 //
 #include <iostream>
+#include "Resolver.h"
+#include "AlternativeFinder.h"
 #include "Alternative.h"
-#include "AlternativeFinder.h"
-#include "CurrentObject.h"
 #include "RenameVars.h"
-#include "Resolver.h"
 #include "ResolveTypeof.h"
 #include "typeops.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
 #include "SynTree/Expression.h"
 #include "SynTree/Initializer.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
+#include "SymTab/Indexer.h"
 #include "SymTab/Autogen.h"
-#include "SymTab/Indexer.h"
 #include "Common/utility.h"
 #include "InitTweak/InitTweak.h"
+#include <iostream>
 using namespace std;
 …
                         if ( const Resolver * res = dynamic_cast< const Resolver * >( &other ) ) {
                                 functionReturn = res->functionReturn;
                                 currentObject = res->currentObject;
+                                initContext = res->initContext;
                                 inEnumDecl = res->inEnumDecl;
+                        }
 …
                 virtual void visit( BranchStmt *branchStmt ) override;
                 virtual void visit( ReturnStmt *returnStmt ) override;
-                virtual void visit( ThrowStmt *throwStmt ) override;
                 virtual void visit( SingleInit *singleInit ) override;
 …
                 Type * functionReturn = nullptr;
                 CurrentObject currentObject = nullptr;
+                Type *initContext = nullptr;
                 bool inEnumDecl = false;
         };
 …
                 // each value of initContext is retained, so the type on the first analysis is preserved and used for selecting
                 // the RHS.
                 ValueGuard<CurrentObject> temp( currentObject );
                 currentObject = CurrentObject( objectDecl->get_type() );
                 if ( inEnumDecl && dynamic_cast< EnumInstType * >( objectDecl->get_type() ) ) {
+                Type *temp = initContext;
+                initContext = new_type;
+                if ( inEnumDecl && dynamic_cast< EnumInstType * >( initContext ) ) {
                         // enumerator initializers should not use the enum type to initialize, since
                         // the enum type is still incomplete at this point. Use signed int instead.
                         currentObject = CurrentObject( new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
+                        initContext = new BasicType( Type::Qualifiers(), BasicType::SignedInt );
+                }
                 Parent::visit( objectDecl );
                 if ( inEnumDecl && dynamic_cast< EnumInstType * >( objectDecl->get_type() ) ) {
+                if ( inEnumDecl && dynamic_cast< EnumInstType * >( initContext ) ) {
                         // delete newly created signed int type
+                        // delete currentObject.getType();
+                }
+                        delete initContext;
+                }
+                initContext = temp;
+        }
 …
         void Resolver::visit( SwitchStmt *switchStmt ) {
                 ValueGuard< CurrentObject > oldCurrentObject( currentObject );
+                ValueGuard< Type * > oldInitContext( initContext );
                 Expression *newExpr;
                 newExpr = findIntegralExpression( switchStmt->get_condition(), *this );
 …
                 switchStmt->set_condition( newExpr );
                 currentObject = CurrentObject( newExpr->get_result() );
+                initContext = newExpr->get_result();
                 Parent::visit( switchStmt );
+        }
 …
         void Resolver::visit( CaseStmt *caseStmt ) {
                 if ( caseStmt->get_condition() ) {
+                        std::list< InitAlternative > initAlts = currentObject.getOptions();
+                        assertf( initAlts.size() == 1, "SwitchStmt did not correctly resolve an integral expression." );
+                        CastExpr * castExpr = new CastExpr( caseStmt->get_condition(), initAlts.front().type->clone() );
+                        assert( initContext );
+                        CastExpr * castExpr = new CastExpr( caseStmt->get_condition(), initContext->clone() );
                         Expression * newExpr = findSingleExpression( castExpr, *this );
                         castExpr = safe_dynamic_cast< CastExpr * >( newExpr );
 …
+        }
-        void Resolver::visit( ThrowStmt *throwStmt ) {
-                if ( throwStmt->get_expr() ) {
-                        Expression * wrapped = new CastExpr( throwStmt->get_expr(), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
-                        Expression * newExpr = findSingleExpression( wrapped, *this );
-                        throwStmt->set_expr( newExpr );
+                }
+        }
         template< typename T >
         bool isCharType( T t ) {
 …
         void Resolver::visit( SingleInit *singleInit ) {
+                // resolve initialization using the possibilities as determined by the currentObject cursor
+                UntypedInitExpr * untyped = new UntypedInitExpr( singleInit->get_value(), currentObject.getOptions() );
+                Expression * newExpr = findSingleExpression( untyped, *this );
+                InitExpr * initExpr = safe_dynamic_cast< InitExpr * >( newExpr );
+                // move cursor to the object that is actually initialized
+                currentObject.setNext( initExpr->get_designation() );
+                // discard InitExpr wrapper and retain relevant pieces
+                newExpr = initExpr->get_expr();
+                newExpr->set_env( initExpr->get_env() );
+                initExpr->set_expr( nullptr );
+                initExpr->set_env( nullptr );
+                delete initExpr;
+                // get the actual object's type (may not exactly match what comes back from the resolver due to conversions)
+                Type * initContext = currentObject.getCurrentType();
+                // check if actual object's type is char[]
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
+                        if ( isCharType( at->get_base() ) ) {
+                                // check if the resolved type is char *
+                                if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_result() ) ) {
+                                        if ( isCharType( pt->get_base() ) ) {
+                                                // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
+                                                CastExpr *ce = safe_dynamic_cast< CastExpr * >( newExpr );
+                                                newExpr = ce->get_arg();
+                                                ce->set_arg( nullptr );
+                                                delete ce;
+                if ( singleInit->get_value() ) {
+                        // // find all the d's
+                        // std::list<Expression *> &designators = singleInit->get_designators();
+                        // std::list<Type *> types1{ initContext }, types2;
+                        // for ( Expression * expr: designators ) {
+                        //      cerr << expr << endl;
+                        //      if ( NameExpr * nexpr = dynamic_cast<NameExpr *>( expr ) ) {
+                        //              for ( Type * type: types1 ) {
+                        //                      cerr << type << endl;
+                        //                      ReferenceToType * fred = dynamic_cast<ReferenceToType *>(type);
+                        //                      std::list<Declaration *> members;
+                        //                      if ( fred ) {
+                        //                              fred->lookup( nexpr->get_name(), members ); // concatenate identical field name
+                        //                              for ( Declaration * mem: members ) {
+                        //                                      if ( DeclarationWithType * dwt = dynamic_cast<DeclarationWithType *>(mem) ) {
+                        //                                              types2.push_back( dwt->get_type() );
+                        //                                      } // if
+                        //                              } // for
+                        //                      } // if
+                        //              } // for
+                        //              types1 = types2;
+                        //              types2.clear();
+                        //      } // if
+                        // } // for
+                        // // for ( Type * type: types1 ) {
+                        // //   cerr << type << endl;
+                        // // } // for
+                        // // O(N^2) checks of d-types with f-types
+                        // // find the minimum cost
+                        CastExpr *castExpr = new CastExpr( singleInit->get_value(), initContext->clone() );
+                        Expression *newExpr = findSingleExpression( castExpr, *this );
+                        delete castExpr;
+                        singleInit->set_value( newExpr );
+                        // check if initializing type is char[]
+                        if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
+                                if ( isCharType( at->get_base() ) ) {
+                                        // check if the resolved type is char *
+                                        if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_result() ) ) {
+                                                if ( isCharType( pt->get_base() ) ) {
+                                                        // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
+                                                        CastExpr *ce = dynamic_cast< CastExpr * >( newExpr );
+                                                        singleInit->set_value( ce->get_arg() );
+                                                        ce->set_arg( NULL );
+                                                        delete ce;
+                                                }
+                                        }
+                                }
+                        }
+                }
+                // set initializer expr to resolved express
+                singleInit->set_value( newExpr );
+                // move cursor to next object in preparation for next initializer
+                currentObject.increment();
+                } // if
+        }
+        template< typename AggrInst >
+        TypeSubstitution makeGenericSubstitutuion( AggrInst * inst ) {
+                assert( inst );
+                assert( inst->get_baseParameters() );
+                std::list< TypeDecl * > baseParams = *inst->get_baseParameters();
+                std::list< Expression * > typeSubs = inst->get_parameters();
+                TypeSubstitution subs( baseParams.begin(), baseParams.end(), typeSubs.begin() );
+                return subs;
+        }
+        ReferenceToType * isStructOrUnion( Type * type ) {
+                if ( StructInstType * sit = dynamic_cast< StructInstType * >( type ) ) {
+                        return sit;
+                } else if ( UnionInstType * uit = dynamic_cast< UnionInstType * >( type ) ) {
+                        return uit;
+                }
+                return nullptr;
+        }
+        void Resolver::resolveSingleAggrInit( Declaration * dcl, InitIterator & init, InitIterator & initEnd, TypeSubstitution sub ) {
+                DeclarationWithType * dt = dynamic_cast< DeclarationWithType * >( dcl );
+                assert( dt );
+                // need to substitute for generic types, so that casts are to concrete types
+                initContext = dt->get_type()->clone();
+                sub.apply( initContext );
+                try {
+                        if ( init == initEnd ) return; // stop when there are no more initializers
+                        (*init)->accept( *this );
+                        ++init; // made it past an initializer
+                } catch( SemanticError & ) {
+                        // need to delve deeper, if you can
+                        if ( ReferenceToType * type = isStructOrUnion( initContext ) ) {
+                                resolveAggrInit( type, init, initEnd );
+                        } else {
+                                // member is not an aggregate type, so can't go any deeper
+                                // might need to rethink what is being thrown
+                                throw;
+                        } // if
+                }
+        }
+        void Resolver::resolveAggrInit( ReferenceToType * inst, InitIterator & init, InitIterator & initEnd ) {
+                if ( StructInstType * sit = dynamic_cast< StructInstType * >( inst ) ) {
+                        TypeSubstitution sub = makeGenericSubstitutuion( sit );
+                        StructDecl * st = sit->get_baseStruct();
+                        if(st->get_members().empty()) return;
+                        // want to resolve each initializer to the members of the struct,
+                        // but if there are more initializers than members we should stop
+                        list< Declaration * >::iterator it = st->get_members().begin();
+                        for ( ; it != st->get_members().end(); ++it) {
+                                resolveSingleAggrInit( *it, init, initEnd, sub );
+                        }
+                } else if ( UnionInstType * uit = dynamic_cast< UnionInstType * >( inst ) ) {
+                        TypeSubstitution sub = makeGenericSubstitutuion( uit );
+                        UnionDecl * un = uit->get_baseUnion();
+                        if(un->get_members().empty()) return;
+                        // only resolve to the first member of a union
+                        resolveSingleAggrInit( *un->get_members().begin(), init, initEnd, sub );
+                } // if
+        }
         void Resolver::visit( ListInit * listInit ) {
+                // move cursor into brace-enclosed initializer-list
+                currentObject.enterListInit();
+                // xxx - fix this so that the list isn't copied, iterator should be used to change current element
+                std::list<Designation *> newDesignations;
+                for ( auto p : group_iterate(listInit->get_designations(), listInit->get_initializers()) ) {
+                        // iterate designations and initializers in pairs, moving the cursor to the current designated object and resolving
+                        // the initializer against that object.
+                        Designation * des = std::get<0>(p);
+                        Initializer * init = std::get<1>(p);
+                        newDesignations.push_back( currentObject.findNext( des ) );
+                        init->accept( *this );
+                }
+                // set the set of 'resolved' designations and leave the brace-enclosed initializer-list
+                listInit->get_designations() = newDesignations; // xxx - memory management
+                currentObject.exitListInit();
+                // xxx - this part has not be folded into CurrentObject yet
+                // } else if ( TypeInstType * tt = dynamic_cast< TypeInstType * >( initContext ) ) {
+                //      Type * base = tt->get_baseType()->get_base();
+                //      if ( base ) {
+                //              // know the implementation type, so try using that as the initContext
+                //              ObjectDecl tmpObj( "", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, base->clone(), nullptr );
+                //              currentObject = &tmpObj;
+                //              visit( listInit );
+                //      } else {
+                //              // missing implementation type -- might be an unknown type variable, so try proceeding with the current init context
+                //              Parent::visit( listInit );
+                //      }
+                // } else {
+                InitIterator iter = listInit->begin();
+                InitIterator end = listInit->end();
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
+                        // resolve each member to the base type of the array
+                        for ( ; iter != end; ++iter ) {
+                                initContext = at->get_base();
+                                (*iter)->accept( *this );
+                        } // for
+                } else if ( TupleType * tt = dynamic_cast< TupleType * > ( initContext ) ) {
+                        for ( Type * t : *tt ) {
+                                if ( iter == end ) break;
+                                initContext = t;
+                                (*iter++)->accept( *this );
+                        }
+                } else if ( ReferenceToType * type = isStructOrUnion( initContext ) ) {
+                        resolveAggrInit( type, iter, end );
+                } else if ( TypeInstType * tt = dynamic_cast< TypeInstType * >( initContext ) ) {
+                        Type * base = tt->get_baseType()->get_base();
+                        if ( base ) {
+                                // know the implementation type, so try using that as the initContext
+                                initContext = base;
+                                visit( listInit );
+                        } else {
+                                // missing implementation type -- might be an unknown type variable, so try proceeding with the current init context
+                                Parent::visit( listInit );
+                        }
+                } else {
+                        assert( dynamic_cast< BasicType * >( initContext ) || dynamic_cast< PointerType * >( initContext )
+                                || dynamic_cast< ZeroType * >( initContext ) || dynamic_cast< OneType * >( initContext ) || dynamic_cast < EnumInstType * > ( initContext ) );
+                        // basic types are handled here
+                        Parent::visit( listInit );
+                }
+#if 0
+                if ( ArrayType *at = dynamic_cast<ArrayType*>(initContext) ) {
+                        std::list<Initializer *>::iterator iter( listInit->begin_initializers() );
+                        for ( ; iter != listInit->end_initializers(); ++iter ) {
+                                initContext = at->get_base();
+                                (*iter)->accept( *this );
+                        } // for
+                } else if ( StructInstType *st = dynamic_cast<StructInstType*>(initContext) ) {
+                        StructDecl *baseStruct = st->get_baseStruct();
+                        std::list<Declaration *>::iterator iter1( baseStruct->get_members().begin() );
+                        std::list<Initializer *>::iterator iter2( listInit->begin_initializers() );
+                        for ( ; iter1 != baseStruct->get_members().end() && iter2 != listInit->end_initializers(); ++iter2 ) {
+                                if ( (*iter2)->get_designators().empty() ) {
+                                        DeclarationWithType *dt = dynamic_cast<DeclarationWithType *>( *iter1 );
+                                        initContext = dt->get_type();
+                                        (*iter2)->accept( *this );
+                                        ++iter1;
+                                } else {
+                                        StructDecl *st = baseStruct;
+                                        iter1 = st->get_members().begin();
+                                        std::list<Expression *>::iterator iter3( (*iter2)->get_designators().begin() );
+                                        for ( ; iter3 != (*iter2)->get_designators().end(); ++iter3 ) {
+                                                NameExpr *key = dynamic_cast<NameExpr *>( *iter3 );
+                                                assert( key );
+                                                for ( ; iter1 != st->get_members().end(); ++iter1 ) {
+                                                        if ( key->get_name() == (*iter1)->get_name() ) {
+                                                                (*iter1)->print( cout );
+                                                                cout << key->get_name() << endl;
+                                                                ObjectDecl *fred = dynamic_cast<ObjectDecl *>( *iter1 );
+                                                                assert( fred );
+                                                                StructInstType *mary = dynamic_cast<StructInstType*>( fred->get_type() );
+                                                                assert( mary );
+                                                                st = mary->get_baseStruct();
+                                                                iter1 = st->get_members().begin();
+                                                                break;
+                                                        } // if
+                                                }  // for
+                                        } // for
+                                        ObjectDecl *fred = dynamic_cast<ObjectDecl *>( *iter1 );
+                                        assert( fred );
+                                        initContext = fred->get_type();
+                                        (*listInit->begin_initializers())->accept( *this );
+                                } // if
+                        } // for
+                } else if ( UnionInstType *st = dynamic_cast<UnionInstType*>(initContext) ) {
+                        DeclarationWithType *dt = dynamic_cast<DeclarationWithType *>( *st->get_baseUnion()->get_members().begin() );
+                        initContext = dt->get_type();
+                        (*listInit->begin_initializers())->accept( *this );
+                } // if
+#endif
+        }

src/ResolvExpr/Unify.cc

-              rb826e6b
+              rfea3faa
                         } else if ( tupleParam ) {
                                 // bundle other parameters into tuple to match
                                 std::list< Type * > binderTypes;
+                                TupleType* binder = new TupleType{ paramTy->get_qualifiers() };
                                 do {
                                         binderTypes.push_back( otherParam->get_type()->clone() );
+                                        binder->get_types().push_back( otherParam->get_type()->clone() );
                                         ++jt;
 …
                                 } while (true);
                                 otherParamTy = new TupleType{ paramTy->get_qualifiers(), binderTypes };
+                                otherParamTy = binder;
                                 ++it;  // skip ttype parameter for break
                         } else if ( otherTupleParam ) {
                                 // bundle parameters into tuple to match other
                                 std::list< Type * > binderTypes;
+                                TupleType* binder = new TupleType{ otherParamTy->get_qualifiers() };
                                 do {
                                         binderTypes.push_back( param->get_type()->clone() );
+                                        binder->get_types().push_back( param->get_type()->clone() );
                                         ++it;
 …
                                 } while (true);
                                 paramTy = new TupleType{ otherParamTy->get_qualifiers(), binderTypes };
+                                paramTy = binder;
                                 ++jt;  // skip ttype parameter for break
+                        }
 …
                         return function->get_returnVals().front()->get_type()->clone();
                 } else {
                         std::list< Type * > types;
+                        TupleType * tupleType = new TupleType( Type::Qualifiers() );
                         for ( DeclarationWithType * decl : function->get_returnVals() ) {
                                 types.push_back( decl->get_type()->clone() );
+                                tupleType->get_types().push_back( decl->get_type()->clone() );
                         } // for
                         return new TupleType( Type::Qualifiers(), types );
+                        return tupleType;
+                }
+        }

src/ResolvExpr/module.mk

-              rb826e6b
+              rfea3faa
 ## file "LICENCE" distributed with Cforall.
 ##
 ## module.mk --
+## module.mk --
 ##
 ## Author           : Richard C. Bilson
 …
        ResolvExpr/PolyCost.cc \
        ResolvExpr/Occurs.cc \
+       ResolvExpr/TypeEnvironment.cc \
+       ResolvExpr/CurrentObject.cc
+       ResolvExpr/TypeEnvironment.cc

src/SymTab/Autogen.cc

-              rb826e6b
+              rfea3faa
 // Author           : Rob Schluntz
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul 14 16:41:00 2017
 // Update Count     : 62
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 17 09:41:08 2017
+// Update Count     : 60
 //
 …
         /// generates struct constructors, destructor, and assignment functions
         void makeStructFunctions( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, std::list< Declaration * > & declsToAdd, const std::vector< FuncData > & data ) {
-                // Builtins do not use autogeneration.
-                if ( aggregateDecl->get_linkage() == LinkageSpec::BuiltinCFA ||
-                         aggregateDecl->get_linkage() == LinkageSpec::BuiltinC ) {
-                        return;
+                }
                 // Make function polymorphic in same parameters as generic struct, if applicable
                 const std::list< TypeDecl* > & typeParams = aggregateDecl->get_parameters(); // List of type variables to be placed on the generated functions

src/SymTab/Autogen.h

-              rb826e6b
+              rfea3faa
 namespace SymTab {
         /// Generates assignment operators, constructors, and destructor for aggregate types as required
         void autogenerateRoutines( std::list< Declaration * > &translationUnit );
+    /// Generates assignment operators, constructors, and destructor for aggregate types as required
+    void autogenerateRoutines( std::list< Declaration * > &translationUnit );
         /// returns true if obj's name is the empty string and it has a bitfield width
         bool isUnnamedBitfield( ObjectDecl * obj );
+    /// returns true if obj's name is the empty string and it has a bitfield width
+    bool isUnnamedBitfield( ObjectDecl * obj );
         /// size_t type - set when size_t typedef is seen. Useful in a few places,
         /// such as in determining array dimension type
         extern Type * SizeType;
+    /// size_t type - set when size_t typedef is seen. Useful in a few places,
+    /// such as in determining array dimension type
+    extern Type * SizeType;
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
         template< typename OutputIterator >
+    /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
+    template< typename OutputIterator >
         Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false, bool forward = true );
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Should only be called with non-array types.
         /// optionally returns a statement which must be inserted prior to the containing loop, if there is one
         template< typename OutputIterator >
+    /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Should only be called with non-array types.
+    /// optionally returns a statement which must be inserted prior to the containing loop, if there is one
+    template< typename OutputIterator >
         Statement * genScalarCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false ) {
         // want to be able to generate assignment, ctor, and dtor generically,
 …
         dstParam = new AddressExpr( dstParam );
         if ( addCast ) {
+                // cast to T* with qualifiers removed, so that qualified objects can be constructed
+                // and destructed with the same functions as non-qualified objects.
+                // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
+                // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
+                // remove lvalue as a qualifier, this can change to
+                //   type->get_qualifiers() = Type::Qualifiers();
+                assert( type );
+                Type * castType = type->clone();
+                castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
+                castType->set_lvalue( true ); // xxx - might not need this
+                dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
+            // cast to T* with qualifiers removed, so that qualified objects can be constructed
+            // and destructed with the same functions as non-qualified objects.
+            // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
+            // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
+            // remove lvalue as a qualifier, this can change to
+            //   type->get_qualifiers() = Type::Qualifiers();
+            assert( type );
+            Type * castType = type->clone();
+//                      castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
+            castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
+            castType->set_lvalue( true ); // xxx - might not need this
+            dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
+        }
         fExpr->get_args().push_back( dstParam );
 …
         return listInit;
+    }
+    /// Store in out a loop which calls fname on each element of the array with srcParam and dstParam as arguments.
+    /// If forward is true, loop goes from 0 to N-1, else N-1 to 0
+    template< typename OutputIterator >
+        void genArrayCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, bool addCast = false, bool forward = true ) {
+        static UniqueName indexName( "_index" );
+        // for a flexible array member nothing is done -- user must define own assignment
+        if ( ! array->get_dimension() ) return ;
+        Expression * begin, * end, * update, * cmp;
+        if ( forward ) {
+            // generate: for ( int i = 0; i < N; ++i )
+            begin = new ConstantExpr( Constant::from_int( 0 ) );
+            end = array->get_dimension()->clone();
+            cmp = new NameExpr( "?<?" );
+            update = new NameExpr( "++?" );
+        } else {
+            // generate: for ( int i = N-1; i >= 0; --i )
+            begin = new UntypedExpr( new NameExpr( "?-?" ) );
+            ((UntypedExpr*)begin)->get_args().push_back( array->get_dimension()->clone() );
+            ((UntypedExpr*)begin)->get_args().push_back( new ConstantExpr( Constant::from_int( 1 ) ) );
+            end = new ConstantExpr( Constant::from_int( 0 ) );
+            cmp = new NameExpr( "?>=?" );
+            update = new NameExpr( "--?" );
+        }
+        /// Store in out a loop which calls fname on each element of the array with srcParam and dstParam as arguments.
+        /// If forward is true, loop goes from 0 to N-1, else N-1 to 0
+        template< typename OutputIterator >
+        void genArrayCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, bool addCast = false, bool forward = true ) {
+                static UniqueName indexName( "_index" );
+        ObjectDecl *index = new ObjectDecl( indexName.newName(), Type::StorageClasses(), LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), new SingleInit( begin, std::list<Expression*>() ) );
+                // for a flexible array member nothing is done -- user must define own assignment
+                if ( ! array->get_dimension() ) return ;
+        UntypedExpr *cond = new UntypedExpr( cmp );
+        cond->get_args().push_back( new VariableExpr( index ) );
+        cond->get_args().push_back( end );
+                Expression * begin, * end, * update, * cmp;
+                if ( forward ) {
+                        // generate: for ( int i = 0; i < N; ++i )
+                        begin = new ConstantExpr( Constant::from_int( 0 ) );
+                        end = array->get_dimension()->clone();
+                        cmp = new NameExpr( "?<?" );
+                        update = new NameExpr( "++?" );
+                } else {
+                        // generate: for ( int i = N-1; i >= 0; --i )
+                        begin = new UntypedExpr( new NameExpr( "?-?" ) );
+                        ((UntypedExpr*)begin)->get_args().push_back( array->get_dimension()->clone() );
+                        ((UntypedExpr*)begin)->get_args().push_back( new ConstantExpr( Constant::from_int( 1 ) ) );
+                        end = new ConstantExpr( Constant::from_int( 0 ) );
+                        cmp = new NameExpr( "?>=?" );
+                        update = new NameExpr( "--?" );
+                }
+        UntypedExpr *inc = new UntypedExpr( update );
+        inc->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
+                ObjectDecl *index = new ObjectDecl( indexName.newName(), Type::StorageClasses(), LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), new SingleInit( begin ) );
+        UntypedExpr *dstIndex = new UntypedExpr( new NameExpr( "?[?]" ) );
+        dstIndex->get_args().push_back( dstParam );
+        dstIndex->get_args().push_back( new VariableExpr( index ) );
+        dstParam = dstIndex;
                 UntypedExpr *cond = new UntypedExpr( cmp );
                 cond->get_args().push_back( new VariableExpr( index ) );
                 cond->get_args().push_back( end );
+        // srcParam must keep track of the array indices to build the
+        // source parameter and/or array list initializer
+        srcParam.addArrayIndex( new VariableExpr( index ), array->get_dimension()->clone() );
+                UntypedExpr *inc = new UntypedExpr( update );
+                inc->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
+        // for stmt's body, eventually containing call
+        CompoundStmt * body = new CompoundStmt( noLabels );
+        Statement * listInit = genCall( srcParam, dstParam, fname, back_inserter( body->get_kids() ), array->get_base(), addCast, forward );
+                UntypedExpr *dstIndex = new UntypedExpr( new NameExpr( "?[?]" ) );
+                dstIndex->get_args().push_back( dstParam );
+                dstIndex->get_args().push_back( new VariableExpr( index ) );
+                dstParam = dstIndex;
+        // block containing for stmt and index variable
+        std::list<Statement *> initList;
+        CompoundStmt * block = new CompoundStmt( noLabels );
+        block->get_kids().push_back( new DeclStmt( noLabels, index ) );
+        if ( listInit ) block->get_kids().push_back( listInit );
+        block->get_kids().push_back( new ForStmt( noLabels, initList, cond, inc, body ) );
+                // srcParam must keep track of the array indices to build the
+                // source parameter and/or array list initializer
+                srcParam.addArrayIndex( new VariableExpr( index ), array->get_dimension()->clone() );
+        *out++ = block;
+    }
+                // for stmt's body, eventually containing call
+                CompoundStmt * body = new CompoundStmt( noLabels );
+                Statement * listInit = genCall( srcParam, dstParam, fname, back_inserter( body->get_kids() ), array->get_base(), addCast, forward );
+    template< typename OutputIterator >
+        Statement * genCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast, bool forward ) {
+        if ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
+            genArrayCall( srcParam, dstParam, fname, out, at, addCast, forward );
+            return 0;
+        } else {
+            return genScalarCall( srcParam, dstParam, fname, out, type, addCast );
+        }
+    }
+                // block containing for stmt and index variable
+                std::list<Statement *> initList;
+                CompoundStmt * block = new CompoundStmt( noLabels );
+                block->get_kids().push_back( new DeclStmt( noLabels, index ) );
+                if ( listInit ) block->get_kids().push_back( listInit );
+                block->get_kids().push_back( new ForStmt( noLabels, initList, cond, inc, body ) );
+    /// inserts into out a generated call expression to function fname with arguments dstParam
+    /// and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls. decl is the
+    /// object being constructed. The function wraps constructor and destructor calls in an
+    /// ImplicitCtorDtorStmt node.
+    template< typename OutputIterator >
+        void genImplicitCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, DeclarationWithType * decl, bool forward = true ) {
+        ObjectDecl *obj = dynamic_cast<ObjectDecl *>( decl );
+        assert( obj );
+        // unnamed bit fields are not copied as they cannot be accessed
+        if ( isUnnamedBitfield( obj ) ) return;
+                *out++ = block;
+        bool addCast = (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) );
+        std::list< Statement * > stmts;
+        genCall( srcParam, dstParam, fname, back_inserter( stmts ), obj->get_type(), addCast, forward );
+        // currently genCall should produce at most one element, but if that changes then the next line needs to be updated to grab the statement which contains the call
+        assert( stmts.size() <= 1 );
+        if ( stmts.size() == 1 ) {
+            Statement * callStmt = stmts.front();
+            if ( addCast ) {
+                // implicitly generated ctor/dtor calls should be wrapped
+                // so that later passes are aware they were generated.
+                // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
+                // because this causes the address to be taken at codegen, which is illegal in C.
+                callStmt = new ImplicitCtorDtorStmt( callStmt );
+            }
+            *out++ = callStmt;
+        }
+        template< typename OutputIterator >
+        Statement * genCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast, bool forward ) {
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
+                        genArrayCall( srcParam, dstParam, fname, out, at, addCast, forward );
+                        return 0;
+                } else {
+                        return genScalarCall( srcParam, dstParam, fname, out, type, addCast );
+                }
+        }
+        /// inserts into out a generated call expression to function fname with arguments dstParam
+        /// and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls. decl is the
+        /// object being constructed. The function wraps constructor and destructor calls in an
+        /// ImplicitCtorDtorStmt node.
+        template< typename OutputIterator >
+        void genImplicitCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, DeclarationWithType * decl, bool forward = true ) {
+                ObjectDecl *obj = dynamic_cast<ObjectDecl *>( decl );
+                assert( obj );
+                // unnamed bit fields are not copied as they cannot be accessed
+                if ( isUnnamedBitfield( obj ) ) return;
+                bool addCast = (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) );
+                std::list< Statement * > stmts;
+                genCall( srcParam, dstParam, fname, back_inserter( stmts ), obj->get_type(), addCast, forward );
+                // currently genCall should produce at most one element, but if that changes then the next line needs to be updated to grab the statement which contains the call
+                assert( stmts.size() <= 1 );
+                if ( stmts.size() == 1 ) {
+                        Statement * callStmt = stmts.front();
+                        if ( addCast ) {
+                                // implicitly generated ctor/dtor calls should be wrapped
+                                // so that later passes are aware they were generated.
+                                // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
+                                // because this causes the address to be taken at codegen, which is illegal in C.
+                                callStmt = new ImplicitCtorDtorStmt( callStmt );
+                        }
+                        *out++ = callStmt;
+                }
+        }
+    }
 } // namespace SymTab
 #endif // AUTOGEN_H

src/SymTab/ImplementationType.cc

-              rb826e6b
+              rfea3faa
 // file "LICENCE" distributed with Cforall.
 //
 // ImplementationType.cc --
+// ImplementationType.cc --
 //
 // Author           : Richard C. Bilson
 …
         void ImplementationType::visit(TupleType *tupleType) {
                 std::list< Type * > types;
+                TupleType *newType = new TupleType( Type::Qualifiers() );
                 for ( std::list< Type* >::iterator i = tupleType->get_types().begin(); i != tupleType->get_types().end(); ++i ) {
                         Type *implType = implementationType( *i, indexer );
                         implType->get_qualifiers() |= tupleType->get_qualifiers();
                         types.push_back( implType );
+                        newType->get_types().push_back( implType );
                 } // for
                 result = new TupleType( Type::Qualifiers(), types );
+                result = newType;
+        }

src/SymTab/Indexer.cc

-              rb826e6b
+              rfea3faa
                         for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
                                 // check for C decls with the same name, skipping those with a compatible type (by mangleName)
                                 if ( ! LinkageSpec::isMangled( decl->second->get_linkage() ) && decl->first != mangleName ) return true;
+                                if ( decl->second->get_linkage() == LinkageSpec::C && decl->first != mangleName ) return true;
+                        }
+                }
 …
                                 // check for C decls with the same name, skipping
                                 // those with an incompatible type (by mangleName)
                                 if ( ! LinkageSpec::isMangled( decl->second->get_linkage() ) && decl->first == mangleName ) return true;
+                                if ( decl->second->get_linkage() == LinkageSpec::C && decl->first == mangleName ) return true;
+                        }
+                }
 …
                         // new definition shadows the autogenerated one, even at the same scope
                         return false;
                 } else if ( LinkageSpec::isMangled( added->get_linkage() ) || ResolvExpr::typesCompatible( added->get_type(), existing->get_type(), Indexer() ) ) {
+                } else if ( added->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( added->get_type(), existing->get_type(), Indexer() ) ) {
                         // typesCompatible doesn't really do the right thing here. When checking compatibility of function types,
                         // we should ignore outermost pointer qualifiers, except _Atomic?
 …
                 // this ensures that no two declarations with the same unmangled name at the same scope both have C linkage
                 if ( ! LinkageSpec::isMangled( decl->get_linkage() ) ) {
+                if ( decl->get_linkage() == LinkageSpec::C ) {
                         // NOTE this is broken in Richard's original code in such a way that it never triggers (it
                         // doesn't check decls that have the same manglename, and all C-linkage decls are defined to

src/SymTab/Mangler.cc

-              rb826e6b
+              rfea3faa
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Wed Jun 28 15:31:00 2017
 // Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 17 09:40:01 2017
+// Update Count     : 20
 //
 …
                         } else {
                                 // if we add another kind of overridable function, this has to change
                                 assert( false && "unknown overrideable linkage" );
+                                assert( false );
                         } // if
+                }

src/SymTab/Validate.cc

-              rb826e6b
+              rfea3faa
         /// Fix return types so that every function returns exactly one value
+        struct ReturnTypeFixer {
+        class ReturnTypeFixer {
+          public:
                 static void fix( std::list< Declaration * > &translationUnit );
 …
         /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers.
+        struct EnumAndPointerDecay {
+        class EnumAndPointerDecay {
+        public:
                 void previsit( EnumDecl *aggregateDecl );
                 void previsit( FunctionType *func );
 …
         };
+        struct ReturnChecker : public WithGuards {
+        class ReturnChecker : public WithScopes {
+          public:
                 /// Checks that return statements return nothing if their return type is void
                 /// and return something if the return type is non-void.
                 static void checkFunctionReturns( std::list< Declaration * > & translationUnit );
+          private:
                 void previsit( FunctionDecl * functionDecl );
                 void previsit( ReturnStmt * returnStmt );
 …
         };
+        struct VerifyCtorDtorAssign {
+        class VerifyCtorDtorAssign {
+        public:
                 /// ensure that constructors, destructors, and assignment have at least one
                 /// parameter, the first of which must be a pointer, and that ctor/dtors have no
 …
         /// ensure that generic types have the correct number of type arguments
+        struct ValidateGenericParameters {
+        class ValidateGenericParameters {
+        public:
                 void previsit( StructInstType * inst );
                 void previsit( UnionInstType * inst );
         };
+        struct ArrayLength {
+        class ArrayLength {
+        public:
                 /// for array types without an explicit length, compute the length and store it so that it
                 /// is known to the rest of the phases. For example,
 …
         };
         struct CompoundLiteral final : public WithDeclsToAdd, public WithVisitorRef<CompoundLiteral> {
+        class CompoundLiteral final : public GenPoly::DeclMutator {
                 Type::StorageClasses storageClasses;
+                void premutate( ObjectDecl *objectDecl );
+                Expression * postmutate( CompoundLiteralExpr *compLitExpr );
+                using GenPoly::DeclMutator::mutate;
+                DeclarationWithType * mutate( ObjectDecl *objectDecl ) final;
+                Expression *mutate( CompoundLiteralExpr *compLitExpr ) final;
         };
 …
                 LinkReferenceToTypes lrt( doDebug, 0 );
                 ForallPointerDecay fpd( 0 );
                 PassVisitor<CompoundLiteral> compoundliteral;
+                CompoundLiteral compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
 …
                 Concurrency::implementThreadStarter( translationUnit );
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 mutateAll( translationUnit, compoundliteral );
+                compoundliteral.mutateDeclarationList( translationUnit );
                 acceptAll( translationUnit, fpd );
                 ArrayLength::computeLength( translationUnit );
 …
+        }
         void CompoundLiteral::premutate( ObjectDecl *objectDecl ) {
+        DeclarationWithType * CompoundLiteral::mutate( ObjectDecl *objectDecl ) {
                 storageClasses = objectDecl->get_storageClasses();
+        }
+        Expression *CompoundLiteral::postmutate( CompoundLiteralExpr *compLitExpr ) {
+                DeclarationWithType * temp = Mutator::mutate( objectDecl );
+                return temp;
+        }
+        Expression *CompoundLiteral::mutate( CompoundLiteralExpr *compLitExpr ) {
                 // transform [storage_class] ... (struct S){ 3, ... };
                 // into [storage_class] struct S temp =  { 3, ... };
                 static UniqueName indexName( "_compLit" );
                 ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, nullptr, compLitExpr->get_result(), compLitExpr->get_initializer() );
                 compLitExpr->set_result( nullptr );
                 compLitExpr->set_initializer( nullptr );
+                ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, 0, compLitExpr->get_result(), compLitExpr->get_initializer() );
+                compLitExpr->set_result( 0 );
+                compLitExpr->set_initializer( 0 );
                 delete compLitExpr;
+                declsToAddBefore.push_back( tempvar );                                  // add modified temporary to current block
+                return new VariableExpr( tempvar );
+                DeclarationWithType * newtempvar = mutate( tempvar );
+                addDeclaration( newtempvar );                                   // add modified temporary to current block
+                return new VariableExpr( newtempvar );
+        }

src/SymTab/module.mk

-              rb826e6b
+              rfea3faa
 ## Author           : Richard C. Bilson
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Andrew Beach
 ## Last Modified On : Wed Jul 12 13:06:00 2017
 ## Update Count     : 3
+## Last Modified By : Rob Schluntz
+## Last Modified On : Tue Jul 07 16:22:23 2015
+## Update Count     : 2
 ###############################################################################
 …
        SymTab/ImplementationType.cc \
        SymTab/TypeEquality.cc \
+       SymTab/Autogen.cc \
+       SymTab/TreeStruct.cc
+       SymTab/Autogen.cc

src/SynTree/AggregateDecl.cc

-              rb826e6b
+              rfea3faa
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 23:56:39 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Tus Jun 27 15:30:00 2017
 // Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Mar 16 07:49:07 2017
+// Update Count     : 20
 //
 …
 AggregateDecl::AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes, LinkageSpec::Spec linkage ) : Parent( name, Type::StorageClasses(), linkage ), body( false ), attributes( attributes ) {
+AggregateDecl::AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name, Type::StorageClasses(), LinkageSpec::Cforall ), body( false ), attributes( attributes ) {
+}

src/SynTree/Constant.cc

-              rb826e6b
+              rfea3faa
 // file "LICENCE" distributed with Cforall.
 //
 // Constant.cc --
+// Constant.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul 14 14:50:00 2017
 // Update Count     : 29
+// Last Modified On : Thr Jun 22 10:11:00 2017
+// Update Count     : 28
 //
 …
+}
-Constant Constant::null( Type * ptrtype ) {
-        if ( nullptr == ptrtype ) {
-                ptrtype = new PointerType(
-                        Type::Qualifiers(),
-                        new VoidType( Type::Qualifiers() )
-                        );
+        }
-        return Constant( ptrtype, "0", (unsigned long long int)0 );
+}
-unsigned long long Constant::get_ival() const {
-        assertf( safe_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." );
-        return val.ival;
+}
-double Constant::get_dval() const {
-        assertf( ! safe_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve dval from integer constant." );
-        return val.dval;
+}
 void Constant::print( std::ostream &os ) const {
         os << "(" << rep << " " << val.ival;

src/SynTree/Constant.h

-              rb826e6b
+              rfea3faa
 // file "LICENCE" distributed with Cforall.
 //
 // Constant.h --
+// Constant.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul 14 13:33:00 2017
 // Update Count     : 16
+// Last Modified On : Thr Jun 22 10:13:00 2017
+// Update Count     : 15
 //
 …
         std::string & get_value() { return rep; }
         void set_value( std::string newValue ) { rep = newValue; }
-        unsigned long long get_ival() const;
-        double get_dval() const;
         /// generates a boolean constant of the given bool
 …
         /// generates a floating point constant of the given double
         static Constant from_double( double d );
-        /// generates a null pointer value for the given type. void * if omitted.
-        static Constant null( Type * ptrtype = nullptr );
         virtual void accept( Visitor & v ) { v.visit( this ); }

src/SynTree/Declaration.h

-              rb826e6b
+              rfea3faa
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul 14 16:59:00 2017
 // Update Count     : 123
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 17 16:05:08 2017
+// Update Count     : 121
 //
 …
         typedef Declaration Parent;
   public:
         AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall );
+        AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >() );
         AggregateDecl( const AggregateDecl &other );
         virtual ~AggregateDecl();
 …
         typedef AggregateDecl Parent;
   public:
+        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ), tagged( false ), parent_name( "" ) {}
+        StructDecl( const std::string &name, const std::string *parent, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( DeclarationNode::Struct ), tagged( true ), parent_name( parent ? *parent : "" ) {}
+        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >() ) : Parent( name, attributes ), kind( kind ) {}
         StructDecl( const StructDecl &other ) : Parent( other ) {}
 …
         bool is_thread() { return kind == DeclarationNode::Thread; }
-        // Tagged/Tree Structure Excetion
-        bool get_tagged() { return tagged; }
-        void set_tagged( bool newValue ) { tagged = newValue; }
-        bool has_parent() { return parent_name != ""; }
-        std::string get_parentName() { return parent_name; }
         virtual StructDecl *clone() const { return new StructDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
 …
         DeclarationNode::Aggregate kind;
         virtual std::string typeString() const;
-        bool tagged;
-        std::string parent_name;
 };
 …
         typedef AggregateDecl Parent;
   public:
         UnionDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ) {}
+        UnionDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >() ) : Parent( name, attributes ) {}
         UnionDecl( const UnionDecl &other ) : Parent( other ) {}
 …
         typedef AggregateDecl Parent;
   public:
         EnumDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ) {}
+        EnumDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >() ) : Parent( name, attributes ) {}
         EnumDecl( const EnumDecl &other ) : Parent( other ) {}

src/SynTree/Expression.cc

-              rb826e6b
+              rfea3faa
 #include <iterator>
+#include "Type.h"
+#include "Initializer.h"
+#include "Expression.h"
 #include "Declaration.h"
-#include "Expression.h"
-#include "Initializer.h"
 #include "Statement.h"
-#include "Type.h"
 #include "TypeSubstitution.h"
-#include "VarExprReplacer.h"
 #include "Common/utility.h"
-#include "Common/PassVisitor.h"
 #include "InitTweak/InitTweak.h"
 …
         Declaration *decl = get_var();
+        // if ( decl != 0) decl->print(os, indent + 2);
         if ( decl != 0) decl->printShort(os, indent + 2);
         os << std::endl;
 …
+}
-InitAlternative::InitAlternative( Type * type, Designation * designation ) : type( type ), designation( designation ) {}
-InitAlternative::InitAlternative( const InitAlternative & other ) : type( maybeClone( other.type ) ), designation( maybeClone( other.designation ) ) {}
-InitAlternative::~InitAlternative() {
-        delete type;
-        delete designation;
+}
-UntypedInitExpr::UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts ) : expr( expr ), initAlts( initAlts ) {}
-UntypedInitExpr::UntypedInitExpr( const UntypedInitExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), initAlts( other.initAlts ) {}
-UntypedInitExpr::~UntypedInitExpr() {
-        delete expr;
+}
-void UntypedInitExpr::print( std::ostream & os, int indent ) const {
-        os << "Untyped Init Expression" << std::endl << std::string( indent+2, ' ' );
-        expr->print( os, indent+2 );
-        if ( ! initAlts.empty() ) {
-                for ( const InitAlternative & alt : initAlts ) {
-                        os << std::string( indent+2, ' ' ) <<  "InitAlternative: ";
-                        alt.type->print( os, indent+2 );
-                        alt.designation->print( os, indent+2 );
+                }
+        }
+}
-InitExpr::InitExpr( Expression * expr, Designation * designation ) : expr( expr ), designation( designation ) {
-        set_result( expr->get_result()->clone() );
+}
-InitExpr::InitExpr( const InitExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), designation( maybeClone( other.designation) ) {}
-InitExpr::~InitExpr() {
-        delete expr;
-        delete designation;
+}
-void InitExpr::print( std::ostream & os, int indent ) const {
-        os << "Init Expression" << std::endl << std::string( indent+2, ' ' );
-        expr->print( os, indent+2 );
-        os << std::string( indent+2, ' ' ) << "with designation: ";
-        designation->print( os, indent+2 );
+}
 std::ostream & operator<<( std::ostream & out, const Expression * expr ) {
         if ( expr ) {

src/SynTree/Expression.h

-              rb826e6b
+              rfea3faa
 };
-struct InitAlternative {
-public:
-        Type * type = nullptr;
-        Designation * designation = nullptr;
-        InitAlternative( Type * type, Designation * designation );
-        InitAlternative( const InitAlternative & other );
-        InitAlternative & operator=( const Initializer & other ) = delete; // at the moment this isn't used, and I don't want to implement it
-        ~InitAlternative();
-};
-class UntypedInitExpr : public Expression {
-public:
-        UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts );
-        UntypedInitExpr( const UntypedInitExpr & other );
-        ~UntypedInitExpr();
-        Expression * get_expr() const { return expr; }
-        UntypedInitExpr * set_expr( Expression * newValue ) { expr = newValue; return this; }
-        std::list<InitAlternative> & get_initAlts() { return initAlts; }
-        virtual UntypedInitExpr * clone() const { return new UntypedInitExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
-private:
-        Expression * expr;
-        std::list<InitAlternative> initAlts;
-};
-class InitExpr : public Expression {
-public:
-        InitExpr( Expression * expr, Designation * designation );
-        InitExpr( const InitExpr & other );
-        ~InitExpr();
-        Expression * get_expr() const { return expr; }
-        InitExpr * set_expr( Expression * newValue ) { expr = newValue; return this; }
-        Designation * get_designation() const { return designation; }
-        InitExpr * set_designation( Designation * newValue ) { designation = newValue; return this; }
-        virtual InitExpr * clone() const { return new InitExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
-private:
-        Expression * expr;
-        Designation * designation;
-};
 std::ostream & operator<<( std::ostream & out, const Expression * expr );

src/SynTree/Initializer.cc

-              rb826e6b
+              rfea3faa
 #include "Common/utility.h"
-Designation::Designation( const std::list< Expression * > & designators ) : designators( designators ) {}
-Designation::Designation( const Designation & other ) : BaseSyntaxNode( other ) {
-        // std::cerr << "cloning designation" << std::endl;
-        cloneAll( other.designators, designators );
-        // std::cerr << "finished cloning designation" << std::endl;
+}
-Designation::~Designation() {
-        // std::cerr << "destroying designation" << std::endl;
-        deleteAll( designators );
-        // std::cerr << "finished destroying designation" << std::endl;
+}
-void Designation::print( std::ostream &os, int indent ) const {
-        if ( ! designators.empty() ) {
-                os << std::string(indent + 2, ' ' ) << "designated by: " << std::endl;
-                for ( std::list < Expression * >::const_iterator i = designators.begin(); i != designators.end(); i++ ) {
-                        os << std::string(indent + 4, ' ' );
-                        ( *i )->print(os, indent + 4 );
+                }
-                os << std::endl;
-        } // if
+}
 Initializer::Initializer( bool maybeConstructed ) : maybeConstructed( maybeConstructed ) {}
 Initializer::Initializer( const Initializer & other ) : BaseSyntaxNode( other ), maybeConstructed( other.maybeConstructed ) {
+}
 Initializer::~Initializer() {}
+SingleInit::SingleInit( Expression *v, bool maybeConstructed ) : Initializer( maybeConstructed ), value ( v ) {
+std::string Initializer::designator_name( Expression *des ) {
+        if ( NameExpr *n = dynamic_cast<NameExpr *>(des) )
+                return n->get_name();
+        else
+                throw 0;
+}
+// void Initializer::print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent ) {}
+SingleInit::SingleInit( Expression *v, const std::list< Expression *> &_designators, bool maybeConstructed ) : Initializer( maybeConstructed ), value ( v ), designators( _designators ) {
+}
 SingleInit::SingleInit( const SingleInit &other ) : Initializer(other), value ( maybeClone( other.value ) ) {
+        cloneAll(other.designators, designators );
+}
 SingleInit::~SingleInit() {
         delete value;
+        deleteAll(designators);
+}
 void SingleInit::print( std::ostream &os, int indent ) const {
         os << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl;
+void SingleInit::print( std::ostream &os, int indent ) {
+        os << std::endl << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl;
         os << std::string(indent+4, ' ' );
         value->print( os, indent+4 );
+        if ( ! designators.empty() ) {
+                os << std::endl << std::string(indent + 2, ' ' ) << "designated by: " << std::endl;
+                for ( std::list < Expression * >::iterator i = designators.begin(); i != designators.end(); i++ ) {
+                        os << std::string(indent + 4, ' ' );
+                        ( *i )->print(os, indent + 4 );
+                }
+        } // if
+}
+ListInit::ListInit( const std::list<Initializer*> &inits, const std::list<Designation *> &des, bool maybeConstructed )
+        : Initializer( maybeConstructed ), initializers( inits ), designations( des ) {
+                // handle the common case where a ListInit is created without designations by making a list of empty designations with the same length as the initializer
+                if ( designations.empty() ) {
+                        for ( auto & i : initializers ) {
+                                (void)i;
+                                designations.push_back( new Designation( {} ) );
+                        }
+                }
+                assertf( initializers.size() == designations.size(), "Created ListInit with mismatching initializers (%d) and designations (%d)", initializers.size(), designations.size() );
+ListInit::ListInit( const std::list<Initializer*> &_initializers, const std::list<Expression *> &_designators, bool maybeConstructed )
+        : Initializer( maybeConstructed ), initializers( _initializers ), designators( _designators ) {
+}
 ListInit::ListInit( const ListInit & other ) : Initializer( other ) {
         cloneAll( other.initializers, initializers );
         cloneAll( other.designations, designations );
+        cloneAll( other.designators, designators );
+}
 ListInit::~ListInit() {
         deleteAll( initializers );
         deleteAll( designations );
+        deleteAll( designators );
+}
+void ListInit::print( std::ostream &os, int indent ) const {
+        os << std::string(indent, ' ') << "Compound initializer:  " << std::endl;
+        for ( Designation * d : designations ) {
+                d->print( os, indent + 2 );
+        }
+void ListInit::print( std::ostream &os, int indent ) {
+        os << std::endl << std::string(indent, ' ') << "Compound initializer:  ";
+        if ( ! designators.empty() ) {
+                os << std::string(indent + 2, ' ' ) << "designated by: [";
+                for ( std::list < Expression * >::iterator i = designators.begin();
+                          i != designators.end(); i++ ) {
+                        ( *i )->print(os, indent + 4 );
+                } // for
+        for ( const Initializer * init : initializers ) {
+                init->print( os, indent + 2 );
+                os << std::endl;
+        }
+                os << std::string(indent + 2, ' ' ) << "]";
+        } // if
+        for ( std::list<Initializer *>::iterator i = initializers.begin(); i != initializers.end(); i++ )
+                (*i)->print( os, indent + 2 );
+}
 …
+}
 void ConstructorInit::print( std::ostream &os, int indent ) const {
+void ConstructorInit::print( std::ostream &os, int indent ) {
         os << std::endl << std::string(indent, ' ') << "Constructor initializer: " << std::endl;
         if ( ctor ) {
 …
+}
+std::ostream & operator<<( std::ostream & out, const Initializer * init ) {
+        if ( init ) {
+                init->print( out );
+        } else {
+                out << "nullptr";
+        }
+        return out;
+}
+std::ostream & operator<<( std::ostream & out, const Designation * des ) {
+        if ( des ) {
+                des->print( out );
+        } else {
+                out << "nullptr";
+        }
+std::ostream & operator<<( std::ostream & out, Initializer * init ) {
+        init->print( out );
         return out;
+}

src/SynTree/Initializer.h

-              rb826e6b
+              rfea3faa
 #include "Visitor.h"
+// Designation: list of designator (NameExpr, VariableExpr, and ConstantExpr) expressions that specify an object being initialized.
+class Designation : public BaseSyntaxNode {
+public:
+        Designation( const std::list< Expression * > & designators );
+        Designation( const Designation & other );
+        virtual ~Designation();
+        std::list< Expression * > & get_designators() { return designators; }
+        virtual Designation * clone() const { return new Designation( *this ); };
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Designation * acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+private:
+        std::list< Expression * > designators;
+};
+const std::list<Designation *> noDesignators;
+const std::list<Expression*> noDesignators;
 // Initializer: base class for object initializers (provide default values)
 class Initializer : public BaseSyntaxNode {
   public:
+        //      Initializer( std::string _name = std::string(""), int _pos = 0 );
         Initializer( bool maybeConstructed );
         Initializer( const Initializer & other );
         virtual ~Initializer();
+        static std::string designator_name( Expression *designator );
+        //      void set_name( std::string newValue ) { name = newValue; }
+        //      std::string get_name() const { return name; }
+        //      void set_pos( int newValue ) { pos = newValue; }
+        //      int get_pos() const { return pos; }
+        virtual void set_designators( std::list<Expression *> & ) { assert(false); }
+        virtual std::list<Expression *> &get_designators() {
+                assert(false);
+                std::list<Expression *> *ret = 0; return *ret;  // never reached
+        }
         bool get_maybeConstructed() { return maybeConstructed; }
 …
         virtual void accept( Visitor &v ) = 0;
         virtual Initializer *acceptMutator( Mutator &m ) = 0;
         virtual void print( std::ostream &os, int indent = 0 ) const = 0;
+        virtual void print( std::ostream &os, int indent = 0 ) = 0;
   private:
+        //      std::string name;
+        //      int pos;
         bool maybeConstructed;
 };
 …
 class SingleInit : public Initializer {
   public:
         SingleInit( Expression *value, bool maybeConstructed = false );
+        SingleInit( Expression *value, const std::list< Expression *> &designators = std::list< Expression * >(), bool maybeConstructed = false );
         SingleInit( const SingleInit &other );
         virtual ~SingleInit();
 …
         void set_value( Expression *newValue ) { value = newValue; }
+        std::list<Expression *> &get_designators() { return designators; }
+        void set_designators( std::list<Expression *> &newValue ) { designators = newValue; }
         virtual SingleInit *clone() const { return new SingleInit( *this); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual void print( std::ostream &os, int indent = 0 );
   private:
         //Constant *value;
         Expression *value;      // has to be a compile-time constant
+        std::list< Expression * > designators;
 };
 …
   public:
         ListInit( const std::list<Initializer*> &initializers,
                           const std::list<Designation *> &designators = {}, bool maybeConstructed = false );
+                          const std::list<Expression *> &designators = std::list< Expression * >(), bool maybeConstructed = false );
         ListInit( const ListInit & other );
         virtual ~ListInit();
+        std::list<Designation *> & get_designations() { return designations; }
+        std::list<Initializer *> & get_initializers() { return initializers; }
+        void set_designators( std::list<Expression *> &newValue ) { designators = newValue; }
+        std::list<Expression *> &get_designators() { return designators; }
+        void set_initializers( std::list<Initializer*> &newValue ) { initializers = newValue; }
+        std::list<Initializer*> &get_initializers() { return initializers; }
         typedef std::list<Initializer*>::iterator iterator;
-        typedef std::list<Initializer*>::const_iterator const_iterator;
         iterator begin() { return initializers.begin(); }
         iterator end() { return initializers.end(); }
-        const_iterator begin() const { return initializers.begin(); }
-        const_iterator end() const { return initializers.end(); }
         virtual ListInit *clone() const { return new ListInit( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual void print( std::ostream &os, int indent = 0 );
   private:
         std::list<Initializer *> initializers;  // order *is* important
         std::list<Designation *> designations;  // order/length is consistent with initializers
+        std::list<Initializer*> initializers;  // order *is* important
+        std::list<Expression *> designators;
 };
 …
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual void print( std::ostream &os, int indent = 0 );
   private:
 …
 };
+std::ostream & operator<<( std::ostream & out, const Initializer * init );
+std::ostream & operator<<( std::ostream & out, const Designation * des );
+std::ostream & operator<<( std::ostream & out, Initializer * init );
 #endif // INITIALIZER_H

src/SynTree/Mutator.cc

-              rb826e6b
+              rfea3faa
+}
-Expression *Mutator::mutate( UntypedInitExpr * initExpr ) {
-        initExpr->set_env( maybeMutate( initExpr->get_env(), *this ) );
-        initExpr->set_result( maybeMutate( initExpr->get_result(), *this ) );
-        initExpr->set_expr( maybeMutate( initExpr->get_expr(), *this ) );
-        // not currently mutating initAlts, but this doesn't matter since this node is only used in the resolver.
-        return initExpr;
+}
-Expression *Mutator::mutate( InitExpr * initExpr ) {
-        initExpr->set_env( maybeMutate( initExpr->get_env(), *this ) );
-        initExpr->set_result( maybeMutate( initExpr->get_result(), *this ) );
-        initExpr->set_expr( maybeMutate( initExpr->get_expr(), *this ) );
-        initExpr->set_designation( maybeMutate( initExpr->get_designation(), *this ) );
-        return initExpr;
+}
 Type *Mutator::mutate( VoidType *voidType ) {
 …
         mutateAll( tupleType->get_forall(), *this );
         mutateAll( tupleType->get_types(), *this );
-        mutateAll( tupleType->get_members(), *this );
         return tupleType;
+}
 …
-Designation *Mutator::mutate( Designation * designation ) {
-        mutateAll( designation->get_designators(), *this );
-        return designation;
+}
 Initializer *Mutator::mutate( SingleInit *singleInit ) {
         singleInit->set_value( singleInit->get_value()->acceptMutator( *this ) );
 …
 Initializer *Mutator::mutate( ListInit *listInit ) {
         mutateAll( listInit->get_designations(), *this );
+        mutateAll( listInit->get_designators(), *this );
         mutateAll( listInit->get_initializers(), *this );
         return listInit;

src/SynTree/Mutator.h

-              rb826e6b
+              rfea3faa
         virtual Expression* mutate( StmtExpr * stmtExpr );
         virtual Expression* mutate( UniqueExpr * uniqueExpr );
-        virtual Expression* mutate( UntypedInitExpr * initExpr );
-        virtual Expression* mutate( InitExpr * initExpr );
         virtual Type* mutate( VoidType *basicType );
 …
         virtual Type* mutate( OneType *oneType );
-        virtual Designation* mutate( Designation *designation );
         virtual Initializer* mutate( SingleInit *singleInit );
         virtual Initializer* mutate( ListInit *listInit );

src/SynTree/SynTree.h

-              rb826e6b
+              rfea3faa
 class StmtExpr;
 class UniqueExpr;
-class UntypedInitExpr;
-class InitExpr;
 class Type;
 …
 class OneType;
-class Designation;
 class Initializer;
 class SingleInit;

src/SynTree/TupleType.cc

-              rb826e6b
+              rfea3faa
 //
-#include "Declaration.h"
-#include "Initializer.h"
 #include "Type.h"
 #include "Common/utility.h"
-#include "Parser/LinkageSpec.h"
 TupleType::TupleType( const Type::Qualifiers &tq, const std::list< Type * > & types, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), types( types ) {
-        for ( Type * t : *this ) {
-                // xxx - this is very awkward. TupleTypes should contain objects so that members can be named, but if they don't have an initializer node then
-                // they end up getting constructors, which end up being inserted causing problems. This happens because the object decls have to be visited so that
-                // their types are kept in sync with the types list here. Ultimately, the types list here should be eliminated and perhaps replaced with a list-view
-                // of the object types list, but I digress. The temporary solution here is to make a ListInit with maybeConstructed = false, that way even when the
-                // object is visited, it is never constructed. Ultimately, a better solution might be either:
-                // a) to separate TupleType from its declarations, into TupleDecl and Tuple{Inst?}Type, ala StructDecl and StructInstType
-                // b) separate initializer nodes better, e.g. add a MaybeConstructed node that is replaced by genInit, rather than what currently exists in a bool
-                members.push_back( new ObjectDecl( "" , Type::StorageClasses(), LinkageSpec::Cforall, nullptr, t->clone(), new ListInit( {}, {}, false ) ) );
+        }
+}
 TupleType::TupleType( const TupleType& other ) : Type( other ) {
         cloneAll( other.types, types );
-        cloneAll( other.members, members );
+}
 TupleType::~TupleType() {
         deleteAll( types );
-        deleteAll( members );
+}

src/SynTree/Type.h

-              rb826e6b
+              rfea3faa
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Tus Jul 18 10:06:00 2017
 // Update Count     : 150
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Mar 23 16:16:36 2017
+// Update Count     : 149
 //
 …
 };
 extern Type::Qualifiers noQualifiers;                           // no qualifiers on constants
+extern Type::Qualifiers emptyQualifiers;                                // no qualifiers on constants
 class VoidType : public Type {
 …
 class TupleType : public Type {
   public:
         TupleType( const Type::Qualifiers & tq, const std::list< Type * > & types, const std::list< Attribute * > & attributes = std::list< Attribute * >()  );
+        TupleType( const Type::Qualifiers & tq, const std::list< Type * > & types = std::list< Type * >(), const std::list< Attribute * > & attributes = std::list< Attribute * >()  );
         TupleType( const TupleType& );
         virtual ~TupleType();
 …
         typedef value_type::iterator iterator;
         std::list<Type *> & get_types() { return types; }
+        std::list<Type*>& get_types() { return types; }
         virtual unsigned size() const { return types.size(); };
-        // For now, this is entirely synthetic -- tuple types always have unnamed members.
-        // Eventually, we may allow named tuples, in which case members should subsume types
-        std::list<Declaration *> & get_members() { return members; }
         iterator begin() { return types.begin(); }
 …
         virtual void print( std::ostream & os, int indent = 0 ) const;
   private:
+        std::list<Type *> types;
+        std::list<Declaration *> members;
+        std::list<Type*> types;
 };

src/SynTree/VarExprReplacer.cc

-              rb826e6b
+              rfea3faa
 //
-#include "Declaration.h"
 #include "Expression.h"
 #include "VarExprReplacer.h"
 VarExprReplacer::VarExprReplacer( const DeclMap & declMap, bool debug ) : declMap( declMap ), debug( debug ) {}
+VarExprReplacer::VarExprReplacer( const DeclMap & declMap ) : declMap( declMap ) {}
 // replace variable with new node from decl map
 void VarExprReplacer::visit( VariableExpr * varExpr ) {
+        // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are)
+        if ( declMap.count( varExpr->get_var() ) ) {
+                if ( debug ) {
+                        std::cerr << "replacing variable reference: " << (void*)varExpr->get_var() << " " << varExpr->get_var() << " with " << (void*)declMap.at( varExpr->get_var() ) << " " << declMap.at( varExpr->get_var() ) << std::endl;
+                }
+                varExpr->set_var( declMap.at( varExpr->get_var() ) );
+        }
+  // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are)
+  if ( declMap.count( varExpr->get_var() ) ) {
+    varExpr->set_var( declMap.at( varExpr->get_var() ) );
+  }
+}

src/SynTree/VarExprReplacer.h

-              rb826e6b
+              rfea3faa
 private:
         const DeclMap & declMap;
-  bool debug;
 public:
         VarExprReplacer( const DeclMap & declMap, bool debug = false );
+        VarExprReplacer( const DeclMap & declMap );
         // replace variable with new node from decl map

src/SynTree/Visitor.cc

-              rb826e6b
+              rfea3faa
+}
-void Visitor::visit( UntypedInitExpr * initExpr ) {
-        maybeAccept( initExpr->get_result(), *this );
-        maybeAccept( initExpr->get_expr(), *this );
-        // not currently visiting initAlts, but this doesn't matter since this node is only used in the resolver.
+}
-void Visitor::visit( InitExpr * initExpr ) {
-        maybeAccept( initExpr->get_result(), *this );
-        maybeAccept( initExpr->get_expr(), *this );
-        maybeAccept( initExpr->get_designation(), *this );
+}
 void Visitor::visit( VoidType *voidType ) {
 …
         acceptAll( tupleType->get_forall(), *this );
         acceptAll( tupleType->get_types(), *this );
-        acceptAll( tupleType->get_members(), *this );
+}
 …
+}
-void Visitor::visit( Designation * designation ) {
-        acceptAll( designation->get_designators(), *this );
+}
 void Visitor::visit( SingleInit *singleInit ) {
 …
 void Visitor::visit( ListInit *listInit ) {
         acceptAll( listInit->get_designations(), *this );
+        acceptAll( listInit->get_designators(), *this );
         acceptAll( listInit->get_initializers(), *this );
+}

src/SynTree/Visitor.h

-              rb826e6b
+              rfea3faa
         virtual void visit( StmtExpr * stmtExpr );
         virtual void visit( UniqueExpr * uniqueExpr );
-        virtual void visit( UntypedInitExpr * initExpr );
-        virtual void visit( InitExpr * initExpr );
         virtual void visit( VoidType *basicType );
 …
         virtual void visit( OneType *oneType );
-        virtual void visit( Designation *designation );
         virtual void visit( SingleInit *singleInit );
         virtual void visit( ListInit *listInit );

src/Tuples/TupleExpansion.cc

-              rb826e6b
+              rfea3faa
+                        }
                         ObjectDecl * finished = new ObjectDecl( toString( "_unq", id, "_finished_" ), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new BasicType( Type::Qualifiers(), BasicType::Bool ),
                                                                                                         new SingleInit( new ConstantExpr( Constant::from_int( 0 ) ) ) );
+                                                                                                        new SingleInit( new ConstantExpr( Constant::from_int( 0 ) ), noDesignators ) );
                         addDeclaration( finished );
                         // (finished ? _unq_expr_N : (_unq_expr_N = <unqExpr->get_expr()>, finished = 1, _unq_expr_N))
 …
         Type * makeTupleType( const std::list< Expression * > & exprs ) {
                 // produce the TupleType which aggregates the types of the exprs
                 std::list< Type * > types;
                 Type::Qualifiers qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Lvalue | Type::Atomic | Type::Mutex );
+                TupleType *tupleType = new TupleType( Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Lvalue | Type::Atomic | Type::Mutex ) );
+                Type::Qualifiers &qualifiers = tupleType->get_qualifiers();
                 for ( Expression * expr : exprs ) {
                         assert( expr->get_result() );
                         if ( expr->get_result()->isVoid() ) {
                                 // if the type of any expr is void, the type of the entire tuple is void
+                                delete tupleType;
                                 return new VoidType( Type::Qualifiers() );
+                        }
                         Type * type = expr->get_result()->clone();
                         types.push_back( type );
+                        tupleType->get_types().push_back( type );
                         // the qualifiers on the tuple type are the qualifiers that exist on all component types
                         qualifiers &= type->get_qualifiers();
                 } // for
                 if ( exprs.empty() ) qualifiers = Type::Qualifiers();
                 return new TupleType( qualifiers, types );
+                return tupleType;
+        }

src/benchmark/CorCtxSwitch.c

-              rb826e6b
+              rfea3faa
         StartTime = Time();
+        // for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+        //      resume( this_coroutine() );
+        //      // resume( &s );
+        // }
         resumer( &s, NoOfTimes );
         EndTime = Time();

src/benchmark/Makefile.am

-              rb826e6b
+              rfea3faa
 CC = @CFA_BINDIR@/@CFA_NAME@
 noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) ctxswitch-thread$(EXEEXT) sched-int$(EXEEXT) monitor$(EXEEXT) csv-data$(EXEEXT)
+noinst_PROGRAMS = bench ctxswitch-coroutine ctxswitch-thread
 bench$(EXEEXT) :
+bench :
         @for ccflags in "-debug" "-nodebug"; do \
                 echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
 …
         rm -f ./a.out ;
 ctxswitch-coroutine$(EXEEXT):
+ctxswitch-coroutine:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 ctxswitch-thread$(EXEEXT):
+ctxswitch-thread:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 sched-int$(EXEEXT):
+sched-int:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 SchedInt.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 monitor$(EXEEXT):
+monitor:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 Monitor.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 csv-data$(EXEEXT):
+csv-data:
         @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
         @./a.out

src/benchmark/Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
 build_triplet = @build@
 host_triplet = @host@
+noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) \
+        ctxswitch-thread$(EXEEXT)
 subdir = src/benchmark
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 …
 bench_OBJECTS = bench.$(OBJEXT)
 bench_LDADD = $(LDADD)
-csv_data_SOURCES = csv-data.c
-csv_data_OBJECTS = csv-data.$(OBJEXT)
-csv_data_LDADD = $(LDADD)
 ctxswitch_coroutine_SOURCES = ctxswitch-coroutine.c
 ctxswitch_coroutine_OBJECTS = ctxswitch-coroutine.$(OBJEXT)
 …
 ctxswitch_thread_OBJECTS = ctxswitch-thread.$(OBJEXT)
 ctxswitch_thread_LDADD = $(LDADD)
-monitor_SOURCES = monitor.c
-monitor_OBJECTS = monitor.$(OBJEXT)
-monitor_LDADD = $(LDADD)
-sched_int_SOURCES = sched-int.c
-sched_int_OBJECTS = sched-int.$(OBJEXT)
-sched_int_LDADD = $(LDADD)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
 …
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 =
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CCLD = $(CC)
 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 = bench.c csv-data.c ctxswitch-coroutine.c ctxswitch-thread.c \
+        monitor.c sched-int.c
+DIST_SOURCES = bench.c csv-data.c ctxswitch-coroutine.c \
+        ctxswitch-thread.c monitor.c sched-int.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = bench.c ctxswitch-coroutine.c ctxswitch-thread.c
+DIST_SOURCES = bench.c ctxswitch-coroutine.c ctxswitch-thread.c
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
 top_srcdir = @top_srcdir@
 AM_CFLAGS = -g -Wall -Wno-unused-function -O2
-noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) ctxswitch-thread$(EXEEXT) sched-int$(EXEEXT) monitor$(EXEEXT) csv-data$(EXEEXT)
 all: all-am
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/benchmark/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bench.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csv-data.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxswitch-coroutine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxswitch-thread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monitor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched-int.Po@am__quote@
 .c.o:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 .c.obj:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ID: $(am__tagged_files)
+        $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        mkid -fID $$unique
+tags: TAGS
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
         set x; \
         here=`pwd`; \
+        $(am__define_uniq_tagged_files); \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         shift; \
         if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 …
           fi; \
         fi
+ctags: ctags-am
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         test -z "$(CTAGS_ARGS)$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 …
           && $(am__cd) $(top_srcdir) \
           && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-cscopelist-am: $(am__tagged_files)
-        list='$(am__tagged_files)'; \
-        case "$(srcdir)" in \
-          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-          *) sdir=$(subdir)/$(srcdir) ;; \
-        esac; \
-        for i in $$list; do \
-          if test -f "$$i"; then \
-            echo "$(subdir)/$$i"; \
-          else \
-            echo "$$sdir/$$i"; \
-          fi; \
-        done >> $(top_builddir)/cscope.files
 distclean-tags:
 …
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
         clean-noinstPROGRAMS 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 \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+        clean-noinstPROGRAMS ctags 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 tags tags-am uninstall \
+        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
         uninstall-am
+.PRECIOUS: Makefile
+bench$(EXEEXT) :
+bench :
         @for ccflags in "-debug" "-nodebug"; do \
                 echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
 …
         rm -f ./a.out ;
 ctxswitch-coroutine$(EXEEXT):
+ctxswitch-coroutine:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 ctxswitch-thread$(EXEEXT):
+ctxswitch-thread:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 sched-int$(EXEEXT):
+sched-int:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 SchedInt.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 monitor$(EXEEXT):
+monitor:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 Monitor.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 csv-data$(EXEEXT):
+csv-data:
         @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
         @./a.out

src/benchmark/bench.h

rb826e6b	rfea3faa
26	26	#define N 10000000
27	27	#endif
28
29		~~unsigned int default_preemption() {~~
30		~~return 0;~~
31		}

src/benchmark/create_pthrd.c

-              rb826e6b
+              rfea3faa
                 n = atoi(argv[1]);
+        }
         printf("create %lu pthreads ... ", n);
+        printf("%lu\n", n);
         for (size_t i = 0; i < n; i++) {
+                pthread_t thread;
+                if (pthread_create(&thread, NULL, foo, NULL) < 0) {
+                        perror( "failure" );
+                pthread_attr_t attr;
+                if (pthread_attr_init(&attr) < 0) {
                         return 1;
+                }
+                if (pthread_join( thread, NULL) < 0) {
+                        perror( "failure" );
+                if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) < 0) {
+                        return 1;
+                }
+                pthread_t thread;
+                if (pthread_create(&thread, &attr, foo, NULL) < 0) {
                         return 1;
+                }
+        }
+        printf("finish\n");
+        pthread_exit(NULL);
+        return 0;
+}

src/benchmark/csv-data.c

-              rb826e6b
+              rfea3faa
+}
+#ifndef N
+#define N 100000000
+#endif
 //-----------------------------------------------------------------------------
 // coroutine context switch
 …
         StartTime = Time();
+        // for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+        //      resume( this_coroutine() );
+        //      // resume( &s );
+        // }
         resumer( &s, NoOfTimes );
         EndTime = Time();
 …
 mon_t mon1;
 condition cond1a;
+condition cond1a;
 condition cond1b;
 …
 mon_t mon2;
 condition cond2a;
+condition cond2a;
 condition cond2b;

src/driver/Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
 cc1lib_PROGRAMS = cc1$(EXEEXT)
 subdir = src/driver
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 …
 cfa_OBJECTS = $(am_cfa_OBJECTS)
 cfa_LDADD = $(LDADD)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
 …
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 =
+am__v_CXX_0 = @echo "  CXX   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 …
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 =
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
 DIST_SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
+'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/driver/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
 install-cc1libPROGRAMS: $(cc1lib_PROGRAMS)
         @$(NORMAL_INSTALL)
+        test -z "$(cc1libdir)" || $(MKDIR_P) "$(DESTDIR)$(cc1libdir)"
         @list='$(cc1lib_PROGRAMS)'; test -n "$(cc1libdir)" || list=; \
-        if test -n "$$list"; then \
-          echo " $(MKDIR_P) '$(DESTDIR)$(cc1libdir)'"; \
-          $(MKDIR_P) "$(DESTDIR)$(cc1libdir)" || exit 1; \
-        fi; \
         for p in $$list; do echo "$$p $$p"; done | \
         sed 's/$(EXEEXT)$$//' | \
         while read p p1; do if test -f $$p \
           ; then echo "$$p"; echo "$$p"; else :; fi; \
+        while read p p1; do if test -f $$p; \
+          then echo "$$p"; echo "$$p"; else :; fi; \
         done | \
+        sed -e 'p;s,.*/,,;n;h' \
+            -e 's|.*|.|' \
+        sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
             -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
         sed 'N;N;N;s,\n, ,g' | \
 …
         files=`for p in $$list; do echo "$$p"; done | \
           sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+              -e 's/$$/$(EXEEXT)/' \
+        `; \
+              -e 's/$$/$(EXEEXT)/' `; \
         test -n "$$list" || exit 0; \
         echo " ( cd '$(DESTDIR)$(cc1libdir)' && rm -f" $$files ")"; \
 …
 clean-noinstPROGRAMS:
         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 cc1$(EXEEXT): $(cc1_OBJECTS) $(cc1_DEPENDENCIES) $(EXTRA_cc1_DEPENDENCIES)
         @rm -f cc1$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(cc1_OBJECTS) $(cc1_LDADD) $(LIBS)
 cfa$(EXEEXT): $(cfa_OBJECTS) $(cfa_DEPENDENCIES) $(EXTRA_cfa_DEPENDENCIES)
         @rm -f cfa$(EXEEXT)
 …
 .cc.o:
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 …
 .cc.obj:
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ID: $(am__tagged_files)
+        $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        mkid -fID $$unique
+tags: TAGS
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
         set x; \
         here=`pwd`; \
+        $(am__define_uniq_tagged_files); \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         shift; \
         if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 …
           fi; \
         fi
+ctags: ctags-am
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         test -z "$(CTAGS_ARGS)$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 …
           && $(am__cd) $(top_srcdir) \
           && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-cscopelist-am: $(am__tagged_files)
-        list='$(am__tagged_files)'; \
-        case "$(srcdir)" in \
-          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-          *) sdir=$(subdir)/$(srcdir) ;; \
-        esac; \
-        for i in $$list; do \
-          if test -f "$$i"; then \
-            echo "$(subdir)/$$i"; \
-          else \
-            echo "$$sdir/$$i"; \
-          fi; \
-        done >> $(top_builddir)/cscope.files
 distclean-tags:
 …
 .MAKE: install-am install-exec-am install-strip uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+        clean-cc1libPROGRAMS clean-generic clean-noinstPROGRAMS \
+        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-cc1libPROGRAMS \
+        install-data install-data-am install-dvi install-dvi-am \
+        install-exec install-exec-am install-exec-hook 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 \
+        tags tags-am uninstall uninstall-am uninstall-cc1libPROGRAMS \
+        uninstall-hook
+.PRECIOUS: Makefile
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+        clean-cc1libPROGRAMS clean-generic clean-noinstPROGRAMS ctags \
+        distclean distclean-compile distclean-generic distclean-tags \
+        distdir dvi dvi-am html html-am info info-am install \
+        install-am install-cc1libPROGRAMS install-data install-data-am \
+        install-dvi install-dvi-am install-exec install-exec-am \
+        install-exec-hook 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 tags uninstall \
+        uninstall-am uninstall-cc1libPROGRAMS uninstall-hook

src/examples/Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
         avl_test$(EXEEXT) Bench$(EXEEXT)
 subdir = src/examples
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 …
 Bench_OBJECTS = Bench.$(OBJEXT)
 Bench_LDADD = $(LDADD)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_avl_test_OBJECTS = avltree/avl_test.$(OBJEXT) \
+        avltree/avl0.$(OBJEXT) avltree/avl1.$(OBJEXT) \
+        avltree/avl2.$(OBJEXT) avltree/avl3.$(OBJEXT) \
+        avltree/avl4.$(OBJEXT) avltree/avl-private.$(OBJEXT)
+am_avl_test_OBJECTS = avl_test.$(OBJEXT) avl0.$(OBJEXT) avl1.$(OBJEXT) \
+        avl2.$(OBJEXT) avl3.$(OBJEXT) avl4.$(OBJEXT) \
+        avl-private.$(OBJEXT)
 avl_test_OBJECTS = $(am_avl_test_OBJECTS)
 avl_test_LDADD = $(LDADD)
 …
 vector_test_OBJECTS = $(am_vector_test_OBJECTS)
 vector_test_LDADD = $(LDADD)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 =
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CCLD = $(CC)
 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 =
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = Bench.c $(avl_test_SOURCES) $(fstream_test_SOURCES) \
         $(vector_test_SOURCES)
 DIST_SOURCES = Bench.c $(avl_test_SOURCES) $(fstream_test_SOURCES) \
         $(vector_test_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
+'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/examples/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
 clean-noinstPROGRAMS:
         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-avltree/$(am__dirstamp):
-        @$(MKDIR_P) avltree
-        @: > avltree/$(am__dirstamp)
-avltree/$(DEPDIR)/$(am__dirstamp):
-        @$(MKDIR_P) avltree/$(DEPDIR)
-        @: > avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl0.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl1.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl2.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl3.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl4.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl-private.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
 avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES)
         @rm -f avl_test$(EXEEXT)
         $(AM_V_CCLD)$(LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS)
 fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES)
         @rm -f fstream_test$(EXEEXT)
         $(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS)
 vector_test$(EXEEXT): $(vector_test_OBJECTS) $(vector_test_DEPENDENCIES) $(EXTRA_vector_test_DEPENDENCIES)
         @rm -f vector_test$(EXEEXT)
 …
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
-        -rm -f avltree/*.$(OBJEXT)
 distclean-compile:
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Bench.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl-private.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_int.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl-private.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl0.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl4.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test.Po@am__quote@
 .c.o:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 .c.obj:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ID: $(am__tagged_files)
+        $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+avl_test.o: avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl_test.o -MD -MP -MF $(DEPDIR)/avl_test.Tpo -c -o avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl_test.Tpo $(DEPDIR)/avl_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl_test.c' object='avl_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c
+avl_test.obj: avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl_test.obj -MD -MP -MF $(DEPDIR)/avl_test.Tpo -c -o avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl_test.Tpo $(DEPDIR)/avl_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl_test.c' object='avl_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi`
+avl0.o: avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl0.o -MD -MP -MF $(DEPDIR)/avl0.Tpo -c -o avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl0.Tpo $(DEPDIR)/avl0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl0.c' object='avl0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c
+avl0.obj: avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl0.obj -MD -MP -MF $(DEPDIR)/avl0.Tpo -c -o avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl0.Tpo $(DEPDIR)/avl0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl0.c' object='avl0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi`
+avl1.o: avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl1.o -MD -MP -MF $(DEPDIR)/avl1.Tpo -c -o avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl1.Tpo $(DEPDIR)/avl1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl1.c' object='avl1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c
+avl1.obj: avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl1.obj -MD -MP -MF $(DEPDIR)/avl1.Tpo -c -o avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl1.Tpo $(DEPDIR)/avl1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl1.c' object='avl1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi`
+avl2.o: avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl2.o -MD -MP -MF $(DEPDIR)/avl2.Tpo -c -o avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl2.Tpo $(DEPDIR)/avl2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl2.c' object='avl2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c
+avl2.obj: avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl2.obj -MD -MP -MF $(DEPDIR)/avl2.Tpo -c -o avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl2.Tpo $(DEPDIR)/avl2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl2.c' object='avl2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi`
+avl3.o: avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl3.o -MD -MP -MF $(DEPDIR)/avl3.Tpo -c -o avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl3.Tpo $(DEPDIR)/avl3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl3.c' object='avl3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c
+avl3.obj: avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl3.obj -MD -MP -MF $(DEPDIR)/avl3.Tpo -c -o avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl3.Tpo $(DEPDIR)/avl3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl3.c' object='avl3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi`
+avl4.o: avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl4.o -MD -MP -MF $(DEPDIR)/avl4.Tpo -c -o avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl4.Tpo $(DEPDIR)/avl4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl4.c' object='avl4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c
+avl4.obj: avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl4.obj -MD -MP -MF $(DEPDIR)/avl4.Tpo -c -o avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl4.Tpo $(DEPDIR)/avl4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl4.c' object='avl4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi`
+avl-private.o: avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl-private.o -MD -MP -MF $(DEPDIR)/avl-private.Tpo -c -o avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl-private.Tpo $(DEPDIR)/avl-private.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl-private.c' object='avl-private.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c
+avl-private.obj: avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl-private.obj -MD -MP -MF $(DEPDIR)/avl-private.Tpo -c -o avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl-private.Tpo $(DEPDIR)/avl-private.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl-private.c' object='avl-private.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi`
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        mkid -fID $$unique
+tags: TAGS
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
         set x; \
         here=`pwd`; \
+        $(am__define_uniq_tagged_files); \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         shift; \
         if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 …
           fi; \
         fi
+ctags: ctags-am
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         test -z "$(CTAGS_ARGS)$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 …
           && $(am__cd) $(top_srcdir) \
           && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-cscopelist-am: $(am__tagged_files)
-        list='$(am__tagged_files)'; \
-        case "$(srcdir)" in \
-          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-          *) sdir=$(subdir)/$(srcdir) ;; \
-        esac; \
-        for i in $$list; do \
-          if test -f "$$i"; then \
-            echo "$(subdir)/$$i"; \
-          else \
-            echo "$$sdir/$$i"; \
-          fi; \
-        done >> $(top_builddir)/cscope.files
 distclean-tags:
 …
         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
         -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-        -rm -f avltree/$(DEPDIR)/$(am__dirstamp)
-        -rm -f avltree/$(am__dirstamp)
 maintainer-clean-generic:
 …
 distclean: distclean-am
         -rm -rf ./$(DEPDIR) avltree/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 …
 maintainer-clean: maintainer-clean-am
         -rm -rf ./$(DEPDIR) avltree/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 …
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
         clean-noinstPROGRAMS 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 \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+        clean-noinstPROGRAMS ctags 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 tags tags-am uninstall \
+        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
         uninstall-am
-.PRECIOUS: Makefile

src/include/assert.h

rb826e6b	rfea3faa
15	15
16	16	#pragma once
17		~~// Pragmas for header cleanup tool~~
18		~~// IWYU pragma: private, include <cassert>~~
19	17
20	18	#include_next <assert.h>

src/libcfa/Makefile.am

-              rb826e6b
+              rfea3faa
 ## Author           : Peter A. Buhr
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Andrew Beach
 ## Last Modified On : Fri Jun 14 17:00:00 2017
 ## Update Count     : 216
+## Last Modified By : Peter A. Buhr
+## Last Modified On : Sun May 14 21:04:21 2017
+## Update Count     : 214
 ###############################################################################
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
-ARFLAGS = cr
 libdir = ${CFA_LIBDIR}
 …
 libobjs = ${headers:=.o}
+libsrc = libcfa-prelude.c interpose.c libhdr/libdebug.c ${headers:=.c} \
+        exception.c typeobject.c
+libsrc = libcfa-prelude.c interpose.c libhdr/libdebug.c ${headers:=.c}
 # not all platforms support concurrency, add option do disable it
 …
         ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
-libcfa_a-exception.o : exception.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
-libcfa_a-typeobject.o : typeobject.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
 concurrency/libcfa_d_a-invoke.o : concurrency/invoke.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
-libcfa_d_a-exception.o : exception.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
-libcfa_d_a-typeobject.o : typeobject.c
         ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<

src/libcfa/Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
 @BUILD_CONCURRENCY_TRUE@am__append_4 = concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c concurrency/invoke.c concurrency/preemption.c
 subdir = src/libcfa
+DIST_COMMON = $(am__nobase_cfa_include_HEADERS_DIST) \
+        $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am \
-        $(am__nobase_cfa_include_HEADERS_DIST) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 …
 LIBRARIES = $(lib_LIBRARIES)
 AR = ar
+ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 =
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 libcfa_d_a_AR = $(AR) $(ARFLAGS)
 libcfa_d_a_LIBADD =
 …
         containers/pair.c containers/result.c containers/vector.c \
         concurrency/coroutine.c concurrency/thread.c \
+        concurrency/kernel.c concurrency/monitor.c exception.c \
+        typeobject.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \
+        concurrency/alarm.c concurrency/invoke.c \
+        concurrency/preemption.c
+        concurrency/kernel.c concurrency/monitor.c \
+        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c \
+        concurrency/invoke.c concurrency/preemption.c
 am__dirstamp = $(am__leading_dot)dirstamp
 @BUILD_CONCURRENCY_TRUE@am__objects_1 = concurrency/libcfa_d_a-coroutine.$(OBJEXT) \
 …
         libcfa_d_a-interpose.$(OBJEXT) \
         libhdr/libcfa_d_a-libdebug.$(OBJEXT) $(am__objects_2) \
-        libcfa_d_a-exception.$(OBJEXT) libcfa_d_a-typeobject.$(OBJEXT) \
         $(am__objects_3)
 am_libcfa_d_a_OBJECTS = $(am__objects_4)
 …
         containers/pair.c containers/result.c containers/vector.c \
         concurrency/coroutine.c concurrency/thread.c \
+        concurrency/kernel.c concurrency/monitor.c exception.c \
+        typeobject.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \
+        concurrency/alarm.c concurrency/invoke.c \
+        concurrency/preemption.c
+        concurrency/kernel.c concurrency/monitor.c \
+        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c \
+        concurrency/invoke.c concurrency/preemption.c
 @BUILD_CONCURRENCY_TRUE@am__objects_5 = concurrency/libcfa_a-coroutine.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-thread.$(OBJEXT) \
 …
         libcfa_a-interpose.$(OBJEXT) \
         libhdr/libcfa_a-libdebug.$(OBJEXT) $(am__objects_6) \
-        libcfa_a-exception.$(OBJEXT) libcfa_a-typeobject.$(OBJEXT) \
         $(am__objects_7)
 am_libcfa_a_OBJECTS = $(am__objects_8)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
 …
 AM_V_CPPAS = $(am__v_CPPAS_@AM_V@)
 am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@)
+am__v_CPPAS_0 = @echo "  CPPAS   " $@;
+am__v_CPPAS_1 =
+am__v_CPPAS_0 = @echo "  CPPAS " $@;
 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 =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 =
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 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 =
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
 DIST_SOURCES = $(am__libcfa_d_a_SOURCES_DIST) \
         $(am__libcfa_a_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__nobase_cfa_include_HEADERS_DIST = assert fstream iostream iterator \
         limits math rational stdlib containers/maybe containers/pair \
 …
         ${shell echo stdhdr/*} gmp concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
+'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
-ARFLAGS = cr
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
 EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 …
 libobjs = ${headers:=.o}
 libsrc = libcfa-prelude.c interpose.c libhdr/libdebug.c ${headers:=.c} \
         exception.c typeobject.c $(am__append_4)
+        $(am__append_4)
 libcfa_a_SOURCES = ${libsrc}
 libcfa_a_CFLAGS = -nodebug -O2
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/libcfa/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
 install-libLIBRARIES: $(lib_LIBRARIES)
         @$(NORMAL_INSTALL)
+        test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
         @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
         list2=; for p in $$list; do \
 …
         done; \
         test -z "$$list2" || { \
-          echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-          $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
           echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \
           $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
 …
         concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
 libcfa-d.a: $(libcfa_d_a_OBJECTS) $(libcfa_d_a_DEPENDENCIES) $(EXTRA_libcfa_d_a_DEPENDENCIES)
         $(AM_V_at)-rm -f libcfa-d.a
 …
         concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
 libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES)
         $(AM_V_at)-rm -f libcfa.a
 …
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
+        -rm -f concurrency/*.$(OBJEXT)
+        -rm -f containers/*.$(OBJEXT)
+        -rm -f libhdr/*.$(OBJEXT)
+        -rm -f concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-alarm.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-coroutine.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-invoke.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-kernel.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-monitor.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-preemption.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-thread.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-alarm.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-coroutine.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-invoke.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-kernel.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-monitor.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-preemption.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-thread.$(OBJEXT)
+        -rm -f containers/libcfa_a-maybe.$(OBJEXT)
+        -rm -f containers/libcfa_a-pair.$(OBJEXT)
+        -rm -f containers/libcfa_a-result.$(OBJEXT)
+        -rm -f containers/libcfa_a-vector.$(OBJEXT)
+        -rm -f containers/libcfa_d_a-maybe.$(OBJEXT)
+        -rm -f containers/libcfa_d_a-pair.$(OBJEXT)
+        -rm -f containers/libcfa_d_a-result.$(OBJEXT)
+        -rm -f containers/libcfa_d_a-vector.$(OBJEXT)
+        -rm -f libhdr/libcfa_a-libdebug.$(OBJEXT)
+        -rm -f libhdr/libcfa_d_a-libdebug.$(OBJEXT)
 distclean-compile:
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-assert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-exception.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-fstream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-interpose.Po@am__quote@
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-stdlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-typeobject.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-assert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-exception.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-fstream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-interpose.Po@am__quote@
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-stdlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-typeobject.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@MACHINE_TYPE@.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-alarm.Po@am__quote@
 …
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-monitor.obj `if test -f 'concurrency/monitor.c'; then $(CYGPATH_W) 'concurrency/monitor.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/monitor.c'; fi`
-libcfa_d_a-exception.obj: exception.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-exception.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-exception.Tpo -c -o libcfa_d_a-exception.obj `if test -f 'exception.c'; then $(CYGPATH_W) 'exception.c'; else $(CYGPATH_W) '$(srcdir)/exception.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-exception.Tpo $(DEPDIR)/libcfa_d_a-exception.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='exception.c' object='libcfa_d_a-exception.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-exception.obj `if test -f 'exception.c'; then $(CYGPATH_W) 'exception.c'; else $(CYGPATH_W) '$(srcdir)/exception.c'; fi`
-libcfa_d_a-typeobject.obj: typeobject.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-typeobject.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-typeobject.Tpo -c -o libcfa_d_a-typeobject.obj `if test -f 'typeobject.c'; then $(CYGPATH_W) 'typeobject.c'; else $(CYGPATH_W) '$(srcdir)/typeobject.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-typeobject.Tpo $(DEPDIR)/libcfa_d_a-typeobject.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='typeobject.c' object='libcfa_d_a-typeobject.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-typeobject.obj `if test -f 'typeobject.c'; then $(CYGPATH_W) 'typeobject.c'; else $(CYGPATH_W) '$(srcdir)/typeobject.c'; fi`
 concurrency/libcfa_d_a-alarm.o: concurrency/alarm.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-alarm.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-alarm.Tpo -c -o concurrency/libcfa_d_a-alarm.o `test -f 'concurrency/alarm.c' || echo '$(srcdir)/'`concurrency/alarm.c
 …
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-monitor.obj `if test -f 'concurrency/monitor.c'; then $(CYGPATH_W) 'concurrency/monitor.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/monitor.c'; fi`
-libcfa_a-exception.obj: exception.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-exception.obj -MD -MP -MF $(DEPDIR)/libcfa_a-exception.Tpo -c -o libcfa_a-exception.obj `if test -f 'exception.c'; then $(CYGPATH_W) 'exception.c'; else $(CYGPATH_W) '$(srcdir)/exception.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-exception.Tpo $(DEPDIR)/libcfa_a-exception.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='exception.c' object='libcfa_a-exception.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-exception.obj `if test -f 'exception.c'; then $(CYGPATH_W) 'exception.c'; else $(CYGPATH_W) '$(srcdir)/exception.c'; fi`
-libcfa_a-typeobject.obj: typeobject.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-typeobject.obj -MD -MP -MF $(DEPDIR)/libcfa_a-typeobject.Tpo -c -o libcfa_a-typeobject.obj `if test -f 'typeobject.c'; then $(CYGPATH_W) 'typeobject.c'; else $(CYGPATH_W) '$(srcdir)/typeobject.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-typeobject.Tpo $(DEPDIR)/libcfa_a-typeobject.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='typeobject.c' object='libcfa_a-typeobject.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-typeobject.obj `if test -f 'typeobject.c'; then $(CYGPATH_W) 'typeobject.c'; else $(CYGPATH_W) '$(srcdir)/typeobject.c'; fi`
 concurrency/libcfa_a-alarm.o: concurrency/alarm.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-alarm.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-alarm.Tpo -c -o concurrency/libcfa_a-alarm.o `test -f 'concurrency/alarm.c' || echo '$(srcdir)/'`concurrency/alarm.c
 …
 install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS)
         @$(NORMAL_INSTALL)
+        test -z "$(cfa_includedir)" || $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)"
         @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
-        if test -n "$$list"; then \
-          echo " $(MKDIR_P) '$(DESTDIR)$(cfa_includedir)'"; \
-          $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)" || exit 1; \
-        fi; \
         $(am__nobase_list) | while read dir files; do \
           xfiles=; for file in $$files; do \
 …
           test -z "$$xfiles" || { \
             test "x$$dir" = x. || { \
               echo " $(MKDIR_P) '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
+              echo "$(MKDIR_P) '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
               $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)/$$dir"; }; \
             echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
 …
         dir='$(DESTDIR)$(cfa_includedir)'; $(am__uninstall_files_from_dir)
+ID: $(am__tagged_files)
+        $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        mkid -fID $$unique
+tags: TAGS
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
         set x; \
         here=`pwd`; \
+        $(am__define_uniq_tagged_files); \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         shift; \
         if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 …
           fi; \
         fi
+ctags: ctags-am
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         test -z "$(CTAGS_ARGS)$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 …
           && $(am__cd) $(top_srcdir) \
           && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-cscopelist-am: $(am__tagged_files)
-        list='$(am__tagged_files)'; \
-        case "$(srcdir)" in \
-          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-          *) sdir=$(subdir)/$(srcdir) ;; \
-        esac; \
-        for i in $$list; do \
-          if test -f "$$i"; then \
-            echo "$(subdir)/$$i"; \
-          else \
-            echo "$$sdir/$$i"; \
-          fi; \
-        done >> $(top_builddir)/cscope.files
 distclean-tags:
 …
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
         clean-libLIBRARIES 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-libLIBRARIES install-man \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+        clean-libLIBRARIES ctags 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-libLIBRARIES install-man \
         install-nobase_cfa_includeHEADERS install-pdf install-pdf-am \
         install-ps install-ps-am install-strip installcheck \
 …
         maintainer-clean-generic maintainer-clean-local mostlyclean \
         mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
         tags tags-am uninstall uninstall-am uninstall-libLIBRARIES \
+        tags uninstall uninstall-am uninstall-libLIBRARIES \
         uninstall-nobase_cfa_includeHEADERS
-.PRECIOUS: Makefile
 …
         ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
-libcfa_a-exception.o : exception.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
-libcfa_a-typeobject.o : typeobject.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
 concurrency/libcfa_d_a-invoke.o : concurrency/invoke.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
-libcfa_d_a-exception.o : exception.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
-libcfa_d_a-typeobject.o : typeobject.c
         ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<

src/libcfa/concurrency/CtxSwitch-i386.S

-              rb826e6b
+              rfea3faa
         ret
+.text
+        .align 2
+.globl  CtxGet
+CtxGet:
+        movl %esp,SP_OFFSET(%eax)
+        movl %ebp,FP_OFFSET(%eax)
+        ret
 // Local Variables: //
 // compile-command: "make install" //

src/libcfa/concurrency/CtxSwitch-x86_64.S

-              rb826e6b
+              rfea3faa
 //                               -*- Mode: Asm -*-
+//                               -*- Mode: Asm -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 …
 // Free Software  Foundation; either  version 2.1 of  the License, or  (at your
 // option) any later version.
 //
+//
 // This library is distributed in the  hope that it will be useful, but WITHOUT
 // ANY  WARRANTY;  without even  the  implied  warranty  of MERCHANTABILITY  or
 // FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
 // for more details.
 //
+//
 // You should  have received a  copy of the  GNU Lesser General  Public License
 // along  with this library.
 //
+//
 // This context switch routine depends on the fact that the stack of a new
 …
 .globl  CtxInvokeStub
 CtxInvokeStub:
         movq %rbx, %rdi
+        movq %rbx, %rdi
         jmp *%r12
+.text
+        .align 2
+.globl  CtxGet
+CtxGet:
+        movq %rsp,SP_OFFSET(%rdi)
+        movq %rbp,FP_OFFSET(%rdi)
+        ret
 // Local Variables: //

src/libcfa/concurrency/alarm.c

-              rb826e6b
+              rfea3faa
 extern "C" {
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
-#include <unistd.h>
 #include <sys/time.h>
+}
-#include "libhdr.h"
 #include "alarm.h"
 #include "kernel_private.h"
 #include "preemption.h"
-//=============================================================================================
-// time type
-//=============================================================================================
-#define one_second         1_000_000_000ul
-#define one_milisecond         1_000_000ul
-#define one_microsecond            1_000ul
-#define one_nanosecond                 1ul
-__cfa_time_t zero_time = { 0 };
-void ?{}( __cfa_time_t * this ) { this->val = 0; }
-void ?{}( __cfa_time_t * this, zero_t zero ) { this->val = 0; }
-void ?{}( itimerval * this, __cfa_time_t * alarm ) {
-        this->it_value.tv_sec = alarm->val / one_second;                        // seconds
-        this->it_value.tv_usec = max( (alarm->val % one_second) / one_microsecond, 1000 ); // microseconds
-        this->it_interval.tv_sec = 0;
-        this->it_interval.tv_usec = 0;
+}
-void ?{}( __cfa_time_t * this, timespec * curr ) {
-        uint64_t secs  = curr->tv_sec;
-        uint64_t nsecs = curr->tv_nsec;
-        this->val = (secs * one_second) + nsecs;
+}
-__cfa_time_t ?=?( __cfa_time_t * this, zero_t rhs ) {
-        this->val = 0;
-        return *this;
+}
-__cfa_time_t from_s ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000_000ul; return ret; }
-__cfa_time_t from_ms( uint64_t val ) { __cfa_time_t ret; ret.val = val *     1_000_000ul; return ret; }
-__cfa_time_t from_us( uint64_t val ) { __cfa_time_t ret; ret.val = val *         1_000ul; return ret; }
-__cfa_time_t from_ns( uint64_t val ) { __cfa_time_t ret; ret.val = val *             1ul; return ret; }
 //=============================================================================================
 …
         timespec curr;
         clock_gettime( CLOCK_REALTIME, &curr );
         return (__cfa_time_t){ &curr };
+        return ((__cfa_time_t)curr.tv_sec * TIMEGRAN) + curr.tv_nsec;
+}
 void __kernel_set_timer( __cfa_time_t alarm ) {
+        itimerval val = { &alarm };
+        itimerval val;
+        val.it_value.tv_sec = alarm / TIMEGRAN;                 // seconds
+        val.it_value.tv_usec = (alarm % TIMEGRAN) / ( TIMEGRAN / 1_000_000L ); // microseconds
+        val.it_interval.tv_sec = 0;
+        val.it_interval.tv_usec = 0;
         setitimer( ITIMER_REAL, &val, NULL );
+}
 …
 //=============================================================================================
 void ?{}( alarm_node_t * this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
+void ?{}( alarm_node_t * this, thread_desc * thrd, __cfa_time_t alarm = 0, __cfa_time_t period = 0 ) {
         this->thrd = thrd;
         this->alarm = alarm;
 …
+}
 void ?{}( alarm_node_t * this, processor   * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
+void ?{}( alarm_node_t * this, processor   * proc, __cfa_time_t alarm = 0, __cfa_time_t period = 0 ) {
         this->proc = proc;
         this->alarm = alarm;
 …
+}
-LIB_DEBUG_DO( bool validate( alarm_list_t * this ) {
-        alarm_node_t ** it = &this->head;
-        while( (*it) ) {
-                it = &(*it)->next;
+        }
-        return it == this->tail;
-})
 static inline void insert_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t p ) {
         verify( !n->next );
+        assert( !n->next );
         if( p == this->tail ) {
                 this->tail = &n->next;
 …
+        }
         *p = n;
-        verify( validate( this ) );
+}
 …
         insert_at( this, n, it );
-        verify( validate( this ) );
+}
 …
                 head->next = NULL;
+        }
-        verify( validate( this ) );
         return head;
+}
 …
 static inline void remove_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t it ) {
         verify( it );
         verify( (*it) == n );
+        verify( (*it)->next == n );
         (*it) = n->next;
+        (*it)->next = n->next;
         if( !n-> next ) {
                 this->tail = it;
+        }
         n->next = NULL;
-        verify( validate( this ) );
+}
 static inline void remove( alarm_list_t * this, alarm_node_t * n ) {
         alarm_node_t ** it = &this->head;
         while( (*it) && (*it) != n ) {
+        while( (*it) && (*it)->next != n ) {
                 it = &(*it)->next;
+        }
-        verify( validate( this ) );
         if( *it ) { remove_at( this, n, it ); }
-        verify( validate( this ) );
+}
 void register_self( alarm_node_t * this ) {
-        alarm_list_t * alarms = &event_kernel->alarms;
         disable_interrupts();
+        lock( &event_kernel->lock DEBUG_CTX2 );
+        assert( !systemProcessor->pending_alarm );
+        lock( &systemProcessor->alarm_lock );
+        {
+                verify( validate( alarms ) );
+                bool first = !alarms->head;
+                insert( alarms, this );
+                if( first ) {
+                        __kernel_set_timer( alarms->head->alarm - __kernel_get_time() );
+                insert( &systemProcessor->alarms, this );
+                if( systemProcessor->pending_alarm ) {
+                        tick_preemption();
+                }
+        }
         unlock( &event_kernel->lock );
+        unlock( &systemProcessor->alarm_lock );
         this->set = true;
         enable_interrupts( DEBUG_CTX );
+        enable_interrupts();
+}
 void unregister_self( alarm_node_t * this ) {
         disable_interrupts();
+        lock( &event_kernel->lock DEBUG_CTX2 );
+        {
+                verify( validate( &event_kernel->alarms ) );
+                remove( &event_kernel->alarms, this );
+        }
+        unlock( &event_kernel->lock );
+        enable_interrupts( DEBUG_CTX );
+        lock( &systemProcessor->alarm_lock );
+        remove( &systemProcessor->alarms, this );
+        unlock( &systemProcessor->alarm_lock );
+        disable_interrupts();
         this->set = false;
+}

src/libcfa/concurrency/alarm.h

-              rb826e6b
+              rfea3faa
 #include <stdbool.h>
-#include <stdint.h>
 #include "assert"
+typedef unsigned long int __cfa_time_t;
 struct thread_desc;
 struct processor;
-struct timespec;
-struct itimerval;
-//=============================================================================================
-// time type
-//=============================================================================================
-struct __cfa_time_t {
-        uint64_t val;
-};
-// ctors
-void ?{}( __cfa_time_t * this );
-void ?{}( __cfa_time_t * this, zero_t zero );
-void ?{}( __cfa_time_t * this, timespec * curr );
-void ?{}( itimerval * this, __cfa_time_t * alarm );
-__cfa_time_t ?=?( __cfa_time_t * this, zero_t rhs );
-// logical ops
-static inline bool ?==?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val == rhs.val; }
-static inline bool ?!=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val != rhs.val; }
-static inline bool ?>? ( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val >  rhs.val; }
-static inline bool ?<? ( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val <  rhs.val; }
-static inline bool ?>=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val >= rhs.val; }
-static inline bool ?<=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val <= rhs.val; }
-static inline bool ?==?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val == rhs; }
-static inline bool ?!=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val != rhs; }
-static inline bool ?>? ( __cfa_time_t lhs, zero_t rhs ) { return lhs.val >  rhs; }
-static inline bool ?<? ( __cfa_time_t lhs, zero_t rhs ) { return lhs.val <  rhs; }
-static inline bool ?>=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val >= rhs; }
-static inline bool ?<=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val <= rhs; }
-// addition/substract
-static inline __cfa_time_t ?+?( __cfa_time_t lhs, __cfa_time_t rhs ) {
-        __cfa_time_t ret;
-        ret.val = lhs.val + rhs.val;
-        return ret;
+}
-static inline __cfa_time_t ?-?( __cfa_time_t lhs, __cfa_time_t rhs ) {
-        __cfa_time_t ret;
-        ret.val = lhs.val - rhs.val;
-        return ret;
+}
-__cfa_time_t from_s ( uint64_t );
-__cfa_time_t from_ms( uint64_t );
-__cfa_time_t from_us( uint64_t );
-__cfa_time_t from_ns( uint64_t );
-extern __cfa_time_t zero_time;
 //=============================================================================================
 // Clock logic
 //=============================================================================================
+#define TIMEGRAN 1_000_000_000L                         // nanosecond granularity, except for timeval
 __cfa_time_t __kernel_get_time();
 …
 typedef alarm_node_t ** __alarm_it_t;
 void ?{}( alarm_node_t * this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time );
 void ?{}( alarm_node_t * this, processor   * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time );
+void ?{}( alarm_node_t * this, thread_desc * thrd, __cfa_time_t alarm = 0, __cfa_time_t period = 0 );
+void ?{}( alarm_node_t * this, processor   * proc, __cfa_time_t alarm = 0, __cfa_time_t period = 0 );
 void ^?{}( alarm_node_t * this );

src/libcfa/concurrency/coroutine

-              rb826e6b
+              rfea3faa
 // Get current coroutine
 extern volatile thread_local coroutine_desc * this_coroutine;
+coroutine_desc * this_coroutine(void);
 // Private wrappers for context switch and stack creation
 …
 // Suspend implementation inlined for performance
 static inline void suspend() {
         coroutine_desc * src = this_coroutine;          // optimization
+        coroutine_desc * src = this_coroutine();                // optimization
         assertf( src->last != 0,
 …
 forall(dtype T | is_coroutine(T))
 static inline void resume(T * cor) {
         coroutine_desc * src = this_coroutine;          // optimization
+        coroutine_desc * src = this_coroutine();                // optimization
         coroutine_desc * dst = get_coroutine(cor);
 …
 static inline void resume(coroutine_desc * dst) {
         coroutine_desc * src = this_coroutine;          // optimization
+        coroutine_desc * src = this_coroutine();                // optimization
         // not resuming self ?

src/libcfa/concurrency/coroutine.c

-              rb826e6b
+              rfea3faa
 #include "invoke.h"
 extern volatile thread_local processor * this_processor;
+extern thread_local processor * this_processor;
 //-----------------------------------------------------------------------------
 …
 // Coroutine ctors and dtors
 void ?{}(coStack_t* this) {
         this->size              = 65000;        // size of stack
+        this->size              = 10240;        // size of stack
         this->storage   = NULL; // pointer to stack
         this->limit             = NULL; // stack grows towards stack limit
 …
         this->context   = NULL; // address of cfa_context_t
         this->top               = NULL; // address of top of storage
         this->userStack = false;
+        this->userStack = false;
+}
 …
         // set state of current coroutine to inactive
         src->state = src->state == Halted ? Halted : Inactive;
+        src->state = Inactive;
         // set new coroutine that task is executing
         this_coroutine = dst;
+        this_processor->current_coroutine = dst;
         // context switch to specified coroutine
-        assert( src->stack.context );
         CtxSwitch( src->stack.context, dst->stack.context );
         // when CtxSwitch returns we are back in the src coroutine
+        // when CtxSwitch returns we are back in the src coroutine
         // set state of new coroutine to active
 …
                 this->size = libCeiling( storageSize, 16 );
                 // use malloc/memalign because "new" raises an exception for out-of-memory
                 // assume malloc has 8 byte alignment so add 8 to allow rounding up to 16 byte alignment
                 LIB_DEBUG_DO( this->storage = memalign( pageSize, cxtSize + this->size + pageSize ) );

src/libcfa/concurrency/invoke.c

-              rb826e6b
+              rfea3faa
 extern void __suspend_internal(void);
+extern void __leave_thread_monitor( struct thread_desc * this );
+extern void disable_interrupts();
+extern void enable_interrupts( DEBUG_CTX_PARAM );
+extern void __leave_monitor_desc( struct monitor_desc * this );
 void CtxInvokeCoroutine(
       void (*main)(void *),
       struct coroutine_desc *(*get_coroutine)(void *),
+      void (*main)(void *),
+      struct coroutine_desc *(*get_coroutine)(void *),
       void *this
 ) {
 …
 void CtxInvokeThread(
       void (*dtor)(void *),
       void (*main)(void *),
       struct thread_desc *(*get_thread)(void *),
+      void (*dtor)(void *),
+      void (*main)(void *),
+      struct thread_desc *(*get_thread)(void *),
       void *this
 ) {
-      // First suspend, once the thread arrives here,
-      // the function pointer to main can be invalidated without risk
       __suspend_internal();
-      // Fetch the thread handle from the user defined thread structure
       struct thread_desc* thrd = get_thread( this );
+      struct coroutine_desc* cor = &thrd->cor;
+      struct monitor_desc* mon = &thrd->mon;
+      cor->state = Active;
+      // Officially start the thread by enabling preemption
+      enable_interrupts( DEBUG_CTX );
+      // Call the main of the thread
+      // LIB_DEBUG_PRINTF("Invoke Thread : invoking main %p (args %p)\n", main, this);
       main( this );
+      // To exit a thread we must :
+      // 1 - Mark it as halted
+      // 2 - Leave its monitor
+      // 3 - Disable the interupts
+      // 4 - Final suspend
+      // The order of these 4 operations is very important
+      __leave_monitor_desc( mon );
       //Final suspend, should never return
       __leave_thread_monitor( thrd );
+      __suspend_internal();
       abortf("Resumed dead thread");
+}
 …
 void CtxStart(
       void (*main)(void *),
       struct coroutine_desc *(*get_coroutine)(void *),
       void *this,
+      void (*main)(void *),
+      struct coroutine_desc *(*get_coroutine)(void *),
+      void *this,
       void (*invoke)(void *)
 ) {
 …
         ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = invoke;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
 #elif defined( __x86_64__ )
 …
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
 #else
       #error Only __i386__ and __x86_64__ is supported for threads in cfa

src/libcfa/concurrency/invoke.h

-              rb826e6b
+              rfea3faa
       struct spinlock {
             volatile int lock;
-            #ifdef __CFA_DEBUG__
-                  const char * prev_name;
-                  void* prev_thrd;
-            #endif
       };
 …
             struct __thread_queue_t entry_queue;      // queue of threads that are blocked waiting for the monitor
             struct __condition_stack_t signal_stack;  // stack of conditions to run next once we exit the monitor
+            struct monitor_desc * stack_owner;        // if bulk acquiring was used we need to synchronize signals with an other monitor
             unsigned int recursion;                   // monitor routines can be called recursively, we need to keep track of that
       };
 …
 #ifndef _INVOKE_PRIVATE_H_
 #define _INVOKE_PRIVATE_H_
       struct machine_context_t {
             void *SP;
 …
       extern void CtxInvokeStub( void );
       void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
+      #if   defined( __x86_64__ )
+      #define CtxGet( ctx ) __asm__ ( \
+                  "movq %%rsp,%0\n"   \
+                  "movq %%rbp,%1\n"   \
+            : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+      #elif defined( __i386__ )
+      #define CtxGet( ctx ) __asm__ ( \
+                  "movl %%esp,%0\n"   \
+                  "movl %%ebp,%1\n"   \
+            : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+      #endif
+      void CtxGet( void * this ) asm ("CtxGet");
 #endif //_INVOKE_PRIVATE_H_

src/libcfa/concurrency/kernel

-              rb826e6b
+              rfea3faa
 //-----------------------------------------------------------------------------
 // Locks
+void lock      ( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, spin if already acquired
+void lock_yield( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, yield repeatedly if already acquired
+bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, return false if already acquired
+void unlock    ( spinlock * );                        // Unlock the spinlock
+bool try_lock( spinlock * );
+void lock( spinlock * );
+void unlock( spinlock * );
 struct semaphore {
         spinlock lock;
         int count;
         __thread_queue_t waiting;
+struct signal_once {
+        volatile bool cond;
+        struct spinlock lock;
+        struct __thread_queue_t blocked;
 };
+void  ?{}(semaphore * this, int count = 1);
+void ^?{}(semaphore * this);
+void P(semaphore * this);
+void V(semaphore * this);
+void ?{}(signal_once * this);
+void ^?{}(signal_once * this);
+void wait( signal_once * );
+void signal( signal_once * );
 //-----------------------------------------------------------------------------
 // Cluster
 struct cluster {
+        spinlock ready_queue_lock;                      // Ready queue locks
+        __thread_queue_t ready_queue;                   // Ready queue for threads
+        unsigned long long int preemption;              // Preemption rate on this cluster
+        __thread_queue_t ready_queue;
+        spinlock lock;
 };
 …
         unsigned short thrd_count;
 };
 static inline void ?{}(FinishAction * this) {
+static inline void ?{}(FinishAction * this) {
         this->action_code = No_Action;
         this->thrd = NULL;
 …
 static inline void ^?{}(FinishAction * this) {}
-// Processor
-// Wrapper around kernel threads
 struct processor {
+        // Main state
+        struct processorCtx_t * runner;                 // Coroutine ctx who does keeps the state of the processor
+        cluster * cltr;                                 // Cluster from which to get threads
+        pthread_t kernel_thread;                        // Handle to pthreads
+        struct processorCtx_t * runner;
+        cluster * cltr;
+        coroutine_desc * current_coroutine;
+        thread_desc * current_thread;
+        pthread_t kernel_thread;
+        signal_once terminated;
+        volatile bool is_terminated;
+        // Termination
+        volatile bool do_terminate;                     // Set to true to notify the processor should terminate
+        semaphore terminated;                           // Termination synchronisation
+        struct FinishAction finish;
         // RunThread data
         struct FinishAction finish;                     // Action to do after a thread is ran
+        struct alarm_node_t * preemption_alarm;
+        unsigned int preemption;
+        // Preemption data
+        struct alarm_node_t * preemption_alarm;         // Node which is added in the discrete event simulaiton
+        bool pending_preemption;                        // If true, a preemption was triggered in an unsafe region, the processor must preempt as soon as possible
+        unsigned short disable_preempt_count;
+#ifdef __CFA_DEBUG__
+        char * last_enable;                             // Last function to enable preemption on this processor
+#endif
+        bool pending_preemption;
 };

src/libcfa/concurrency/kernel.c

-              rb826e6b
+              rfea3faa
 //
+#include "libhdr.h"
+#include "startup.h"
+//Start and stop routine for the kernel, declared first to make sure they run first
+void kernel_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
+void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
+//Header
+#include "kernel_private.h"
 //C Includes
 …
 //CFA Includes
 #include "kernel_private.h"
+#include "libhdr.h"
 #include "preemption.h"
-#include "startup.h"
 //Private includes
 …
 #include "invoke.h"
-//Start and stop routine for the kernel, declared first to make sure they run first
-void kernel_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
-void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
 //-----------------------------------------------------------------------------
 // Kernel storage
+KERNEL_STORAGE(cluster,           mainCluster);
+KERNEL_STORAGE(processor,         mainProcessor);
+KERNEL_STORAGE(processorCtx_t,    mainProcessorCtx);
+KERNEL_STORAGE(thread_desc,       mainThread);
+KERNEL_STORAGE(machine_context_t, mainThreadCtx);
+cluster *     mainCluster;
+processor *   mainProcessor;
+#define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]
+KERNEL_STORAGE(processorCtx_t, systemProcessorCtx);
+KERNEL_STORAGE(cluster, systemCluster);
+KERNEL_STORAGE(system_proc_t, systemProcessor);
+KERNEL_STORAGE(thread_desc, mainThread);
+KERNEL_STORAGE(machine_context_t, mainThread_context);
+cluster * systemCluster;
+system_proc_t * systemProcessor;
 thread_desc * mainThread;
 …
 // Global state
+volatile thread_local coroutine_desc * this_coroutine;
+volatile thread_local thread_desc * this_thread;
+volatile thread_local processor * this_processor;
+volatile thread_local bool preemption_in_progress = 0;
+volatile thread_local unsigned short disable_preempt_count = 1;
+thread_local processor * this_processor;
+coroutine_desc * this_coroutine(void) {
+        return this_processor->current_coroutine;
+}
+thread_desc * this_thread(void) {
+        return this_processor->current_thread;
+}
 //-----------------------------------------------------------------------------
 // Main thread construction
 struct current_stack_info_t {
         machine_context_t ctx;
+        machine_context_t ctx;
         unsigned int size;              // size of stack
         void *base;                             // base of stack
 …
 void ?{}( current_stack_info_t * this ) {
         CtxGet( this->ctx );
+        CtxGet( &this->ctx );
         this->base = this->ctx.FP;
         this->storage = this->ctx.SP;
 …
         this->limit = (void *)(((intptr_t)this->base) - this->size);
         this->context = &storage_mainThreadCtx;
+        this->context = &mainThread_context_storage;
         this->top = this->base;
+}
 …
 void ?{}( coroutine_desc * this, current_stack_info_t * info) {
         (&this->stack){ info };
+        (&this->stack){ info };
         this->name = "Main Thread";
         this->errno_ = 0;
 …
 void ?{}(processor * this) {
         this{ mainCluster };
+        this{ systemCluster };
+}
 void ?{}(processor * this, cluster * cltr) {
         this->cltr = cltr;
+        (&this->terminated){ 0 };
+        this->do_terminate = false;
+        this->current_coroutine = NULL;
+        this->current_thread = NULL;
+        (&this->terminated){};
+        this->is_terminated = false;
         this->preemption_alarm = NULL;
+        this->preemption = default_preemption();
+        this->disable_preempt_count = 1;                //Start with interrupts disabled
         this->pending_preemption = false;
 …
 void ?{}(processor * this, cluster * cltr, processorCtx_t * runner) {
         this->cltr = cltr;
+        (&this->terminated){ 0 };
+        this->do_terminate = false;
+        this->preemption_alarm = NULL;
+        this->current_coroutine = NULL;
+        this->current_thread = NULL;
+        (&this->terminated){};
+        this->is_terminated = false;
+        this->disable_preempt_count = 0;
         this->pending_preemption = false;
-        this->kernel_thread = pthread_self();
         this->runner = runner;
         LIB_DEBUG_PRINT_SAFE("Kernel : constructing main processor context %p\n", runner);
+        LIB_DEBUG_PRINT_SAFE("Kernel : constructing processor context %p\n", runner);
         runner{ this };
+}
+void ?{}(system_proc_t * this, cluster * cltr, processorCtx_t * runner) {
+        (&this->alarms){};
+        (&this->alarm_lock){};
+        this->pending_alarm = false;
+        (&this->proc){ cltr, runner };
+}
 void ^?{}(processor * this) {
         if( ! this->do_terminate ) {
+        if( ! this->is_terminated ) {
                 LIB_DEBUG_PRINT_SAFE("Kernel : core %p signaling termination\n", this);
+                this->do_terminate = true;
+                P( &this->terminated );
+                pthread_join( this->kernel_thread, NULL );
+                this->is_terminated = true;
+                wait( &this->terminated );
+        }
+}
 …
 void ?{}(cluster * this) {
         ( &this->ready_queue ){};
+        ( &this->ready_queue_lock ){};
+        this->preemption = default_preemption();
+        ( &this->lock ){};
+}
 void ^?{}(cluster * this) {
+}
 …
                 thread_desc * readyThread = NULL;
                 for( unsigned int spin_count = 0; ! this->do_terminate; spin_count++ )
+                for( unsigned int spin_count = 0; ! this->is_terminated; spin_count++ )
+                {
                         readyThread = nextThread( this->cltr );
 …
                         if(readyThread)
+                        {
-                                verify( disable_preempt_count > 0 );
                                 runThread(this, readyThread);
-                                verify( disable_preempt_count > 0 );
                                 //Some actions need to be taken from the kernel
 …
+        }
+        V( &this->terminated );
+        signal( &this->terminated );
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p terminated\n", this);
+}
 // runThread runs a thread by context switching
 // from the processor coroutine to the target thread
+// runThread runs a thread by context switching
+// from the processor coroutine to the target thread
 void runThread(processor * this, thread_desc * dst) {
         coroutine_desc * proc_cor = get_coroutine(this->runner);
         coroutine_desc * thrd_cor = get_coroutine(dst);
         //Reset the terminating actions here
         this->finish.action_code = No_Action;
         //Update global state
         this_thread = dst;
+        this->current_thread = dst;
         // Context Switch to the thread
 …
+}
 // Once a thread has finished running, some of
+// Once a thread has finished running, some of
 // its final actions must be executed from the kernel
 void finishRunning(processor * this) {
 …
+        }
         else if( this->finish.action_code == Release_Schedule ) {
                 unlock( this->finish.lock );
+                unlock( this->finish.lock );
                 ScheduleThread( this->finish.thrd );
+        }
 …
         processor * proc = (processor *) arg;
         this_processor = proc;
-        this_coroutine = NULL;
-        this_thread = NULL;
-        disable_preempt_count = 1;
         // SKULLDUGGERY: We want to create a context for the processor coroutine
         // which is needed for the 2-step context switch. However, there is no reason
         // to waste the perfectly valid stack create by pthread.
+        // to waste the perfectly valid stack create by pthread.
         current_stack_info_t info;
         machine_context_t ctx;
 …
         //Set global state
         this_coroutine = &proc->runner->__cor;
         this_thread = NULL;
+        proc->current_coroutine = &proc->runner->__cor;
+        proc->current_thread = NULL;
         //We now have a proper context from which to schedule threads
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p created (%p, %p)\n", proc, proc->runner, &ctx);
         // SKULLDUGGERY: Since the coroutine doesn't have its own stack, we can't
         // resume it to start it like it normally would, it will just context switch
         // back to here. Instead directly call the main since we already are on the
+        // SKULLDUGGERY: Since the coroutine doesn't have its own stack, we can't
+        // resume it to start it like it normally would, it will just context switch
+        // back to here. Instead directly call the main since we already are on the
         // appropriate stack.
         proc_cor_storage.__cor.state = Active;
 …
         // Main routine of the core returned, the core is now fully terminated
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p main ended (%p)\n", proc, proc->runner);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p main ended (%p)\n", proc, proc->runner);
         return NULL;
 …
 void start(processor * this) {
         LIB_DEBUG_PRINT_SAFE("Kernel : Starting core %p\n", this);
         pthread_create( &this->kernel_thread, NULL, CtxInvokeProcessor, (void*)this );
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p started\n", this);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p started\n", this);
+}
 …
 // Scheduler routines
 void ScheduleThread( thread_desc * thrd ) {
+        // if( !thrd ) return;
+        assert( thrd );
+        assert( thrd->cor.state != Halted );
+        verify( disable_preempt_count > 0 );
+        if( !thrd ) return;
         verifyf( thrd->next == NULL, "Expected null got %p", thrd->next );
+        lock(   &this_processor->cltr->ready_queue_lock DEBUG_CTX2 );
+        append( &this_processor->cltr->ready_queue, thrd );
+        unlock( &this_processor->cltr->ready_queue_lock );
+        verify( disable_preempt_count > 0 );
+        lock( &systemProcessor->proc.cltr->lock );
+        append( &systemProcessor->proc.cltr->ready_queue, thrd );
+        unlock( &systemProcessor->proc.cltr->lock );
+}
 thread_desc * nextThread(cluster * this) {
+        verify( disable_preempt_count > 0 );
+        lock( &this->ready_queue_lock DEBUG_CTX2 );
+        lock( &this->lock );
         thread_desc * head = pop_head( &this->ready_queue );
+        unlock( &this->ready_queue_lock );
+        verify( disable_preempt_count > 0 );
+        unlock( &this->lock );
         return head;
+}
+void BlockInternal() {
+        disable_interrupts();
+        verify( disable_preempt_count > 0 );
+void ScheduleInternal() {
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal( spinlock * lock ) {
+        disable_interrupts();
+}
+void ScheduleInternal( spinlock * lock ) {
         this_processor->finish.action_code = Release;
         this_processor->finish.lock = lock;
-        verify( disable_preempt_count > 0 );
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal( thread_desc * thrd ) {
+        disable_interrupts();
+        assert( thrd->cor.state != Halted );
+}
+void ScheduleInternal( thread_desc * thrd ) {
         this_processor->finish.action_code = Schedule;
         this_processor->finish.thrd = thrd;
-        verify( disable_preempt_count > 0 );
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal( spinlock * lock, thread_desc * thrd ) {
+        disable_interrupts();
+}
+void ScheduleInternal( spinlock * lock, thread_desc * thrd ) {
         this_processor->finish.action_code = Release_Schedule;
         this_processor->finish.lock = lock;
         this_processor->finish.thrd = thrd;
-        verify( disable_preempt_count > 0 );
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal(spinlock ** locks, unsigned short count) {
+        disable_interrupts();
+}
+void ScheduleInternal(spinlock ** locks, unsigned short count) {
         this_processor->finish.action_code = Release_Multi;
         this_processor->finish.locks = locks;
         this_processor->finish.lock_count = count;
-        verify( disable_preempt_count > 0 );
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal(spinlock ** locks, unsigned short lock_count, thread_desc ** thrds, unsigned short thrd_count) {
+        disable_interrupts();
+}
+void ScheduleInternal(spinlock ** locks, unsigned short lock_count, thread_desc ** thrds, unsigned short thrd_count) {
         this_processor->finish.action_code = Release_Multi_Schedule;
         this_processor->finish.locks = locks;
 …
         this_processor->finish.thrds = thrds;
         this_processor->finish.thrd_count = thrd_count;
-        verify( disable_preempt_count > 0 );
-        suspend();
-        verify( disable_preempt_count > 0 );
-        enable_interrupts( DEBUG_CTX );
+}
-void LeaveThread(spinlock * lock, thread_desc * thrd) {
-        verify( disable_preempt_count > 0 );
-        this_processor->finish.action_code = thrd ? Release_Schedule : Release;
-        this_processor->finish.lock = lock;
-        this_processor->finish.thrd = thrd;
         suspend();
+}
 …
 // Kernel boot procedures
 void kernel_startup(void) {
         LIB_DEBUG_PRINT_SAFE("Kernel : Starting\n");
+        LIB_DEBUG_PRINT_SAFE("Kernel : Starting\n");
         // Start by initializing the main thread
         // SKULLDUGGERY: the mainThread steals the process main thread
         // which will then be scheduled by the mainProcessor normally
         mainThread = (thread_desc *)&storage_mainThread;
+        // SKULLDUGGERY: the mainThread steals the process main thread
+        // which will then be scheduled by the systemProcessor normally
+        mainThread = (thread_desc *)&mainThread_storage;
         current_stack_info_t info;
         mainThread{ &info };
 …
         LIB_DEBUG_PRINT_SAFE("Kernel : Main thread ready\n");
-        // Initialize the main cluster
-        mainCluster = (cluster *)&storage_mainCluster;
-        mainCluster{};
-        LIB_DEBUG_PRINT_SAFE("Kernel : main cluster ready\n");
-        // Initialize the main processor and the main processor ctx
-        // (the coroutine that contains the processing control flow)
-        mainProcessor = (processor *)&storage_mainProcessor;
-        mainProcessor{ mainCluster, (processorCtx_t *)&storage_mainProcessorCtx };
-        //initialize the global state variables
-        this_processor = mainProcessor;
-        this_thread = mainThread;
-        this_coroutine = &mainThread->cor;
         // Enable preemption
         kernel_start_preemption();
+        // Add the main thread to the ready queue
+        // once resume is called on mainProcessor->runner the mainThread needs to be scheduled like any normal thread
+        // Initialize the system cluster
+        systemCluster = (cluster *)&systemCluster_storage;
+        systemCluster{};
+        LIB_DEBUG_PRINT_SAFE("Kernel : System cluster ready\n");
+        // Initialize the system processor and the system processor ctx
+        // (the coroutine that contains the processing control flow)
+        systemProcessor = (system_proc_t *)&systemProcessor_storage;
+        systemProcessor{ systemCluster, (processorCtx_t *)&systemProcessorCtx_storage };
+        // Add the main thread to the ready queue
+        // once resume is called on systemProcessor->runner the mainThread needs to be scheduled like any normal thread
         ScheduleThread(mainThread);
+        // SKULLDUGGERY: Force a context switch to the main processor to set the main thread's context to the current UNIX
+        //initialize the global state variables
+        this_processor = &systemProcessor->proc;
+        this_processor->current_thread = mainThread;
+        this_processor->current_coroutine = &mainThread->cor;
+        // SKULLDUGGERY: Force a context switch to the system processor to set the main thread's context to the current UNIX
         // context. Hence, the main thread does not begin through CtxInvokeThread, like all other threads. The trick here is that
         // mainThread is on the ready queue when this call is made.
         resume( mainProcessor->runner );
+        // mainThread is on the ready queue when this call is made.
+        resume( systemProcessor->proc.runner );
 …
         // THE SYSTEM IS NOW COMPLETELY RUNNING
         LIB_DEBUG_PRINT_SAFE("Kernel : Started\n--------------------------------------------------\n\n");
-        enable_interrupts( DEBUG_CTX );
+}
 …
         LIB_DEBUG_PRINT_SAFE("\n--------------------------------------------------\nKernel : Shutting down\n");
+        disable_interrupts();
+        // SKULLDUGGERY: Notify the mainProcessor it needs to terminates.
+        // SKULLDUGGERY: Notify the systemProcessor it needs to terminates.
         // When its coroutine terminates, it return control to the mainThread
         // which is currently here
         mainProcessor->do_terminate = true;
+        systemProcessor->proc.is_terminated = true;
         suspend();
         // THE SYSTEM IS NOW COMPLETELY STOPPED
+        // Disable preemption
+        kernel_stop_preemption();
+        // Destroy the main processor and its context in reverse order of construction
+        // Destroy the system processor and its context in reverse order of construction
         // These were manually constructed so we need manually destroy them
         ^(mainProcessor->runner){};
         ^(mainProcessor){};
+        ^(systemProcessor->proc.runner){};
+        ^(systemProcessor){};
         // Final step, destroy the main thread since it is no longer needed
 …
         ^(mainThread){};
         LIB_DEBUG_PRINT_SAFE("Kernel : Shutdown complete\n");
+        LIB_DEBUG_PRINT_SAFE("Kernel : Shutdown complete\n");
+}
 …
         // abort cannot be recursively entered by the same or different processors because all signal handlers return when
         // the globalAbort flag is true.
         lock( &kernel_abort_lock DEBUG_CTX2 );
+        lock( &kernel_abort_lock );
         // first task to abort ?
 …
                 kernel_abort_called = true;
                 unlock( &kernel_abort_lock );
+        }
+        }
         else {
                 unlock( &kernel_abort_lock );
                 sigset_t mask;
                 sigemptyset( &mask );
 …
                 sigaddset( &mask, SIGUSR1 );                    // block SIGUSR1 signals
                 sigsuspend( &mask );                            // block the processor to prevent further damage during abort
                 _exit( EXIT_FAILURE );                          // if processor unblocks before it is killed, terminate it
+        }
         return this_thread;
+                _exit( EXIT_FAILURE );                          // if processor unblocks before it is killed, terminate it
+        }
+        return this_thread();
+}
 …
         __lib_debug_write( STDERR_FILENO, abort_text, len );
         if ( thrd != this_coroutine ) {
                 len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", this_coroutine->name, this_coroutine );
+        if ( thrd != this_coroutine() ) {
+                len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", this_coroutine()->name, this_coroutine() );
                 __lib_debug_write( STDERR_FILENO, abort_text, len );
+        }
+        }
         else {
                 __lib_debug_write( STDERR_FILENO, ".\n", 2 );
 …
 extern "C" {
         void __lib_debug_acquire() {
                 lock( &kernel_debug_lock DEBUG_CTX2 );
+                lock(&kernel_debug_lock);
+        }
         void __lib_debug_release() {
                 unlock( &kernel_debug_lock );
+                unlock(&kernel_debug_lock);
+        }
+}
 …
+}
 bool try_lock( spinlock * this DEBUG_CTX_PARAM2 ) {
+bool try_lock( spinlock * this ) {
         return this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0;
+}
 void lock( spinlock * this DEBUG_CTX_PARAM2 ) {
+void lock( spinlock * this ) {
         for ( unsigned int i = 1;; i += 1 ) {
+                if ( this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0 ) { break; }
+        }
+        LIB_DEBUG_DO(
+                this->prev_name = caller;
+                this->prev_thrd = this_thread;
+        )
+}
+void lock_yield( spinlock * this DEBUG_CTX_PARAM2 ) {
+        for ( unsigned int i = 1;; i += 1 ) {
+                if ( this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0 ) { break; }
+                yield();
+        }
+        LIB_DEBUG_DO(
+                this->prev_name = caller;
+                this->prev_thrd = this_thread;
+        )
+}
+                if ( this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0 ) break;
+        }
+}
 void unlock( spinlock * this ) {
 …
+}
+void  ?{}( semaphore * this, int count = 1 ) {
+        (&this->lock){};
+        this->count = count;
+        (&this->waiting){};
+}
+void ^?{}(semaphore * this) {}
+void P(semaphore * this) {
+        lock( &this->lock DEBUG_CTX2 );
+        this->count -= 1;
+        if ( this->count < 0 ) {
+                // queue current task
+                append( &this->waiting, (thread_desc *)this_thread );
+                // atomically release spin lock and block
+                BlockInternal( &this->lock );
+        }
+        else {
+            unlock( &this->lock );
+        }
+}
+void V(semaphore * this) {
+        thread_desc * thrd = NULL;
+        lock( &this->lock DEBUG_CTX2 );
+        this->count += 1;
+        if ( this->count <= 0 ) {
+                // remove task at head of waiting list
+                thrd = pop_head( &this->waiting );
+        }
+void ?{}( signal_once * this ) {
+        this->cond = false;
+}
+void ^?{}( signal_once * this ) {
+}
+void wait( signal_once * this ) {
+        lock( &this->lock );
+        if( !this->cond ) {
+                append( &this->blocked, this_thread() );
+                ScheduleInternal( &this->lock );
+                lock( &this->lock );
+        }
         unlock( &this->lock );
+        // make new owner
+        WakeThread( thrd );
+}
+void signal( signal_once * this ) {
+        lock( &this->lock );
+        {
+                this->cond = true;
+                thread_desc * it;
+                while( it = pop_head( &this->blocked) ) {
+                        ScheduleThread( it );
+                }
+        }
+        unlock( &this->lock );
+}
 …
+                }
                 head->next = NULL;
+        }
+        }
         return head;
+}
 …
                 this->top = top->next;
                 top->next = NULL;
+        }
+        }
         return top;
+}

src/libcfa/concurrency/kernel_private.h

-              rb826e6b
+              rfea3faa
 #define KERNEL_PRIVATE_H
-#include "libhdr.h"
 #include "kernel"
 #include "thread"
 …
 #include "alarm.h"
+#include "libhdr.h"
 //-----------------------------------------------------------------------------
 // Scheduler
-extern "C" {
-        void disable_interrupts();
-        void enable_interrupts_noPoll();
-        void enable_interrupts( DEBUG_CTX_PARAM );
+}
 void ScheduleThread( thread_desc * );
-static inline void WakeThread( thread_desc * thrd ) {
-        if( !thrd ) return;
-        disable_interrupts();
-        ScheduleThread( thrd );
-        enable_interrupts( DEBUG_CTX );
+}
 thread_desc * nextThread(cluster * this);
+//Block current thread and release/wake-up the following resources
+void BlockInternal(void);
+void BlockInternal(spinlock * lock);
+void BlockInternal(thread_desc * thrd);
+void BlockInternal(spinlock * lock, thread_desc * thrd);
+void BlockInternal(spinlock ** locks, unsigned short count);
+void BlockInternal(spinlock ** locks, unsigned short count, thread_desc ** thrds, unsigned short thrd_count);
+void LeaveThread(spinlock * lock, thread_desc * thrd);
+void ScheduleInternal(void);
+void ScheduleInternal(spinlock * lock);
+void ScheduleInternal(thread_desc * thrd);
+void ScheduleInternal(spinlock * lock, thread_desc * thrd);
+void ScheduleInternal(spinlock ** locks, unsigned short count);
+void ScheduleInternal(spinlock ** locks, unsigned short count, thread_desc ** thrds, unsigned short thrd_count);
 //-----------------------------------------------------------------------------
 …
 void spin(processor * this, unsigned int * spin_count);
+struct event_kernel_t {
+struct system_proc_t {
+        processor proc;
         alarm_list_t alarms;
+        spinlock lock;
+        spinlock alarm_lock;
+        bool pending_alarm;
 };
+extern event_kernel_t * event_kernel;
+extern cluster * systemCluster;
+extern system_proc_t * systemProcessor;
+extern thread_local processor * this_processor;
+extern volatile thread_local processor * this_processor;
+extern volatile thread_local coroutine_desc * this_coroutine;
+extern volatile thread_local thread_desc * this_thread;
+extern volatile thread_local bool preemption_in_progress;
+extern volatile thread_local unsigned short disable_preempt_count;
+static inline void disable_interrupts() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, 1, __ATOMIC_SEQ_CST );
+        assert( prev != (unsigned short) -1 );
+}
+static inline void enable_interrupts_noRF() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, -1, __ATOMIC_SEQ_CST );
+        verify( prev != (unsigned short) 0 );
+}
+static inline void enable_interrupts() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, -1, __ATOMIC_SEQ_CST );
+        verify( prev != (unsigned short) 0 );
+        if( prev == 1 && this_processor->pending_preemption ) {
+                ScheduleInternal( this_processor->current_thread );
+                this_processor->pending_preemption = false;
+        }
+}
 //-----------------------------------------------------------------------------
 …
 extern void ThreadCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
-//-----------------------------------------------------------------------------
-// Utils
-#define KERNEL_STORAGE(T,X) static char storage_##X[sizeof(T)]
 #endif //KERNEL_PRIVATE_H

src/libcfa/concurrency/monitor

rb826e6b	rfea3faa
26	26	static inline void ?{}(monitor_desc * this) {
27	27	this->owner = NULL;
	28	this->stack_owner = NULL;
28	29	this->recursion = 0;
29	30	}

src/libcfa/concurrency/monitor.c

-              rb826e6b
+              rfea3faa
 #include <stdlib>
+#include "kernel_private.h"
 #include "libhdr.h"
-#include "kernel_private.h"
 //-----------------------------------------------------------------------------
 …
 extern "C" {
         void __enter_monitor_desc( monitor_desc * this ) {
                 lock_yield( &this->lock DEBUG_CTX2 );
                 thread_desc * thrd = this_thread;
                 // LIB_DEBUG_PRINT_SAFE("%p Entering %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
+        void __enter_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
+                thread_desc * thrd = this_thread();
+                LIB_DEBUG_PRINT_SAFE("%p Entering %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
                 if( !this->owner ) {
 …
                         //Some one else has the monitor, wait in line for it
                         append( &this->entry_queue, thrd );
                         // LIB_DEBUG_PRINT_SAFE("%p Blocking on entry\n", thrd);
                         BlockInternal( &this->lock );
                         //BlockInternal will unlock spinlock, no need to unlock ourselves
                         return;
+                        LIB_DEBUG_PRINT_SAFE("%p Blocking on entry\n", thrd);
+                        ScheduleInternal( &this->lock );
+                        //ScheduleInternal will unlock spinlock, no need to unlock ourselves
+                        return;
+                }
 …
         // leave pseudo code :
         //      TODO
         void __leave_monitor_desc( monitor_desc * this ) {
                 lock_yield( &this->lock DEBUG_CTX2 );
                 // LIB_DEBUG_PRINT_SAFE("%p Leaving %p (o: %p, r: %i). ", this_thread, this, this->owner, this->recursion);
                 verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread, this->owner, this->recursion );
+        void __leave_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
+                LIB_DEBUG_PRINT_SAFE("%p Leaving %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
+                verifyf( this_thread() == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread(), this->owner, this->recursion );
                 //Leaving a recursion level, decrement the counter
 …
                 unlock( &this->lock );
                 // LIB_DEBUG_PRINT_SAFE("Next owner is %p\n", new_owner);
+                LIB_DEBUG_PRINT_SAFE("Next owner is %p\n", new_owner);
                 //We need to wake-up the thread
+                WakeThread( new_owner );
+        }
+        void __leave_thread_monitor( thread_desc * thrd ) {
+                monitor_desc * this = &thrd->mon;
+                lock_yield( &this->lock DEBUG_CTX2 );
+                disable_interrupts();
+                thrd->cor.state = Halted;
+                verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i)", thrd, this->owner, this->recursion );
+                //Leaving a recursion level, decrement the counter
+                this->recursion -= 1;
+                //If we haven't left the last level of recursion
+                //it means we don't need to do anything
+                if( this->recursion != 0) {
+                        unlock( &this->lock );
+                        return;
+                }
+                thread_desc * new_owner = next_thread( this );
+                LeaveThread( &this->lock, new_owner );
+                ScheduleThread( new_owner );
+        }
+}
 …
         enter( this->m, this->count );
         this->prev_mntrs = this_thread->current_monitors;
         this->prev_count = this_thread->current_monitor_count;
         this_thread->current_monitors      = m;
         this_thread->current_monitor_count = count;
+        this->prev_mntrs = this_thread()->current_monitors;
+        this->prev_count = this_thread()->current_monitor_count;
+        this_thread()->current_monitors      = m;
+        this_thread()->current_monitor_count = count;
+}
 …
         leave( this->m, this->count );
         this_thread->current_monitors      = this->prev_mntrs;
         this_thread->current_monitor_count = this->prev_count;
+        this_thread()->current_monitors      = this->prev_mntrs;
+        this_thread()->current_monitor_count = this->prev_count;
+}
 …
 // Internal scheduling
 void wait( condition * this, uintptr_t user_info = 0 ) {
         // LIB_DEBUG_PRINT_SAFE("Waiting\n");
+        LIB_DEBUG_PRINT_SAFE("Waiting\n");
         brand_condition( this );
 …
         unsigned short count = this->monitor_count;
         unsigned int recursions[ count ];               //Save the current recursion levels to restore them later
         spinlock *   locks     [ count ];               //We need to pass-in an array of locks to BlockInternal
         // LIB_DEBUG_PRINT_SAFE("count %i\n", count);
         __condition_node_t waiter = { (thread_desc*)this_thread, count, user_info };
+        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to ScheduleInternal
+        LIB_DEBUG_PRINT_SAFE("count %i\n", count);
+        __condition_node_t waiter = { this_thread(), count, user_info };
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
                 (&criteria[i]){ this->monitors[i], &waiter };
                 // LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
+                LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
+        }
 …
+        }
         // LIB_DEBUG_PRINT_SAFE("Will unblock: ");
+        LIB_DEBUG_PRINT_SAFE("Will unblock: ");
         for(int i = 0; i < thread_count; i++) {
                 // LIB_DEBUG_PRINT_SAFE("%p ", threads[i]);
+        }
         // LIB_DEBUG_PRINT_SAFE("\n");
+                LIB_DEBUG_PRINT_SAFE("%p ", threads[i]);
+        }
+        LIB_DEBUG_PRINT_SAFE("\n");
         // Everything is ready to go to sleep
         BlockInternal( locks, count, threads, thread_count );
+        ScheduleInternal( locks, count, threads, thread_count );
 …
 bool signal( condition * this ) {
         if( is_empty( this ) ) {
                 // LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
+                LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
                 return false;
+        }
 …
         unsigned short count = this->monitor_count;
         //Some more checking in debug
         LIB_DEBUG_DO(
                 thread_desc * this_thrd = this_thread;
+                thread_desc * this_thrd = this_thread();
                 if ( this->monitor_count != this_thrd->current_monitor_count ) {
                         abortf( "Signal on condition %p made with different number of monitor(s), expected %i got %i", this, this->monitor_count, this_thrd->current_monitor_count );
 …
         //Lock all the monitors
         lock_all( this->monitors, NULL, count );
         // LIB_DEBUG_PRINT_SAFE("Signalling");
+        LIB_DEBUG_PRINT_SAFE("Signalling");
         //Pop the head of the waiting queue
 …
         for(int i = 0; i < count; i++) {
                 __condition_criterion_t * crit = &node->criteria[i];
                 // LIB_DEBUG_PRINT_SAFE(" %p", crit->target);
+                LIB_DEBUG_PRINT_SAFE(" %p", crit->target);
                 assert( !crit->ready );
                 push( &crit->target->signal_stack, crit );
+        }
         // LIB_DEBUG_PRINT_SAFE("\n");
+        LIB_DEBUG_PRINT_SAFE("\n");
         //Release
 …
         unsigned short count = this->monitor_count;
         unsigned int recursions[ count ];               //Save the current recursion levels to restore them later
         spinlock *   locks     [ count ];               //We need to pass-in an array of locks to BlockInternal
+        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to ScheduleInternal
         lock_all( this->monitors, locks, count );
         //create creteria
         __condition_node_t waiter = { (thread_desc*)this_thread, count, 0 };
+        __condition_node_t waiter = { this_thread(), count, 0 };
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
                 (&criteria[i]){ this->monitors[i], &waiter };
                 // LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
+                LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
                 push( &criteria[i].target->signal_stack, &criteria[i] );
+        }
 …
         //Everything is ready to go to sleep
         BlockInternal( locks, count, &signallee, 1 );
+        ScheduleInternal( locks, count, &signallee, 1 );
 …
 uintptr_t front( condition * this ) {
         verifyf( !is_empty(this),
+        verifyf( !is_empty(this),
                 "Attempt to access user data on an empty condition.\n"
                 "Possible cause is not checking if the condition is empty before reading stored data."
 …
 // Internal scheduling
 void __accept_internal( unsigned short count, __acceptable_t * acceptables, void (*func)(void) ) {
         // thread_desc * this = this_thread;
+        // thread_desc * this = this_thread();
         // unsigned short count = this->current_monitor_count;
         // unsigned int recursions[ count ];            //Save the current recursion levels to restore them later
         // spinlock *   locks     [ count ];            //We need to pass-in an array of locks to BlockInternal
+        // spinlock *   locks     [ count ];            //We need to pass-in an array of locks to ScheduleInternal
         // lock_all( this->current_monitors, locks, count );
 …
         // // // Everything is ready to go to sleep
         // // BlockInternal( locks, count, threads, thread_count );
+        // // ScheduleInternal( locks, count, threads, thread_count );
 …
 static inline void lock_all( spinlock ** locks, unsigned short count ) {
         for( int i = 0; i < count; i++ ) {
                 lock_yield( locks[i] DEBUG_CTX2 );
+                lock( locks[i] );
+        }
+}
 …
         for( int i = 0; i < count; i++ ) {
                 spinlock * l = &source[i]->lock;
                 lock_yield( l DEBUG_CTX2 );
+                lock( l );
                 if(locks) locks[i] = l;
+        }
 …
         for(    int i = 0; i < count; i++ ) {
                 // LIB_DEBUG_PRINT_SAFE( "Checking %p for %p\n", &criteria[i], target );
+                LIB_DEBUG_PRINT_SAFE( "Checking %p for %p\n", &criteria[i], target );
                 if( &criteria[i] == target ) {
                         criteria[i].ready = true;
                         // LIB_DEBUG_PRINT_SAFE( "True\n" );
+                        LIB_DEBUG_PRINT_SAFE( "True\n" );
+                }
 …
+        }
         // LIB_DEBUG_PRINT_SAFE( "Runing %i\n", ready2run );
+        LIB_DEBUG_PRINT_SAFE( "Runing %i\n", ready2run );
         return ready2run ? node->waiting_thread : NULL;
+}
 static inline void brand_condition( condition * this ) {
         thread_desc * thrd = this_thread;
+        thread_desc * thrd = this_thread();
         if( !this->monitors ) {
                 // LIB_DEBUG_PRINT_SAFE("Branding\n");
+                LIB_DEBUG_PRINT_SAFE("Branding\n");
                 assertf( thrd->current_monitors != NULL, "No current monitor to brand condition", thrd->current_monitors );
                 this->monitor_count = thrd->current_monitor_count;

src/libcfa/concurrency/preemption.c

-              rb826e6b
+              rfea3faa
 //
-#include "libhdr.h"
 #include "preemption.h"
 extern "C" {
-#include <errno.h>
-#include <execinfo.h>
-#define __USE_GNU
 #include <signal.h>
-#undef __USE_GNU
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
+}
+#define __CFA_DEFAULT_PREEMPTION__ 10
-#ifdef __USE_STREAM__
-#include "fstream"
-#endif
-//TODO move to defaults
-#define __CFA_DEFAULT_PREEMPTION__ 10000
-//TODO move to defaults
 __attribute__((weak)) unsigned int default_preemption() {
         return __CFA_DEFAULT_PREEMPTION__;
+}
-// Short hands for signal context information
-#define __CFA_SIGCXT__ ucontext_t *
-#define __CFA_SIGPARMS__ __attribute__((unused)) int sig, __attribute__((unused)) siginfo_t *sfp, __attribute__((unused)) __CFA_SIGCXT__ cxt
-// FwdDeclarations : timeout handlers
 static void preempt( processor   * this );
 static void timeout( thread_desc * this );
-// FwdDeclarations : Signal handlers
-void sigHandler_ctxSwitch( __CFA_SIGPARMS__ );
-void sigHandler_segv     ( __CFA_SIGPARMS__ );
-void sigHandler_abort    ( __CFA_SIGPARMS__ );
-// FwdDeclarations : sigaction wrapper
-static void __kernel_sigaction( int sig, void (*handler)(__CFA_SIGPARMS__), int flags );
-// FwdDeclarations : alarm thread main
-void * alarm_loop( __attribute__((unused)) void * args );
-// Machine specific register name
-#ifdef __x86_64__
-#define CFA_REG_IP REG_RIP
-#else
-#define CFA_REG_IP REG_EIP
-#endif
-KERNEL_STORAGE(event_kernel_t, event_kernel);         // private storage for event kernel
-event_kernel_t * event_kernel;                        // kernel public handle to even kernel
-static pthread_t alarm_thread;                        // pthread handle to alarm thread
-void ?{}(event_kernel_t * this) {
-        (&this->alarms){};
-        (&this->lock){};
+}
 //=============================================================================================
 …
 //=============================================================================================
+// Get next expired node
+static inline alarm_node_t * get_expired( alarm_list_t * alarms, __cfa_time_t currtime ) {
+        if( !alarms->head ) return NULL;                          // If no alarms return null
+        if( alarms->head->alarm >= currtime ) return NULL;        // If alarms head not expired return null
+        return pop(alarms);                                       // Otherwise just pop head
+void kernel_start_preemption() {
+}
-// Tick one frame of the Discrete Event Simulation for alarms
 void tick_preemption() {
+        alarm_node_t * node = NULL;                     // Used in the while loop but cannot be declared in the while condition
+        alarm_list_t * alarms = &event_kernel->alarms;  // Local copy for ease of reading
+        __cfa_time_t currtime = __kernel_get_time();    // Check current time once so we everything "happens at once"
+        //Loop throught every thing expired
+        while( node = get_expired( alarms, currtime ) ) {
+                // Check if this is a kernel
+        alarm_list_t * alarms = &systemProcessor->alarms;
+        __cfa_time_t currtime = __kernel_get_time();
+        while( alarms->head && alarms->head->alarm < currtime ) {
+                alarm_node_t * node = pop(alarms);
                 if( node->kernel_alarm ) {
                         preempt( node->proc );
 …
+                }
+                // Check if this is a periodic alarm
+                __cfa_time_t period = node->period;
+                if( period > 0 ) {
+                        node->alarm = currtime + period;    // Alarm is periodic, add currtime to it (used cached current time)
+                        insert( alarms, node );             // Reinsert the node for the next time it triggers
+                if( node->period > 0 ) {
+                        node->alarm += node->period;
+                        insert( alarms, node );
+                }
                 else {
                         node->set = false;                  // Node is one-shot, just mark it as not pending
+                        node->set = false;
+                }
+        }
+        // If there are still alarms pending, reset the timer
+        if( alarms->head ) { __kernel_set_timer( alarms->head->alarm - currtime ); }
+        if( alarms->head ) {
+                __kernel_set_timer( alarms->head->alarm - currtime );
+        }
+}
-// Update the preemption of a processor and notify interested parties
 void update_preemption( processor * this, __cfa_time_t duration ) {
+        //     assert( THREAD_GETMEM( disableInt ) && THREAD_GETMEM( disableIntCnt ) == 1 );
         alarm_node_t * alarm = this->preemption_alarm;
 …
+}
+void ?{}( preemption_scope * this, processor * proc ) {
+        (&this->alarm){ proc };
+        this->proc = proc;
+        this->proc->preemption_alarm = &this->alarm;
+        update_preemption( this->proc, this->proc->preemption );
+}
+void ^?{}( preemption_scope * this ) {
+        update_preemption( this->proc, 0 );
+}
 //=============================================================================================
 // Kernel Signal Tools
+// Kernel Signal logic
 //=============================================================================================
+LIB_DEBUG_DO( static thread_local void * last_interrupt = 0; )
+static inline bool preemption_ready() {
+        return this_processor->disable_preempt_count == 0;
+}
+extern "C" {
+        // Disable interrupts by incrementing the counter
+        void disable_interrupts() {
+                __attribute__((unused)) unsigned short new_val = __atomic_add_fetch_2( &disable_preempt_count, 1, __ATOMIC_SEQ_CST );
+                verify( new_val < 65_000u );              // If this triggers someone is disabling interrupts without enabling them
+static inline void defer_ctxSwitch() {
+        this_processor->pending_preemption = true;
+}
+static inline void defer_alarm() {
+        systemProcessor->pending_alarm = true;
+}
+void sigHandler_ctxSwitch( __attribute__((unused)) int sig ) {
+        if( preemption_ready() ) {
+                ScheduleInternal( this_processor->current_thread );
+        }
+        // Enable interrupts by decrementing the counter
+        // If counter reaches 0, execute any pending CtxSwitch
+        void enable_interrupts( DEBUG_CTX_PARAM ) {
+                processor * proc   = this_processor;      // Cache the processor now since interrupts can start happening after the atomic add
+                thread_desc * thrd = this_thread;         // Cache the thread now since interrupts can start happening after the atomic add
+                unsigned short prev = __atomic_fetch_add_2( &disable_preempt_count, -1, __ATOMIC_SEQ_CST );
+                verify( prev != 0u );                     // If this triggers someone is enabled already enabled interruptsverify( prev != 0u );
+                // Check if we need to prempt the thread because an interrupt was missed
+                if( prev == 1 && proc->pending_preemption ) {
+                        proc->pending_preemption = false;
+                        BlockInternal( thrd );
+                }
+                // For debugging purposes : keep track of the last person to enable the interrupts
+                LIB_DEBUG_DO( proc->last_enable = caller; )
+        }
+        // Disable interrupts by incrementint the counter
+        // Don't execute any pending CtxSwitch even if counter reaches 0
+        void enable_interrupts_noPoll() {
+                __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &disable_preempt_count, -1, __ATOMIC_SEQ_CST );
+                verify( prev != 0u );                     // If this triggers someone is enabled already enabled interrupts
+        else {
+                defer_ctxSwitch();
+        }
+}
+// sigprocmask wrapper : unblock a single signal
+static inline void signal_unblock( int sig ) {
+        sigset_t mask;
+        sigemptyset( &mask );
+        sigaddset( &mask, sig );
+        if ( pthread_sigmask( SIG_UNBLOCK, &mask, NULL ) == -1 ) {
+            abortf( "internal error, pthread_sigmask" );
+void sigHandler_alarm( __attribute__((unused)) int sig ) {
+        if( try_lock( &systemProcessor->alarm_lock ) ) {
+                tick_preemption();
+                unlock( &systemProcessor->alarm_lock );
+        }
+        else {
+                defer_alarm();
+        }
+}
-// sigprocmask wrapper : block a single signal
-static inline void signal_block( int sig ) {
-        sigset_t mask;
-        sigemptyset( &mask );
-        sigaddset( &mask, sig );
-        if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+        }
+}
-// kill wrapper : signal a processor
 static void preempt( processor * this ) {
         pthread_kill( this->kernel_thread, SIGUSR1 );
+}
-// reserved for future use
 static void timeout( thread_desc * this ) {
         //TODO : implement waking threads
+}
-// Check if a CtxSwitch signal handler shoud defer
-// If true  : preemption is safe
-// If false : preemption is unsafe and marked as pending
-static inline bool preemption_ready() {
-        bool ready = disable_preempt_count == 0 && !preemption_in_progress; // Check if preemption is safe
-        this_processor->pending_preemption = !ready;                        // Adjust the pending flag accordingly
-        return ready;
+}
-//=============================================================================================
-// Kernel Signal Startup/Shutdown logic
-//=============================================================================================
-// Startup routine to activate preemption
-// Called from kernel_startup
-void kernel_start_preemption() {
-        LIB_DEBUG_PRINT_SAFE("Kernel : Starting preemption\n");
-        // Start with preemption disabled until ready
-        disable_preempt_count = 1;
-        // Initialize the event kernel
-        event_kernel = (event_kernel_t *)&storage_event_kernel;
-        event_kernel{};
-        // Setup proper signal handlers
-        __kernel_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO );         // CtxSwitch handler
-        // __kernel_sigaction( SIGSEGV, sigHandler_segv     , SA_SIGINFO );      // Failure handler
-        // __kernel_sigaction( SIGBUS , sigHandler_segv     , SA_SIGINFO );      // Failure handler
-        signal_block( SIGALRM );
-        pthread_create( &alarm_thread, NULL, alarm_loop, NULL );
+}
-// Shutdown routine to deactivate preemption
-// Called from kernel_shutdown
-void kernel_stop_preemption() {
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopping\n");
-        // Block all signals since we are already shutting down
-        sigset_t mask;
-        sigfillset( &mask );
-        sigprocmask( SIG_BLOCK, &mask, NULL );
-        // Notify the alarm thread of the shutdown
-        sigval val = { 1 };
-        pthread_sigqueue( alarm_thread, SIGALRM, val );
-        // Wait for the preemption thread to finish
-        pthread_join( alarm_thread, NULL );
-        // Preemption is now fully stopped
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopped\n");
+}
-// Raii ctor/dtor for the preemption_scope
-// Used by thread to control when they want to receive preemption signals
-void ?{}( preemption_scope * this, processor * proc ) {
-        (&this->alarm){ proc, zero_time, zero_time };
-        this->proc = proc;
-        this->proc->preemption_alarm = &this->alarm;
-        update_preemption( this->proc, from_us(this->proc->cltr->preemption) );
+}
-void ^?{}( preemption_scope * this ) {
-        disable_interrupts();
-        update_preemption( this->proc, zero_time );
+}
-//=============================================================================================
-// Kernel Signal Handlers
-//=============================================================================================
-// Context switch signal handler
-// Receives SIGUSR1 signal and causes the current thread to yield
-void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
-        LIB_DEBUG_DO( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
-        // Check if it is safe to preempt here
-        if( !preemption_ready() ) { return; }
-        preemption_in_progress = true;                      // Sync flag : prevent recursive calls to the signal handler
-        signal_unblock( SIGUSR1 );                          // We are about to CtxSwitch out of the signal handler, let other handlers in
-        preemption_in_progress = false;                     // Clear the in progress flag
-        // Preemption can occur here
-        BlockInternal( (thread_desc*)this_thread );         // Do the actual CtxSwitch
+}
-// Main of the alarm thread
-// Waits on SIGALRM and send SIGUSR1 to whom ever needs it
-void * alarm_loop( __attribute__((unused)) void * args ) {
-        // Block sigalrms to control when they arrive
-        sigset_t mask;
-        sigemptyset( &mask );
-        sigaddset( &mask, SIGALRM );
-        if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+        }
-        // Main loop
-        while( true ) {
-                // Wait for a sigalrm
-                siginfo_t info;
-                int sig = sigwaitinfo( &mask, &info );
-                // If another signal arrived something went wrong
-                assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int);
-                LIB_DEBUG_PRINT_SAFE("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
-                // Switch on the code (a.k.a. the sender) to
-                switch( info.si_code )
+                {
-                // Timers can apparently be marked as sent for the kernel
-                // In either case, tick preemption
-                case SI_TIMER:
-                case SI_KERNEL:
-                        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
-                        lock( &event_kernel->lock DEBUG_CTX2 );
-                        tick_preemption();
-                        unlock( &event_kernel->lock );
-                        break;
-                // Signal was not sent by the kernel but by an other thread
-                case SI_QUEUE:
-                        // For now, other thread only signal the alarm thread to shut it down
-                        // If this needs to change use info.si_value and handle the case here
-                        goto EXIT;
+                }
+        }
-EXIT:
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n");
-        return NULL;
+}
-// Sigaction wrapper : register an signal handler
-static void __kernel_sigaction( int sig, void (*handler)(__CFA_SIGPARMS__), int flags ) {
-        struct sigaction act;
-        act.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
-        act.sa_flags = flags;
-        if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO,
-                        " __kernel_sigaction( sig:%d, handler:%p, flags:%d ), problem installing signal handler, error(%d) %s.\n",
-                        sig, handler, flags, errno, strerror( errno )
-                );
-                _exit( EXIT_FAILURE );
+        }
+}
-// Sigaction wrapper : restore default handler
-static void __kernel_sigdefault( int sig ) {
-        struct sigaction act;
-        act.sa_handler = SIG_DFL;
-        act.sa_flags = 0;
-        sigemptyset( &act.sa_mask );
-        if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO,
-                        " __kernel_sigdefault( sig:%d ), problem reseting signal handler, error(%d) %s.\n",
-                        sig, errno, strerror( errno )
-                );
-                _exit( EXIT_FAILURE );
+        }
+}
-//=============================================================================================
-// Terminating Signals logic
-//=============================================================================================
-LIB_DEBUG_DO(
-        static void __kernel_backtrace( int start ) {
-                // skip first N stack frames
-                enum { Frames = 50 };
-                void * array[Frames];
-                int size = backtrace( array, Frames );
-                char ** messages = backtrace_symbols( array, size );
-                // find executable name
-                *index( messages[0], '(' ) = '\0';
-                #ifdef __USE_STREAM__
-                serr | "Stack back trace for:" | messages[0] | endl;
-                #else
-                fprintf( stderr, "Stack back trace for: %s\n", messages[0]);
-                #endif
-                // skip last 2 stack frames after main
-                for ( int i = start; i < size && messages != NULL; i += 1 ) {
-                        char * name = NULL;
-                        char * offset_begin = NULL;
-                        char * offset_end = NULL;
-                        for ( char *p = messages[i]; *p; ++p ) {
-                                // find parantheses and +offset
-                                if ( *p == '(' ) {
-                                        name = p;
+                                }
-                                else if ( *p == '+' ) {
-                                        offset_begin = p;
+                                }
-                                else if ( *p == ')' ) {
-                                        offset_end = p;
-                                        break;
+                                }
+                        }
-                        // if line contains symbol print it
-                        int frameNo = i - start;
-                        if ( name && offset_begin && offset_end && name < offset_begin ) {
-                                // delimit strings
-                                *name++ = '\0';
-                                *offset_begin++ = '\0';
-                                *offset_end++ = '\0';
-                                #ifdef __USE_STREAM__
-                                serr    | "("  | frameNo | ")" | messages[i] | ":"
-                                        | name | "+" | offset_begin | offset_end | endl;
-                                #else
-                                fprintf( stderr, "(%i) %s : %s + %s %s\n", frameNo, messages[i], name, offset_begin, offset_end);
-                                #endif
+                        }
-                        // otherwise, print the whole line
-                        else {
-                                #ifdef __USE_STREAM__
-                                serr | "(" | frameNo | ")" | messages[i] | endl;
-                                #else
-                                fprintf( stderr, "(%i) %s\n", frameNo, messages[i] );
-                                #endif
+                        }
+                }
-                free( messages );
+        }
+)
-// void sigHandler_segv( __CFA_SIGPARMS__ ) {
-//      LIB_DEBUG_DO(
-//              #ifdef __USE_STREAM__
-//              serr    | "*CFA runtime error* program cfa-cpp terminated with"
-//                      | (sig == SIGSEGV ? "segment fault." : "bus error.")
-//                      | endl;
-//              #else
-//              fprintf( stderr, "*CFA runtime error* program cfa-cpp terminated with %s\n", sig == SIGSEGV ? "segment fault." : "bus error." );
-//              #endif
-//              // skip first 2 stack frames
-//              __kernel_backtrace( 1 );
-//      )
-//      exit( EXIT_FAILURE );
-// }
-// void sigHandler_abort( __CFA_SIGPARMS__ ) {
-//      // skip first 6 stack frames
-//      LIB_DEBUG_DO( __kernel_backtrace( 6 ); )
-//      // reset default signal handler
-//      __kernel_sigdefault( SIGABRT );
-//      raise( SIGABRT );
-// }

src/libcfa/concurrency/thread

rb826e6b	rfea3faa
54	54	}
55	55
56		~~extern volatile thread_local thread_desc * this_thread~~;
	56	thread_desc * this_thread(void);
57	57
58	58	forall( dtype T \| is_thread(T) )

src/libcfa/concurrency/thread.c

-              rb826e6b
+              rfea3faa
+}
 extern volatile thread_local processor * this_processor;
+extern thread_local processor * this_processor;
 //-----------------------------------------------------------------------------
 …
         coroutine_desc* thrd_c = get_coroutine(this);
         thread_desc*  thrd_h = get_thread   (this);
+        thrd_c->last = this_coroutine;
+        thrd_c->last = this_coroutine();
+        this_processor->current_coroutine = thrd_c;
         // LIB_DEBUG_PRINT_SAFE("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
+        LIB_DEBUG_PRINT_SAFE("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
-        disable_interrupts();
         create_stack(&thrd_c->stack, thrd_c->stack.size);
-        this_coroutine = thrd_c;
         CtxStart(this, CtxInvokeThread);
-        assert( thrd_c->last->stack.context );
         CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );
         ScheduleThread(thrd_h);
-        enable_interrupts( DEBUG_CTX );
+}
 void yield( void ) {
         BlockInternal( (thread_desc *)this_thread );
+        ScheduleInternal( this_processor->current_thread );
+}
 …
 void ThreadCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
         // set state of current coroutine to inactive
         src->state = src->state == Halted ? Halted : Inactive;
+        src->state = Inactive;
         dst->state = Active;
 …
         // set new coroutine that the processor is executing
         // and context switch to it
+        this_coroutine = dst;
+        assert( src->stack.context );
+        this_processor->current_coroutine = dst;
         CtxSwitch( src->stack.context, dst->stack.context );
         this_coroutine = src;
+        this_processor->current_coroutine = src;
         // set state of new coroutine to active
         dst->state = dst->state == Halted ? Halted : Inactive;
+        dst->state = Inactive;
         src->state = Active;
+}

src/libcfa/fstream

-              rb826e6b
+              rfea3faa
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 08:32:38 2017
 // Update Count     : 117
+// Last Modified On : Mon May 15 18:11:09 2017
+// Update Count     : 104
 //
+#pragma once
+#ifndef __FSTREAM_H__
+#define __FSTREAM_H__
 #include "iostream"
 enum { sepSize = 16 };
+enum { separateSize = 16 };
 struct ofstream {
         void * file;
         _Bool sepDefault;
         _Bool sepOnOff;
-        _Bool sawNL;
         const char * sepCur;
         char separator[sepSize];
         char tupleSeparator[sepSize];
+        char separator[separateSize];
+        char tupleSeparator[separateSize];
 }; // ofstream
 …
 const char * sepGetCur( ofstream * );
 void sepSetCur( ofstream *, const char * );
-_Bool getNL( ofstream * );
-void setNL( ofstream *, _Bool );
 // public
 …
 extern ifstream * sin;
+#endif // __FSTREAM_H__
 // Local Variables: //
 // mode: c //

src/libcfa/fstream.c

-              rb826e6b
+              rfea3faa
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jul  6 18:38:25 2017
 // Update Count     : 251
+// Last Modified On : Mon May 15 18:11:11 2017
+// Update Count     : 234
 //
 …
 // private
 _Bool sepPrt( ofstream * os ) { setNL( os, false ); return os->sepOnOff; }
+_Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
 void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
 void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
 const char * sepGetCur( ofstream * os ) { return os->sepCur; }
 void sepSetCur( ofstream * os, const char * sepCur ) { os->sepCur = sepCur; }
-_Bool getNL( ofstream * os ) { return os->sawNL; }
-void setNL( ofstream * os, _Bool state ) { os->sawNL = state; }
 // public
 void sepOn( ofstream * os ) { os->sepOnOff = ! getNL( os ); }
 void sepOff( ofstream * os ) { os->sepOnOff = false; }
+void sepOn( ofstream * os ) { os->sepOnOff = 1; }
+void sepOff( ofstream * os ) { os->sepOnOff = 0; }
 _Bool sepDisable( ofstream *os ) {
 …
 void sepSet( ofstream * os, const char * s ) {
         assert( s );
         strncpy( os->separator, s, sepSize - 1 );
         os->separator[sepSize - 1] = '\0';
+        strncpy( os->separator, s, separateSize - 1 );
+        os->separator[separateSize - 1] = '\0';
 } // sepSet
 …
 void sepSetTuple( ofstream * os, const char * s ) {
         assert( s );
         strncpy( os->tupleSeparator, s, sepSize - 1 );
         os->tupleSeparator[sepSize - 1] = '\0';
+        strncpy( os->tupleSeparator, s, separateSize - 1 );
+        os->tupleSeparator[separateSize - 1] = '\0';
 } // sepSet
 …
                 exit( EXIT_FAILURE );
         } // if
         ?{}( os, file, true, false, " ", ", " );
+        ?{}( os, file, 1, 0, " ", ", " );
 } // open
 …
 } // fmt
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, " ", ", " };
+static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
 ofstream *sout = &soutFile;
 static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, " ", ", " };
+static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), 1, 0, " ", ", " };
 ofstream *serr = &serrFile;
 …
 void open( ifstream * is, const char * name, const char * mode ) {
         FILE *file = fopen( name, mode );
         if ( file == 0 ) {                                                                      // do not change unless successful
+        FILE *t = fopen( name, mode );
+        if ( t == 0 ) {                                                                         // do not change unless successful
                 fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
                 perror( 0 );
                 exit( EXIT_FAILURE );
         } // if
         is->file = file;
+        is->file = t;
 } // open

src/libcfa/gmp

-              rb826e6b
+              rfea3faa
 // Created On       : Tue Apr 19 08:43:43 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 09:33:20 2017
 // Update Count     : 15
+// Last Modified On : Sat May 27 09:55:51 2017
+// Update Count     : 14
 //
 // https://gmplib.org/gmp-man-6.1.1.pdf
-#pragma once
 #include <gmp.h>                                                                                // GNU multi-precise integers

src/libcfa/iostream

-              rb826e6b
+              rfea3faa
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 08:35:59 2017
 // Update Count     : 118
+// Last Modified On : Mon May 15 18:08:44 2017
+// Update Count     : 105
 //
+#pragma once
+#ifndef __IOSTREAM_H__
+#define __IOSTREAM_H__
 #include "iterator"
 …
         const char * sepGetCur( ostype * );                                     // get current separator string
         void sepSetCur( ostype *, const char * );                       // set current separator string
-        _Bool getNL( ostype * );                                                        // check newline
-        void setNL( ostype *, _Bool );                                          // saw newline
         // public
         void sepOn( ostype * );                                                         // turn separator state on
 …
         ostype * write( ostype *, const char *, unsigned long int );
         int fmt( ostype *, const char fmt[], ... );
 }; // ostream
+};
 trait writeable( otype T ) {
         forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, T );
 }; // writeable
+};
 // implement writable for intrinsic types
 …
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) );
 forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * );
-forall( dtype ostype | ostream( ostype ) ) ostype * sep( ostype * );
-forall( dtype ostype | ostream( ostype ) ) ostype * sepTuple( ostype * );
 forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * );
 forall( dtype ostype | ostream( ostype ) ) ostype * sepOff( ostype * );
 …
         istype * ungetc( istype *, char );
         int fmt( istype *, const char fmt[], ... );
 }; // istream
+};
 trait readable( otype T ) {
         forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, T );
 }; // readable
+};
 forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, char * );
 …
 forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrC );
+#endif // __IOSTREAM_H
 // Local Variables: //
 // mode: c //

src/libcfa/iostream.c

-              rb826e6b
+              rfea3faa
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Jul 16 21:12:03 2017
 // Update Count     : 398
+// Last Modified On : Mon May  8 18:24:23 2017
+// Update Count     : 369
 //
 …
 extern "C" {
 #include <stdio.h>
-#include <stdbool.h>                                                                    // true/false
 #include <string.h>                                                                             // strlen
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
 …
 forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype * os, char ch ) {
+        fmt( os, "%c", ch );
+        if ( ch == '\n' ) setNL( os, true );
+ostype * ?|?( ostype * os, char c ) {
+        fmt( os, "%c", c );
         sepOff( os );
         return os;
 …
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, float _Complex fc ) {
+        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+        fmt( os, "%g%+gi", crealf( fc ), cimagf( fc ) );
+        os | crealf( fc );
+        _Bool temp = sepDisable( os );                                          // disable separators within complex value
+        if ( cimagf( fc ) >= 0 ) os | '+';                                      // negative value prints '-'
+        os | cimagf( fc ) | 'i';
+        sepReset( os, temp );                                                           // reset separator
         return os;
 } // ?|?
 …
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, double _Complex dc ) {
+        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+        fmt( os, "%.*lg%+.*lgi", DBL_DIG, creal( dc ), DBL_DIG, cimag( dc ) );
+        os | creal( dc );
+        _Bool temp = sepDisable( os );                                          // disable separators within complex value
+        if ( cimag( dc ) >= 0 ) os | '+';                                       // negative value prints '-'
+        os | cimag( dc ) | 'i';
+        sepReset( os, temp );                                                           // reset separator
         return os;
 } // ?|?
 …
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, long double _Complex ldc ) {
+        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+        fmt( os, "%.*Lg%+.*Lgi", LDBL_DIG, creall( ldc ), LDBL_DIG, cimagl( ldc ) );
+        os | creall( ldc );
+        _Bool temp = sepDisable( os );                                          // disable separators within complex value
+        if ( cimagl( ldc ) >= 0 ) os | '+';                                     // negative value prints '-'
+        os | cimagl( ldc ) | 'i';
+        sepReset( os, temp );                                                           // reset separator
         return os;
 } // ?|?
 …
         // last character IS spacing or opening punctuation => turn off separator for next item
         size_t len = strlen( cp );
         ch = cp[len - 1];                                                                       // must make unsigned
+        unsigned int len = strlen( cp ), posn = len - 1;
+        ch = cp[posn];                                                                          // must make unsigned
         if ( sepPrt( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
                 sepOn( os );
 …
                 sepOff( os );
         } // if
-        if ( ch == '\n' ) setNL( os, true );                            // check *AFTER* sepPrt call above as it resets NL flag
         return write( os, cp, len );
 } // ?|?
 …
 forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
+        sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
         os | arg;                                                                                       // print first argument
-        sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
         os | rest;                                                                                      // print remaining arguments
         sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
 …
 forall( dtype ostype | ostream( ostype ) )
-ostype * sep( ostype * os ) {
-        os | sepGet( os );
-        return os;
-} // sep
-forall( dtype ostype | ostream( ostype ) )
-ostype * sepTuple( ostype * os ) {
-        os | sepGetTuple( os );
-        return os;
-} // sepTuple
-forall( dtype ostype | ostream( ostype ) )
 ostype * endl( ostype * os ) {
         os | '\n';
-        setNL( os, true );
         flush( os );
         sepOff( os );                                                                           // prepare for next line

src/libcfa/iterator

-              rb826e6b
+              rfea3faa
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 08:37:25 2017
 // Update Count     : 10
+// Last Modified On : Wed Mar  2 18:06:05 2016
+// Update Count     : 9
 //
+#pragma once
+#ifndef ITERATOR_H
+#define ITERATOR_H
 // An iterator can be used to traverse a data structure.
 …
 forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )
 void for_each( iterator_type begin, iterator_type end, void (* func)( elt_type ) );
+void for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) );
 forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )
+void for_each_reverse( iterator_type begin, iterator_type end, void (* func)( elt_type ) );
+void for_each_reverse( iterator_type begin, iterator_type end, void (*func)( elt_type ) );
+#endif // ITERATOR_H
 // Local Variables: //

src/libcfa/iterator.c

-              rb826e6b
+              rfea3faa
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 08:38:23 2017
 // Update Count     : 28
+// Last Modified On : Wed Mar  2 18:08:11 2016
+// Update Count     : 27
 //
 …
 forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )
 void for_each( iterator_type begin, iterator_type end, void (* func)( elt_type ) ) {
+void for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) {
         for ( iterator_type i = begin; i != end; ++i ) {
                 func( *i );
         } // for
 } // for_each
+        }
+}
 forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )
 void for_each_reverse( iterator_type begin, iterator_type end, void (* func)( elt_type ) ) {
+void for_each_reverse( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) {
         for ( iterator_type i = end; i != begin; ) {
                 --i;
                 func( *i );
         } // for
 } // for_each_reverse
+        }
+}
 // Local Variables: //

src/libcfa/libhdr/libalign.h

-              rb826e6b
+              rfea3faa
 //                              -*- Mode: C++ -*-
+//                              -*- Mode: C++ -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 …
 // Free Software  Foundation; either  version 2.1 of  the License, or  (at your
 // option) any later version.
 //
+//
 // This library is distributed in the  hope that it will be useful, but WITHOUT
 // ANY  WARRANTY;  without even  the  implied  warranty  of MERCHANTABILITY  or
 // FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
 // for more details.
 //
+//
 // You should  have received a  copy of the  GNU Lesser General  Public License
 // along  with this library.
 //
+//
 …
 #include "assert"
-#include <stdbool.h>
 // Minimum size used to align memory boundaries for memory allocations.
+// Minimum size used to align memory boundaries for memory allocations.
 #define libAlign() (sizeof(double))

src/libcfa/libhdr/libdebug.h

-              rb826e6b
+              rfea3faa
 #ifdef __CFA_DEBUG__
+        #define LIB_DEBUG_DO(...) __VA_ARGS__
+        #define LIB_NO_DEBUG_DO(...)
+        #define DEBUG_CTX __PRETTY_FUNCTION__
+        #define DEBUG_CTX2 , __PRETTY_FUNCTION__
+        #define DEBUG_CTX_PARAM const char * caller
+        #define DEBUG_CTX_PARAM2 , const char * caller
+        #define LIB_DEBUG_DO(x) x
+        #define LIB_NO_DEBUG_DO(x) ((void)0)
 #else
+        #define LIB_DEBUG_DO(...)
+        #define LIB_NO_DEBUG_DO(...) __VA_ARGS__
+        #define DEBUG_CTX
+        #define DEBUG_CTX2
+        #define DEBUG_CTX_PARAM
+        #define DEBUG_CTX_PARAM2
+        #define LIB_DEBUG_DO(x) ((void)0)
+        #define LIB_NO_DEBUG_DO(x) x
 #endif
 …
 #ifdef __CFA_DEBUG_PRINT__
+        #define LIB_DEBUG_WRITE( fd, buffer, len )     __lib_debug_write( fd, buffer, len )
+        #define LIB_DEBUG_ACQUIRE()                    __lib_debug_acquire()
+        #define LIB_DEBUG_RELEASE()                    __lib_debug_release()
+        #define LIB_DEBUG_PRINT_SAFE(...)              __lib_debug_print_safe   (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_NOLOCK(...)            __lib_debug_print_nolock (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_BUFFER(...)            __lib_debug_print_buffer (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_BUFFER_DECL(fd, ...)   char text[256]; int len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
+        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(fd, ...)  len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
+      #define LIB_DEBUG_WRITE( fd, buffer, len )  __lib_debug_write( fd, buffer, len )
+      #define LIB_DEBUG_ACQUIRE()                 __lib_debug_acquire()
+      #define LIB_DEBUG_RELEASE()                 __lib_debug_release()
+      #define LIB_DEBUG_PRINT_SAFE(...)           __lib_debug_print_safe   (__VA_ARGS__)
+      #define LIB_DEBUG_PRINT_NOLOCK(...)         __lib_debug_print_nolock (__VA_ARGS__)
+      #define LIB_DEBUG_PRINT_BUFFER(...)         __lib_debug_print_buffer (__VA_ARGS__)
 #else
+        #define LIB_DEBUG_WRITE(...)               ((void)0)
+        #define LIB_DEBUG_ACQUIRE()                ((void)0)
+        #define LIB_DEBUG_RELEASE()                ((void)0)
+        #define LIB_DEBUG_PRINT_SAFE(...)          ((void)0)
+        #define LIB_DEBUG_PRINT_NOLOCK(...)        ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER(...)        ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER_DECL(...)   ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(...)  ((void)0)
+      #define LIB_DEBUG_WRITE(...)          ((void)0)
+      #define LIB_DEBUG_ACQUIRE()           ((void)0)
+      #define LIB_DEBUG_RELEASE()           ((void)0)
+      #define LIB_DEBUG_PRINT_SAFE(...)     ((void)0)
+      #define LIB_DEBUG_PRINT_NOLOCK(...)   ((void)0)
+      #define LIB_DEBUG_PRINT_BUFFER(...)   ((void)0)
 #endif

src/libcfa/limits

-              rb826e6b
+              rfea3faa
 // Created On       : Wed Apr  6 18:06:52 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 09:33:57 2017
 // Update Count     : 7
+// Last Modified On : Wed Apr  6 21:08:16 2016
+// Update Count     : 6
 //
+#pragma once
+#ifndef LIMITS_H
+#define LIMITS_H
 // Integral Constants
 …
 extern const long _Complex _1_SQRT_2;                                   // 1 / sqrt(2)
+#endif // LIMITS_H
 // Local Variables: //
 // mode: c //

src/libcfa/math

-              rb826e6b
+              rfea3faa
 // Created On       : Mon Apr 18 23:37:04 2016
 // Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul  7 09:34:15 2017
+// Update Count     : 61
+//
+#pragma once
+// Last Modified On : Wed May 24 17:40:39 2017
+// Update Count     : 60
+//
+#ifndef MATH_H
+#define MATH_H
 extern "C" {
 …
 long double scalbln( long double, long int );
+#endif // MATH_H
 // Local Variables: //
 // mode: c //

src/libcfa/rational

-              rb826e6b
+              rfea3faa
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 09:34:33 2017
 // Update Count     : 93
+// Last Modified On : Mon May 15 21:30:12 2017
+// Update Count     : 90
 //
+#pragma once
+#ifndef RATIONAL_H
+#define RATIONAL_H
 #include "iostream"
 …
 // implementation
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 struct Rational {
         RationalImpl numerator, denominator;                            // invariant: denominator > 0
 …
 // constructors
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, RationalImpl n );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, RationalImpl n, RationalImpl d );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, zero_t );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, one_t );
 // numerator/denominator getter
+// getter for numerator/denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl numerator( Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl denominator( Rational(RationalImpl) r );
+forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 [ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src );
 // numerator/denominator setter
+// setter for numerator/denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d );
 // comparison
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?==?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?!=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?<?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?<=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?>?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?>=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 // arithmetic
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) +?( Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) -?( Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 // conversion
 forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
 double widen( Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl );  RationalImpl convert( double );} )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl );  RationalImpl convert( double );} )
 Rational(RationalImpl) narrow( double f, RationalImpl md );
 // I/O
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 forall( dtype istype | istream( istype ) | { istype * ?|?( istype *, RationalImpl * ); } )
 istype * ?|?( istype *, Rational(RationalImpl) * );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 forall( dtype ostype | ostream( ostype ) | { ostype * ?|?( ostype *, RationalImpl ); } )
 ostype * ?|?( ostype *, Rational(RationalImpl ) );
+#endif // RATIONAL_H
 // Local Variables: //

src/libcfa/rational.c

-              rb826e6b
+              rfea3faa
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue May 16 18:35:36 2017
 // Update Count     : 150
+// Last Modified On : Mon May 15 21:29:23 2017
+// Update Count     : 149
 //
 …
 // Calculate greatest common denominator of two numbers, the first of which may be negative. Used to reduce rationals.
 // alternative: https://en.wikipedia.org/wiki/Binary_GCD_algorithm
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 static RationalImpl gcd( RationalImpl a, RationalImpl b ) {
         for ( ;; ) {                                                                            // Euclid's algorithm
 …
 } // gcd
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 static RationalImpl simplify( RationalImpl * n, RationalImpl * d ) {
         if ( *d == (RationalImpl){0} ) {
 …
 // constructors
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r ) {
         r{ (RationalImpl){0}, (RationalImpl){1} };
 } // rational
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, RationalImpl n ) {
         r{ n, (RationalImpl){1} };
 } // rational
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, RationalImpl n, RationalImpl d ) {
         RationalImpl t = simplify( &n, &d );                            // simplify
 …
 // getter for numerator/denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl numerator( Rational(RationalImpl) r ) {
         return r.numerator;
 } // numerator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl denominator( Rational(RationalImpl) r ) {
         return r.denominator;
 } // denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 [ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src ) {
         return *dest = src.[ numerator, denominator ];
 …
 // setter for numerator/denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n ) {
         RationalImpl prev = r.numerator;
 …
 } // numerator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d ) {
         RationalImpl prev = r.denominator;
 …
 // comparison
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?==?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return l.numerator * r.denominator == l.denominator * r.numerator;
 } // ?==?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?!=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l == r );
 } // ?!=?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?<?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return l.numerator * r.denominator < l.denominator * r.numerator;
 } // ?<?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?<=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return l.numerator * r.denominator <= l.denominator * r.numerator;
 } // ?<=?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?>?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l <= r );
 } // ?>?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?>=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l < r );
 …
 // arithmetic
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) +?( Rational(RationalImpl) r ) {
         Rational(RationalImpl) t = { r.numerator, r.denominator };
 …
 } // +?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) -?( Rational(RationalImpl) r ) {
         Rational(RationalImpl) t = { -r.numerator, r.denominator };
 …
 } // -?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         if ( l.denominator == r.denominator ) {                         // special case
 …
 } // ?+?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         if ( l.denominator == r.denominator ) {                         // special case
 …
 } // ?-?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         Rational(RationalImpl) t = { l.numerator * r.numerator, l.denominator * r.denominator };
 …
 } // ?*?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         if ( r.numerator < (RationalImpl){0} ) {
 …
 // conversion
 forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
 double widen( Rational(RationalImpl) r ) {
         return convert( r.numerator ) / convert( r.denominator );
 …
 // http://www.ics.uci.edu/~eppstein/numth/frap.c
 forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); RationalImpl convert( double ); } )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); RationalImpl convert( double ); } )
 Rational(RationalImpl) narrow( double f, RationalImpl md ) {
         if ( md <= (RationalImpl){1} ) {                                        // maximum fractional digits too small?
 …
 // I/O
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 forall( dtype istype | istream( istype ) | { istype * ?|?( istype *, RationalImpl * ); } )
 istype * ?|?( istype * is, Rational(RationalImpl) * r ) {
 …
 } // ?|?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 forall( dtype ostype | ostream( ostype ) | { ostype * ?|?( ostype *, RationalImpl ); } )
 ostype * ?|?( ostype * os, Rational(RationalImpl ) r ) {

src/libcfa/stdlib

-              rb826e6b
+              rfea3faa
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul  7 09:34:49 2017
+// Update Count     : 219
+//
+#pragma once
+// Last Modified On : Fri Jun  2 15:51:03 2017
+// Update Count     : 218
+//
+#ifndef STDLIB_H
+#define STDLIB_H
 //---------------------------------------
 …
 void swap( T * t1, T * t2 );
+#endif // STDLIB_H
 // Local Variables: //
 // mode: c //

src/main.cc

-              rb826e6b
+              rfea3faa
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul  7 11:13:00 2017
 // Update Count     : 442
+// Last Modified On : Wed May 10 14:45:00 2017
+// Update Count     : 437
 //
+#include <cassert>                          // for assertf
+#include <cxxabi.h>                         // for __cxa_demangle
+#include <execinfo.h>                       // for backtrace, backtrace_symbols
+#include <getopt.h>                         // for no_argument, optind, geto...
+#include <signal.h>                         // for signal, SIGABRT, SIGSEGV
+#include <cstdio>                           // for fopen, FILE, fclose, stdin
+#include <cstdlib>                          // for exit, free, abort, EXIT_F...
+#include <cstring>                          // for index
+#include <fstream>                          // for ofstream
+#include <iostream>                         // for operator<<, basic_ostream
+#include <iterator>                         // for back_inserter
+#include <list>                             // for list
+#include <string>                           // for operator<<, allocator
+#include "../config.h"                      // for CFA_LIBDIR
+#include "CodeGen/FixMain.h"                // for FixMain
+#include "CodeGen/FixNames.h"               // for fixNames
+#include "CodeGen/Generate.h"               // for generate
+#include "CodeTools/DeclStats.h"            // for printDeclStats
+#include "CodeTools/TrackLoc.h"             // for fillLocations
+#include "Common/CompilerError.h"           // for CompilerError
+#include "Common/SemanticError.h"           // for SemanticError
+#include "Common/UnimplementedError.h"      // for UnimplementedError
+#include "Common/utility.h"                 // for deleteAll, filter, printAll
+#include "ControlStruct/ExceptTranslate.h"  // for translateEHM
+#include "ControlStruct/Mutate.h"           // for mutate
+#include "GenPoly/Box.h"                    // for box
+#include "GenPoly/CopyParams.h"             // for copyParams
+#include "GenPoly/InstantiateGeneric.h"     // for instantiateGeneric
+#include "GenPoly/Lvalue.h"                 // for convertLvalue
+#include "GenPoly/Specialize.h"             // for convertSpecializations
+#include "InitTweak/FixInit.h"              // for fix
+#include "InitTweak/GenInit.h"              // for genInit
+#include "MakeLibCfa.h"                     // for makeLibCfa
+#include "Parser/LinkageSpec.h"             // for Spec, Cforall, Intrinsic
+#include "Parser/ParseNode.h"               // for DeclarationNode, buildList
+#include "Parser/TypedefTable.h"            // for TypedefTable
+#include "ResolvExpr/AlternativePrinter.h"  // for AlternativePrinter
+#include "ResolvExpr/Resolver.h"            // for resolve
+#include "SymTab/Validate.h"                // for validate
+#include "SynTree/Declaration.h"            // for Declaration
+#include "SynTree/Visitor.h"                // for acceptAll
+#include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
+#include <iostream>
+#include <fstream>
+#include <signal.h>                                                                             // signal
+#include <getopt.h>                                                                             // getopt
+#include <execinfo.h>                                                                   // backtrace, backtrace_symbols
+#include <cxxabi.h>                                                                             // __cxa_demangle
+#include <cstring>                                                                              // index
+using namespace std;
+#include "Parser/lex.h"
+#include "Parser/parser.h"
+#include "Parser/TypedefTable.h"
+#include "GenPoly/Lvalue.h"
+#include "GenPoly/Specialize.h"
+#include "GenPoly/Box.h"
+#include "GenPoly/CopyParams.h"
+#include "GenPoly/InstantiateGeneric.h"
+#include "Concurrency/Keywords.h"
+#include "CodeGen/Generate.h"
+#include "CodeGen/FixNames.h"
+#include "CodeGen/FixMain.h"
+#include "CodeTools/DeclStats.h"
+#include "CodeTools/TrackLoc.h"
+#include "ControlStruct/Mutate.h"
+#include "SymTab/Validate.h"
+#include "ResolvExpr/AlternativePrinter.h"
+#include "ResolvExpr/Resolver.h"
+#include "MakeLibCfa.h"
+#include "InitTweak/GenInit.h"
+#include "InitTweak/FixInit.h"
+#include "Common/UnimplementedError.h"
+#include "../config.h"
+#include "Tuples/Tuples.h"
 using namespace std;
 …
                 if ( ! nopreludep ) {                                                   // include gcc builtins
                         // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
+                        // Read to cfa builtins, if not generating the cfa library
+                        FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                        assertf( builtins, "cannot open builtins.cf\n" );
+                        parse( builtins, LinkageSpec::Compiler );
                         // Read to gcc builtins, if not generating the cfa library
 …
                                 assertf( prelude, "cannot open prelude.cf\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );
-                                // Read to cfa builtins, if not generating the cfa library
-                                FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
-                                assertf( builtins, "cannot open builtins.cf\n" );
-                                parse( builtins, LinkageSpec::BuiltinCFA );
                         } // if
                 } // if
 …
                 OPTPRINT( "expandUniqueExpr" ); // xxx - is this the right place for this? want to expand ASAP so that subsequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
                 Tuples::expandUniqueExpr( translationUnit );
-                OPTPRINT( "translateEHM" );
-                ControlStruct::translateEHM( translationUnit );
                 OPTPRINT( "convertSpecializations" ) // needs to happen before tuple types are expanded
 …
                         break;
                   case '?':
+                        if ( optopt ) {                                                         // short option ?
+                                assertf( false, "Unknown option: -%c\n", (char)optopt );
+                        } else {
+                                assertf( false, "Unknown option: %s\n", argv[optind - 1] );
+                        } // if
+                        assertf( false, "Unknown option: '%c'\n", (char)optopt );
                   default:
                         abort();

src/prelude/Makefile.am

-              rb826e6b
+              rfea3faa
 noinst_DATA = ../libcfa/libcfa-prelude.c
-CC = ${abs_top_srcdir}/src/driver/cfa
-$(DEPDIR) :
-        mkdir $(DEPDIR)
-$(DEPDIR)/builtins.Po : $(DEPDIR)
-        touch ${@}
 # create extra forward types/declarations to reduce inclusion of library files
 extras.cf : extras.regx extras.c
 …
 # create forward declarations for cfa builtins
+builtins.cf : builtins.c ${CC}
+        ${AM_V_GEN}${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
+        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
+include $(DEPDIR)/builtins.Po
+builtins.cf : builtins.c
+        ${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@}
 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
 …
         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
-maintainer-clean-local :
-        rm -rf $(DEPDIR)
 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

src/prelude/Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
 host_triplet = @host@
 subdir = src/prelude
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+am__v_GEN_0 = @echo "  GEN   " $@;
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
-am__v_at_1 =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
 …
 am__installdirs = "$(DESTDIR)$(cfalibdir)"
 DATA = $(cfalib_DATA) $(noinst_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
 CC = ${abs_top_srcdir}/src/driver/cfa
+CC = @CC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/prelude/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
 install-cfalibDATA: $(cfalib_DATA)
         @$(NORMAL_INSTALL)
+        test -z "$(cfalibdir)" || $(MKDIR_P) "$(DESTDIR)$(cfalibdir)"
         @list='$(cfalib_DATA)'; test -n "$(cfalibdir)" || list=; \
-        if test -n "$$list"; then \
-          echo " $(MKDIR_P) '$(DESTDIR)$(cfalibdir)'"; \
-          $(MKDIR_P) "$(DESTDIR)$(cfalibdir)" || exit 1; \
-        fi; \
         for p in $$list; do \
           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 …
         files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
         dir='$(DESTDIR)$(cfalibdir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
+ctags CTAGS:
 cscope cscopelist:
+tags: TAGS
+TAGS:
+ctags: CTAGS
+CTAGS:
 …
 maintainer-clean: maintainer-clean-am
         -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+        maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-am
 …
 .MAKE: install-am install-strip
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+        ctags-am distclean distclean-generic distdir dvi dvi-am html \
+        html-am info info-am install install-am install-cfalibDATA \
+        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 maintainer-clean-local mostlyclean \
+        mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+        uninstall-am uninstall-cfalibDATA
+.PRECIOUS: Makefile
+$(DEPDIR) :
+        mkdir $(DEPDIR)
+$(DEPDIR)/builtins.Po : $(DEPDIR)
+        touch ${@}
+.PHONY: all all-am check check-am clean clean-generic distclean \
+        distclean-generic distdir dvi dvi-am html html-am info info-am \
+        install install-am install-cfalibDATA 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 uninstall uninstall-am uninstall-cfalibDATA
 # create extra forward types/declarations to reduce inclusion of library files
 …
 # create forward declarations for cfa builtins
+builtins.cf : builtins.c ${CC}
+        ${AM_V_GEN}${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
+        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
+include $(DEPDIR)/builtins.Po
+builtins.cf : builtins.c
+        ${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@}
 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
 …
 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
-maintainer-clean-local :
-        rm -rf $(DEPDIR)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/prelude/builtins.c

rb826e6b	rfea3faa
1	1	typedef unsigned long long __cfaabi_exception_type_t;
2
3		~~#include "../libcfa/exception.h"~~

src/tests/.expect/32/math.txt

rb826e6b	rfea3faa
22	22	cos:0.540302 0.54030230586814 0.540302305868139717 0.83373-0.988898i 0.833730025131149-0.988897705762865i 0.833730025131149049-0.988897705762865096i
23	23	tan:1.55741 1.5574077246549 1.55740772465490223 0.271753+1.08392i 0.271752585319512+1.08392332733869i 0.271752585319511717+1.08392332733869454i
24		asin:1.5708 1.5707963267949 1.57079632679489662 0.666239+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i
	24	asin:1.5708 1.5707963267949 1.57079632679489662 0.66624+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i
25	25	acos:0 0 0 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i
26	26	atan:0.785398 0.785398163397448 0.78539816339744831 1.01722+0.402359i 1.01722196789785+0.402359478108525i 1.01722196789785137+0.402359478108525094i

src/tests/.expect/concurrent/sched-int-disjoint.txt

rb826e6b	rfea3faa
9	9	9000
10	10	10000
	11	11000
	12	12000
	13	13000
	14	14000
	15	15000
	16	16000
	17	17000
	18	18000
	19	19000
	20	20000
	21	21000
	22	22000
	23	23000
	24	24000
	25	25000
	26	26000
	27	27000
	28	28000
	29	29000
	30	30000
	31	31000
	32	32000
	33	33000
	34	34000
	35	35000
	36	36000
	37	37000
	38	38000
	39	39000
	40	40000
	41	41000
	42	42000
	43	43000
	44	44000
	45	45000
	46	46000
	47	47000
	48	48000
	49	49000
	50	50000
	51	51000
	52	52000
	53	53000
	54	54000
	55	55000
	56	56000
	57	57000
	58	58000
	59	59000
	60	60000
	61	61000
	62	62000
	63	63000
	64	64000
	65	65000
	66	66000
	67	67000
	68	68000
	69	69000
	70	70000
	71	71000
	72	72000
	73	73000
	74	74000
	75	75000
	76	76000
	77	77000
	78	78000
	79	79000
	80	80000
	81	81000
	82	82000
	83	83000
	84	84000
	85	85000
	86	86000
	87	87000
	88	88000
	89	89000
	90	90000
	91	91000
	92	92000
	93	93000
	94	94000
	95	95000
	96	96000
	97	97000
	98	98000
	99	99000
	100	100000
11	101	All waiter done

src/tests/.expect/io.txt

-              rb826e6b
+              rfea3faa
-opening delimiters
 x (1 x [2 x {3 x =4 x $5 x £6 x ¥7 x ¡8 x ¿9 x «10
-closing delimiters
 , x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x
-opening/closing delimiters
 x`1`x'2'x"3"x:4:x 5 x   6       x
 …
+x
-override opening/closing delimiters
 x ( 1 ) x 2 , x 3 :x: 4
-input bacis types
-output basic types
+A
 2 3 4 5 6 7 8
 …
 .1+2.3i 1.1-2.3i 1.1-2.3i
-tuples
-, 2, 3 4, 5, 6
-toggle separator
 .11.21.3
 .1+2.3i1.1-2.3i1.1-2.3i
+.1+2.3i 1.1-2.3i1.1-2.3i
+.1+2.3i 1.1-2.3i 1.1-2.3i
+.1+2.3i1.1-2.3i 1.1-2.3i
+abcxyz
+ abcxyz
 abcxyz
-change separator
-from " " to ", $"
 .1, $1.2, $1.3
 .1+2.3i, $1.1-2.3i, $1.1-2.3i
 abc, $xyz
-, 2, 3, $4, 5, 6
+from ", $" to " "
+.1 1.2 1.3
+.1+2.3i 1.1-2.3i 1.1-2.3i
+abc xyz
+, 2, 3 4, 5, 6
+check sepOn/sepOff
+2 3
+, 2, 3, 4
+, $2, $3 ", $"
+2 3 " "
+2 3
 3
-2 3
-2 3
-2 3
-check enable/disable
 23
 2 3
+2 3
+2 3
+2 3 4 5 6 " "
+, 2, 3 4, 5, 6 " "
+, 2, 3 4, 5, 6
+2 3 4 " "
+, 2, 3, 4 ", "
+, 2, 3, 4
 , 4, a, 7.2
 , 4, a, 7.2
 4 a 7.2
 4 a 7.234a7.23 4 a 7.2
 -4-a-7.2^3^4^3-4-a-7.2
+4 a 7.234a7.23 4 a 7.2
+-4-a-7.2^3^4-3-4-a-7.2

src/tests/Makefile.am

-              rb826e6b
+              rfea3faa
 # applies to both programs
+DEBUG_FLAGS =
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@
+if !BUILD_DEBUG
+BUILD_FLAGS += -nodebug
+else
+if !BUILD_RELEASE
+BUILD_FLAGS += -debug
+else
+BUILD_FLAGS += ${DEBUG_FLAGS}
+endif
+endif
+EXTRA_FLAGS =
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
+CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 …
 fstream_test_SOURCES = fstream_test.c
-fstream_test_CFLAGS = $(if $(test), 2>> .err/fstream_test.log, ) ${BUILD_FLAGS}
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
-vector_test_CFLAGS = $(if $(test), 2>> .err/vector_test.log, ) ${BUILD_FLAGS}
 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_CFLAGS = $(if $(test), 2>> .err/avl_test.log, ) ${BUILD_FLAGS}
 all-local :
 …
 % : %.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} -o ${@}
+        ${CC} ${CFLAGS} ${<} -o ${@}
 dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 extension : extension.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
+        ${CC} ${CFLAGS} -lgmp ${<} -o ${@}
 memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 ###############################################################################
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
 host_triplet = @host@
 @BUILD_CONCURRENCY_TRUE@am__append_1 = coroutine thread monitor
-@BUILD_DEBUG_FALSE@am__append_2 = -nodebug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_3 = -debug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_4 = ${DEBUG_FLAGS}
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
         avl_test$(EXEEXT)
 subdir = src/tests
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_avl_test_OBJECTS = avltree/avl_test-avl_test.$(OBJEXT) \
+        avltree/avl_test-avl0.$(OBJEXT) \
+        avltree/avl_test-avl1.$(OBJEXT) \
+        avltree/avl_test-avl2.$(OBJEXT) \
+        avltree/avl_test-avl3.$(OBJEXT) \
+        avltree/avl_test-avl4.$(OBJEXT) \
+        avltree/avl_test-avl-private.$(OBJEXT)
+am_avl_test_OBJECTS = avl_test.$(OBJEXT) avl0.$(OBJEXT) avl1.$(OBJEXT) \
+        avl2.$(OBJEXT) avl3.$(OBJEXT) avl4.$(OBJEXT) \
+        avl-private.$(OBJEXT)
 avl_test_OBJECTS = $(am_avl_test_OBJECTS)
 avl_test_LDADD = $(LDADD)
+avl_test_LINK = $(CCLD) $(avl_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+        $(LDFLAGS) -o $@
+am_fstream_test_OBJECTS = fstream_test-fstream_test.$(OBJEXT)
+am_fstream_test_OBJECTS = fstream_test.$(OBJEXT)
 fstream_test_OBJECTS = $(am_fstream_test_OBJECTS)
 fstream_test_LDADD = $(LDADD)
+fstream_test_LINK = $(CCLD) $(fstream_test_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_vector_test_OBJECTS = vector/vector_test-vector_int.$(OBJEXT) \
+        vector/vector_test-array.$(OBJEXT) \
+        vector/vector_test-vector_test.$(OBJEXT)
+am_vector_test_OBJECTS = vector_int.$(OBJEXT) array.$(OBJEXT) \
+        vector_test.$(OBJEXT)
 vector_test_OBJECTS = $(am_vector_test_OBJECTS)
 vector_test_LDADD = $(LDADD)
-vector_test_LINK = $(CCLD) $(vector_test_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
 …
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-am__v_lt_1 =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 =
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CCLD = $(CC)
 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 =
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
         $(vector_test_SOURCES)
 DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
         $(vector_test_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
+'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
+CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
 # applies to both programs
+DEBUG_FLAGS =
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ \
+        $(am__append_2) $(am__append_3) $(am__append_4)
+EXTRA_FLAGS =
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
-AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
 fstream_test_SOURCES = fstream_test.c
-fstream_test_CFLAGS = $(if $(test), 2>> .err/fstream_test.log, ) ${BUILD_FLAGS}
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
-vector_test_CFLAGS = $(if $(test), 2>> .err/vector_test.log, ) ${BUILD_FLAGS}
 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_CFLAGS = $(if $(test), 2>> .err/avl_test.log, ) ${BUILD_FLAGS}
 all: all-am
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/tests/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-avltree/$(am__dirstamp):
-        @$(MKDIR_P) avltree
-        @: > avltree/$(am__dirstamp)
-avltree/$(DEPDIR)/$(am__dirstamp):
-        @$(MKDIR_P) avltree/$(DEPDIR)
-        @: > avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl_test.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl0.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl1.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl2.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl3.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl4.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl-private.$(OBJEXT): avltree/$(am__dirstamp) \
-        avltree/$(DEPDIR)/$(am__dirstamp)
 avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES)
         @rm -f avl_test$(EXEEXT)
+        $(AM_V_CCLD)$(avl_test_LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS)
+        $(AM_V_CCLD)$(LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS)
 fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES)
         @rm -f fstream_test$(EXEEXT)
+        $(AM_V_CCLD)$(fstream_test_LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS)
+vector/$(am__dirstamp):
+        @$(MKDIR_P) vector
+        @: > vector/$(am__dirstamp)
+vector/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) vector/$(DEPDIR)
+        @: > vector/$(DEPDIR)/$(am__dirstamp)
+vector/vector_test-vector_int.$(OBJEXT): vector/$(am__dirstamp) \
+        vector/$(DEPDIR)/$(am__dirstamp)
+vector/vector_test-array.$(OBJEXT): vector/$(am__dirstamp) \
+        vector/$(DEPDIR)/$(am__dirstamp)
+vector/vector_test-vector_test.$(OBJEXT): vector/$(am__dirstamp) \
+        vector/$(DEPDIR)/$(am__dirstamp)
+        $(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS)
 vector_test$(EXEEXT): $(vector_test_OBJECTS) $(vector_test_DEPENDENCIES) $(EXTRA_vector_test_DEPENDENCIES)
         @rm -f vector_test$(EXEEXT)
         $(AM_V_CCLD)$(vector_test_LINK) $(vector_test_OBJECTS) $(vector_test_LDADD) $(LIBS)
+        $(AM_V_CCLD)$(LINK) $(vector_test_OBJECTS) $(vector_test_LDADD) $(LIBS)
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
-        -rm -f avltree/*.$(OBJEXT)
-        -rm -f vector/*.$(OBJEXT)
 distclean-compile:
         -rm -f *.tab.c
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test-fstream_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl-private.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vector/$(DEPDIR)/vector_test-array.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vector/$(DEPDIR)/vector_test-vector_int.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vector/$(DEPDIR)/vector_test-vector_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl-private.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_int.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_test.Po@am__quote@
 .c.o:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 .c.obj:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+avltree/avl_test-avl_test.o: avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl_test.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl_test.Tpo -c -o avltree/avl_test-avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl_test.Tpo avltree/$(DEPDIR)/avl_test-avl_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl_test.c' object='avltree/avl_test-avl_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c
+avltree/avl_test-avl_test.obj: avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl_test.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl_test.Tpo -c -o avltree/avl_test-avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl_test.Tpo avltree/$(DEPDIR)/avl_test-avl_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl_test.c' object='avltree/avl_test-avl_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi`
+avltree/avl_test-avl0.o: avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl0.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl0.Tpo -c -o avltree/avl_test-avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl0.Tpo avltree/$(DEPDIR)/avl_test-avl0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl0.c' object='avltree/avl_test-avl0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c
+avltree/avl_test-avl0.obj: avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl0.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl0.Tpo -c -o avltree/avl_test-avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl0.Tpo avltree/$(DEPDIR)/avl_test-avl0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl0.c' object='avltree/avl_test-avl0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi`
+avltree/avl_test-avl1.o: avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl1.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl1.Tpo -c -o avltree/avl_test-avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl1.Tpo avltree/$(DEPDIR)/avl_test-avl1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl1.c' object='avltree/avl_test-avl1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c
+avltree/avl_test-avl1.obj: avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl1.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl1.Tpo -c -o avltree/avl_test-avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl1.Tpo avltree/$(DEPDIR)/avl_test-avl1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl1.c' object='avltree/avl_test-avl1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi`
+avltree/avl_test-avl2.o: avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl2.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl2.Tpo -c -o avltree/avl_test-avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl2.Tpo avltree/$(DEPDIR)/avl_test-avl2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl2.c' object='avltree/avl_test-avl2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c
+avltree/avl_test-avl2.obj: avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl2.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl2.Tpo -c -o avltree/avl_test-avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl2.Tpo avltree/$(DEPDIR)/avl_test-avl2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl2.c' object='avltree/avl_test-avl2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi`
+avltree/avl_test-avl3.o: avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl3.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl3.Tpo -c -o avltree/avl_test-avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl3.Tpo avltree/$(DEPDIR)/avl_test-avl3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl3.c' object='avltree/avl_test-avl3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c
+avltree/avl_test-avl3.obj: avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl3.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl3.Tpo -c -o avltree/avl_test-avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl3.Tpo avltree/$(DEPDIR)/avl_test-avl3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl3.c' object='avltree/avl_test-avl3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi`
+avltree/avl_test-avl4.o: avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl4.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl4.Tpo -c -o avltree/avl_test-avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl4.Tpo avltree/$(DEPDIR)/avl_test-avl4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl4.c' object='avltree/avl_test-avl4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c
+avltree/avl_test-avl4.obj: avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl4.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl4.Tpo -c -o avltree/avl_test-avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl4.Tpo avltree/$(DEPDIR)/avl_test-avl4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl4.c' object='avltree/avl_test-avl4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi`
+avltree/avl_test-avl-private.o: avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl-private.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl-private.Tpo -c -o avltree/avl_test-avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl-private.Tpo avltree/$(DEPDIR)/avl_test-avl-private.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl-private.c' object='avltree/avl_test-avl-private.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c
+avltree/avl_test-avl-private.obj: avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl-private.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl-private.Tpo -c -o avltree/avl_test-avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl-private.Tpo avltree/$(DEPDIR)/avl_test-avl-private.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl-private.c' object='avltree/avl_test-avl-private.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi`
+fstream_test-fstream_test.o: fstream_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -MT fstream_test-fstream_test.o -MD -MP -MF $(DEPDIR)/fstream_test-fstream_test.Tpo -c -o fstream_test-fstream_test.o `test -f 'fstream_test.c' || echo '$(srcdir)/'`fstream_test.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/fstream_test-fstream_test.Tpo $(DEPDIR)/fstream_test-fstream_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='fstream_test.c' object='fstream_test-fstream_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -c -o fstream_test-fstream_test.o `test -f 'fstream_test.c' || echo '$(srcdir)/'`fstream_test.c
+fstream_test-fstream_test.obj: fstream_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -MT fstream_test-fstream_test.obj -MD -MP -MF $(DEPDIR)/fstream_test-fstream_test.Tpo -c -o fstream_test-fstream_test.obj `if test -f 'fstream_test.c'; then $(CYGPATH_W) 'fstream_test.c'; else $(CYGPATH_W) '$(srcdir)/fstream_test.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/fstream_test-fstream_test.Tpo $(DEPDIR)/fstream_test-fstream_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='fstream_test.c' object='fstream_test-fstream_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -c -o fstream_test-fstream_test.obj `if test -f 'fstream_test.c'; then $(CYGPATH_W) 'fstream_test.c'; else $(CYGPATH_W) '$(srcdir)/fstream_test.c'; fi`
+vector/vector_test-vector_int.o: vector/vector_int.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-vector_int.o -MD -MP -MF vector/$(DEPDIR)/vector_test-vector_int.Tpo -c -o vector/vector_test-vector_int.o `test -f 'vector/vector_int.c' || echo '$(srcdir)/'`vector/vector_int.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-vector_int.Tpo vector/$(DEPDIR)/vector_test-vector_int.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/vector_int.c' object='vector/vector_test-vector_int.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-vector_int.o `test -f 'vector/vector_int.c' || echo '$(srcdir)/'`vector/vector_int.c
+vector/vector_test-vector_int.obj: vector/vector_int.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-vector_int.obj -MD -MP -MF vector/$(DEPDIR)/vector_test-vector_int.Tpo -c -o vector/vector_test-vector_int.obj `if test -f 'vector/vector_int.c'; then $(CYGPATH_W) 'vector/vector_int.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_int.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-vector_int.Tpo vector/$(DEPDIR)/vector_test-vector_int.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/vector_int.c' object='vector/vector_test-vector_int.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-vector_int.obj `if test -f 'vector/vector_int.c'; then $(CYGPATH_W) 'vector/vector_int.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_int.c'; fi`
+vector/vector_test-array.o: vector/array.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-array.o -MD -MP -MF vector/$(DEPDIR)/vector_test-array.Tpo -c -o vector/vector_test-array.o `test -f 'vector/array.c' || echo '$(srcdir)/'`vector/array.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-array.Tpo vector/$(DEPDIR)/vector_test-array.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/array.c' object='vector/vector_test-array.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-array.o `test -f 'vector/array.c' || echo '$(srcdir)/'`vector/array.c
+vector/vector_test-array.obj: vector/array.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-array.obj -MD -MP -MF vector/$(DEPDIR)/vector_test-array.Tpo -c -o vector/vector_test-array.obj `if test -f 'vector/array.c'; then $(CYGPATH_W) 'vector/array.c'; else $(CYGPATH_W) '$(srcdir)/vector/array.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-array.Tpo vector/$(DEPDIR)/vector_test-array.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/array.c' object='vector/vector_test-array.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-array.obj `if test -f 'vector/array.c'; then $(CYGPATH_W) 'vector/array.c'; else $(CYGPATH_W) '$(srcdir)/vector/array.c'; fi`
+vector/vector_test-vector_test.o: vector/vector_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-vector_test.o -MD -MP -MF vector/$(DEPDIR)/vector_test-vector_test.Tpo -c -o vector/vector_test-vector_test.o `test -f 'vector/vector_test.c' || echo '$(srcdir)/'`vector/vector_test.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-vector_test.Tpo vector/$(DEPDIR)/vector_test-vector_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/vector_test.c' object='vector/vector_test-vector_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-vector_test.o `test -f 'vector/vector_test.c' || echo '$(srcdir)/'`vector/vector_test.c
+vector/vector_test-vector_test.obj: vector/vector_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-vector_test.obj -MD -MP -MF vector/$(DEPDIR)/vector_test-vector_test.Tpo -c -o vector/vector_test-vector_test.obj `if test -f 'vector/vector_test.c'; then $(CYGPATH_W) 'vector/vector_test.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_test.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-vector_test.Tpo vector/$(DEPDIR)/vector_test-vector_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/vector_test.c' object='vector/vector_test-vector_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-vector_test.obj `if test -f 'vector/vector_test.c'; then $(CYGPATH_W) 'vector/vector_test.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_test.c'; fi`
+ID: $(am__tagged_files)
+        $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+avl_test.o: avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl_test.o -MD -MP -MF $(DEPDIR)/avl_test.Tpo -c -o avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl_test.Tpo $(DEPDIR)/avl_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl_test.c' object='avl_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c
+avl_test.obj: avltree/avl_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl_test.obj -MD -MP -MF $(DEPDIR)/avl_test.Tpo -c -o avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl_test.Tpo $(DEPDIR)/avl_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl_test.c' object='avl_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi`
+avl0.o: avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl0.o -MD -MP -MF $(DEPDIR)/avl0.Tpo -c -o avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl0.Tpo $(DEPDIR)/avl0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl0.c' object='avl0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c
+avl0.obj: avltree/avl0.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl0.obj -MD -MP -MF $(DEPDIR)/avl0.Tpo -c -o avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl0.Tpo $(DEPDIR)/avl0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl0.c' object='avl0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi`
+avl1.o: avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl1.o -MD -MP -MF $(DEPDIR)/avl1.Tpo -c -o avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl1.Tpo $(DEPDIR)/avl1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl1.c' object='avl1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c
+avl1.obj: avltree/avl1.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl1.obj -MD -MP -MF $(DEPDIR)/avl1.Tpo -c -o avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl1.Tpo $(DEPDIR)/avl1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl1.c' object='avl1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi`
+avl2.o: avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl2.o -MD -MP -MF $(DEPDIR)/avl2.Tpo -c -o avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl2.Tpo $(DEPDIR)/avl2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl2.c' object='avl2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c
+avl2.obj: avltree/avl2.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl2.obj -MD -MP -MF $(DEPDIR)/avl2.Tpo -c -o avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl2.Tpo $(DEPDIR)/avl2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl2.c' object='avl2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi`
+avl3.o: avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl3.o -MD -MP -MF $(DEPDIR)/avl3.Tpo -c -o avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl3.Tpo $(DEPDIR)/avl3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl3.c' object='avl3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c
+avl3.obj: avltree/avl3.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl3.obj -MD -MP -MF $(DEPDIR)/avl3.Tpo -c -o avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl3.Tpo $(DEPDIR)/avl3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl3.c' object='avl3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi`
+avl4.o: avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl4.o -MD -MP -MF $(DEPDIR)/avl4.Tpo -c -o avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl4.Tpo $(DEPDIR)/avl4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl4.c' object='avl4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c
+avl4.obj: avltree/avl4.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl4.obj -MD -MP -MF $(DEPDIR)/avl4.Tpo -c -o avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl4.Tpo $(DEPDIR)/avl4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl4.c' object='avl4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi`
+avl-private.o: avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl-private.o -MD -MP -MF $(DEPDIR)/avl-private.Tpo -c -o avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl-private.Tpo $(DEPDIR)/avl-private.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl-private.c' object='avl-private.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c
+avl-private.obj: avltree/avl-private.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl-private.obj -MD -MP -MF $(DEPDIR)/avl-private.Tpo -c -o avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/avl-private.Tpo $(DEPDIR)/avl-private.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='avltree/avl-private.c' object='avl-private.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi`
+vector_int.o: vector/vector_int.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vector_int.o -MD -MP -MF $(DEPDIR)/vector_int.Tpo -c -o vector_int.o `test -f 'vector/vector_int.c' || echo '$(srcdir)/'`vector/vector_int.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/vector_int.Tpo $(DEPDIR)/vector_int.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/vector_int.c' object='vector_int.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vector_int.o `test -f 'vector/vector_int.c' || echo '$(srcdir)/'`vector/vector_int.c
+vector_int.obj: vector/vector_int.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vector_int.obj -MD -MP -MF $(DEPDIR)/vector_int.Tpo -c -o vector_int.obj `if test -f 'vector/vector_int.c'; then $(CYGPATH_W) 'vector/vector_int.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_int.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/vector_int.Tpo $(DEPDIR)/vector_int.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/vector_int.c' object='vector_int.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vector_int.obj `if test -f 'vector/vector_int.c'; then $(CYGPATH_W) 'vector/vector_int.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_int.c'; fi`
+array.o: vector/array.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT array.o -MD -MP -MF $(DEPDIR)/array.Tpo -c -o array.o `test -f 'vector/array.c' || echo '$(srcdir)/'`vector/array.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/array.Tpo $(DEPDIR)/array.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/array.c' object='array.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o array.o `test -f 'vector/array.c' || echo '$(srcdir)/'`vector/array.c
+array.obj: vector/array.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT array.obj -MD -MP -MF $(DEPDIR)/array.Tpo -c -o array.obj `if test -f 'vector/array.c'; then $(CYGPATH_W) 'vector/array.c'; else $(CYGPATH_W) '$(srcdir)/vector/array.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/array.Tpo $(DEPDIR)/array.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/array.c' object='array.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o array.obj `if test -f 'vector/array.c'; then $(CYGPATH_W) 'vector/array.c'; else $(CYGPATH_W) '$(srcdir)/vector/array.c'; fi`
+vector_test.o: vector/vector_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vector_test.o -MD -MP -MF $(DEPDIR)/vector_test.Tpo -c -o vector_test.o `test -f 'vector/vector_test.c' || echo '$(srcdir)/'`vector/vector_test.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/vector_test.Tpo $(DEPDIR)/vector_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/vector_test.c' object='vector_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vector_test.o `test -f 'vector/vector_test.c' || echo '$(srcdir)/'`vector/vector_test.c
+vector_test.obj: vector/vector_test.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vector_test.obj -MD -MP -MF $(DEPDIR)/vector_test.Tpo -c -o vector_test.obj `if test -f 'vector/vector_test.c'; then $(CYGPATH_W) 'vector/vector_test.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_test.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/vector_test.Tpo $(DEPDIR)/vector_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='vector/vector_test.c' object='vector_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vector_test.obj `if test -f 'vector/vector_test.c'; then $(CYGPATH_W) 'vector/vector_test.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_test.c'; fi`
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        mkid -fID $$unique
+tags: TAGS
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
         set x; \
         here=`pwd`; \
+        $(am__define_uniq_tagged_files); \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         shift; \
         if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 …
           fi; \
         fi
+ctags: ctags-am
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         test -z "$(CTAGS_ARGS)$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 …
           && $(am__cd) $(top_srcdir) \
           && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-cscopelist-am: $(am__tagged_files)
-        list='$(am__tagged_files)'; \
-        case "$(srcdir)" in \
-          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-          *) sdir=$(subdir)/$(srcdir) ;; \
-        esac; \
-        for i in $$list; do \
-          if test -f "$$i"; then \
-            echo "$(subdir)/$$i"; \
-          else \
-            echo "$$sdir/$$i"; \
-          fi; \
-        done >> $(top_builddir)/cscope.files
 distclean-tags:
 …
         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
         -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-        -rm -f avltree/$(DEPDIR)/$(am__dirstamp)
-        -rm -f avltree/$(am__dirstamp)
-        -rm -f vector/$(DEPDIR)/$(am__dirstamp)
-        -rm -f vector/$(am__dirstamp)
 maintainer-clean-generic:
 …
 distclean: distclean-am
         -rm -rf ./$(DEPDIR) avltree/$(DEPDIR) vector/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 …
 maintainer-clean: maintainer-clean-am
         -rm -rf ./$(DEPDIR) avltree/$(DEPDIR) vector/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 …
 .MAKE: install-am install-strip
+.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 \
+        tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
+        clean-generic clean-local ctags 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 tags uninstall \
+        uninstall-am
 …
 % : %.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} -o ${@}
+        ${CC} ${CFLAGS} ${<} -o ${@}
 dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 extension : extension.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
+        ${CC} ${CFLAGS} -lgmp ${<} -o ${@}
 memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/tests/gmp.c

-              rb826e6b
+              rfea3faa
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jul 13 16:35:01 2017
 // Update Count     : 541
+// Last Modified On : Wed May 24 22:05:38 2017
+// Update Count     : 540
 //
 …
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa gmp.c -lgmp" //
+// compile-command: "cfa gmp.c -l gmp" //
 // End: //

src/tests/io.c

-              rb826e6b
+              rfea3faa
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jul  6 23:26:12 2017
 // Update Count     : 78
+// Last Modified On : Thu Jun  8 09:52:10 2017
+// Update Count     : 51
 //
 …
         sout | endl;
-        sout | "opening delimiters" | endl;
         sout
+                // opening delimiters
                 | "x (" | 1
                 | "x [" | 2
 …
                 | "x ¿" | 9
                 | "x «" | 10
+                | endl | endl;
+        sout | "closing delimiters" | endl;
+                | endl;
         sout
+                // closing delimiters
                 | 1 | ", x"
                 | 2 | ". x"
 …
                 | 10 | "] x"
                 | 11 | "} x"
+                | endl | endl;
+        sout | "opening/closing delimiters" | endl;
+                | endl;
         sout
+                // opening-closing delimiters
                 | "x`" | 1 | "`x'" | 2
                 | "'x\"" | 3 | "\"x:" | 4
 …
                 | "\tx\f" | 7 | "\fx\v" | 8
                 | "\vx\n" | 9 | "\nx\r" | 10
+                | "\rx"
+                | endl | endl;
+        sout | "override opening/closing delimiters" | endl;
+                | "\rx" |
+                endl;
         sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4 | endl;
-        sout | endl;
         ifstream in;                                                                            // create / open file
         open( &in, "io.data", "r" );
-        sout | "input bacis types" | endl;
         &in | &c                                                                                        // character
                 | &si | &usi | &i | &ui | &li | &uli | &lli | &ulli     // integral
 …
                 | &fc | &dc | &ldc                                                              // floating-point complex
                 | cstr( s1 ) | cstr( s2, size );                                // C string, length unchecked and checked
-        sout | endl;
-        sout | "output basic types" | endl;
         sout | c | ' ' | endl                                                           // character
                 | si | usi | i | ui | li | uli | lli | ulli | endl // integral
 …
                 | fc | dc | ldc | endl;                                                 // complex
         sout | endl;
         sout | "tuples" | endl;
         [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
         sout | t1 | t2 | endl;                                                          // print tuple
+        sout | f | "" | d | "" | ld | endl                                      // floating point without separator
+                | sepDisable | fc | dc | ldc | sepEnable | endl // complex without separator
+                | sepOn | s1 | sepOff | s2 | endl                               // local separator removal
+                | s1 | "" | s2 | endl;                                                  // C string without separator
         sout | endl;
+        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
+        sepSet( sout, ", $" );                                                          // change separator, maximum of 15 characters
+        sout | f | d | ld | endl
+                | fc | dc | ldc | endl
+                | s1 | s2 | endl;
         sout | endl;
+        sout | "change separator" | endl;
+        sout | "from \"" | sep | "\"";
+        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 | "\" ";
+        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;
+        [int, int] t1 = [1, 2], t2 = [3, 4];
+        sout | t1 | t2 | endl;                                                          // print tuple
+        sout | "check sepOn/sepOff" | endl;
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl;                        // no separator at start/end of line
+        sepSet( sout, " " );
+        sepSet( sout, ", $" );                                                          // set separator from " " to ", $"
+        sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
+        sepSet( sout, " " );                                                            // reset separator to " "
+        sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl;                        // separator at start 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 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 | fmt( d, "%8.3f" ) || endl;
+//      sout | endl;
+        sout | sepEnable | 1 | 2 | 3 | endl;                            // globally turn on implicit separation
         sepSetTuple( sout, " " );                                                       // set tuple separator from ", " to " "
         sout | t1 | t2 | " \"" | sep | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sepSetTuple( sout, ", " );                                                      // reset tuple separator to ", "
+        sout | t1 | t2 | " \"" | sep | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sout | t1 | t2 | endl;                                                          // print tuple
-        sout | endl;
         [int, int, const char *, double] t3 = { 3, 4, "a", 7.2 };

src/tests/preempt_longrun/Makefile.am

-              rb826e6b
+              rfea3faa
 ## Author           : Thierry Delisle
 ## Created On       : Fri Jun 16 10:57:34 2017
 ## Last Modified By :
 ## Last Modified On :
+## Last Modified By :
+## Last Modified On :
 ## Update Count     : 0
 ###############################################################################
 repeats=10
+max_time=600
+preempt=1_000ul
+max_time=10
+N=10ul
+preempt=10_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 TESTS = barge block create disjoint enter enter3 processor stack wait yield
+TESTS = barge block create disjoint processor stack wait yield
 .INTERMEDIATE: ${TESTS}
 all-local: ${TESTS:=.run}
-clean-local:
-        rm -f ${TESTS}
 % : %.c ${CC}

src/tests/preempt_longrun/Makefile.in

-              rb826e6b
+              rfea3faa
 # Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 ###############################################################################
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
+}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \   ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 …
 host_triplet = @host@
 subdir = src/tests/preempt_longrun
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+am__v_GEN_0 = @echo "  GEN   " $@;
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
-am__v_at_1 =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red='[0;31m'; \
+    grn='[0;32m'; \
+    lgn='[1;32m'; \
+    blu='[1;34m'; \
+    mgn='[0;35m'; \
+    brg='[1m'; \
+    std='[m'; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[     ]*:recheck:[    ]*
+am__global_test_result_rx = ^[  ]*:global-test-result:[         ]*
+am__copy_in_global_log_rx = ^[  ]*:copy-in-global-log:[         ]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+            recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[        ]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);                                      \
+$(am__vpath_adj_setup) $(am__vpath_adj)                 \
+$(am__tty_colors);                                      \
+srcdir=$(srcdir); export srcdir;                        \
+case "$@" in                                            \
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;    \
+    *) am__odir=.;;                                     \
+esac;                                                   \
+test "x$$am__odir" = x"." || test -d "$$am__odir"       \
+  || $(MKDIR_P) "$$am__odir" || exit $$?;               \
+if test -f "./$$f"; then dir=./;                        \
+elif test -f "$$f"; then dir=;                          \
+else dir="$(srcdir)/"; fi;                              \
+tst=$$dir$$f; log='$@';                                 \
+if test -n '$(DISABLE_HARD_ERRORS)'; then               \
+  am__enable_hard_errors=no;                            \
+else                                                    \
+  am__enable_hard_errors=yes;                           \
+fi;                                                     \
+case " $(XFAIL_TESTS) " in                              \
+  *[\ \ ]$$f[\ \        ]* | *[\ \      ]$$dir$$f[\ \   ]*) \
+    am__expect_failure=yes;;                            \
+  *)                                                    \
+    am__expect_failure=no;;                             \
+esac;                                                   \
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/automake/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/automake/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+        $(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+        $(top_srcdir)/automake/test-driver
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 …
 top_srcdir = @top_srcdir@
 repeats = 10
+max_time = 600
+preempt = 1_000ul
+max_time = 10
+N = 10ul
+preempt = 10_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 TESTS = barge block create disjoint enter enter3 processor stack wait yield
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
+TESTS = barge block create disjoint processor stack wait yield
 all: all-am
 .SUFFIXES:
-.SUFFIXES: .log .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
 …
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/tests/preempt_longrun/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+tags TAGS:
+ctags CTAGS:
+cscope cscopelist:
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+        rm -f $< $@
+        $(MAKE) $(AM_MAKEFLAGS) $<
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+        @:
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+        @$(am__set_TESTS_bases); \
+        am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+        redo_bases=`for i in $$bases; do \
+                      am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+                    done`; \
+        if test -n "$$redo_bases"; then \
+          redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+          redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+          if $(am__make_dryrun); then :; else \
+            rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+          fi; \
+        fi; \
+        if test -n "$$am__remaking_logs"; then \
+          echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+               "recursion detected" >&2; \
+        elif test -n "$$redo_logs"; then \
+          am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+        fi; \
+        if $(am__make_dryrun); then :; else \
+          st=0;  \
+          errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+          for i in $$redo_bases; do \
+            test -f $$i.trs && test -r $$i.trs \
+              || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+            test -f $$i.log && test -r $$i.log \
+              || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+tags: TAGS
+TAGS:
+ctags: CTAGS
+CTAGS:
+check-TESTS: $(TESTS)
+        @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+        srcdir=$(srcdir); export srcdir; \
+        list=' $(TESTS) '; \
+        $(am__tty_colors); \
+        if test -n "$$list"; then \
+          for tst in $$list; do \
+            if test -f ./$$tst; then dir=./; \
+            elif test -f $$tst; then dir=; \
+            else dir="$(srcdir)/"; fi; \
+            if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+              all=`expr $$all + 1`; \
+              case " $(XFAIL_TESTS) " in \
+              *[\ \     ]$$tst[\ \      ]*) \
+                xpass=`expr $$xpass + 1`; \
+                failed=`expr $$failed + 1`; \
+                col=$$red; res=XPASS; \
+              ;; \
+              *) \
+                col=$$grn; res=PASS; \
+              ;; \
+              esac; \
+            elif test $$? -ne 77; then \
+              all=`expr $$all + 1`; \
+              case " $(XFAIL_TESTS) " in \
+              *[\ \     ]$$tst[\ \      ]*) \
+                xfail=`expr $$xfail + 1`; \
+                col=$$lgn; res=XFAIL; \
+              ;; \
+              *) \
+                failed=`expr $$failed + 1`; \
+                col=$$red; res=FAIL; \
+              ;; \
+              esac; \
+            else \
+              skip=`expr $$skip + 1`; \
+              col=$$blu; res=SKIP; \
+            fi; \
+            echo "$${col}$$res$${std}: $$tst"; \
           done; \
+          test $$st -eq 0 || exit 1; \
+        fi
+        @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+        ws='[   ]'; \
+        results=`for b in $$bases; do echo $$b.trs; done`; \
+        test -n "$$results" || results=/dev/null; \
+        all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+        pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+        fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+        skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+        xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+        xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+        error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+        if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+          success=true; \
+        else \
+          success=false; \
+        fi; \
+        br='==================='; br=$$br$$br$$br$$br; \
+        result_count () \
+        { \
+            if test x"$$1" = x"--maybe-color"; then \
+              maybe_colorize=yes; \
+            elif test x"$$1" = x"--no-color"; then \
+              maybe_colorize=no; \
+          if test "$$all" -eq 1; then \
+            tests="test"; \
+            All=""; \
+          else \
+            tests="tests"; \
+            All="All "; \
+          fi; \
+          if test "$$failed" -eq 0; then \
+            if test "$$xfail" -eq 0; then \
+              banner="$$All$$all $$tests passed"; \
             else \
               echo "$@: invalid 'result_count' usage" >&2; exit 4; \
             fi; \
             shift; \
             desc=$$1 count=$$2; \
             if test $$maybe_colorize = yes && test $$count -gt 0; then \
               color_start=$$3 color_end=$$std; \
+              if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+              banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+            fi; \
+          else \
+            if test "$$xpass" -eq 0; then \
+              banner="$$failed of $$all $$tests failed"; \
             else \
+              color_start= color_end=; \
+            fi; \
+            echo "$${color_start}# $$desc $$count$${color_end}"; \
+        }; \
+        create_testsuite_report () \
+        { \
+          result_count $$1 "TOTAL:" $$all   "$$brg"; \
+          result_count $$1 "PASS: " $$pass  "$$grn"; \
+          result_count $$1 "SKIP: " $$skip  "$$blu"; \
+          result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+          result_count $$1 "FAIL: " $$fail  "$$red"; \
+          result_count $$1 "XPASS:" $$xpass "$$red"; \
+          result_count $$1 "ERROR:" $$error "$$mgn"; \
+        }; \
+        {                                                               \
+          echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |       \
+            $(am__rst_title);                                           \
+          create_testsuite_report --no-color;                           \
+          echo;                                                         \
+          echo ".. contents:: :depth: 2";                               \
+          echo;                                                         \
+          for b in $$bases; do echo $$b; done                           \
+            | $(am__create_global_log);                                 \
+        } >$(TEST_SUITE_LOG).tmp || exit 1;                             \
+        mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);                     \
+        if $$success; then                                              \
+          col="$$grn";                                                  \
+         else                                                           \
+          col="$$red";                                                  \
+          test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);               \
+        fi;                                                             \
+        echo "$${col}$$br$${std}";                                      \
+        echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";   \
+        echo "$${col}$$br$${std}";                                      \
+        create_testsuite_report --maybe-color;                          \
+        echo "$$col$$br$$std";                                          \
+        if $$success; then :; else                                      \
+          echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";         \
+          if test -n "$(PACKAGE_BUGREPORT)"; then                       \
+            echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+          fi;                                                           \
+          echo "$$col$$br$$std";                                        \
+        fi;                                                             \
+        $$success || exit 1
+check-TESTS:
+        @list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+        @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+        @set +e; $(am__set_TESTS_bases); \
+        log_list=`for i in $$bases; do echo $$i.log; done`; \
+        trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+        log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+        exit $$?;
+recheck: all
+        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+        @set +e; $(am__set_TESTS_bases); \
+        bases=`for i in $$bases; do echo $$i; done \
+                 | $(am__list_recheck_tests)` || exit 1; \
+        log_list=`for i in $$bases; do echo $$i.log; done`; \
+        log_list=`echo $$log_list`; \
+        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+                am__force_recheck=am--force-recheck \
+                TEST_LOGS="$$log_list"; \
+        exit $$?
+barge.log: barge
+        @p='barge'; \
+        b='barge'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+block.log: block
+        @p='block'; \
+        b='block'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+create.log: create
+        @p='create'; \
+        b='create'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+disjoint.log: disjoint
+        @p='disjoint'; \
+        b='disjoint'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+enter.log: enter
+        @p='enter'; \
+        b='enter'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+enter3.log: enter3
+        @p='enter3'; \
+        b='enter3'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+processor.log: processor
+        @p='processor'; \
+        b='processor'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+stack.log: stack
+        @p='stack'; \
+        b='stack'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+wait.log: wait
+        @p='wait'; \
+        b='wait'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+yield.log: yield
+        @p='yield'; \
+        b='yield'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+        @p='$<'; \
+        $(am__set_b); \
+        $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@       @p='$<'; \
+@am__EXEEXT_TRUE@       $(am__set_b); \
+@am__EXEEXT_TRUE@       $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@       --log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@       $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@       "$$tst" $(AM_TESTS_FD_REDIRECT)
+              if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+              banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+            fi; \
+          fi; \
+          dashes="$$banner"; \
+          skipped=""; \
+          if test "$$skip" -ne 0; then \
+            if test "$$skip" -eq 1; then \
+              skipped="($$skip test was not run)"; \
+            else \
+              skipped="($$skip tests were not run)"; \
+            fi; \
+            test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+              dashes="$$skipped"; \
+          fi; \
+          report=""; \
+          if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+            report="Please report to $(PACKAGE_BUGREPORT)"; \
+            test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+              dashes="$$report"; \
+          fi; \
+          dashes=`echo "$$dashes" | sed s/./=/g`; \
+          if test "$$failed" -eq 0; then \
+            col="$$grn"; \
+          else \
+            col="$$red"; \
+          fi; \
+          echo "$${col}$$dashes$${std}"; \
+          echo "$${col}$$banner$${std}"; \
+          test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+          test -z "$$report" || echo "$${col}$$report$${std}"; \
+          echo "$${col}$$dashes$${std}"; \
+          test "$$failed" -eq 0; \
+        else :; fi
 distdir: $(DISTFILES)
 …
         fi
 mostlyclean-generic:
-        -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-        -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-        -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 clean-generic:
 …
 clean: clean-am
 clean-am: clean-generic clean-local mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 distclean: distclean-am
 …
 .PHONY: all all-am all-local check check-TESTS check-am clean \
+        clean-generic clean-local cscopelist-am ctags-am distclean \
+        distclean-generic distdir dvi dvi-am html html-am info info-am \
+        install install-am install-data install-data-am install-dvi \
+        install-dvi-am install-exec install-exec-am install-html \
+        install-html-am install-info install-info-am install-man \
+        install-pdf install-pdf-am install-ps install-ps-am \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-generic pdf pdf-am ps ps-am recheck tags-am \
+        uninstall uninstall-am
+.PRECIOUS: Makefile
+        clean-generic 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 uninstall uninstall-am
 …
 all-local: ${TESTS:=.run}
-clean-local:
-        rm -f ${TESTS}
 % : %.c ${CC}

src/tests/preempt_longrun/create.c

rb826e6b	rfea3faa
10	10	}
11	11
12		thread ~~worker_t~~ {};
	12	thread Worker {};
13	13
14		void main(~~worker_t~~ * this) {}
	14	void main(Worker * this) {}
15	15
16	16	int main(int argc, char* argv[]) {
17		processor p;
18		for(int i = 0; i < 10_000ul; i++) {
19		worker_t w[7];
	17	for(int i = 0; i < 100_000ul; i++) {
	18	Worker w;
20	19	}
21	20	}

src/tests/preempt_longrun/processor.c

-              rb826e6b
+              rfea3faa
+}
 thread worker_t {};
+thread Worker {};
 void main(worker_t * this) {}
+void main(Worker * this) {}
 int main(int argc, char* argv[]) {
         for(int i = 0; i < 10_000ul; i++) {
+        for(int i = 0; i < 100_000ul; i++) {
                 processor p;
+        }

src/tests/preempt_longrun/stack.c

-              rb826e6b
+              rfea3faa
+}
 thread worker_t {};
+thread Worker {};
 void main(worker_t * this) {
+void main(Worker * this) {
         volatile long p = 5_021_609ul;
         volatile long a = 326_417ul;
         volatile long n = 1l;
         for (volatile long i = 0; i < p; i++) {
                 n *= a;
                 n %= p;
+        for (volatile long i = 0; i < p; i++) {
+                n *= a;
+                n %= p;
+        }
         if( n != a ) {
                 abort();
 …
+}
-extern "C" {
-static worker_t * workers;
+}
 int main(int argc, char* argv[]) {
         processor p;
+        {
+                worker_t w[7];
+                workers = w;
+                Worker w[7];
+        }
+}

src/tests/preempt_longrun/yield.c

rb826e6b	rfea3faa
10	10	}
11	11
12		thread ~~worker_t~~ {};
	12	thread Worker {};
13	13
14		void main(~~worker_t~~ * this) {
15		for(int i = 0; i < ~~325~~_000ul; i++) {
	14	void main(Worker * this) {
	15	for(int i = 0; i < 100_000ul; i++) {
16	16	yield();
17	17	}
18		}
19
20		~~extern "C" {~~
21		~~static worker_t * workers;~~
22	18	}
23	19
…	…
25	21	processor p;
26	22	{
27		worker_t w[7];
28		workers = w;
	23	Worker w[7];
29	24	}
30	25	}

src/tests/sched-int-barge.c

-              rb826e6b
+              rfea3faa
 #include <stdlib>
 #include <thread>
-#ifndef N
-#define N 100_000
-#endif
 enum state_t { WAIT, SIGNAL, BARGE };
 …
+        }
         if( c->counter >= N ) c->done = true;
+        if( c->counter >= 100_000 ) c->done = true;
         return !c->done;
+}

src/tests/sched-int-block.c

-              rb826e6b
+              rfea3faa
 #ifndef N
 #define N 10_000
+#define N 100_000
 #endif
 …
 //------------------------------------------------------------------------------
 void wait_op( global_data_t * mutex a, global_data_t * mutex b, unsigned i ) {
         wait( &cond, (uintptr_t)this_thread );
+        wait( &cond, (uintptr_t)this_thread() );
         yield( ((unsigned)rand48()) % 10 );
 …
+        }
         a->last_thread = b->last_thread = this_thread;
+        a->last_thread = b->last_thread = this_thread();
         yield( ((unsigned)rand48()) % 10 );
 …
         yield( ((unsigned)rand48()) % 10 );
         a->last_thread = b->last_thread = a->last_signaller = b->last_signaller = this_thread;
+        a->last_thread = b->last_thread = a->last_signaller = b->last_signaller = this_thread();
         if( !is_empty( &cond ) ) {
 …
 //------------------------------------------------------------------------------
 void barge_op( global_data_t * mutex a ) {
         a->last_thread = this_thread;
+        a->last_thread = this_thread();
+}

src/tests/sched-int-disjoint.c

-              rb826e6b
+              rfea3faa
 #ifndef N
 #define N 10_000
+#define N 100_000
 #endif
 …
 void main( Barger * this ) {
         while( !all_done ) {
+        while( !all_done ) {
                 barge( &data );
                 yield();
+                yield();
+        }
+}
 …
         wait( &cond );
         if( d->state != SIGNAL ) {
                 sout | "ERROR barging!" | endl;
+                sout | "ERROR barging!" | endl;
+        }
 …
         bool running = data.counter < N && data.counter > 0;
         if( data.state != SIGNAL && running ) {
                 sout | "ERROR Eager signal" | data.state | endl;
+                sout | "ERROR Eager signal" | data.state | endl;
+        }
+}
 …
 void main( Signaller * this ) {
         while( !all_done ) {
+        while( !all_done ) {
                 logic( &mut );
                 yield();
+                yield();
+        }
+}
 …
                 sout | "All waiter done" | endl;
                 all_done = true;
+        }
+        }
+}

src/tests/sched-int-wait.c

-              rb826e6b
+              rfea3faa
                 unsigned action = (unsigned)rand48() % 4;
                 switch( action ) {
                         case 0:
+                        case 0:
                                 signal( &condABC, &globalA, &globalB, &globalC );
                                 break;
                         case 1:
+                        case 1:
                                 signal( &condAB , &globalA, &globalB );
                                 break;
                         case 2:
+                        case 2:
                                 signal( &condBC , &globalB, &globalC );
                                 break;
                         case 3:
+                        case 3:
                                 signal( &condAC , &globalA, &globalC );
                                 break;
 …
+                }
                 yield();
+        }
+        }
+}

src/tests/test.py

-              rb826e6b
+              rfea3faa
         # remove any outputs from the previous tests to prevent side effects
         rm( (out_file, err_file, test.name), dry_run )
+        rm( (out_file, test.name), dry_run )
         options = "-debug" if debug else "-nodebug"
         # build, skipping to next test on error
         make_ret, _ = sh("""%s test=yes DEBUG_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
+        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
         retcode = 0
 …
                         error = myfile.read()
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
 …
                 if   retcode == TestResult.SUCCESS:     result_txt = "Done"
                 elif retcode == TestResult.TIMEOUT:     result_txt = "TIMEOUT"
                 else :                                          result_txt = "ERROR code %d" % retcode
+                else :                                          result_txt = "ERROR"
         else :
                 if   retcode == TestResult.SUCCESS:     result_txt = "PASSED"
                 elif retcode == TestResult.TIMEOUT:     result_txt = "TIMEOUT"
                 else :                                          result_txt = "FAILED with code %d" % retcode
+                else :                                          result_txt = "FAILED"
         #print result with error if needed

src/tests/thread.c

-              rb826e6b
+              rfea3faa
 #include <thread>
 thread First  { semaphore* lock; };
 thread Second { semaphore* lock; };
+// thread First;
+// void main(First* this);
+void ?{}( First * this, semaphore* lock ) { this->lock = lock; }
+void ?{}( Second * this, semaphore* lock ) { this->lock = lock; }
+// thread Second;
+// void main(Second* this);
+thread First  { signal_once* lock; };
+thread Second { signal_once* lock; };
+void ?{}( First * this, signal_once* lock ) { this->lock = lock; }
+void ?{}( Second * this, signal_once* lock ) { this->lock = lock; }
 void main(First* this) {
 …
                 yield();
+        }
         V(this->lock);
+        signal(this->lock);
+}
 void main(Second* this) {
         P(this->lock);
+        wait(this->lock);
         for(int i = 0; i < 10; i++) {
                 sout | "Second : Suspend No." | i + 1 | endl;
 …
 int main(int argc, char* argv[]) {
         semaphore lock = { 0 };
+        signal_once lock;
         sout | "User main begin" | endl;
+        {

tools/cfa.nanorc

-              rb826e6b
+              rfea3faa
 ## WIP
+syntax "cfa" "\.cfa"
+syntax "cfa" "\.cfa$"
+## No magic
 # Macros
 …
 # Control Flow Structures
 color brightyellow "\<(if|else|while|do|for|switch|choose|case|default)\>"
 color brightyellow "\<(try|catch(Resume)?|finally)\>"
+##color brightyellow "\<(try|catch|catchResume|finally)\>"
 # Control Flow Statements
 color magenta "\<(goto|return|break|continue|fallthr(u|ough)|throw(Resume)?)\>"
+color magenta "\<(return|break|continue|fallthru|throw)\>"
 # Operator Names
 …
 color brightmagenta "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 # Strings and Angle Strings
 color yellow ""([^"]|\\")*"" "<[^[:blank:]=]*>"
+color brightyellow ""([^"]|\\")*"" "<[^[:blank:]=]*>"
 # Multiline Strings: This regex is VERY expencive and often too strong.
 ###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""

Context Navigation

Changes in / [b826e6b:fea3faa]

Legend: