Changeset 3bbd012 for src

Timestamp:

Jul 31, 2018, 2:43:04 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

642bc83

Parents:

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

Message:

Merge branch 'master' into demangler

Location:

src

Files:

• Common/Eval.cc (added)
• Common/SemanticError.h (modified) (3 diffs)
• Common/module.mk (modified) (1 diff)
• Common/utility.h (modified) (2 diffs)
• CompilationState.cc (added)
• CompilationState.h (added)
• InitTweak/FixGlobalInit.cc (modified) (5 diffs)
• InitTweak/FixGlobalInit.h (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/FixInit.h (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (1 diff)
• Makefile.am (modified) (6 diffs)
• Makefile.in (modified) (38 diffs)
• Parser/DeclarationNode.cc (modified) (13 diffs)
• Parser/ParseNode.h (modified) (11 diffs)
• Parser/TypeData.cc (modified) (10 diffs)
• Parser/TypeData.h (modified) (5 diffs)
• Parser/TypedefTable.cc (modified) (2 diffs)
• Parser/TypedefTable.h (modified) (2 diffs)
• Parser/parser.yy (modified) (16 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• ResolvExpr/CurrentObject.cc (modified) (2 diffs)
• SymTab/Validate.cc (modified) (6 diffs)
• Validate/HandleAttributes.cc (added)
• Validate/HandleAttributes.h (added)
• Validate/module.mk (added)
• benchmark/Makefile.am (modified) (8 diffs)
• benchmark/Makefile.in (modified) (12 diffs)
• config.h.in (moved) (moved from config.h.in ) (1 diff)
• driver/Makefile.am (modified) (2 diffs)
• driver/Makefile.in (modified) (4 diffs)
• driver/cc1.cc (modified) (2 diffs)
• driver/cfa.cc (modified) (1 diff)
• examples/Makefile.in (modified) (3 diffs)
• libcfa/Makefile.am (modified) (6 diffs)
• libcfa/Makefile.in (modified) (22 diffs)
• libcfa/concurrency/kernel.c (modified) (12 diffs)
• libcfa/concurrency/kernel_private.h (modified) (1 diff)
• libcfa/concurrency/preemption.c (modified) (5 diffs)
• libcfa/concurrency/preemption.h (modified) (1 diff)
• libcfa/heap.c (added)
• libcfa/startup.c (added)
• libcfa/startup.h (modified) (2 diffs)
• libcfa/stdhdr/bfdlink.h (modified) (2 diffs)
• libcfa/stdhdr/hwloc.h (modified) (2 diffs)
• libcfa/stdhdr/krb5.h (modified) (2 diffs)
• libcfa/stdhdr/malloc.h (modified) (1 diff)
• libcfa/stdlib (modified) (12 diffs)
• main.cc (modified) (5 diffs)
• prelude/Makefile.am (modified) (3 diffs)
• prelude/Makefile.in (modified) (6 diffs)
• tests/.expect/alloc-ERROR.txt (modified) (4 diffs)
• tests/.expect/alloc.txt (modified) (1 diff)
• tests/.expect/attributes.x64.txt (modified) (19 diffs)
• tests/.expect/attributes.x86.txt (modified) (18 diffs)
• tests/.expect/declarationErrors.txt (modified) (1 diff)
• tests/.in/io.data (moved) (moved from src/tests/io.data )
• tests/Makefile.am (modified) (4 diffs)
• tests/Makefile.in (modified) (12 diffs)
• tests/alloc.c (modified) (3 diffs)
• tests/attributes.c (modified) (3 diffs)
• tests/config.py.in (added)
• tests/io2.c (modified) (3 diffs)
• tests/preempt_longrun/Makefile.am (modified) (1 diff)
• tests/preempt_longrun/Makefile.in (modified) (4 diffs)
• tests/pybin/settings.py (modified) (4 diffs)
• tests/pybin/test_run.py (modified) (3 diffs)
• tests/pybin/tools.py (modified) (7 diffs)
• tests/structMember.c (modified) (2 diffs)
• tests/test.py (modified) (7 diffs)

src/Common/SemanticError.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 16 15:01:23 2018
-// Update Count     : 30
+// Last Modified On : Thu Jul 19 10:09:17 2018
+// Update Count     : 31
 //
 
@@ -57 +57 @@
         {"qualifiers-zero_t-one_t", "questionable use of type qualifier %s with %s", Severity::Warn},
         {"aggregate-forward-decl" , "forward declaration of nested aggregate: %s"  , Severity::Warn},
+        {"superfluous-decl"       , "declaration does not allocate storage: %s"    , Severity::Warn},
+        {"gcc-attributes"         , "invalid attribute: %s"                        , Severity::Warn},
 };
 
@@ -64 +66 @@
         BadQualifiersZeroOne,
         AggrForwardDecl,
-        NUMBER_OF_WARNINGS, //This MUST be the last warning
+        SuperfluousDecl,
+        GccAttributes,
+        NUMBER_OF_WARNINGS, // This MUST be the last warning
 };
 

src/Common/module.mk

@@ -19 +19 @@
        Common/DebugMalloc.cc \
        Common/Assert.cc \
-       Common/Heap.cc
+       Common/Heap.cc \
+       Common/Eval.cc

src/Common/utility.h

@@ -31 +31 @@
 #include "Common/Indenter.h"
 
+class Expression;
+
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -456 +458 @@
 } // ilog2
 
+// -----------------------------------------------------------------------------
+/// evaluates expr as a long long int. If second is false, expr could not be evaluated
+std::pair<long long int, bool> eval(Expression * expr);
 
 // Local Variables: //

src/InitTweak/FixGlobalInit.cc

@@ -37 +37 @@
         class GlobalFixer : public WithShortCircuiting {
           public:
-                GlobalFixer( const std::string & name, bool inLibrary );
+                GlobalFixer( bool inLibrary );
 
                 void previsit( ObjectDecl *objDecl );
@@ -52 +52 @@
         };
 
-        void fixGlobalInit( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary ) {
-                PassVisitor<GlobalFixer> visitor( name, inLibrary );
+        void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary ) {
+                PassVisitor<GlobalFixer> visitor( inLibrary );
                 acceptAll( translationUnit, visitor );
                 GlobalFixer & fixer = visitor.pass;
@@ -70 +70 @@
         }
 
-  std::string globalFunctionName( const std::string & name ) {
-        // get basename
-        std::string ret = name.substr( 0, name.find( '.' ) );
-        // replace invalid characters with _
-                static std::string invalid = "/-";
-        replace_if( ret.begin(), ret.end(), []( char c ) { return invalid.find(c) != std::string::npos; }, '_' );
-        return ret;
-  }
-
-        GlobalFixer::GlobalFixer( const std::string & name, bool inLibrary ) : tempNamer( "_global_init" ) {
-                std::string fixedName = globalFunctionName( name );
+        GlobalFixer::GlobalFixer( bool inLibrary ) : tempNamer( "_global_init" ) {
                 std::list< Expression * > ctorParameters;
                 std::list< Expression * > dtorParameters;
@@ -90 +80 @@
                         // for library code are run before constructors and destructors for user code,
                         // specify a priority when building the library. Priorities 0-100 are reserved by gcc.
-                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
-                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
+                        // Priorities 101-200 are reserved by cfa, so use priority 200 for CFA library globals,
+                        // allowing room for overriding with a higher priority.
+                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 200 ) ) );
+                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 200 ) ) );
                 }
-                initFunction = new FunctionDecl( "_init_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                initFunction = new FunctionDecl( "__global_init__", Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
                 initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
-                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                destroyFunction = new FunctionDecl( "__global_destroy__", Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
                 destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
         }
@@ -110 +102 @@
                 if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
                         // a decision should have been made by the resolver, so ctor and init are not both non-NULL
-                        assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
+                        assert( ! ctorInit->ctor || ! ctorInit->init );
 
-                        Statement * dtor = ctorInit->get_dtor();
+                        Statement * dtor = ctorInit->dtor;
                         if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {
                                 // don't need to call intrinsic dtor, because it does nothing, but
                                 // non-intrinsic dtors must be called
                                 destroyStatements.push_front( dtor );
-                                ctorInit->set_dtor( NULL );
+                                ctorInit->dtor = nullptr;
                         } // if
-                        if ( Statement * ctor = ctorInit->get_ctor() ) {
+                        if ( Statement * ctor = ctorInit->ctor ) {
                                 initStatements.push_back( ctor );
-                                objDecl->set_init( NULL );
-                                ctorInit->set_ctor( NULL );
-                        } else if ( Initializer * init = ctorInit->get_init() ) {
-                                objDecl->set_init( init );
-                                ctorInit->set_init( NULL );
+                                objDecl->init = nullptr;
+                                ctorInit->ctor = nullptr;
+                        } else if ( Initializer * init = ctorInit->init ) {
+                                objDecl->init = init;
+                                ctorInit->init = nullptr;
                         } else {
                                 // no constructor and no initializer, which is okay
-                                objDecl->set_init( NULL );
+                                objDecl->init = nullptr;
                         } // if
                         delete ctorInit;

src/InitTweak/FixGlobalInit.h

@@ -22 +22 @@
 
 namespace InitTweak {
-  /// Moves global initialization into an _init function that is unique to the translation unit.
-  /// Sets the priority of the initialization function depending on whether the initialization
-  /// function is for library code.
-  void fixGlobalInit( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary );
-
-  /// Apply transformations to a file name to get a valid C identifier which will be used as
-  /// the name of the generated initializer function.
-  std::string globalFunctionName( const std::string & name );
+        /// Moves global initialization into an _init function that is unique to the translation unit.
+        /// Sets the priority of the initialization function depending on whether the initialization
+        /// function is for library code.
+        void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary );
 } // namespace
 

src/InitTweak/FixInit.cc

@@ -238 +238 @@
         } // namespace
 
-        void fix( std::list< Declaration * > & translationUnit, const std::string & filename, bool inLibrary ) {
+        void fix( std::list< Declaration * > & translationUnit, bool inLibrary ) {
                 PassVisitor<SelfAssignChecker> checker;
                 acceptAll( translationUnit, checker );
 
                 // fixes ConstructorInit for global variables. should happen before fixInitializers.
-                InitTweak::fixGlobalInit( translationUnit, filename, inLibrary );
+                InitTweak::fixGlobalInit( translationUnit, inLibrary );
 
                 UnqCount unqCount;

src/InitTweak/FixInit.h

@@ -24 +24 @@
   /// replace constructor initializers with expression statements
   /// and unwrap basic C-style initializers
-        void fix( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary );
+        void fix( std::list< Declaration * > & translationUnit, bool inLibrary );
 } // namespace
 

src/InitTweak/InitTweak.cc

@@ -408 +408 @@
                 return allofCtorDtor( stmt, []( Expression * callExpr ){
                         if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_result() );
+                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->function->result );
                                 assert( funcType );
                                 return funcType->get_parameters().size() == 1;

src/Makefile.am

@@ -19 +19 @@
 
 SRC = main.cc \
-      MakeLibCfa.cc
+      MakeLibCfa.cc \
+      CompilationState.cc
 
 MAINTAINERCLEANFILES =
@@ -37 +38 @@
 include SynTree/module.mk
 include Tuples/module.mk
+include Validate/module.mk
 include Virtual/module.mk
 
@@ -45 +47 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = -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 -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
 driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
 
@@ -91 +93 @@
   SynTree/Attribute.cc \
   SynTree/DeclReplacer.cc \
+  CompilationState.cc \
   CodeGen/CodeGenerator.cc \
   CodeGen/FixMain.cc \
@@ -96 +99 @@
   CodeGen/OperatorTable.cc \
   Common/Assert.cc \
+  Common/Eval.cc \
   Common/SemanticError.cc \
   Common/UniqueName.cc \
@@ -134 +138 @@
   Tuples/Explode.cc \
   Tuples/TupleAssignment.cc \
-  Tuples/TupleExpansion.cc
+  Tuples/TupleExpansion.cc \
+  Validate/HandleAttributes.cc
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}

src/Makefile.in

@@ -23 +23 @@
 #SRC +=  ArgTweak/Rewriter.cc \
 #       ArgTweak/Mutate.cc
+
+######################### -*- Mode: Makefile-Gmake -*- ########################
+###############################################################################
 
 ######################### -*- Mode: Makefile-Gmake -*- ########################
@@ -192 +195 @@
         SynTree/libdemangle_a-Attribute.$(OBJEXT) \
         SynTree/libdemangle_a-DeclReplacer.$(OBJEXT) \
+        libdemangle_a-CompilationState.$(OBJEXT) \
         CodeGen/libdemangle_a-CodeGenerator.$(OBJEXT) \
         CodeGen/libdemangle_a-FixMain.$(OBJEXT) \
@@ -197 +201 @@
         CodeGen/libdemangle_a-OperatorTable.$(OBJEXT) \
         Common/libdemangle_a-Assert.$(OBJEXT) \
+        Common/libdemangle_a-Eval.$(OBJEXT) \
         Common/libdemangle_a-SemanticError.$(OBJEXT) \
         Common/libdemangle_a-UniqueName.$(OBJEXT) \
@@ -235 +240 @@
         Tuples/libdemangle_a-Explode.$(OBJEXT) \
         Tuples/libdemangle_a-TupleAssignment.$(OBJEXT) \
-        Tuples/libdemangle_a-TupleExpansion.$(OBJEXT)
+        Tuples/libdemangle_a-TupleExpansion.$(OBJEXT) \
+        Validate/libdemangle_a-HandleAttributes.$(OBJEXT)
 libdemangle_a_OBJECTS = $(am_libdemangle_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(cfa_cpplibdir)"
@@ -246 +252 @@
 am__objects_1 = driver_cfa_cpp-main.$(OBJEXT) \
         driver_cfa_cpp-MakeLibCfa.$(OBJEXT) \
+        driver_cfa_cpp-CompilationState.$(OBJEXT) \
         CodeGen/driver_cfa_cpp-Generate.$(OBJEXT) \
         CodeGen/driver_cfa_cpp-CodeGenerator.$(OBJEXT) \
@@ -261 +268 @@
         Common/driver_cfa_cpp-Assert.$(OBJEXT) \
         Common/driver_cfa_cpp-Heap.$(OBJEXT) \
+        Common/driver_cfa_cpp-Eval.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT) \
@@ -351 +359 @@
         Tuples/driver_cfa_cpp-TupleExpansion.$(OBJEXT) \
         Tuples/driver_cfa_cpp-Explode.$(OBJEXT) \
+        Validate/driver_cfa_cpp-HandleAttributes.$(OBJEXT) \
         Virtual/driver_cfa_cpp-ExpandCasts.$(OBJEXT)
 am_driver_cfa_cpp_OBJECTS = $(am__objects_1)
@@ -390 +399 @@
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
 AM_V_LEX = $(am__v_LEX_@AM_V@)
@@ -397 +405 @@
 am__v_LEX_1 = 
 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/
@@ -426 +433 @@
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+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
@@ -452 +460 @@
         $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk \
         $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk \
-        $(srcdir)/Tuples/module.mk $(srcdir)/Virtual/module.mk \
-        $(top_srcdir)/automake/depcomp $(top_srcdir)/automake/ylwrap \
-        Parser/lex.cc Parser/parser.cc Parser/parser.hh
+        $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk \
+        $(srcdir)/Virtual/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@
@@ -505 +514 @@
 LTLIBOBJS = @LTLIBOBJS@
 MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -579 +587 @@
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
-SRC = main.cc MakeLibCfa.cc CodeGen/Generate.cc \
+SRC = main.cc MakeLibCfa.cc CompilationState.cc CodeGen/Generate.cc \
         CodeGen/CodeGenerator.cc CodeGen/GenType.cc \
         CodeGen/FixNames.cc CodeGen/FixMain.cc \
@@ -586 +594 @@
         Concurrency/Waitfor.cc Common/SemanticError.cc \
         Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
-        Common/Heap.cc ControlStruct/LabelGenerator.cc \
+        Common/Heap.cc Common/Eval.cc ControlStruct/LabelGenerator.cc \
         ControlStruct/LabelFixer.cc ControlStruct/MLEMutator.cc \
         ControlStruct/Mutate.cc ControlStruct/ForExprMutator.cc \
@@ -628 +636 @@
         SynTree/Attribute.cc SynTree/DeclReplacer.cc \
         Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
-        Tuples/Explode.cc Virtual/ExpandCasts.cc
+        Tuples/Explode.cc Validate/HandleAttributes.cc \
+        Virtual/ExpandCasts.cc
 MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
         ${cfa_cpplib_PROGRAMS}}
@@ -640 +649 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = -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 -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
 driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
 demangler_SOURCES = SymTab/demangler.cc
@@ -683 +692 @@
   SynTree/Attribute.cc \
   SynTree/DeclReplacer.cc \
+  CompilationState.cc \
   CodeGen/CodeGenerator.cc \
   CodeGen/FixMain.cc \
@@ -688 +698 @@
   CodeGen/OperatorTable.cc \
   Common/Assert.cc \
+  Common/Eval.cc \
   Common/SemanticError.cc \
   Common/UniqueName.cc \
@@ -726 +737 @@
   Tuples/Explode.cc \
   Tuples/TupleAssignment.cc \
-  Tuples/TupleExpansion.cc
+  Tuples/TupleExpansion.cc \
+  Validate/HandleAttributes.cc
 
 all: $(BUILT_SOURCES)
@@ -733 +745 @@
 .SUFFIXES:
 .SUFFIXES: .cc .ll .o .obj .yy
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(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 $(srcdir)/Virtual/module.mk $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(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 $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -753 +765 @@
             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 $(srcdir)/Virtual/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 $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
@@ -871 +883 @@
         @: > Common/$(DEPDIR)/$(am__dirstamp)
 Common/libdemangle_a-Assert.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/libdemangle_a-Eval.$(OBJEXT): Common/$(am__dirstamp) \
         Common/$(DEPDIR)/$(am__dirstamp)
 Common/libdemangle_a-SemanticError.$(OBJEXT): Common/$(am__dirstamp) \
@@ -1014 +1028 @@
 Tuples/libdemangle_a-TupleExpansion.$(OBJEXT): Tuples/$(am__dirstamp) \
         Tuples/$(DEPDIR)/$(am__dirstamp)
+Validate/$(am__dirstamp):
+        @$(MKDIR_P) Validate
+        @: > Validate/$(am__dirstamp)
+Validate/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Validate/$(DEPDIR)
+        @: > Validate/$(DEPDIR)/$(am__dirstamp)
+Validate/libdemangle_a-HandleAttributes.$(OBJEXT):  \
+        Validate/$(am__dirstamp) Validate/$(DEPDIR)/$(am__dirstamp)
 
 libdemangle.a: $(libdemangle_a_OBJECTS) $(libdemangle_a_DEPENDENCIES) $(EXTRA_libdemangle_a_DEPENDENCIES) 
@@ -1104 +1126 @@
         Common/$(DEPDIR)/$(am__dirstamp)
 Common/driver_cfa_cpp-Heap.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/driver_cfa_cpp-Eval.$(OBJEXT): Common/$(am__dirstamp) \
         Common/$(DEPDIR)/$(am__dirstamp)
 ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT):  \
@@ -1312 +1336 @@
 Tuples/driver_cfa_cpp-Explode.$(OBJEXT): Tuples/$(am__dirstamp) \
         Tuples/$(DEPDIR)/$(am__dirstamp)
+Validate/driver_cfa_cpp-HandleAttributes.$(OBJEXT):  \
+        Validate/$(am__dirstamp) Validate/$(DEPDIR)/$(am__dirstamp)
 Virtual/$(am__dirstamp):
         @$(MKDIR_P) Virtual
@@ -1342 +1368 @@
         -rm -f SynTree/*.$(OBJEXT)
         -rm -f Tuples/*.$(OBJEXT)
+        -rm -f Validate/*.$(OBJEXT)
         -rm -f Virtual/*.$(OBJEXT)
 
@@ -1347 +1374 @@
         -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/driver_cfa_cpp-CompilationState.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/driver_cfa_cpp-MakeLibCfa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/driver_cfa_cpp-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdemangle_a-CompilationState.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-CodeGenerator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-FixMain.Po@am__quote@
@@ -1363 +1392 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Eval.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Heap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/libdemangle_a-Assert.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/libdemangle_a-Eval.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/libdemangle_a-SemanticError.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/libdemangle_a-UniqueName.Po@am__quote@
@@ -1535 +1566 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/libdemangle_a-TupleAssignment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/libdemangle_a-TupleExpansion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/driver_cfa_cpp-HandleAttributes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/libdemangle_a-HandleAttributes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Virtual/$(DEPDIR)/driver_cfa_cpp-ExpandCasts.Po@am__quote@
 
@@ -2057 +2090 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/libdemangle_a-DeclReplacer.obj `if test -f 'SynTree/DeclReplacer.cc'; then $(CYGPATH_W) 'SynTree/DeclReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclReplacer.cc'; fi`
 
+libdemangle_a-CompilationState.o: CompilationState.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -MT libdemangle_a-CompilationState.o -MD -MP -MF $(DEPDIR)/libdemangle_a-CompilationState.Tpo -c -o libdemangle_a-CompilationState.o `test -f 'CompilationState.cc' || echo '$(srcdir)/'`CompilationState.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libdemangle_a-CompilationState.Tpo $(DEPDIR)/libdemangle_a-CompilationState.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CompilationState.cc' object='libdemangle_a-CompilationState.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) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o libdemangle_a-CompilationState.o `test -f 'CompilationState.cc' || echo '$(srcdir)/'`CompilationState.cc
+
+libdemangle_a-CompilationState.obj: CompilationState.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -MT libdemangle_a-CompilationState.obj -MD -MP -MF $(DEPDIR)/libdemangle_a-CompilationState.Tpo -c -o libdemangle_a-CompilationState.obj `if test -f 'CompilationState.cc'; then $(CYGPATH_W) 'CompilationState.cc'; else $(CYGPATH_W) '$(srcdir)/CompilationState.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libdemangle_a-CompilationState.Tpo $(DEPDIR)/libdemangle_a-CompilationState.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CompilationState.cc' object='libdemangle_a-CompilationState.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) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o libdemangle_a-CompilationState.obj `if test -f 'CompilationState.cc'; then $(CYGPATH_W) 'CompilationState.cc'; else $(CYGPATH_W) '$(srcdir)/CompilationState.cc'; fi`
+
 CodeGen/libdemangle_a-CodeGenerator.o: CodeGen/CodeGenerator.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -MT CodeGen/libdemangle_a-CodeGenerator.o -MD -MP -MF CodeGen/$(DEPDIR)/libdemangle_a-CodeGenerator.Tpo -c -o CodeGen/libdemangle_a-CodeGenerator.o `test -f 'CodeGen/CodeGenerator.cc' || echo '$(srcdir)/'`CodeGen/CodeGenerator.cc
@@ -2127 +2174 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o Common/libdemangle_a-Assert.obj `if test -f 'Common/Assert.cc'; then $(CYGPATH_W) 'Common/Assert.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Assert.cc'; fi`
 
+Common/libdemangle_a-Eval.o: Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -MT Common/libdemangle_a-Eval.o -MD -MP -MF Common/$(DEPDIR)/libdemangle_a-Eval.Tpo -c -o Common/libdemangle_a-Eval.o `test -f 'Common/Eval.cc' || echo '$(srcdir)/'`Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/libdemangle_a-Eval.Tpo Common/$(DEPDIR)/libdemangle_a-Eval.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Eval.cc' object='Common/libdemangle_a-Eval.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) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o Common/libdemangle_a-Eval.o `test -f 'Common/Eval.cc' || echo '$(srcdir)/'`Common/Eval.cc
+
+Common/libdemangle_a-Eval.obj: Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -MT Common/libdemangle_a-Eval.obj -MD -MP -MF Common/$(DEPDIR)/libdemangle_a-Eval.Tpo -c -o Common/libdemangle_a-Eval.obj `if test -f 'Common/Eval.cc'; then $(CYGPATH_W) 'Common/Eval.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Eval.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/libdemangle_a-Eval.Tpo Common/$(DEPDIR)/libdemangle_a-Eval.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Eval.cc' object='Common/libdemangle_a-Eval.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) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o Common/libdemangle_a-Eval.obj `if test -f 'Common/Eval.cc'; then $(CYGPATH_W) 'Common/Eval.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Eval.cc'; fi`
+
 Common/libdemangle_a-SemanticError.o: Common/SemanticError.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -MT Common/libdemangle_a-SemanticError.o -MD -MP -MF Common/$(DEPDIR)/libdemangle_a-SemanticError.Tpo -c -o Common/libdemangle_a-SemanticError.o `test -f 'Common/SemanticError.cc' || echo '$(srcdir)/'`Common/SemanticError.cc
@@ -2673 +2734 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/libdemangle_a-TupleExpansion.obj `if test -f 'Tuples/TupleExpansion.cc'; then $(CYGPATH_W) 'Tuples/TupleExpansion.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleExpansion.cc'; fi`
 
+Validate/libdemangle_a-HandleAttributes.o: Validate/HandleAttributes.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -MT Validate/libdemangle_a-HandleAttributes.o -MD -MP -MF Validate/$(DEPDIR)/libdemangle_a-HandleAttributes.Tpo -c -o Validate/libdemangle_a-HandleAttributes.o `test -f 'Validate/HandleAttributes.cc' || echo '$(srcdir)/'`Validate/HandleAttributes.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Validate/$(DEPDIR)/libdemangle_a-HandleAttributes.Tpo Validate/$(DEPDIR)/libdemangle_a-HandleAttributes.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Validate/HandleAttributes.cc' object='Validate/libdemangle_a-HandleAttributes.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) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o Validate/libdemangle_a-HandleAttributes.o `test -f 'Validate/HandleAttributes.cc' || echo '$(srcdir)/'`Validate/HandleAttributes.cc
+
+Validate/libdemangle_a-HandleAttributes.obj: Validate/HandleAttributes.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -MT Validate/libdemangle_a-HandleAttributes.obj -MD -MP -MF Validate/$(DEPDIR)/libdemangle_a-HandleAttributes.Tpo -c -o Validate/libdemangle_a-HandleAttributes.obj `if test -f 'Validate/HandleAttributes.cc'; then $(CYGPATH_W) 'Validate/HandleAttributes.cc'; else $(CYGPATH_W) '$(srcdir)/Validate/HandleAttributes.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Validate/$(DEPDIR)/libdemangle_a-HandleAttributes.Tpo Validate/$(DEPDIR)/libdemangle_a-HandleAttributes.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Validate/HandleAttributes.cc' object='Validate/libdemangle_a-HandleAttributes.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) $(libdemangle_a_CXXFLAGS) $(CXXFLAGS) -c -o Validate/libdemangle_a-HandleAttributes.obj `if test -f 'Validate/HandleAttributes.cc'; then $(CYGPATH_W) 'Validate/HandleAttributes.cc'; else $(CYGPATH_W) '$(srcdir)/Validate/HandleAttributes.cc'; fi`
+
 SymTab/demangler-demangler.o: SymTab/demangler.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(demangler_CXXFLAGS) $(CXXFLAGS) -MT SymTab/demangler-demangler.o -MD -MP -MF SymTab/$(DEPDIR)/demangler-demangler.Tpo -c -o SymTab/demangler-demangler.o `test -f 'SymTab/demangler.cc' || echo '$(srcdir)/'`SymTab/demangler.cc
@@ -2715 +2790 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o driver_cfa_cpp-MakeLibCfa.obj `if test -f 'MakeLibCfa.cc'; then $(CYGPATH_W) 'MakeLibCfa.cc'; else $(CYGPATH_W) '$(srcdir)/MakeLibCfa.cc'; fi`
 
+driver_cfa_cpp-CompilationState.o: CompilationState.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT driver_cfa_cpp-CompilationState.o -MD -MP -MF $(DEPDIR)/driver_cfa_cpp-CompilationState.Tpo -c -o driver_cfa_cpp-CompilationState.o `test -f 'CompilationState.cc' || echo '$(srcdir)/'`CompilationState.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/driver_cfa_cpp-CompilationState.Tpo $(DEPDIR)/driver_cfa_cpp-CompilationState.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CompilationState.cc' object='driver_cfa_cpp-CompilationState.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 driver_cfa_cpp-CompilationState.o `test -f 'CompilationState.cc' || echo '$(srcdir)/'`CompilationState.cc
+
+driver_cfa_cpp-CompilationState.obj: CompilationState.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT driver_cfa_cpp-CompilationState.obj -MD -MP -MF $(DEPDIR)/driver_cfa_cpp-CompilationState.Tpo -c -o driver_cfa_cpp-CompilationState.obj `if test -f 'CompilationState.cc'; then $(CYGPATH_W) 'CompilationState.cc'; else $(CYGPATH_W) '$(srcdir)/CompilationState.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/driver_cfa_cpp-CompilationState.Tpo $(DEPDIR)/driver_cfa_cpp-CompilationState.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CompilationState.cc' object='driver_cfa_cpp-CompilationState.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 driver_cfa_cpp-CompilationState.obj `if test -f 'CompilationState.cc'; then $(CYGPATH_W) 'CompilationState.cc'; else $(CYGPATH_W) '$(srcdir)/CompilationState.cc'; fi`
+
 CodeGen/driver_cfa_cpp-Generate.o: CodeGen/Generate.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeGen/driver_cfa_cpp-Generate.o -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Tpo -c -o CodeGen/driver_cfa_cpp-Generate.o `test -f 'CodeGen/Generate.cc' || echo '$(srcdir)/'`CodeGen/Generate.cc
@@ -2925 +3014 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Common/driver_cfa_cpp-Heap.obj `if test -f 'Common/Heap.cc'; then $(CYGPATH_W) 'Common/Heap.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Heap.cc'; fi`
 
+Common/driver_cfa_cpp-Eval.o: Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-Eval.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Eval.Tpo -c -o Common/driver_cfa_cpp-Eval.o `test -f 'Common/Eval.cc' || echo '$(srcdir)/'`Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Eval.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Eval.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Eval.cc' object='Common/driver_cfa_cpp-Eval.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 Common/driver_cfa_cpp-Eval.o `test -f 'Common/Eval.cc' || echo '$(srcdir)/'`Common/Eval.cc
+
+Common/driver_cfa_cpp-Eval.obj: Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-Eval.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Eval.Tpo -c -o Common/driver_cfa_cpp-Eval.obj `if test -f 'Common/Eval.cc'; then $(CYGPATH_W) 'Common/Eval.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Eval.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Eval.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Eval.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Eval.cc' object='Common/driver_cfa_cpp-Eval.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 Common/driver_cfa_cpp-Eval.obj `if test -f 'Common/Eval.cc'; then $(CYGPATH_W) 'Common/Eval.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Eval.cc'; fi`
+
 ControlStruct/driver_cfa_cpp-LabelGenerator.o: ControlStruct/LabelGenerator.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-LabelGenerator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelGenerator.o `test -f 'ControlStruct/LabelGenerator.cc' || echo '$(srcdir)/'`ControlStruct/LabelGenerator.cc
@@ -4184 +4287 @@
 @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 Tuples/driver_cfa_cpp-Explode.obj `if test -f 'Tuples/Explode.cc'; then $(CYGPATH_W) 'Tuples/Explode.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/Explode.cc'; fi`
+
+Validate/driver_cfa_cpp-HandleAttributes.o: Validate/HandleAttributes.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Validate/driver_cfa_cpp-HandleAttributes.o -MD -MP -MF Validate/$(DEPDIR)/driver_cfa_cpp-HandleAttributes.Tpo -c -o Validate/driver_cfa_cpp-HandleAttributes.o `test -f 'Validate/HandleAttributes.cc' || echo '$(srcdir)/'`Validate/HandleAttributes.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Validate/$(DEPDIR)/driver_cfa_cpp-HandleAttributes.Tpo Validate/$(DEPDIR)/driver_cfa_cpp-HandleAttributes.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Validate/HandleAttributes.cc' object='Validate/driver_cfa_cpp-HandleAttributes.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 Validate/driver_cfa_cpp-HandleAttributes.o `test -f 'Validate/HandleAttributes.cc' || echo '$(srcdir)/'`Validate/HandleAttributes.cc
+
+Validate/driver_cfa_cpp-HandleAttributes.obj: Validate/HandleAttributes.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Validate/driver_cfa_cpp-HandleAttributes.obj -MD -MP -MF Validate/$(DEPDIR)/driver_cfa_cpp-HandleAttributes.Tpo -c -o Validate/driver_cfa_cpp-HandleAttributes.obj `if test -f 'Validate/HandleAttributes.cc'; then $(CYGPATH_W) 'Validate/HandleAttributes.cc'; else $(CYGPATH_W) '$(srcdir)/Validate/HandleAttributes.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Validate/$(DEPDIR)/driver_cfa_cpp-HandleAttributes.Tpo Validate/$(DEPDIR)/driver_cfa_cpp-HandleAttributes.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Validate/HandleAttributes.cc' object='Validate/driver_cfa_cpp-HandleAttributes.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 Validate/driver_cfa_cpp-HandleAttributes.obj `if test -f 'Validate/HandleAttributes.cc'; then $(CYGPATH_W) 'Validate/HandleAttributes.cc'; else $(CYGPATH_W) '$(srcdir)/Validate/HandleAttributes.cc'; fi`
 
 Virtual/driver_cfa_cpp-ExpandCasts.o: Virtual/ExpandCasts.cc
@@ -4346 +4463 @@
         -rm -f Tuples/$(DEPDIR)/$(am__dirstamp)
         -rm -f Tuples/$(am__dirstamp)
+        -rm -f Validate/$(DEPDIR)/$(am__dirstamp)
+        -rm -f Validate/$(am__dirstamp)
         -rm -f Virtual/$(DEPDIR)/$(am__dirstamp)
         -rm -f Virtual/$(am__dirstamp)
@@ -4364 +4483 @@
 
 distclean: distclean-am
-        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Virtual/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Validate/$(DEPDIR) Virtual/$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -4410 +4529 @@
 
 maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Virtual/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Validate/$(DEPDIR) Virtual/$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul  6 06:56:08 2018
-// Update Count     : 1088
+// Last Modified On : Fri Jul 20 14:56:54 2018
+// Update Count     : 1107
 //
 
@@ -54 +54 @@
 
 DeclarationNode::DeclarationNode() :
-                builtin( NoBuiltinType ),
-                type( nullptr ),
-                bitfieldWidth( nullptr ),
-                hasEllipsis( false ),
-                linkage( ::linkage ),
-                asmName( nullptr ),
-                initializer( nullptr ),
-                extension( false ),
-                asmStmt( nullptr ) {
+        linkage( ::linkage ) {
 
 //      variable.name = nullptr;
@@ -104 +96 @@
         newnode->builtin = NoBuiltinType;
         newnode->type = maybeClone( type );
+        newnode->inLine = inLine;
         newnode->storageClasses = storageClasses;
         newnode->funcSpecs = funcSpecs;
@@ -131 +124 @@
 } // DeclarationNode::clone
 
-void DeclarationNode::print( std::ostream &os, int indent ) const {
+void DeclarationNode::print( std::ostream & os, int indent ) const {
         os << string( indent, ' ' );
         if ( name ) {
@@ -167 +160 @@
 }
 
-void DeclarationNode::printList( std::ostream &os, int indent ) const {
+void DeclarationNode::printList( std::ostream & os, int indent ) const {
         ParseNode::printList( os, indent );
         if ( hasEllipsis ) {
@@ -521 +514 @@
 } // DeclarationNode::copySpecifiers
 
-static void addQualifiersToType( TypeData *&src, TypeData * dst ) {
+static void addQualifiersToType( TypeData *& src, TypeData * dst ) {
         if ( dst->base ) {
                 addQualifiersToType( src, dst->base );
@@ -574 +567 @@
 } // addQualifiers
 
-static void addTypeToType( TypeData *&src, TypeData *&dst ) {
+static void addTypeToType( TypeData *& src, TypeData *& dst ) {
         if ( src->forall && dst->kind == TypeData::Function ) {
                 if ( dst->forall ) {
@@ -965 +958 @@
 }
 
-void buildList( const DeclarationNode * firstNode, std::list< Declaration * > &outputList ) {
+void buildList( const DeclarationNode * firstNode, std::list< Declaration * > & outputList ) {
         SemanticErrorException errors;
         std::back_insert_iterator< std::list< Declaration * > > out( outputList );
@@ -1002 +995 @@
                                 //   struct T;            // anonymous member
                                 // };
-                                if ( ! (extracted && decl->name == "" && ! anon) ) {
-                                        if (decl->name == "") {
+                                if ( ! (extracted && decl->name == "" && ! anon && ! cur->get_inLine()) ) {
+                                        if ( decl->name == "" ) {
                                                 if ( DeclarationWithType * dwt = dynamic_cast<DeclarationWithType *>( decl ) ) {
                                                         if ( ReferenceToType * aggr = dynamic_cast<ReferenceToType *>( dwt->get_type() ) ) {
                                                                 if ( aggr->name.find("anonymous") == std::string::npos ) {
-                                                                        bool isInline = false;
-                                                                        if (cur->type->kind == TypeData::Aggregate || cur->type->kind == TypeData::AggregateInst) {
-                                                                                if (cur->type->kind == TypeData::Aggregate) {
-                                                                                        isInline = cur->type->aggregate.inLine;
-                                                                                } else {
-                                                                                        isInline = cur->type->aggInst.inLine;
-                                                                                        if ( TypeData * aggr = cur->type->aggInst.aggregate ) {
-                                                                                                if ( aggr->kind == TypeData::Aggregate ) {
-                                                                                                        isInline = isInline || aggr->aggregate.inLine;
-                                                                                                }
-                                                                                        }
-                                                                                }
-                                                                        }
-                                                                        if (! isInline) {
-                                                                                // temporary: warn about anonymous member declarations of named types, since this conflicts with the syntax for the forward declaration of an anonymous type
+                                                                        if ( ! cur->get_inLine() ) {
+                                                                                // temporary: warn about anonymous member declarations of named types, since
+                                                                                // this conflicts with the syntax for the forward declaration of an anonymous type
                                                                                 SemanticWarning( cur->location, Warning::AggrForwardDecl, aggr->name.c_str() );
-                                                                        }
-                                                                }
-                                                        }
-                                                }
-                                        }
+                                                                        } // if
+                                                                } // if
+                                                        } // if
+                                                } // if
+                                        } // if
                                         decl->location = cur->location;
-                                        * out++ = decl;
-                                }
+                                        *out++ = decl;
+                                } // if
                         } // if
-                } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
-        } // while
+        } // for
 
         if ( ! errors.isEmpty() ) {
@@ -1043 +1024 @@
 
 // currently only builds assertions, function parameters, and return values
-void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > &outputList ) {
+void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > & outputList ) {
         SemanticErrorException errors;
         std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList );
@@ -1074 +1055 @@
                                 * out++ = obj;
                         } // if
-                } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
@@ -1084 +1065 @@
 } // buildList
 
-void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > &outputList ) {
+void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > & outputList ) {
         SemanticErrorException errors;
         std::back_insert_iterator< std::list< Type * > > out( outputList );
@@ -1092 +1073 @@
                 try {
                         * out++ = cur->buildType();
-                } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  6 16:17:18 2018
-// Update Count     : 843
+// Last Modified On : Fri Jul 20 14:56:30 2018
+// Update Count     : 850
 //
 
@@ -68 +68 @@
         }
 
-        virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
-        virtual void printList( std::ostream &os, int indent = 0 ) const {
+        virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
+        virtual void printList( std::ostream & os, int indent = 0 ) const {
                 print( os, indent );
                 if ( next ) next->print( os, indent );
@@ -103 +103 @@
         InitializerNode * next_init() const { return kids; }
 
-        void print( std::ostream &os, int indent = 0 ) const;
+        void print( std::ostream & os, int indent = 0 ) const;
         void printOneLine( std::ostream & ) const;
 
@@ -127 +127 @@
         ExpressionNode * set_extension( bool exten ) { extension = exten; return this; }
 
-        virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
-                os << expr.get() << std::endl;
-        }
-        void printOneLine( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
+        virtual void print( std::ostream & os, __attribute__((unused)) int indent = 0 ) const override {
+                os << expr.get();
+        }
+        void printOneLine( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
 
         template<typename T>
@@ -290 +290 @@
         }
 
-        virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override;
-        virtual void printList( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override;
+        virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const override;
+        virtual void printList( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const override;
 
         Declaration * build() const;
@@ -303 +303 @@
         bool get_extension() const { return extension; }
         DeclarationNode * set_extension( bool exten ) { extension = exten; return this; }
+
+        bool get_inLine() const { return inLine; }
+        DeclarationNode * set_inLine( bool inL ) { inLine = inL; return this; }
   public:
         DeclarationNode * get_last() { return (DeclarationNode *)ParseNode::get_last(); }
@@ -327 +330 @@
         StaticAssert_t assert;
 
-        BuiltinType builtin;
-
-        TypeData * type;
-
+        BuiltinType builtin = NoBuiltinType;
+
+        TypeData * type = nullptr;
+
+        bool inLine = false;
         Type::FuncSpecifiers funcSpecs;
         Type::StorageClasses storageClasses;
 
-        ExpressionNode * bitfieldWidth;
+        ExpressionNode * bitfieldWidth = nullptr;
         std::unique_ptr<ExpressionNode> enumeratorValue;
-        bool hasEllipsis;
+        bool hasEllipsis = false;
         LinkageSpec::Spec linkage;
-        Expression * asmName;
+        Expression * asmName = nullptr;
         std::list< Attribute * > attributes;
-        InitializerNode * initializer;
+        InitializerNode * initializer = nullptr;
         bool extension = false;
         std::string error;
-        StatementNode * asmStmt;
+        StatementNode * asmStmt = nullptr;
 
         static UniqueName anonymous;
@@ -377 +381 @@
         virtual StatementNode * append_last_case( StatementNode * );
 
-        virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
+        virtual void print( std::ostream & os, __attribute__((unused)) int indent = 0 ) const override {
                 os << stmt.get() << std::endl;
         }
@@ -435 +439 @@
 
 template< typename SynTreeType, typename NodeType, template< typename, typename...> class Container, typename... Args >
-void buildList( const NodeType * firstNode, Container< SynTreeType *, Args... > &outputList ) {
+void buildList( const NodeType * firstNode, Container< SynTreeType *, Args... > & outputList ) {
         SemanticErrorException errors;
         std::back_insert_iterator< Container< SynTreeType *, Args... > > out( outputList );
@@ -449 +453 @@
                                 assertf(false, "buildList unknown type");
                         } // if
-                } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
@@ -460 +464 @@
 
 // in DeclarationNode.cc
-void buildList( const DeclarationNode * firstNode, std::list< Declaration * > &outputList );
-void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > &outputList );
-void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > &outputList );
+void buildList( const DeclarationNode * firstNode, std::list< Declaration * > & outputList );
+void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > & outputList );
+void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > & outputList );
 
 template< typename SynTreeType, typename NodeType >
-void buildMoveList( const NodeType * firstNode, std::list< SynTreeType * > &outputList ) {
+void buildMoveList( const NodeType * firstNode, std::list< SynTreeType * > & outputList ) {
         buildList( firstNode, outputList );
         delete firstNode;

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 13:52:09 2018
-// Update Count     : 606
+// Last Modified On : Fri Jul 20 14:39:31 2018
+// Update Count     : 622
 //
 
@@ -76 +76 @@
                 aggregate.parent = nullptr;
                 aggregate.anon = false;
-                aggregate.inLine = false;
                 break;
           case AggregateInst:
@@ -83 +82 @@
                 aggInst.params = nullptr;
                 aggInst.hoistType = false;
-                aggInst.inLine = false;
                 break;
           case Symbolic:
@@ -221 +219 @@
                 newtype->aggregate.body = aggregate.body;
                 newtype->aggregate.anon = aggregate.anon;
-                newtype->aggregate.inLine = aggregate.inLine;
                 newtype->aggregate.tagged = aggregate.tagged;
                 newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr;
@@ -229 +226 @@
                 newtype->aggInst.params = maybeClone( aggInst.params );
                 newtype->aggInst.hoistType = aggInst.hoistType;
-                newtype->aggInst.inLine = aggInst.inLine;
                 break;
           case Enum:
@@ -275 +271 @@
 
         switch ( kind ) {
-          case Unknown:
-                os << "entity of unknown type ";
+          case Basic:
+                if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " ";
+                if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " ";
+                if ( complextype == DeclarationNode::NoComplexType ) { // basic type
+                        assert( basictype != DeclarationNode::NoBasicType );
+                        os << DeclarationNode::basicTypeNames[ basictype ] << " ";
+                } else {                                                                                // complex type
+                        // handle double _Complex
+                        if ( basictype != DeclarationNode::NoBasicType ) os << DeclarationNode::basicTypeNames[ basictype ] << " ";
+                        os << DeclarationNode::complexTypeNames[ complextype ] << " ";
+                } // if
                 break;
           case Pointer:
@@ -285 +290 @@
                 } // if
                 break;
-          case EnumConstant:
-                os << "enumeration constant ";
-                break;
-          case Basic:
-                if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " ";
-                if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " ";
-                assert( basictype != DeclarationNode::NoBasicType );
-                os << DeclarationNode::basicTypeNames[ basictype ] << " ";
-                if ( complextype != DeclarationNode::NoComplexType ) os << DeclarationNode::complexTypeNames[ complextype ] << " ";
+          case Reference:
+                os << "reference ";
+                if ( base ) {
+                        os << "to ";
+                        base->print( os, indent );
+                } // if
                 break;
           case Array:
@@ -379 +381 @@
                 } // if
                 break;
-          case SymbolicInst:
-                os << "instance of type " << *symbolic.name;
-                if ( symbolic.actuals ) {
-                        os << " with parameters" << endl;
-                        symbolic.actuals->printList( os, indent + 2 );
-                } // if
+          case EnumConstant:
+                os << "enumeration constant ";
                 break;
           case Symbolic:
@@ -406 +404 @@
                 } // if
                 break;
+          case SymbolicInst:
+                os << *symbolic.name;
+                if ( symbolic.actuals ) {
+                        os << "(";
+                        symbolic.actuals->printList( os, indent + 2 );
+                        os << ")";
+                } // if
+                break;
           case Tuple:
                 os << "tuple ";
@@ -421 +427 @@
           case Builtin:
                 os << DeclarationNode::builtinTypeNames[builtintype];
+                break;
+          case GlobalScope:
+                break;
+          case Qualified:
+                qualified.parent->print( os );
+                os << ".";
+                qualified.child->print( os );
+                break;
+          case Unknown:
+                os << "entity of unknown type ";
                 break;
           default:

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 14:00:09 2018
-// Update Count     : 193
+// Last Modified On : Fri Jul 20 13:56:40 2018
+// Update Count     : 195
 //
 
@@ -26 +26 @@
 
 struct TypeData {
-        enum Kind { Basic, Pointer, Array, Reference, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
+        enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
                                 SymbolicInst, Tuple, Typeof, Builtin, GlobalScope, Qualified, Unknown };
 
@@ -37 +37 @@
                 bool body;
                 bool anon;
-                bool inLine;
 
                 bool tagged;
@@ -47 +46 @@
                 ExpressionNode * params;
                 bool hoistType;
-                bool inLine;
         };
 
@@ -79 +77 @@
         };
 
-        struct Qualified_t { // qualified type S.T
+        struct Qualified_t {                                                            // qualified type S.T
                 TypeData * parent;
                 TypeData * child;

src/Parser/TypedefTable.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 13 18:35:54 2018
-// Update Count     : 257
+// Last Modified On : Wed Jul 25 15:32:35 2018
+// Update Count     : 258
 //
 
@@ -49 +49 @@
 bool TypedefTable::exists( const string & identifier ) {
         return kindTable.find( identifier ) != kindTable.end();
+} // TypedefTable::exists
+
+bool TypedefTable::existsCurr( const string & identifier ) {
+        return kindTable.findAt( kindTable.currentScope() - 1, identifier ) != kindTable.end();
 } // TypedefTable::exists
 

src/Parser/TypedefTable.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 10 18:32:23 2018
-// Update Count     : 112
+// Last Modified On : Wed Jul 25 15:33:55 2018
+// Update Count     : 114
 //
 
@@ -31 +31 @@
 
         bool exists( const std::string & identifier );
+        bool existsCurr( const std::string & identifier );
         int isKind( const std::string & identifier ) const;
         void makeTypedef( const std::string & name, int kind = TYPEDEFname );

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 16:16:25 2018
-// Update Count     : 3756
+// Last Modified On : Wed Jul 25 15:54:35 2018
+// Update Count     : 3841
 //
 
@@ -114 +114 @@
         } // for
 } // distExt
+
+void distInl( DeclarationNode * declaration ) {
+        // distribute EXTENSION across all declarations
+        for ( DeclarationNode *iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
+                iter->set_inLine( true );
+        } // for
+} // distInl
 
 void distQual( DeclarationNode * declaration, DeclarationNode * qualifiers ) {
@@ -166 +173 @@
 } // build_postfix_name
 
+DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) {
+        if ( ! fieldList ) {                                                            // field declarator ?
+                if ( ! ( typeSpec->type && typeSpec->type->kind == TypeData::Aggregate ) ) {
+                        stringstream ss;
+                        typeSpec->type->print( ss );
+                        SemanticWarning( yylloc, Warning::SuperfluousDecl, ss.str().c_str() );
+                        return nullptr;
+                } // if
+                fieldList = DeclarationNode::newName( nullptr );
+        } // if
+        return distAttr( typeSpec, fieldList );                         // mark all fields in list
+} // fieldDecl
+
 bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
 
@@ -338 +358 @@
 %type<decl> exception_declaration
 
-%type<decl> field_declaration field_declaration_list_opt field_declarator_opt field_declaring_list
-%type<en> field field_list field_name fraction_constants_opt
+%type<decl> field_declaration_list_opt field_declaration field_declaring_list_opt field_declarator field_abstract_list_opt field_abstract
+%type<en> field field_name_list field_name fraction_constants_opt
 
 %type<decl> external_function_definition function_definition function_array function_declarator function_no_ptr function_ptr
@@ -352 +372 @@
 %type<decl> cfa_array_parameter_1st_dimension
 
-%type<decl> cfa_trait_declaring_list cfa_declaration cfa_field_declaring_list
+%type<decl> cfa_trait_declaring_list cfa_declaration cfa_field_declaring_list cfa_field_abstract_list
 %type<decl> cfa_function_declaration cfa_function_return cfa_function_specifier
 
@@ -492 +512 @@
         ;
 
-identifier:
-        IDENTIFIER
-        | ATTR_IDENTIFIER                                                                       // CFA
-        | quasi_keyword
-        ;
-
 no_attr_identifier:
         IDENTIFIER
         | quasi_keyword
+        | '@'                                                                                           // CFA
+                { Token tok = { new string( DeclarationNode::anonymous.newName() ), yylval.tok.loc }; $$ = tok; }
+        ;
+
+identifier:
+        no_attr_identifier
+        | ATTR_IDENTIFIER                                                                       // CFA
         ;
 
@@ -541 +562 @@
         | type_name '.' no_attr_identifier                                      // CFA, nested type
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
-        | type_name '.' '[' field_list ']'                                      // CFA, nested type / tuple field selector
+        | type_name '.' '[' field_name_list ']'                         // CFA, nested type / tuple field selector
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11
@@ -594 +615 @@
         | postfix_expression FLOATING_FRACTIONconstant          // CFA, tuple index
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_FLOATING_FRACTIONconstant( *$2 ) ) ); }
-        | postfix_expression '.' '[' field_list ']'                     // CFA, tuple field selector
+        | postfix_expression '.' '[' field_name_list ']'        // CFA, tuple field selector
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); }
         | postfix_expression ARROW no_attr_identifier
@@ -602 +623 @@
         | postfix_expression ARROW INTEGERconstant                      // CFA, tuple index
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_constantInteger( *$3 ) ) ); }
-        | postfix_expression ARROW '[' field_list ']'           // CFA, tuple field selector
+        | postfix_expression ARROW '[' field_name_list ']'      // CFA, tuple field selector
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $4 ) ) ); }
         | postfix_expression ICR
@@ -629 +650 @@
         // empty
                 { $$ = nullptr; }
-        // | '@'                                                                                                // use default argument
-        //      { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); }
+        | '?'                                                                                           // CFA, default parameter
+                { SemanticError( yylloc, "Default parameter for argument is currently unimplemented." ); $$ = nullptr; }
+                // { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); }
         | assignment_expression
         ;
 
-field_list:                                                                                             // CFA, tuple field selector
+field_name_list:                                                                                // CFA, tuple field selector
         field
-        | field_list ',' field                                          { $$ = (ExpressionNode *)$1->set_last( $3 ); }
+        | field_name_list ',' field                                     { $$ = (ExpressionNode *)$1->set_last( $3 ); }
         ;
 
@@ -643 +665 @@
         | FLOATING_DECIMALconstant field
                 { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_FLOATING_DECIMALconstant( *$1 ) ), maybeMoveBuild<Expression>( $2 ) ) ); }
-        | FLOATING_DECIMALconstant '[' field_list ']'
+        | FLOATING_DECIMALconstant '[' field_name_list ']'
                 { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_FLOATING_DECIMALconstant( *$1 ) ), build_tuple( $3 ) ) ); }
         | field_name '.' field
                 { $$ = new ExpressionNode( build_fieldSel( $1, maybeMoveBuild<Expression>( $3 ) ) ); }
-        | field_name '.' '[' field_list ']'
+        | field_name '.' '[' field_name_list ']'
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); }
         | field_name ARROW field
                 { $$ = new ExpressionNode( build_pfieldSel( $1, maybeMoveBuild<Expression>( $3 ) ) ); }
-        | field_name ARROW '[' field_list ']'
+        | field_name ARROW '[' field_name_list ']'
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $4 ) ) ); }
         ;
@@ -1932 +1954 @@
 
 field_declaration:
-        type_specifier field_declaring_list ';'
-                { $$ = distAttr( $1, $2 ); }
-        | EXTENSION type_specifier field_declaring_list ';'     // GCC
-                { distExt( $3 ); $$ = distAttr( $2, $3 ); }             // mark all fields in list
-        | INLINE type_specifier field_declaring_list ';'        // CFA
-                {
-                        if ( $2->type && ( $2->type->kind == TypeData::Aggregate || $2->type->kind == TypeData::AggregateInst ) ) {
-                                if ( $2->type->kind == TypeData::Aggregate ) {
-                                        $2->type->aggregate.inLine = true;
-                                } else {
-                                        $2->type->aggInst.inLine = true;
-                                } // if
-                                $$ = distAttr( $2, $3 );
-                        } else {
-                                SemanticError( yylloc, "inline qualifier only allowed for aggregate field declarations." ); $$ = nullptr;
-                        } // if 
+        type_specifier field_declaring_list_opt ';'
+                { $$ = fieldDecl( $1, $2 ); }
+        | EXTENSION type_specifier field_declaring_list_opt ';' // GCC
+                { $$ = fieldDecl( $2, $3 ); distExt( $$ ); }
+        | INLINE type_specifier field_abstract_list_opt ';'     // CFA
+                {
+                        if ( ! $3 ) {                                                           // field declarator ?
+                                $3 = DeclarationNode::newName( nullptr );
+                        } // if
+                        $3->inLine = true;
+                        $$ = distAttr( $2, $3 );                                        // mark all fields in list
+                        distInl( $3 );
                 }
         | typedef_declaration ';'                                                       // CFA
@@ -1953 +1971 @@
         | EXTENSION cfa_field_declaring_list ';'                        // GCC
                 { distExt( $2 ); $$ = $2; }                                             // mark all fields in list
+        | INLINE cfa_field_abstract_list ';'                            // CFA, new style field declaration
+                { $$ = $2; }                                                                    // mark all fields in list
         | cfa_typedef_declaration ';'                                           // CFA
         | static_assert                                                                         // C11
         ;
 
+field_declaring_list_opt:
+        // empty
+                { $$ = nullptr; }
+        | field_declarator
+        | field_declaring_list_opt ',' attribute_list_opt field_declarator
+                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
+        ;
+
+field_declarator:
+        bit_subrange_size                                                                       // C special case, no field name
+                { $$ = DeclarationNode::newBitfield( $1 ); }
+        | variable_declarator bit_subrange_size_opt
+                // A semantic check is required to ensure bit_subrange only appears on integral types.
+                { $$ = $1->addBitfield( $2 ); }
+        | variable_type_redeclarator bit_subrange_size_opt
+                // A semantic check is required to ensure bit_subrange only appears on integral types.
+                { $$ = $1->addBitfield( $2 ); }
+        ;
+
+field_abstract_list_opt:
+        // empty
+                { $$ = nullptr; }
+        | field_abstract
+        | field_abstract_list_opt ',' attribute_list_opt field_abstract
+                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
+        ;
+
+field_abstract:
+                //      no bit fields
+        variable_abstract_declarator
+        ;
+
 cfa_field_declaring_list:                                                               // CFA, new style field declaration
-        cfa_abstract_declarator_tuple                                           // CFA, no field name
-        | cfa_abstract_declarator_tuple no_attr_identifier_or_type_name
+        // bit-fields are handled by C declarations
+        cfa_abstract_declarator_tuple no_attr_identifier_or_type_name
                 { $$ = $1->addName( $2 ); }
         | cfa_field_declaring_list ',' no_attr_identifier_or_type_name
                 { $$ = $1->appendList( $1->cloneType( $3 ) ); }
-        | cfa_field_declaring_list ','                                          // CFA, no field name
+        ;
+
+cfa_field_abstract_list:                                                                // CFA, new style field declaration
+        // bit-fields are handled by C declarations
+        cfa_abstract_declarator_tuple
+        | cfa_field_abstract_list ','
                 { $$ = $1->appendList( $1->cloneType( 0 ) ); }
-        ;
-
-field_declaring_list:
-        field_declarator_opt
-        | field_declaring_list ',' attribute_list_opt field_declarator_opt
-                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
-        ;
-
-field_declarator_opt:
-        // empty
-                { $$ = DeclarationNode::newName( 0 ); /* XXX */ } // CFA, no field name
-        // '@'
-        //      { $$ = DeclarationNode::newName( new string( DeclarationNode::anonymous.newName() ) ); } // CFA, no field name
-        | bit_subrange_size                                                                     // no field name
-                { $$ = DeclarationNode::newBitfield( $1 ); }
-        | variable_declarator bit_subrange_size_opt
-                // A semantic check is required to ensure bit_subrange only appears on base type int.
-                { $$ = $1->addBitfield( $2 ); }
-        | variable_type_redeclarator bit_subrange_size_opt
-                // A semantic check is required to ensure bit_subrange only appears on base type int.
-                { $$ = $1->addBitfield( $2 ); }
-        | variable_abstract_declarator                                          // CFA, no field name
         ;
 
@@ -2226 +2261 @@
         | '[' push constant_expression ELLIPSIS constant_expression pop ']' // GCC, multiple array elements
                 { $$ = new ExpressionNode( new RangeExpr( maybeMoveBuild< Expression >( $3 ), maybeMoveBuild< Expression >( $5 ) ) ); }
-        | '.' '[' push field_list pop ']'                                       // CFA, tuple field selector
+        | '.' '[' push field_name_list pop ']'                          // CFA, tuple field selector
                 { $$ = $4; }
         ;
@@ -2769 +2804 @@
         typedef
                 // hide type name in enclosing scope by variable name
-                { typedefTable.addToEnclosingScope( *$1->name, IDENTIFIER, "ID" ); }
+                {
+                        // if ( ! typedefTable.existsCurr( *$1->name ) ) {
+                                typedefTable.addToEnclosingScope( *$1->name, IDENTIFIER, "ID" );
+                        // } else {
+                        //      SemanticError( yylloc, string("'") + *$1->name + "' redeclared as different kind of symbol." ); $$ = nullptr;
+                        // } // if
+                }
         | '(' paren_type ')'
                 { $$ = $2; }
@@ -2780 +2821 @@
                 { $$ = $3->addPointer( DeclarationNode::newPointer( $2, $1 ) ); }
         | '(' type_ptr ')' attribute_list_opt
-                { $$ = $2->addQualifiers( $4 ); }
+                { $$ = $2->addQualifiers( $4 ); }                               // redundant parenthesis
         ;
 

src/ResolvExpr/AlternativeFinder.cc

@@ -25 +25 @@
 #include <vector>                  // for vector
 
+#include "CompilationState.h"      // for resolvep
 #include "Alternative.h"           // for AltList, Alternative
 #include "AlternativeFinder.h"
@@ -49 +50 @@
 #include "typeops.h"               // for adjustExprType, polyCost, castCost
 
-bool resolvep;
 #define PRINT( text ) if ( resolvep ) { text }
 //#define DEBUG_COST

src/ResolvExpr/CurrentObject.cc

@@ -139 +139 @@
                 ArrayIterator( ArrayType * at ) : array( at ) {
                         PRINT( std::cerr << "Creating array iterator: " << at << std::endl; )
-                        base = at->get_base();
+                        base = at->base;
                         memberIter = createMemberIterator( base );
-                        if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=" );
-                        setSize( at->get_dimension() );
+                        if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=: " );
+                        setSize( at->dimension );
                 }
 
@@ -150 +150 @@
 
         private:
-                void setSize( Expression * expr ) {
-                        if ( ConstantExpr * constExpr = dynamic_cast< ConstantExpr * >( expr ) ) {
-                                try {
-                                        size = constExpr->intValue();
-                                        PRINT( std::cerr << "array type with size: " << size << std::endl; )
-                                } catch ( SemanticErrorException & ) {
-                                        SemanticError( expr, "Constant expression of non-integral type in array dimension: " );
-                                }
-                        }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
-                                setSize( castExpr->get_arg() ); // xxx - need to perform the conversion specified by the cast
-                        } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
-                                if ( EnumInstType * inst = dynamic_cast< EnumInstType * > ( varExpr->result ) ) {
-                                        long long int value;
-                                        if ( inst->baseEnum->valueOf( varExpr->var, value ) ) {
-                                                size = value;
-                                        }
-                                }
+                void setSize( Expression * expr ) { // replace this logic with an eval call
+                        auto res = eval(expr);
+                        if (res.second) {
+                                size = res.first;
                         } else {
-                                assertf( false, "unhandled expression in setSize: %s", toString( expr ).c_str() ); // xxx - if not a constant expression, it's not simple to determine how long the array actually is, which is necessary for initialization to be done correctly -- fix this
+                                SemanticError( expr->location, toString("Array designator must be a constant expression: ", expr) );
                         }
                 }

src/SymTab/Validate.cc

@@ -61 +61 @@
 #include "Parser/LinkageSpec.h"        // for C
 #include "ResolvExpr/typeops.h"        // for typesCompatible
+#include "ResolvExpr/Resolver.h"       // for findSingleExpression
 #include "SymTab/Autogen.h"            // for SizeType
 #include "SynTree/Attribute.h"         // for noAttributes, Attribute
@@ -72 +73 @@
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 #include "SynTree/Visitor.h"           // for Visitor
+#include "Validate/HandleAttributes.h" // for handleAttributes
 
 class CompoundStmt;
@@ -247 +249 @@
         };
 
-        struct ArrayLength {
+        struct ArrayLength : public WithIndexer {
                 /// 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,
@@ -258 +260 @@
 
                 void previsit( ObjectDecl * objDecl );
+                void previsit( ArrayType * arrayType );
         };
 
@@ -312 +315 @@
                 acceptAll( translationUnit, finder ); // xxx - remove this pass soon
                 mutateAll( translationUnit, labelAddrFixer );
+                Validate::handleAttributes( translationUnit );
         }
 
@@ -1232 +1236 @@
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
-                        if ( at->get_dimension() ) return;
+                        if ( at->dimension ) return;
                         if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
-                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
-                        }
+                                at->dimension = new ConstantExpr( Constant::from_ulong( init->initializers.size() ) );
+                        }
+                }
+        }
+
+        void ArrayLength::previsit( ArrayType * type ) {
+                if ( type->dimension ) {
+                        // need to resolve array dimensions early so that constructor code can correctly determine
+                        // if a type is a VLA (and hence whether its elements need to be constructed)
+                        ResolvExpr::findSingleExpression( type->dimension, SymTab::SizeType->clone(), indexer );
+
+                        // must re-evaluate whether a type is a VLA, now that more information is available
+                        // (e.g. the dimension may have been an enumerator, which was unknown prior to this step)
+                        type->isVarLen = ! InitTweak::isConstExpr( type->dimension );
                 }
         }

src/benchmark/Makefile.am

@@ -17 +17 @@
 # applies to both programs
 CFLAGS =
-AM_CFLAGS = -g -Wall -Wno-unused-function -O2
-CC = @CFA_BINDIR@/@CFA_NAME@
+AM_CFLAGS = \
+        -XCFA \
+        -t \
+        -B${abs_top_builddir}/src/driver \
+        -g \
+        -O2 \
+        -Wall \
+        -Wno-unused-function \
+        -quiet \
+        -I$(srcdir) \
+        -L${abs_top_builddir}/src/libcfa \
+        -I${abs_top_srcdir}/src/libcfa \
+        -I${abs_top_srcdir}/src/libcfa/containers \
+        -I${abs_top_srcdir}/src/libcfa/concurrency \
+        -I${abs_top_srcdir}/src/libcfa/stdhdr
+
+CC = ${top_builddir}/src/driver/cfa
 TOOLSDIR = ${abs_top_srcdir}/tools/
 REPEAT   = ${TOOLSDIR}repeat
@@ -93 +108 @@
 ## =========================================================================================================
 loop$(EXEEXT):
-        @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 function$(EXEEXT):
-        @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 fetch_add$(EXEEXT):
-        @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ## =========================================================================================================
@@ -118 +133 @@
 
 ctxswitch-pthread$(EXEEXT):
-        @@BACKEND_CC@ ctxswitch/pthreads.c     -DBENCH_N=50000000  -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ $(srcdir)/ctxswitch/pthreads.c     -DBENCH_N=50000000  -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-cfa_coroutine$(EXEEXT):
-        @${CC}        ctxswitch/cfa_cor.c      -DBENCH_N=50000000  -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/ctxswitch/cfa_cor.c      -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-cfa_thread$(EXEEXT):
-        @${CC}        ctxswitch/cfa_thrd.c     -DBENCH_N=50000000  -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/ctxswitch/cfa_thrd.c     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-cfa_thread2$(EXEEXT):
-        @${CC}        ctxswitch/cfa_thrd2.c    -DBENCH_N=50000000  -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/ctxswitch/cfa_thrd2.c    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-upp_coroutine$(EXEEXT):
-        @u++          ctxswitch/upp_cor.cc     -DBENCH_N=50000000  -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/ctxswitch/upp_cor.cc     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-upp_thread$(EXEEXT):
-        @u++          ctxswitch/upp_thrd.cc    -DBENCH_N=50000000  -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/ctxswitch/upp_thrd.cc    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-kos_fibre$(EXEEXT):
-        @${CXX}       ctxswitch/kos_fibre.cpp  -DBENCH_N=50000000  -I. -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
+        @${CXX}       $(srcdir)/ctxswitch/kos_fibre.cpp  -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
 
 ctxswitch-kos_fibre2$(EXEEXT):
-        @${CXX}       ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000  -I. -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
+        @${CXX}       $(srcdir)/ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
 
 ctxswitch-goroutine$(EXEEXT):
-        @go build -o a.out ctxswitch/goroutine.go
+        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
 
 ctxswitch-java_thread$(EXEEXT):
-        @javac ctxswitch/JavaThread.java
+        @javac $(srcdir)/ctxswitch/JavaThread.java
         @echo "#!/bin/sh" > a.out
         @echo "cd ctxswitch && java JavaThread" >> a.out
@@ -163 +178 @@
 
 mutex-pthread_lock$(EXEEXT):
-        @@BACKEND_CC@ mutex/pthreads.c    -DBENCH_N=50000000    -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ $(srcdir)/mutex/pthreads.c    -DBENCH_N=50000000    -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-upp$(EXEEXT):
-        @u++          mutex/upp.cc        -DBENCH_N=50000000    -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/mutex/upp.cc        -DBENCH_N=50000000    -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-cfa1$(EXEEXT):
-        @${CC}        mutex/cfa1.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/mutex/cfa1.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-cfa2$(EXEEXT):
-        @${CC}        mutex/cfa2.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/mutex/cfa2.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-cfa4$(EXEEXT):
-        @${CC}        mutex/cfa4.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/mutex/cfa4.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-java_thread$(EXEEXT):
-        @javac mutex/JavaThread.java
+        @javac $(srcdir)/mutex/JavaThread.java
         @echo "#!/bin/sh" > a.out
         @echo "cd mutex && java JavaThread" >> a.out
@@ -193 +208 @@
 
 signal-pthread_cond$(EXEEXT):
-        @@BACKEND_CC@ schedint/pthreads.c -DBENCH_N=500000      -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ $(srcdir)/schedint/pthreads.c -DBENCH_N=500000      -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-upp$(EXEEXT):
-        @u++          schedint/upp.cc     -DBENCH_N=5000000     -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/schedint/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-cfa1$(EXEEXT):
-        @${CC}        schedint/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedint/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-cfa2$(EXEEXT):
-        @${CC}        schedint/cfa2.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedint/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-cfa4$(EXEEXT):
-        @${CC}        schedint/cfa4.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedint/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-java_thread$(EXEEXT):
-        @javac schedint/JavaThread.java
+        @javac $(srcdir)/schedint/JavaThread.java
         @echo "#!/bin/sh" > a.out
         @echo "cd schedint && java JavaThread" >> a.out
@@ -222 +237 @@
 
 waitfor-upp$(EXEEXT):
-        @u++          schedext/upp.cc     -DBENCH_N=5000000     -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/schedext/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa1$(EXEEXT):
-        @${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedext/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa2$(EXEEXT):
-        @${CC}        schedext/cfa2.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedext/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa4$(EXEEXT):
-        @${CC}        schedext/cfa4.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedext/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ## =========================================================================================================
@@ -245 +260 @@
 
 creation-cfa_coroutine$(EXEEXT):
-        @${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-cfa_coroutine_eager$(EXEEXT):
-        @${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
+        @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
 
 creation-cfa_thread$(EXEEXT):
-        @${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/creation/cfa_thrd.c  -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-upp_coroutine$(EXEEXT):
-        @u++          creation/upp_cor.cc  -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/creation/upp_cor.cc  -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-upp_thread$(EXEEXT):
-        @u++          creation/upp_thrd.cc -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/creation/upp_thrd.cc -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-pthread$(EXEEXT):
-        @@BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ $(srcdir)/creation/pthreads.c  -DBENCH_N=250000     -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-goroutine$(EXEEXT):
-        @go build -o a.out creation/goroutine.go
+        @go build -o a.out $(srcdir)/creation/goroutine.go
 
 creation-java_thread$(EXEEXT):
-        @javac creation/JavaThread.java
+        @javac $(srcdir)/creation/JavaThread.java
         @echo "#!/bin/sh" > a.out
         @echo "cd creation && java JavaThread" >> a.out
@@ -284 +299 @@
 
 
+testdir = $(top_srcdir)/src/tests
+
 compile-array$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/array.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/array.c                       @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-attributes$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/attributes.c                    @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-empty$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w compile/empty.c                          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-expression$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/expression.c                    @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-io$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/io1.c                           @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-monitor$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/concurrent/monitor.c    @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c  @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-operators$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/operators.c                     @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c                   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-thread$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/concurrent/thread.c             @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-typeof$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/typeof.c                        @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
+        @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c                      @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+

src/benchmark/Makefile.in

@@ -135 +135 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = @CFA_BINDIR@/@CFA_NAME@
+CC = ${top_builddir}/src/driver/cfa
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -177 +177 @@
 LTLIBOBJS = @LTLIBOBJS@
 MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -248 +247 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -g -Wall -Wno-unused-function -O2
+AM_CFLAGS = \
+        -XCFA \
+        -t \
+        -B${abs_top_builddir}/src/driver \
+        -g \
+        -O2 \
+        -Wall \
+        -Wno-unused-function \
+        -quiet \
+        -I$(srcdir) \
+        -L${abs_top_builddir}/src/libcfa \
+        -I${abs_top_srcdir}/src/libcfa \
+        -I${abs_top_srcdir}/src/libcfa/containers \
+        -I${abs_top_srcdir}/src/libcfa/concurrency \
+        -I${abs_top_srcdir}/src/libcfa/stdhdr
+
 TOOLSDIR = ${abs_top_srcdir}/tools/
 REPEAT = ${TOOLSDIR}repeat
@@ -256 +270 @@
 TIME_FORMAT = "%E"
 PRINT_FORMAT = %20s: #Comments needed for spacing
+testdir = $(top_srcdir)/src/tests
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -283 +298 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
@@ -506 +521 @@
 
 loop$(EXEEXT):
-        @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 function$(EXEEXT):
-        @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 fetch_add$(EXEEXT):
-        @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch$(EXEEXT): \
@@ -530 +545 @@
 
 ctxswitch-pthread$(EXEEXT):
-        @@BACKEND_CC@ ctxswitch/pthreads.c     -DBENCH_N=50000000  -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ $(srcdir)/ctxswitch/pthreads.c     -DBENCH_N=50000000  -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-cfa_coroutine$(EXEEXT):
-        @${CC}        ctxswitch/cfa_cor.c      -DBENCH_N=50000000  -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/ctxswitch/cfa_cor.c      -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-cfa_thread$(EXEEXT):
-        @${CC}        ctxswitch/cfa_thrd.c     -DBENCH_N=50000000  -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/ctxswitch/cfa_thrd.c     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-cfa_thread2$(EXEEXT):
-        @${CC}        ctxswitch/cfa_thrd2.c    -DBENCH_N=50000000  -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/ctxswitch/cfa_thrd2.c    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-upp_coroutine$(EXEEXT):
-        @u++          ctxswitch/upp_cor.cc     -DBENCH_N=50000000  -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/ctxswitch/upp_cor.cc     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-upp_thread$(EXEEXT):
-        @u++          ctxswitch/upp_thrd.cc    -DBENCH_N=50000000  -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/ctxswitch/upp_thrd.cc    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ctxswitch-kos_fibre$(EXEEXT):
-        @${CXX}       ctxswitch/kos_fibre.cpp  -DBENCH_N=50000000  -I. -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
+        @${CXX}       $(srcdir)/ctxswitch/kos_fibre.cpp  -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
 
 ctxswitch-kos_fibre2$(EXEEXT):
-        @${CXX}       ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000  -I. -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
+        @${CXX}       $(srcdir)/ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
 
 ctxswitch-goroutine$(EXEEXT):
-        @go build -o a.out ctxswitch/goroutine.go
+        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
 
 ctxswitch-java_thread$(EXEEXT):
-        @javac ctxswitch/JavaThread.java
+        @javac $(srcdir)/ctxswitch/JavaThread.java
         @echo "#!/bin/sh" > a.out
         @echo "cd ctxswitch && java JavaThread" >> a.out
@@ -574 +589 @@
 
 mutex-pthread_lock$(EXEEXT):
-        @@BACKEND_CC@ mutex/pthreads.c    -DBENCH_N=50000000    -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ $(srcdir)/mutex/pthreads.c    -DBENCH_N=50000000    -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-upp$(EXEEXT):
-        @u++          mutex/upp.cc        -DBENCH_N=50000000    -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/mutex/upp.cc        -DBENCH_N=50000000    -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-cfa1$(EXEEXT):
-        @${CC}        mutex/cfa1.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/mutex/cfa1.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-cfa2$(EXEEXT):
-        @${CC}        mutex/cfa2.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/mutex/cfa2.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-cfa4$(EXEEXT):
-        @${CC}        mutex/cfa4.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/mutex/cfa4.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 mutex-java_thread$(EXEEXT):
-        @javac mutex/JavaThread.java
+        @javac $(srcdir)/mutex/JavaThread.java
         @echo "#!/bin/sh" > a.out
         @echo "cd mutex && java JavaThread" >> a.out
@@ -603 +618 @@
 
 signal-pthread_cond$(EXEEXT):
-        @@BACKEND_CC@ schedint/pthreads.c -DBENCH_N=500000      -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ $(srcdir)/schedint/pthreads.c -DBENCH_N=500000      -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-upp$(EXEEXT):
-        @u++          schedint/upp.cc     -DBENCH_N=5000000     -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/schedint/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-cfa1$(EXEEXT):
-        @${CC}        schedint/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedint/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-cfa2$(EXEEXT):
-        @${CC}        schedint/cfa2.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedint/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-cfa4$(EXEEXT):
-        @${CC}        schedint/cfa4.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedint/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 signal-java_thread$(EXEEXT):
-        @javac schedint/JavaThread.java
+        @javac $(srcdir)/schedint/JavaThread.java
         @echo "#!/bin/sh" > a.out
         @echo "cd schedint && java JavaThread" >> a.out
@@ -630 +645 @@
 
 waitfor-upp$(EXEEXT):
-        @u++          schedext/upp.cc     -DBENCH_N=5000000     -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/schedext/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa1$(EXEEXT):
-        @${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedext/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa2$(EXEEXT):
-        @${CC}        schedext/cfa2.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedext/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa4$(EXEEXT):
-        @${CC}        schedext/cfa4.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/schedext/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation$(EXEEXT) :\
@@ -652 +667 @@
 
 creation-cfa_coroutine$(EXEEXT):
-        @${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-cfa_coroutine_eager$(EXEEXT):
-        @${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
+        @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
 
 creation-cfa_thread$(EXEEXT):
-        @${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        $(srcdir)/creation/cfa_thrd.c  -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-upp_coroutine$(EXEEXT):
-        @u++          creation/upp_cor.cc  -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/creation/upp_cor.cc  -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-upp_thread$(EXEEXT):
-        @u++          creation/upp_thrd.cc -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @u++          $(srcdir)/creation/upp_thrd.cc -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-pthread$(EXEEXT):
-        @@BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @@BACKEND_CC@ $(srcdir)/creation/pthreads.c  -DBENCH_N=250000     -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 creation-goroutine$(EXEEXT):
-        @go build -o a.out creation/goroutine.go
+        @go build -o a.out $(srcdir)/creation/goroutine.go
 
 creation-java_thread$(EXEEXT):
-        @javac creation/JavaThread.java
+        @javac $(srcdir)/creation/JavaThread.java
         @echo "#!/bin/sh" > a.out
         @echo "cd creation && java JavaThread" >> a.out
@@ -689 +704 @@
 
 compile-array$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/array.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/array.c                       @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-attributes$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/attributes.c                    @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-empty$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w compile/empty.c                          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-expression$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/expression.c                    @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-io$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/io1.c                           @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-monitor$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/concurrent/monitor.c    @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c  @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-operators$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/operators.c                     @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c                   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-thread$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/concurrent/thread.c             @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 compile-typeof$(EXEEXT):
-        @${CC} -quiet -fsyntax-only -w ../tests/typeof.c                        @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c                      @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/config.h.in

@@ -1 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Location of include files. */

src/driver/Makefile.am

@@ -28 +28 @@
 endif
 
+# don't install cfa directly
 noinst_PROGRAMS = cfa
-cfa_SOURCES = cfa.cc
 
+# use
 install-exec-hook:
         @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"
@@ -40 +41 @@
         cd "$(CFA_BINDIR)" && rm -f $(CFA_NAME)
 
+cfa_SOURCES = cfa.cc
+
 # put into lib for now
 cc1libdir = ${CFA_LIBDIR}

src/driver/Makefile.in

@@ -221 +221 @@
 LTLIBOBJS = @LTLIBOBJS@
 MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -306 +305 @@
 .SUFFIXES:
 .SUFFIXES: .cc .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -330 +329 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
@@ -626 +625 @@
 
 
+# use
 install-exec-hook:
         @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"

src/driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 13 17:40:10 2018
-// Update Count     : 110
+// Last Modified On : Thu Jul 19 10:46:11 2018
+// Update Count     : 111
 //
 
@@ -454 +454 @@
                                         args[nargs] = argv[i];                          // pass the argument along
                                         nargs += 1;
-                #ifdef __DEBUG_H__
+                                        #ifdef __DEBUG_H__
                                         cerr << "arg:\"" << argv[i] << "\"" << endl;
-                #endif // __DEBUG_H__
+                                        #endif // __DEBUG_H__
                                 } // if
                         } // if

src/driver/cfa.cc

@@ -343 +343 @@
                 args[nargs] = "--undefined=__cfaabi_interpose_startup";
                 nargs += 1;
+                args[nargs] = "-Xlinker";
+                nargs += 1;
+                args[nargs] = "--undefined=__cfaabi_appready_startup";
+                nargs += 1;
 
                 // include the cfa library in case it's needed

src/examples/Makefile.in

@@ -231 +231 @@
 LTLIBOBJS = @LTLIBOBJS@
 MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -310 +309 @@
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -334 +333 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Jul 12 08:04:35 2018
-## Update Count     : 234
+## Last Modified On : Tue Jul 24 17:25:39 2018
+## Update Count     : 240
 ###############################################################################
 
@@ -36 +36 @@
          ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -Wall -O0 -c -o $@ $<
 
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@ $(DEFAULT_INCLUDES)
 
 AM_CCASFLAGS = @CFA_FLAGS@
@@ -43 +43 @@
 #use -no-include-stdhdr to prevent rebuild cycles
 #The built sources must not depend on the installed headers
-CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
-CC = ${abs_top_srcdir}/src/driver/cfa
+CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
+CC = ${abs_top_builddir}/src/driver/cfa
 
 headers = fstream iostream iterator limits rational time stdlib common \
@@ -55 +55 @@
 
 libobjs = ${headers:=.o}
-libsrc = libcfa-prelude.c interpose.c bits/debug.c ${headers:=.c} \
-         assert.c exception.c virtual.c
+libsrc = libcfa-prelude.c startup.c interpose.c bits/debug.c assert.c exception.c virtual.c heap.c \
+        ${headers:=.c}
 
 # not all platforms support concurrency, add option do disable it
@@ -64 +64 @@
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
+# SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
 % : %.c
-        @true
+        echo "Dummy rule, should never be called"
+        false
+
+# This rule should always match headers and since it has no prerequisite it will never be called
+$(addprefix $(srcdir)/,$(headers)):
+        echo "Dummy rule, should never be called"
+        false
 
 concurrency/libcfa_a-invoke.o : concurrency/invoke.c
@@ -92 +99 @@
 libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug
 
-stdhdr = ${shell find stdhdr -type f -printf "%p "}
+stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
 
 cfa_includedir = $(CFA_INCDIR)

src/libcfa/Makefile.in

@@ -148 +148 @@
 libcfa_d_a_AR = $(AR) $(ARFLAGS)
 libcfa_d_a_LIBADD =
-am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c interpose.c \
-        bits/debug.c fstream.c iostream.c iterator.c limits.c \
-        rational.c time.c stdlib.c common.c containers/maybe.c \
-        containers/pair.c containers/result.c containers/vector.c \
+am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c startup.c interpose.c \
+        bits/debug.c assert.c exception.c virtual.c heap.c fstream.c \
+        iostream.c iterator.c limits.c rational.c time.c stdlib.c \
+        common.c containers/maybe.c containers/pair.c \
+        containers/result.c containers/vector.c \
         concurrency/coroutine.c concurrency/thread.c \
         concurrency/kernel.c concurrency/monitor.c concurrency/mutex.c \
-        assert.c exception.c virtual.c \
         concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c \
         concurrency/invoke.c concurrency/preemption.c
@@ -177 +177 @@
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-preemption.$(OBJEXT)
 am__objects_4 = libcfa_d_a-libcfa-prelude.$(OBJEXT) \
-        libcfa_d_a-interpose.$(OBJEXT) bits/libcfa_d_a-debug.$(OBJEXT) \
-        $(am__objects_2) libcfa_d_a-assert.$(OBJEXT) \
+        libcfa_d_a-startup.$(OBJEXT) libcfa_d_a-interpose.$(OBJEXT) \
+        bits/libcfa_d_a-debug.$(OBJEXT) libcfa_d_a-assert.$(OBJEXT) \
         libcfa_d_a-exception.$(OBJEXT) libcfa_d_a-virtual.$(OBJEXT) \
-        $(am__objects_3)
+        libcfa_d_a-heap.$(OBJEXT) $(am__objects_2) $(am__objects_3)
 am_libcfa_d_a_OBJECTS = $(am__objects_4)
 libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS)
 libcfa_a_AR = $(AR) $(ARFLAGS)
 libcfa_a_LIBADD =
-am__libcfa_a_SOURCES_DIST = libcfa-prelude.c interpose.c bits/debug.c \
-        fstream.c iostream.c iterator.c limits.c rational.c time.c \
-        stdlib.c common.c containers/maybe.c containers/pair.c \
+am__libcfa_a_SOURCES_DIST = libcfa-prelude.c startup.c interpose.c \
+        bits/debug.c assert.c exception.c virtual.c heap.c fstream.c \
+        iostream.c iterator.c limits.c rational.c time.c stdlib.c \
+        common.c containers/maybe.c containers/pair.c \
         containers/result.c containers/vector.c \
         concurrency/coroutine.c concurrency/thread.c \
         concurrency/kernel.c concurrency/monitor.c concurrency/mutex.c \
-        assert.c exception.c virtual.c \
         concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c \
         concurrency/invoke.c concurrency/preemption.c
@@ -212 +212 @@
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-preemption.$(OBJEXT)
 am__objects_8 = libcfa_a-libcfa-prelude.$(OBJEXT) \
-        libcfa_a-interpose.$(OBJEXT) bits/libcfa_a-debug.$(OBJEXT) \
-        $(am__objects_6) libcfa_a-assert.$(OBJEXT) \
+        libcfa_a-startup.$(OBJEXT) libcfa_a-interpose.$(OBJEXT) \
+        bits/libcfa_a-debug.$(OBJEXT) libcfa_a-assert.$(OBJEXT) \
         libcfa_a-exception.$(OBJEXT) libcfa_a-virtual.$(OBJEXT) \
-        $(am__objects_7)
+        libcfa_a-heap.$(OBJEXT) $(am__objects_6) $(am__objects_7)
 am_libcfa_a_OBJECTS = $(am__objects_8)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
@@ -268 +268 @@
         containers/result containers/vector concurrency/coroutine \
         concurrency/thread concurrency/kernel concurrency/monitor \
-        concurrency/mutex ${shell find stdhdr -type f -printf "%p "} \
-        math gmp time_t.h bits/align.h bits/containers.h bits/defs.h \
-        bits/debug.h bits/locks.h concurrency/invoke.h
+        concurrency/mutex ${shell find ${srcdir}/stdhdr -type f \
+        -printf "%p "} math gmp time_t.h bits/align.h \
+        bits/containers.h bits/defs.h bits/debug.h bits/locks.h \
+        concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -302 +303 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = ${abs_top_srcdir}/src/driver/cfa
+CC = ${abs_top_builddir}/src/driver/cfa
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -318 +319 @@
 #use -no-include-stdhdr to prevent rebuild cycles
 #The built sources must not depend on the installed headers
-CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
+CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -346 +347 @@
 LTLIBOBJS = @LTLIBOBJS@
 MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -422 +422 @@
 ARFLAGS = cr
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@ $(DEFAULT_INCLUDES)
 AM_CCASFLAGS = @CFA_FLAGS@
 headers = fstream iostream iterator limits rational time stdlib common \
@@ -428 +428 @@
         containers/vector $(am__append_3)
 libobjs = ${headers:=.o}
-libsrc = libcfa-prelude.c interpose.c bits/debug.c ${headers:=.c} \
-        assert.c exception.c virtual.c $(am__append_4)
+libsrc = libcfa-prelude.c startup.c interpose.c bits/debug.c assert.c \
+        exception.c virtual.c heap.c ${headers:=.c} $(am__append_4)
 libcfa_a_SOURCES = ${libsrc}
 libcfa_a_CFLAGS = -nodebug -O2
 libcfa_d_a_SOURCES = ${libsrc}
 libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug
-stdhdr = ${shell find stdhdr -type f -printf "%p "}
+stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
 cfa_includedir = $(CFA_INCDIR)
 nobase_cfa_include_HEADERS = \
@@ -454 +454 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -478 +478 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
@@ -614 +614 @@
 @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-heap.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-iostream.Po@am__quote@
@@ -620 +621 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-limits.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-startup.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-time.Po@am__quote@
@@ -627 +629 @@
 @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-heap.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-iostream.Po@am__quote@
@@ -633 +636 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-limits.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-startup.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-time.Po@am__quote@
@@ -703 +707 @@
 @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-libcfa-prelude.obj `if test -f 'libcfa-prelude.c'; then $(CYGPATH_W) 'libcfa-prelude.c'; else $(CYGPATH_W) '$(srcdir)/libcfa-prelude.c'; fi`
 
+libcfa_d_a-startup.o: startup.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.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) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
+
+libcfa_d_a-startup.obj: startup.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.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-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
+
 libcfa_d_a-interpose.o: interpose.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-interpose.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-interpose.Tpo -c -o libcfa_d_a-interpose.o `test -f 'interpose.c' || echo '$(srcdir)/'`interpose.c
@@ -731 +749 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o bits/libcfa_d_a-debug.obj `if test -f 'bits/debug.c'; then $(CYGPATH_W) 'bits/debug.c'; else $(CYGPATH_W) '$(srcdir)/bits/debug.c'; fi`
 
+libcfa_d_a-assert.o: assert.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-assert.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-assert.Tpo -c -o libcfa_d_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-assert.Tpo $(DEPDIR)/libcfa_d_a-assert.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='assert.c' object='libcfa_d_a-assert.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) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c
+
+libcfa_d_a-assert.obj: assert.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-assert.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-assert.Tpo -c -o libcfa_d_a-assert.obj `if test -f 'assert.c'; then $(CYGPATH_W) 'assert.c'; else $(CYGPATH_W) '$(srcdir)/assert.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-assert.Tpo $(DEPDIR)/libcfa_d_a-assert.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='assert.c' object='libcfa_d_a-assert.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-assert.obj `if test -f 'assert.c'; then $(CYGPATH_W) 'assert.c'; else $(CYGPATH_W) '$(srcdir)/assert.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-virtual.obj: virtual.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-virtual.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-virtual.Tpo -c -o libcfa_d_a-virtual.obj `if test -f 'virtual.c'; then $(CYGPATH_W) 'virtual.c'; else $(CYGPATH_W) '$(srcdir)/virtual.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-virtual.Tpo $(DEPDIR)/libcfa_d_a-virtual.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='virtual.c' object='libcfa_d_a-virtual.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-virtual.obj `if test -f 'virtual.c'; then $(CYGPATH_W) 'virtual.c'; else $(CYGPATH_W) '$(srcdir)/virtual.c'; fi`
+
+libcfa_d_a-heap.o: heap.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-heap.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-heap.Tpo -c -o libcfa_d_a-heap.o `test -f 'heap.c' || echo '$(srcdir)/'`heap.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-heap.Tpo $(DEPDIR)/libcfa_d_a-heap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='heap.c' object='libcfa_d_a-heap.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) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-heap.o `test -f 'heap.c' || echo '$(srcdir)/'`heap.c
+
+libcfa_d_a-heap.obj: heap.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-heap.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-heap.Tpo -c -o libcfa_d_a-heap.obj `if test -f 'heap.c'; then $(CYGPATH_W) 'heap.c'; else $(CYGPATH_W) '$(srcdir)/heap.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-heap.Tpo $(DEPDIR)/libcfa_d_a-heap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='heap.c' object='libcfa_d_a-heap.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-heap.obj `if test -f 'heap.c'; then $(CYGPATH_W) 'heap.c'; else $(CYGPATH_W) '$(srcdir)/heap.c'; fi`
+
 libcfa_d_a-fstream.o: fstream.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-fstream.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-fstream.Tpo -c -o libcfa_d_a-fstream.o `test -f 'fstream.c' || echo '$(srcdir)/'`fstream.c
@@ -969 +1029 @@
 @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-mutex.obj `if test -f 'concurrency/mutex.c'; then $(CYGPATH_W) 'concurrency/mutex.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/mutex.c'; fi`
 
-libcfa_d_a-assert.o: assert.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-assert.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-assert.Tpo -c -o libcfa_d_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-assert.Tpo $(DEPDIR)/libcfa_d_a-assert.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='assert.c' object='libcfa_d_a-assert.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) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c
-
-libcfa_d_a-assert.obj: assert.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-assert.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-assert.Tpo -c -o libcfa_d_a-assert.obj `if test -f 'assert.c'; then $(CYGPATH_W) 'assert.c'; else $(CYGPATH_W) '$(srcdir)/assert.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-assert.Tpo $(DEPDIR)/libcfa_d_a-assert.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='assert.c' object='libcfa_d_a-assert.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-assert.obj `if test -f 'assert.c'; then $(CYGPATH_W) 'assert.c'; else $(CYGPATH_W) '$(srcdir)/assert.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-virtual.obj: virtual.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-virtual.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-virtual.Tpo -c -o libcfa_d_a-virtual.obj `if test -f 'virtual.c'; then $(CYGPATH_W) 'virtual.c'; else $(CYGPATH_W) '$(srcdir)/virtual.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-virtual.Tpo $(DEPDIR)/libcfa_d_a-virtual.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='virtual.c' object='libcfa_d_a-virtual.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-virtual.obj `if test -f 'virtual.c'; then $(CYGPATH_W) 'virtual.c'; else $(CYGPATH_W) '$(srcdir)/virtual.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
@@ -1039 +1071 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-libcfa-prelude.obj `if test -f 'libcfa-prelude.c'; then $(CYGPATH_W) 'libcfa-prelude.c'; else $(CYGPATH_W) '$(srcdir)/libcfa-prelude.c'; fi`
 
+libcfa_a-startup.o: startup.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_a-startup.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) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
+
+libcfa_a-startup.obj: startup.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_a-startup.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-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
+
 libcfa_a-interpose.o: interpose.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-interpose.o -MD -MP -MF $(DEPDIR)/libcfa_a-interpose.Tpo -c -o libcfa_a-interpose.o `test -f 'interpose.c' || echo '$(srcdir)/'`interpose.c
@@ -1067 +1113 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o bits/libcfa_a-debug.obj `if test -f 'bits/debug.c'; then $(CYGPATH_W) 'bits/debug.c'; else $(CYGPATH_W) '$(srcdir)/bits/debug.c'; fi`
 
+libcfa_a-assert.o: assert.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-assert.o -MD -MP -MF $(DEPDIR)/libcfa_a-assert.Tpo -c -o libcfa_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-assert.Tpo $(DEPDIR)/libcfa_a-assert.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='assert.c' object='libcfa_a-assert.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) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c
+
+libcfa_a-assert.obj: assert.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-assert.obj -MD -MP -MF $(DEPDIR)/libcfa_a-assert.Tpo -c -o libcfa_a-assert.obj `if test -f 'assert.c'; then $(CYGPATH_W) 'assert.c'; else $(CYGPATH_W) '$(srcdir)/assert.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-assert.Tpo $(DEPDIR)/libcfa_a-assert.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='assert.c' object='libcfa_a-assert.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-assert.obj `if test -f 'assert.c'; then $(CYGPATH_W) 'assert.c'; else $(CYGPATH_W) '$(srcdir)/assert.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-virtual.obj: virtual.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-virtual.obj -MD -MP -MF $(DEPDIR)/libcfa_a-virtual.Tpo -c -o libcfa_a-virtual.obj `if test -f 'virtual.c'; then $(CYGPATH_W) 'virtual.c'; else $(CYGPATH_W) '$(srcdir)/virtual.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-virtual.Tpo $(DEPDIR)/libcfa_a-virtual.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='virtual.c' object='libcfa_a-virtual.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-virtual.obj `if test -f 'virtual.c'; then $(CYGPATH_W) 'virtual.c'; else $(CYGPATH_W) '$(srcdir)/virtual.c'; fi`
+
+libcfa_a-heap.o: heap.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-heap.o -MD -MP -MF $(DEPDIR)/libcfa_a-heap.Tpo -c -o libcfa_a-heap.o `test -f 'heap.c' || echo '$(srcdir)/'`heap.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-heap.Tpo $(DEPDIR)/libcfa_a-heap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='heap.c' object='libcfa_a-heap.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) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-heap.o `test -f 'heap.c' || echo '$(srcdir)/'`heap.c
+
+libcfa_a-heap.obj: heap.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-heap.obj -MD -MP -MF $(DEPDIR)/libcfa_a-heap.Tpo -c -o libcfa_a-heap.obj `if test -f 'heap.c'; then $(CYGPATH_W) 'heap.c'; else $(CYGPATH_W) '$(srcdir)/heap.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-heap.Tpo $(DEPDIR)/libcfa_a-heap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='heap.c' object='libcfa_a-heap.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-heap.obj `if test -f 'heap.c'; then $(CYGPATH_W) 'heap.c'; else $(CYGPATH_W) '$(srcdir)/heap.c'; fi`
+
 libcfa_a-fstream.o: fstream.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-fstream.o -MD -MP -MF $(DEPDIR)/libcfa_a-fstream.Tpo -c -o libcfa_a-fstream.o `test -f 'fstream.c' || echo '$(srcdir)/'`fstream.c
@@ -1304 +1392 @@
 @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 concurrency/libcfa_a-mutex.obj `if test -f 'concurrency/mutex.c'; then $(CYGPATH_W) 'concurrency/mutex.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/mutex.c'; fi`
-
-libcfa_a-assert.o: assert.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-assert.o -MD -MP -MF $(DEPDIR)/libcfa_a-assert.Tpo -c -o libcfa_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-assert.Tpo $(DEPDIR)/libcfa_a-assert.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='assert.c' object='libcfa_a-assert.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) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c
-
-libcfa_a-assert.obj: assert.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-assert.obj -MD -MP -MF $(DEPDIR)/libcfa_a-assert.Tpo -c -o libcfa_a-assert.obj `if test -f 'assert.c'; then $(CYGPATH_W) 'assert.c'; else $(CYGPATH_W) '$(srcdir)/assert.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-assert.Tpo $(DEPDIR)/libcfa_a-assert.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='assert.c' object='libcfa_a-assert.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-assert.obj `if test -f 'assert.c'; then $(CYGPATH_W) 'assert.c'; else $(CYGPATH_W) '$(srcdir)/assert.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-virtual.obj: virtual.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-virtual.obj -MD -MP -MF $(DEPDIR)/libcfa_a-virtual.Tpo -c -o libcfa_a-virtual.obj `if test -f 'virtual.c'; then $(CYGPATH_W) 'virtual.c'; else $(CYGPATH_W) '$(srcdir)/virtual.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-virtual.Tpo $(DEPDIR)/libcfa_a-virtual.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='virtual.c' object='libcfa_a-virtual.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-virtual.obj `if test -f 'virtual.c'; then $(CYGPATH_W) 'virtual.c'; else $(CYGPATH_W) '$(srcdir)/virtual.c'; fi`
 
 concurrency/libcfa_a-alarm.o: concurrency/alarm.c
@@ -1616 +1676 @@
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
+# SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
 % : %.c
-        @true
+        echo "Dummy rule, should never be called"
+        false
+
+# This rule should always match headers and since it has no prerequisite it will never be called
+$(addprefix $(srcdir)/,$(headers)):
+        echo "Dummy rule, should never be called"
+        false
 
 concurrency/libcfa_a-invoke.o : concurrency/invoke.c

src/libcfa/concurrency/kernel.c

@@ -37 +37 @@
 
 //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 ) ));
+static void kernel_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
+static void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
 
 //-----------------------------------------------------------------------------
@@ -133 +133 @@
 
 // Construct the processor context of non-main processors
-void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info) {
+static void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info) {
         (this.__cor){ info };
         this.proc = proc;
 }
 
+static void start(processor * this);
 void ?{}(processor & this, const char * name, cluster & cltr) with( this ) {
         this.name = name;
@@ -186 +187 @@
 // Kernel Scheduling logic
 //=============================================================================================
+static void runThread(processor * this, thread_desc * dst);
+static void finishRunning(processor * this);
+static void halt(processor * this);
+
 //Main of the processor contexts
 void main(processorCtx_t & runner) {
@@ -239 +244 @@
 // runThread runs a thread by context switching
 // from the processor coroutine to the target thread
-void runThread(processor * this, thread_desc * dst) {
+static void runThread(processor * this, thread_desc * dst) {
         assert(dst->curr_cor);
         coroutine_desc * proc_cor = get_coroutine(this->runner);
@@ -256 +261 @@
 
 // KERNEL_ONLY
-void returnToKernel() {
+static void returnToKernel() {
         coroutine_desc * proc_cor = get_coroutine(kernelTLS.this_processor->runner);
         coroutine_desc * thrd_cor = kernelTLS.this_thread->curr_cor = kernelTLS.this_coroutine;
@@ -265 +270 @@
 // Once a thread has finished running, some of
 // its final actions must be executed from the kernel
-void finishRunning(processor * this) with( this->finish ) {
+static void finishRunning(processor * this) with( this->finish ) {
         verify( ! kernelTLS.preemption_state.enabled );
         choose( action_code ) {
@@ -299 +304 @@
 // This is the entry point for processors (kernel threads)
 // It effectively constructs a coroutine by stealing the pthread stack
-void * CtxInvokeProcessor(void * arg) {
+static void * CtxInvokeProcessor(void * arg) {
         processor * proc = (processor *) arg;
         kernelTLS.this_processor = proc;
@@ -336 +341 @@
 }
 
-void start(processor * this) {
+static void start(processor * this) {
         __cfaabi_dbg_print_safe("Kernel : Starting core %p\n", this);
 
@@ -542 +547 @@
 //-----------------------------------------------------------------------------
 // Kernel boot procedures
-void kernel_startup(void) {
+static void kernel_startup(void) {
         verify( ! kernelTLS.preemption_state.enabled );
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
@@ -618 +623 @@
 }
 
-void kernel_shutdown(void) {
+static void kernel_shutdown(void) {
         __cfaabi_dbg_print_safe("\n--------------------------------------------------\nKernel : Shutting down\n");
 
@@ -655 +660 @@
 // Kernel Quiescing
 //=============================================================================================
-
-void halt(processor * this) with( *this ) {
+static void halt(processor * this) with( *this ) {
         // verify( ! __atomic_load_n(&do_terminate, __ATOMIC_SEQ_CST) );
 
@@ -683 +687 @@
 // Unexpected Terminating logic
 //=============================================================================================
-
-
 static __spinlock_t kernel_abort_lock;
 static bool kernel_abort_called = false;

src/libcfa/concurrency/kernel_private.h

@@ -54 +54 @@
 // Processor
 void main(processorCtx_t *);
-void start(processor * this);
-void runThread(processor * this, thread_desc * dst);
-void finishRunning(processor * this);
-void halt(processor * this);
 
 static inline void wake_fast(processor * this) {

src/libcfa/concurrency/preemption.c

@@ -39 +39 @@
 
 // FwdDeclarations : Signal handlers
-void sigHandler_ctxSwitch( __CFA_SIGPARMS__ );
-void sigHandler_segv     ( __CFA_SIGPARMS__ );
-void sigHandler_ill      ( __CFA_SIGPARMS__ );
-void sigHandler_fpe      ( __CFA_SIGPARMS__ );
-void sigHandler_abort    ( __CFA_SIGPARMS__ );
+static void sigHandler_ctxSwitch( __CFA_SIGPARMS__ );
+static void sigHandler_segv     ( __CFA_SIGPARMS__ );
+static void sigHandler_ill      ( __CFA_SIGPARMS__ );
+static void sigHandler_fpe      ( __CFA_SIGPARMS__ );
+static void sigHandler_abort    ( __CFA_SIGPARMS__ );
 
 // FwdDeclarations : alarm thread main
-void * alarm_loop( __attribute__((unused)) void * args );
+static void * alarm_loop( __attribute__((unused)) void * args );
 
 // Machine specific register name
@@ -63 +63 @@
 static pthread_t alarm_thread;                        // pthread handle to alarm thread
 
-void ?{}(event_kernel_t & this) with( this ) {
+static void ?{}(event_kernel_t & this) with( this ) {
         alarms{};
         lock{};
@@ -85 +85 @@
 
 // Tick one frame of the Discrete Event Simulation for alarms
-void tick_preemption() {
+static 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
@@ -350 +350 @@
 // Context switch signal handler
 // Receives SIGUSR1 signal and causes the current thread to yield
-void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
+static void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
         __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.CFA_REG_IP); )
 
@@ -393 +393 @@
 // Main of the alarm thread
 // Waits on SIGALRM and send SIGUSR1 to whom ever needs it
-void * alarm_loop( __attribute__((unused)) void * args ) {
+static void * alarm_loop( __attribute__((unused)) void * args ) {
         // Block sigalrms to control when they arrive
         sigset_t mask;

src/libcfa/concurrency/preemption.h

@@ -22 +22 @@
 void kernel_stop_preemption();
 void update_preemption( processor * this, Duration duration );
-void tick_preemption();
 
 struct preemption_scope {

src/libcfa/startup.h

@@ -10 +10 @@
 // Created On       : Wed Mar 29 15:56:41 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 21:37:11 2017
-// Update Count     : 2
+// Last Modified On : Tue Jul 24 16:16:37 2018
+// Update Count     : 4
 //
 
@@ -19 +19 @@
 extern "C" {
         enum {
-                STARTUP_PRIORITY_CORE       = 101,
-                STARTUP_PRIORITY_KERNEL     = 102,
-                STARTUP_PRIORITY_MEMORY     = 103,
+                STARTUP_PRIORITY_MEMORY     = 101,
+                STARTUP_PRIORITY_CORE       = 102,
+                STARTUP_PRIORITY_KERNEL     = 103,
                 STARTUP_PRIORITY_IOSTREAM   = 104,
+                STARTUP_PRIORITY_APPREADY   = 105,
         };
 }
 #else
-#define STARTUP_PRIORITY_CORE       101
-#define STARTUP_PRIORITY_KERNEL     102
-#define STARTUP_PRIORITY_MEMORY     103
+#define STARTUP_PRIORITY_MEMORY     101
+#define STARTUP_PRIORITY_CORE       102
+#define STARTUP_PRIORITY_KERNEL     103
 #define STARTUP_PRIORITY_IOSTREAM   104
+#define STARTUP_PRIORITY_APPREADY   105
 #endif
 

src/libcfa/stdhdr/bfdlink.h

@@ -10 +10 @@
 // Created On       : Tue Jul 18 07:26:04 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 07:46:50 2017
-// Update Count     : 3
+// Last Modified On : Sun Jul 22 13:49:30 2018
+// Update Count     : 4
 // 
 
@@ -20 +20 @@
 #endif
 
-#include_next <bfdlink.h>                                                               // must have internal check for multiple expansion
+#include_next <bfdlink.h>                                                               // has internal check for multiple expansion
 
 #if defined( with ) && defined( __CFA_BFDLINK_H__ )             // reset only if set

src/libcfa/stdhdr/hwloc.h

@@ -10 +10 @@
 // Created On       : Tue Jul 18 07:45:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 07:56:33 2017
-// Update Count     : 3
+// Last Modified On : Sun Jul 22 13:49:58 2018
+// Update Count     : 4
 // 
 
@@ -20 +20 @@
 #endif
 
-#include_next <hwloc.h>                                                                 // must have internal check for multiple expansion
+#include_next <hwloc.h>                                                                 // has internal check for multiple expansion
 
 #if defined( thread ) && defined( __CFA_HWLOC_H__ )             // reset only if set

src/libcfa/stdhdr/krb5.h

@@ -10 +10 @@
 // Created On       : Tue Jul 18 07:55:44 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 07:58:01 2017
-// Update Count     : 3
+// Last Modified On : Sun Jul 22 13:50:24 2018
+// Update Count     : 4
 // 
 
@@ -20 +20 @@
 #endif
 
-#include_next <krb5.h>                                                                  // must have internal check for multiple expansion
+#include_next <krb5.h>                                                                  // has internal check for multiple expansion
 
 #if defined( enable ) && defined( __CFA_KRB5_H__ )              // reset only if set

src/libcfa/stdhdr/malloc.h

@@ -10 +10 @@
 // Created On       : Thu Jul 20 15:58:16 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 16:00:12 2017
-// Update Count     : 4
+// Last Modified On : Mon Jul 23 18:20:32 2018
+// Update Count     : 8
 // 
+
+
+size_t default_mmap_start();                                                    // CFA extras
+size_t default_heap_expansion();
+extern "C" {
+size_t malloc_alignment( void * );
+_Bool malloc_zero_fill( void * );
+int malloc_stats_fd( int fd );
+void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize );
+} // extern "C"
 
 extern "C" {

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 08:03:58 2018
-// Update Count     : 337
+// Last Modified On : Fri Jul 27 07:21:36 2018
+// Update Count     : 345
 //
 
 #pragma once
 
-#include <stdlib.h>                                                                             // allocation, strto*, ato*
+#include <stdlib.h>                                                                             // *alloc, strto*, ato*
 extern "C" {
         void * memalign( size_t align, size_t size );           // malloc.h
-        void * memset( void * dest, int c, size_t size );       // string.h
+        void * memset( void * dest, int fill, size_t size ); // string.h
         void * memcpy( void * dest, const void * src, size_t size ); // string.h
+    void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize ); // CFA
 } // extern "C"
 
@@ -36 +37 @@
 
         T * malloc( void ) {
-                // printf( "* malloc\n" );
                 return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
         } // malloc
@@ -48 +48 @@
 
         T * calloc( size_t dim ) {
-                //printf( "X2\n" );
                 return (T *)(void *)calloc( dim, sizeof(T) );   // C calloc
         } // calloc
 
         T * realloc( T * ptr, size_t size ) {
-                //printf( "X3\n" );
                 return (T *)(void *)realloc( (void *)ptr, size );
         } // realloc
 
         T * memalign( size_t align ) {
-                //printf( "X4\n" );
                 return (T *)memalign( align, sizeof(T) );
         } // memalign
 
         T * aligned_alloc( size_t align ) {
-                //printf( "X5\n" );
                 return (T *)aligned_alloc( align, sizeof(T) );
         } // aligned_alloc
 
         int posix_memalign( T ** ptr, size_t align ) {
-                //printf( "X6\n" );
                 return posix_memalign( (void **)ptr, align, sizeof(T) ); // C posix_memalign
         } // posix_memalign
@@ -76 +71 @@
 
         T * alloc( void ) {
-                //printf( "X7\n" );
                 return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
         } // alloc
 
         T * alloc( char fill ) {
-                //printf( "X8\n" );
                 T * ptr = (T *)(void *)malloc( (size_t)sizeof(T) );     // C malloc
                 return (T *)memset( ptr, (int)fill, sizeof(T) );        // initial with fill value
@@ -87 +80 @@
 
         T * alloc( size_t dim ) {
-                //printf( "X9\n" );
                 return (T *)(void *)malloc( dim * (size_t)sizeof(T) ); // C malloc
         } // alloc
 
         T * alloc( size_t dim, char fill ) {
-                //printf( "X10\n" );
                 T * ptr = (T *)(void *)malloc( dim * (size_t)sizeof(T) ); // C malloc
                 return (T *)memset( ptr, (int)fill, dim * sizeof(T) );    // initial with fill value
@@ -98 +89 @@
 
         T * alloc( T ptr[], size_t dim ) {
-                //printf( "X11\n" );
                 return (T *)(void *)realloc( (void *)ptr, dim * (size_t)sizeof(T) ); // C realloc
         } // alloc
@@ -109 +99 @@
 static inline forall( dtype T | sized(T) ) {
         T * align_alloc( size_t align ) {
-                //printf( "X13\n" );
                 return (T *)memalign( align, sizeof(T) );
         } // align_alloc
 
         T * align_alloc( size_t align, char fill ) {
-                //printf( "X14\n" );
                 T * ptr = (T *)memalign( align, sizeof(T) );
                 return (T *)memset( ptr, (int)fill, sizeof(T) );
@@ -120 +108 @@
 
         T * align_alloc( size_t align, size_t dim ) {
-                //printf( "X15\n" );
                 return (T *)memalign( align, dim * sizeof(T) );
         } // align_alloc
 
         T * align_alloc( size_t align, size_t dim, char fill ) {
-                //printf( "X16\n" );
-                T * ptr = (T *)memalign( align, dim * sizeof(T) );
-                return (T *)memset( ptr, (int)fill, dim * sizeof(T) );
+                T * ptr;
+                if ( fill == '\0' ) {
+                        ptr = (T *)cmemalign( align, dim, sizeof(T) );
+                } else {
+                        ptr = (T *)memalign( align, dim * sizeof(T) );
+                        return (T *)memset( ptr, (int)fill, dim * sizeof(T) );
+                } // if
+                return ptr;
         } // align_alloc
 } // distribution
@@ -135 +127 @@
         // data, non-array types
 
-        T * memset( T * dest, char c ) {
-                //printf( "X17\n" );
-                return (T *)memset( dest, c, sizeof(T) );
+        T * memset( T * dest, char fill ) {
+                return (T *)memset( dest, fill, sizeof(T) );
         } // memset
 
         T * memcpy( T * dest, const T * src ) {
-                //printf( "X18\n" );
                 return (T *)memcpy( dest, src, sizeof(T) );
         } // memcpy
@@ -149 +139 @@
         // data, array types
 
-        T * memset( T dest[], size_t dim, char c ) {
-                //printf( "X19\n" );
-                return (T *)(void *)memset( dest, c, dim * sizeof(T) ); // C memset
-        } // memset
-
-        T * memcpy( T dest[], const T src[], size_t dim ) {
-                //printf( "X20\n" );
+        T * amemset( T dest[], char fill, size_t dim ) {
+                return (T *)(void *)memset( dest, fill, dim * sizeof(T) ); // C memset
+        } // amemset
+
+        T * amemcpy( T dest[], const T src[], size_t dim ) {
                 return (T *)(void *)memcpy( dest, src, dim * sizeof(T) ); // C memcpy
-        } // memcpy
+        } // amemcpy
 } // distribution
 
@@ -215 +203 @@
         E * bsearchu( E key, const E * vals, size_t dim );
         size_t bsearchu( E key, const E * vals, size_t dim );
-
-        void qsort( E * vals, size_t dim );
 } // distribution
 
@@ -226 +212 @@
         E * bsearchu( K key, const E * vals, size_t dim );
         size_t bsearchu( K key, const E * vals, size_t dim );
+} // distribution
+
+forall( otype E | { int ?<?( E, E ); } ) {
+        void qsort( E * vals, size_t dim );
 } // distribution
 

src/main.cc

@@ -28 +28 @@
 #include <string>                           // for char_traits, operator<<
 
+#include "CompilationState.h"
 #include "../config.h"                      // for CFA_LIBDIR
 #include "CodeGen/FixMain.h"                // for FixMain
@@ -72 +73 @@
 DeclarationNode * parseTree = nullptr;                                  // program parse tree
 
-extern int yydebug;                                                                             // set for -g flag (Grammar)
-bool
-        astp = false,
-        bresolvep = false,
-        bboxp = false,
-        bcodegenp = false,
-        ctorinitp = false,
-        declstatsp = false,
-        exprp = false,
-        expraltp = false,
-        genericsp = false,
-        libcfap = false,
-        nopreludep = false,
-        noprotop = false,
-        nomainp = false,
-        parsep = false,
-        symtabp = false,
-        treep = false,
-        tuplep = false,
-        validp = false,
-        errorp = false,
-        codegenp = false,
-        prettycodegenp = false,
-        linemarks = false;
-extern bool resolvep;                                                           // used in AlternativeFinder
-
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
@@ -208 +183 @@
 
                         // Read to gcc builtins, if not generating the cfa library
-                        FILE * gcc_builtins = fopen( libcfap | treep ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
+                        FILE * gcc_builtins = fopen( buildingLibrary() ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
                         assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
                         parse( gcc_builtins, LinkageSpec::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
-                        FILE * extras = fopen( libcfap | treep ? "../prelude/extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
+                        FILE * extras = fopen( buildingLibrary() ? "../prelude/extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
                         assertf( extras, "cannot open extras.cf\n" );
                         parse( extras, LinkageSpec::BuiltinC );
@@ -219 +194 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( treep ? "../prelude/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
+                                FILE * prelude = fopen( buildingLibrary() ? "../prelude/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
                                 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" );
+                                FILE * builtins = fopen( buildingLibrary() ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
                                 parse( builtins, LinkageSpec::BuiltinCFA );
@@ -299 +274 @@
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
+                PASS( "fixInit", InitTweak::fix( translationUnit, buildingLibrary() ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );

src/prelude/Makefile.am

@@ -23 +23 @@
 noinst_DATA = ../libcfa/libcfa-prelude.c
 
-CC = ${abs_top_srcdir}/src/driver/cfa
+CC = ${abs_top_builddir}/src/driver/cfa
 
 $(DEPDIR) :
@@ -32 +32 @@
 
 # create extra forward types/declarations to reduce inclusion of library files
-extras.cf : extras.regx extras.c
-        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
+extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
+        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
 
 # create forward declarations for gcc builtins
-gcc-builtins.cf : gcc-builtins.c prototypes.sed
-        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E -P $< | sed -r -f prototypes.sed > $@
+gcc-builtins.cf : gcc-builtins.c ${srcdir}/prototypes.sed
+        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@
 
-gcc-builtins.c : builtins.def prototypes.awk sync-builtins.cf
-        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
+gcc-builtins.c : ${srcdir}/builtins.def ${srcdir}/prototypes.awk ${srcdir}/sync-builtins.cf ${srcdir}/prototypes.c
+        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
 
 prelude.cf : prelude-gen.cc
@@ -58 +58 @@
 include $(DEPDIR)/builtins.Po
 
-../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 -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
+../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
+        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
 
-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 -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
+        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 maintainer-clean-local :

src/prelude/Makefile.in

@@ -162 +162 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = ${abs_top_srcdir}/src/driver/cfa
+CC = ${abs_top_builddir}/src/driver/cfa
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -202 +202 @@
 LTLIBOBJS = @LTLIBOBJS@
 MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -285 +284 @@
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -309 +308 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
@@ -501 +500 @@
 
 # create extra forward types/declarations to reduce inclusion of library files
-extras.cf : extras.regx extras.c
-        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
+extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
+        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
 
 # create forward declarations for gcc builtins
-gcc-builtins.cf : gcc-builtins.c prototypes.sed
-        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E -P $< | sed -r -f prototypes.sed > $@
-
-gcc-builtins.c : builtins.def prototypes.awk sync-builtins.cf
-        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
+gcc-builtins.cf : gcc-builtins.c ${srcdir}/prototypes.sed
+        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@
+
+gcc-builtins.c : ${srcdir}/builtins.def ${srcdir}/prototypes.awk ${srcdir}/sync-builtins.cf ${srcdir}/prototypes.c
+        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
 
 prelude.cf : prelude-gen.cc
@@ -527 +526 @@
 include $(DEPDIR)/builtins.Po
 
-../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 -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
-
-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 -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
+        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
+
+bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
+        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 maintainer-clean-local :

src/tests/.expect/alloc-ERROR.txt

@@ -1 @@
-alloc.c:264:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: ?=?
 ...to: 
@@ -19 +19 @@
 
 
-alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: ?=?
 ...to: 
@@ -39 +39 @@
 
 
-alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.c:267:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: ?=?
 ...to: 
@@ -50 +50 @@
 
 
-alloc.c:267:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.c:268:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: ?=?
 ...to: 

src/tests/.expect/alloc.txt

@@ -49 +49 @@
 CFA array memset
 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 
-CFA memcpy
+CFA array memcpy
 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 
 

src/tests/.expect/attributes.x64.txt

@@ -88 +88 @@
     __attribute__ ((used,unused,unused)) signed int __f7__i_1;
     __attribute__ ((used,used,unused)) signed int __f8__i_1;
-    __attribute__ ((unused)) signed int __anonymous_object0;
     __attribute__ ((unused,unused)) signed int *__f9__Pi_1;
 };
@@ -103 +102 @@
 static inline void ___constructor__F_4sFdliiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1);
 static inline void ___constructor__F_4sFdliiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1);
-static inline void ___constructor__F_4sFdliiiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object1);
-static inline void ___constructor__F_4sFdliiiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object2, __attribute__ ((unused,unused)) signed int *__f9__Pi_1);
+static inline void ___constructor__F_4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused,unused)) signed int *__f9__Pi_1);
 static inline void ___constructor__F_4sFdl_autogen___1(struct Fdl *___dst__4sFdl_1){
     ((void)((*___dst__4sFdl_1).__f1__i_1) /* ?{} */);
@@ -114 +112 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -126 +123 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=___src__4sFdl_1.__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0=___src__4sFdl_1.__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1) /* ?{} */);
 }
 static inline void ___destructor__F_4sFdl_autogen___1(struct Fdl *___dst__4sFdl_1){
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ^?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ^?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ^?{} */);
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ^?{} */);
@@ -151 +146 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=___src__4sFdl_1.__f7__i_1));
     ((void)((*___dst__4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1));
-    ((void)((*___dst__4sFdl_1).__anonymous_object0=___src__4sFdl_1.__anonymous_object0));
     ((void)((*___dst__4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1));
     ((void)___constructor__F_4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), (*___dst__4sFdl_1)));
@@ -165 +159 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -177 +170 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -189 +181 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -201 +192 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -213 +203 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -225 +214 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -237 +225 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -249 +236 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
-}
-static inline void ___constructor__F_4sFdliiiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object3){
+    ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
+}
+static inline void ___constructor__F_4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused,unused)) signed int *__f9__Pi_1){
     ((void)((*___dst__4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */);
@@ -261 +247 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0=__anonymous_object3) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
-}
-static inline void ___constructor__F_4sFdliiiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object4, __attribute__ ((unused,unused)) signed int *__f9__Pi_1){
-    ((void)((*___dst__4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f3__i_1=__f3__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f4__i_1=__f4__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f5__i_1=__f5__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f6__i_1=__f6__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0=__anonymous_object4) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1=__f9__Pi_1) /* ?{} */);
 }
@@ -293 +266 @@
     __attribute__ ((unused)) signed int **const ___retval_f2__CPPi_1;
 }
-__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object5))[];
+__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object0))[];
 __attribute__ ((unused,unused)) signed int (*__f3__FPA0i_i__1(signed int __p__i_1))[]{
     __attribute__ ((unused)) signed int (*___retval_f3__PA0i_1)[];
 }
-__attribute__ ((unused,used,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object6);
-__attribute__ ((unused,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object7){
-    __attribute__ ((unused)) signed int (*___retval_f4__Fi_i__1)(signed int __anonymous_object8);
+__attribute__ ((unused,used,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object1);
+__attribute__ ((unused,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object2){
+    __attribute__ ((unused)) signed int (*___retval_f4__Fi_i__1)(signed int __anonymous_object3);
 }
 signed int __vtr__Fi___1(){
@@ -329 +302 @@
 signed int __tpr2__Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **__Foo__PPi_1);
 signed int __tpr3__Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *__Foo__Pi_1);
-signed int __tpr4__Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object9)(__attribute__ ((unused,unused)) signed int __anonymous_object10[((unsigned long int )5)]));
+signed int __tpr4__Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object4)(__attribute__ ((unused,unused)) signed int __anonymous_object5[((unsigned long int )5)]));
 signed int __tpr5__Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__Fi___1)());
 signed int __tpr6__Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__Fi___1)());
-signed int __tpr7__Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object11)(__attribute__ ((unused)) signed int (*__anonymous_object12)(__attribute__ ((unused,unused)) signed int __anonymous_object13)));
+signed int __tpr7__Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object6)(__attribute__ ((unused)) signed int (*__anonymous_object7)(__attribute__ ((unused,unused)) signed int __anonymous_object8)));
 signed int __ad__Fi___1(){
     __attribute__ ((unused)) signed int ___retval_ad__i_1;
@@ -343 +316 @@
     ((void)sizeof(__attribute__ ((unused,unused)) signed int ));
     ((void)sizeof(__attribute__ ((unused,unused,unused,unused)) signed int **));
-    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [5]));
-    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[10]));
+    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [((unsigned long int )5)]));
+    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[((unsigned long int )10)]));
     ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
     struct __attribute__ ((unused)) __anonymous3 {
@@ -386 +359 @@
     ((void)sizeof(enum __anonymous4 ));
 }
-signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object14, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object15);
-signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object16, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object17);
-signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object18, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object19);
-signed int __apd4__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object20)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)());
-signed int __apd5__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)(__attribute__ ((unused)) signed int __anonymous_object23), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object24)(__attribute__ ((unused)) signed int __anonymous_object25));
-signed int __apd6__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object26)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object27)());
-signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object28)(__attribute__ ((unused)) signed int __anonymous_object29), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object30)(__attribute__ ((unused)) signed int __anonymous_object31));
+signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object9, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object10);
+signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object11, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object12);
+signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object13, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object14);
+signed int __apd4__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)());
+signed int __apd5__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __anonymous_object18), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object19)(__attribute__ ((unused)) signed int __anonymous_object20));
+signed int __apd6__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)());
+signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object23)(__attribute__ ((unused)) signed int __anonymous_object24), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object25)(__attribute__ ((unused)) signed int __anonymous_object26));
 struct Vad {
-    __attribute__ ((unused)) signed int __anonymous_object32;
-    __attribute__ ((unused,unused)) signed int *__anonymous_object33;
-    __attribute__ ((unused,unused)) signed int __anonymous_object34[((unsigned long int )10)];
-    __attribute__ ((unused,unused)) signed int (*__anonymous_object35)();
+    __attribute__ ((unused)) signed int __anonymous_object27:4;
+    __attribute__ ((unused)) signed int __anonymous_object28:4;
+    __attribute__ ((unused,unused)) signed int __anonymous_object29:6;
 };
 static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1);
@@ -403 +375 @@
 static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1);
 static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1);
-static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object36);
-static inline void ___constructor__F_4sVadiPi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object37, __attribute__ ((unused,unused)) signed int *__anonymous_object38);
-static inline void ___constructor__F_4sVadiPiA0i_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object39, __attribute__ ((unused,unused)) signed int *__anonymous_object40, __attribute__ ((unused,unused)) signed int __anonymous_object41[((unsigned long int )10)]);
-static inline void ___constructor__F_4sVadiPiA0iFi___autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object42, __attribute__ ((unused,unused)) signed int *__anonymous_object43, __attribute__ ((unused,unused)) signed int __anonymous_object44[((unsigned long int )10)], __attribute__ ((unused,unused)) signed int (*__anonymous_object45)());
 static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object32) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33) /* ?{} */);
-    {
-        signed int _index0 = 0;
-        for (;(_index0<10);((void)(++_index0))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index0)]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */);
 }
 static inline void ___constructor__F_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=___src__4sVad_1.__anonymous_object32) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33=___src__4sVad_1.__anonymous_object33) /* ?{} */);
-    {
-        signed int _index1 = 0;
-        for (;(_index1<10);((void)(++_index1))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index1)]=___src__4sVad_1.__anonymous_object34[((signed long int )_index1)]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35=___src__4sVad_1.__anonymous_object35) /* ?{} */);
 }
 static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ^?{} */);
-    {
-        signed int _index2 = (10-1);
-        for (;(_index2>=0);((void)(--_index2))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index2)]) /* ^?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object33) /* ^?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object32) /* ^?{} */);
 }
 static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){
     struct Vad ___ret__4sVad_1;
-    ((void)((*___dst__4sVad_1).__anonymous_object32=___src__4sVad_1.__anonymous_object32));
-    ((void)((*___dst__4sVad_1).__anonymous_object33=___src__4sVad_1.__anonymous_object33));
-    {
-        signed int _index3 = 0;
-        for (;(_index3<10);((void)(++_index3))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index3)]=___src__4sVad_1.__anonymous_object34[((signed long int )_index3)]));
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35=___src__4sVad_1.__anonymous_object35));
     ((void)___constructor__F_4sVad4sVad_autogen___1((&___ret__4sVad_1), (*___dst__4sVad_1)));
     return ___ret__4sVad_1;
 }
-static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object46){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object46) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33) /* ?{} */);
-    {
-        signed int _index4 = 0;
-        for (;(_index4<10);((void)(++_index4))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index4)]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */);
-}
-static inline void ___constructor__F_4sVadiPi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object47, __attribute__ ((unused,unused)) signed int *__anonymous_object48){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object47) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object48) /* ?{} */);
-    {
-        signed int _index5 = 0;
-        for (;(_index5<10);((void)(++_index5))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index5)]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */);
-}
-static inline void ___constructor__F_4sVadiPiA0i_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object49, __attribute__ ((unused,unused)) signed int *__anonymous_object50, __attribute__ ((unused,unused)) signed int __anonymous_object51[((unsigned long int )10)]){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object49) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object50) /* ?{} */);
-    {
-        signed int _index6 = 0;
-        for (;(_index6<10);((void)(++_index6))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index6)]=__anonymous_object51[((signed long int )_index6)]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */);
-}
-static inline void ___constructor__F_4sVadiPiA0iFi___autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object52, __attribute__ ((unused,unused)) signed int *__anonymous_object53, __attribute__ ((unused,unused)) signed int __anonymous_object54[((unsigned long int )10)], __attribute__ ((unused,unused)) signed int (*__anonymous_object55)()){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object52) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object53) /* ?{} */);
-    {
-        signed int _index7 = 0;
-        for (;(_index7<10);((void)(++_index7))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index7)]=__anonymous_object54[((signed long int )_index7)]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35=__anonymous_object55) /* ?{} */);
-}

src/tests/.expect/attributes.x86.txt

@@ -88 +88 @@
     __attribute__ ((used,unused,unused)) signed int __f7__i_1;
     __attribute__ ((used,used,unused)) signed int __f8__i_1;
-    __attribute__ ((unused)) signed int __anonymous_object0;
     __attribute__ ((unused,unused)) signed int *__f9__Pi_1;
 };
@@ -103 +102 @@
 static inline void ___constructor__F_4sFdliiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1);
 static inline void ___constructor__F_4sFdliiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1);
-static inline void ___constructor__F_4sFdliiiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object1);
-static inline void ___constructor__F_4sFdliiiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object2, __attribute__ ((unused,unused)) signed int *__f9__Pi_1);
+static inline void ___constructor__F_4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused,unused)) signed int *__f9__Pi_1);
 static inline void ___constructor__F_4sFdl_autogen___1(struct Fdl *___dst__4sFdl_1){
     ((void)((*___dst__4sFdl_1).__f1__i_1) /* ?{} */);
@@ -114 +112 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -126 +123 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=___src__4sFdl_1.__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0=___src__4sFdl_1.__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1) /* ?{} */);
 }
 static inline void ___destructor__F_4sFdl_autogen___1(struct Fdl *___dst__4sFdl_1){
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ^?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ^?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ^?{} */);
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ^?{} */);
@@ -151 +146 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=___src__4sFdl_1.__f7__i_1));
     ((void)((*___dst__4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1));
-    ((void)((*___dst__4sFdl_1).__anonymous_object0=___src__4sFdl_1.__anonymous_object0));
     ((void)((*___dst__4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1));
     ((void)___constructor__F_4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), (*___dst__4sFdl_1)));
@@ -165 +159 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -177 +170 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -189 +181 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -201 +192 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -213 +203 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -225 +214 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -237 +225 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
 }
@@ -249 +236 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
-}
-static inline void ___constructor__F_4sFdliiiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object3){
+    ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
+}
+static inline void ___constructor__F_4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused,unused)) signed int *__f9__Pi_1){
     ((void)((*___dst__4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */);
@@ -261 +247 @@
     ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0=__anonymous_object3) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */);
-}
-static inline void ___constructor__F_4sFdliiiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object4, __attribute__ ((unused,unused)) signed int *__f9__Pi_1){
-    ((void)((*___dst__4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f3__i_1=__f3__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f4__i_1=__f4__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f5__i_1=__f5__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f6__i_1=__f6__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */);
-    ((void)((*___dst__4sFdl_1).__anonymous_object0=__anonymous_object4) /* ?{} */);
     ((void)((*___dst__4sFdl_1).__f9__Pi_1=__f9__Pi_1) /* ?{} */);
 }
@@ -293 +266 @@
     __attribute__ ((unused)) signed int **const ___retval_f2__CPPi_1;
 }
-__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object5))[];
+__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object0))[];
 __attribute__ ((unused,unused)) signed int (*__f3__FPA0i_i__1(signed int __p__i_1))[]{
     __attribute__ ((unused)) signed int (*___retval_f3__PA0i_1)[];
 }
-__attribute__ ((unused,used,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object6);
-__attribute__ ((unused,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object7){
-    __attribute__ ((unused)) signed int (*___retval_f4__Fi_i__1)(signed int __anonymous_object8);
+__attribute__ ((unused,used,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object1);
+__attribute__ ((unused,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object2){
+    __attribute__ ((unused)) signed int (*___retval_f4__Fi_i__1)(signed int __anonymous_object3);
 }
 signed int __vtr__Fi___1(){
@@ -329 +302 @@
 signed int __tpr2__Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **__Foo__PPi_1);
 signed int __tpr3__Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *__Foo__Pi_1);
-signed int __tpr4__Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object9)(__attribute__ ((unused,unused)) signed int __anonymous_object10[((unsigned int )5)]));
+signed int __tpr4__Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object4)(__attribute__ ((unused,unused)) signed int __anonymous_object5[((unsigned int )5)]));
 signed int __tpr5__Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__Fi___1)());
 signed int __tpr6__Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__Fi___1)());
-signed int __tpr7__Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object11)(__attribute__ ((unused)) signed int (*__anonymous_object12)(__attribute__ ((unused,unused)) signed int __anonymous_object13)));
+signed int __tpr7__Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object6)(__attribute__ ((unused)) signed int (*__anonymous_object7)(__attribute__ ((unused,unused)) signed int __anonymous_object8)));
 signed int __ad__Fi___1(){
     __attribute__ ((unused)) signed int ___retval_ad__i_1;
@@ -386 +359 @@
     ((void)sizeof(enum __anonymous4 ));
 }
-signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object14, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object15);
-signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object16, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object17);
-signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object18, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object19);
-signed int __apd4__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object20)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)());
-signed int __apd5__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)(__attribute__ ((unused)) signed int __anonymous_object23), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object24)(__attribute__ ((unused)) signed int __anonymous_object25));
-signed int __apd6__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object26)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object27)());
-signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object28)(__attribute__ ((unused)) signed int __anonymous_object29), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object30)(__attribute__ ((unused)) signed int __anonymous_object31));
+signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object9, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object10);
+signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object11, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object12);
+signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object13, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object14);
+signed int __apd4__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)());
+signed int __apd5__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __anonymous_object18), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object19)(__attribute__ ((unused)) signed int __anonymous_object20));
+signed int __apd6__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)());
+signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object23)(__attribute__ ((unused)) signed int __anonymous_object24), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object25)(__attribute__ ((unused)) signed int __anonymous_object26));
 struct Vad {
-    __attribute__ ((unused)) signed int __anonymous_object32;
-    __attribute__ ((unused,unused)) signed int *__anonymous_object33;
-    __attribute__ ((unused,unused)) signed int __anonymous_object34[((unsigned int )10)];
-    __attribute__ ((unused,unused)) signed int (*__anonymous_object35)();
+    __attribute__ ((unused)) signed int __anonymous_object27:4;
+    __attribute__ ((unused)) signed int __anonymous_object28:4;
+    __attribute__ ((unused,unused)) signed int __anonymous_object29:6;
 };
 static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1);
@@ -403 +375 @@
 static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1);
 static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1);
-static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object36);
-static inline void ___constructor__F_4sVadiPi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object37, __attribute__ ((unused,unused)) signed int *__anonymous_object38);
-static inline void ___constructor__F_4sVadiPiA0i_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object39, __attribute__ ((unused,unused)) signed int *__anonymous_object40, __attribute__ ((unused,unused)) signed int __anonymous_object41[((unsigned int )10)]);
-static inline void ___constructor__F_4sVadiPiA0iFi___autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object42, __attribute__ ((unused,unused)) signed int *__anonymous_object43, __attribute__ ((unused,unused)) signed int __anonymous_object44[((unsigned int )10)], __attribute__ ((unused,unused)) signed int (*__anonymous_object45)());
 static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object32) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33) /* ?{} */);
-    {
-        signed int _index0 = 0;
-        for (;(_index0<10);((void)(++_index0))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[_index0]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */);
 }
 static inline void ___constructor__F_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=___src__4sVad_1.__anonymous_object32) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33=___src__4sVad_1.__anonymous_object33) /* ?{} */);
-    {
-        signed int _index1 = 0;
-        for (;(_index1<10);((void)(++_index1))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[_index1]=___src__4sVad_1.__anonymous_object34[_index1]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35=___src__4sVad_1.__anonymous_object35) /* ?{} */);
 }
 static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ^?{} */);
-    {
-        signed int _index2 = (10-1);
-        for (;(_index2>=0);((void)(--_index2))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[_index2]) /* ^?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object33) /* ^?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object32) /* ^?{} */);
 }
 static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){
     struct Vad ___ret__4sVad_1;
-    ((void)((*___dst__4sVad_1).__anonymous_object32=___src__4sVad_1.__anonymous_object32));
-    ((void)((*___dst__4sVad_1).__anonymous_object33=___src__4sVad_1.__anonymous_object33));
-    {
-        signed int _index3 = 0;
-        for (;(_index3<10);((void)(++_index3))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[_index3]=___src__4sVad_1.__anonymous_object34[_index3]));
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35=___src__4sVad_1.__anonymous_object35));
     ((void)___constructor__F_4sVad4sVad_autogen___1((&___ret__4sVad_1), (*___dst__4sVad_1)));
     return ___ret__4sVad_1;
 }
-static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object46){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object46) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33) /* ?{} */);
-    {
-        signed int _index4 = 0;
-        for (;(_index4<10);((void)(++_index4))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[_index4]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */);
-}
-static inline void ___constructor__F_4sVadiPi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object47, __attribute__ ((unused,unused)) signed int *__anonymous_object48){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object47) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object48) /* ?{} */);
-    {
-        signed int _index5 = 0;
-        for (;(_index5<10);((void)(++_index5))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[_index5]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */);
-}
-static inline void ___constructor__F_4sVadiPiA0i_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object49, __attribute__ ((unused,unused)) signed int *__anonymous_object50, __attribute__ ((unused,unused)) signed int __anonymous_object51[((unsigned int )10)]){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object49) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object50) /* ?{} */);
-    {
-        signed int _index6 = 0;
-        for (;(_index6<10);((void)(++_index6))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[_index6]=__anonymous_object51[_index6]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */);
-}
-static inline void ___constructor__F_4sVadiPiA0iFi___autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object52, __attribute__ ((unused,unused)) signed int *__anonymous_object53, __attribute__ ((unused,unused)) signed int __anonymous_object54[((unsigned int )10)], __attribute__ ((unused,unused)) signed int (*__anonymous_object55)()){
-    ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object52) /* ?{} */);
-    ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object53) /* ?{} */);
-    {
-        signed int _index7 = 0;
-        for (;(_index7<10);((void)(++_index7))) {
-            ((void)((*___dst__4sVad_1).__anonymous_object34[_index7]=__anonymous_object54[_index7]) /* ?{} */);
-        }
-
-    }
-
-    ((void)((*___dst__4sVad_1).__anonymous_object35=__anonymous_object55) /* ?{} */);
-}

src/tests/.expect/declarationErrors.txt

@@ -17 +17 @@
 
 
-declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile instance of type Int
+declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile Int
 
 declarationErrors.c:24:1 error: duplicate const in declaration of f01: static inline function

src/tests/Makefile.am

@@ -15 +15 @@
 ###############################################################################
 
+
 debug=yes
 
@@ -25 +26 @@
 endif
 
+TEST_PY = python ${srcdir}/test.py
+
 # applies to both programs
-DEBUG_FLAGS =
+AM_CFLAGS = $(if $(test), 2> $(test), ) \
+        -XCFA \
+        -t \
+        -B${abs_top_builddir}/src/driver \
+        -g \
+        -Wall \
+        -Wno-unused-function \
+        -quiet @CFA_FLAGS@ \
+        -I. \
+        -DIN_DIR="${srcdir}/.in/" \
+        -L${abs_top_builddir}/src/libcfa \
+        -I${abs_top_srcdir}/src/libcfa \
+        -I${abs_top_srcdir}/src/libcfa/containers \
+        -I${abs_top_srcdir}/src/libcfa/concurrency \
+        -I${abs_top_srcdir}/src/libcfa/stdhdr
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I.
 if !BUILD_DEBUG
-BUILD_FLAGS += -nodebug
+AM_CFLAGS += -nodebug
 else
 if !BUILD_RELEASE
-BUILD_FLAGS += -debug
+AM_CFLAGS += -debug
 else
-BUILD_FLAGS += ${DEBUG_FLAGS}
+AM_CFLAGS += ${DEBUG_FLAGS}
 endif
 endif
 
-TEST_FLAGS = $(if $(test), 2> $(test), )
-AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
-CC = @CFA_BINDIR@/@CFA_NAME@
+CC = ${abs_top_builddir}/src/driver/cfa
 
 .PHONY : list
@@ -47 +61 @@
 
 fstream_test_SOURCES = fstream_test.c
-fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${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>> $(test), ) ${BUILD_FLAGS}
 
 all-local :
-        @+python test.py --debug=${debug} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
 
 all-tests :
-        @+python test.py --all --debug=${debug} ${concurrent}           # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -62 +74 @@
 
 list :
-        @+python test.py --list ${concurrent}
+        @+${TEST_PY} --list ${concurrent}
 
 concurrency :
-        @+python test.py --debug=${debug} -Iconcurrent
+        @+${TEST_PY} --debug=${debug} -Iconcurrent
 
-.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
+# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
+# however, here it is more complicated because it must match the dependencies based on how
+# they are generated by gcc
+headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
+headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
+headers_deps = $(addprefix %/, $(headers_real))
+$(headers_deps) :
+        echo "Dummy rule, should never be called"
 
+# %/stdlib:
+#       echo "Dummy rule, should never be called"
 
-% : %.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} -o ${@}
+# implicit rule so not all test require a rule
+% : %.c $(CC)
+        echo $(headers_deps)
+        $(COMPILE) $(abspath ${<}) -o ${@}
 
-declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+declarationSpecifier: declarationSpecifier.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+gccExtensions : gccExtensions.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-extension : extension.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+extension : extension.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+attributes : attributes.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-functions: functions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+functions: functions.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+KRfunctions : KRfunctions.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+sched-ext-parse : sched-ext-parse.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
+gmp : gmp.c $(CC)
+        $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
 
-completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+completeTypeError : completeTypeError.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+typedefRedef-ERR1: typedefRedef.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+alloc-ERROR: alloc.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+fallthrough-ERROR: fallthrough.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+nested-types-ERR1: nested-types.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+nested-types-ERR2: nested-types.c $(CC)
+        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
 # Constructor/destructor tests
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
+        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
-raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 # Warnings
-warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
+warnings/self-assignment: warnings/self-assignment.c $(CC)
+        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
 
 #builtins
-builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
+builtins/sync: builtins/sync.c $(CC)
+        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only

src/tests/Makefile.in

@@ -103 +103 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
+CONFIG_CLEAN_FILES = config.py
+CONFIG_CLEAN_VPATH_FILES = test.py
 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 = avltree/avl_test.$(OBJEXT) \
+        avltree/avl0.$(OBJEXT) avltree/avl1.$(OBJEXT) \
+        avltree/avl2.$(OBJEXT) avltree/avl3.$(OBJEXT) \
+        avltree/avl4.$(OBJEXT) avltree/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_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -138 +131 @@
 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
-am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -180 +169 @@
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.py.in \
+        $(srcdir)/test.py $(top_srcdir)/automake/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -191 +181 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = @CFA_BINDIR@/@CFA_NAME@
+CC = ${abs_top_builddir}/src/driver/cfa
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -231 +221 @@
 LTLIBOBJS = @LTLIBOBJS@
 MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -306 +295 @@
 @BUILD_CONCURRENCY_FALSE@concurrent = '-Econcurrent'
 @BUILD_CONCURRENCY_TRUE@concurrent = 
+TEST_PY = python ${srcdir}/test.py
 
 # applies to both programs
-DEBUG_FLAGS = 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. \
-        $(am__append_1) $(am__append_2) $(am__append_3)
-TEST_FLAGS = $(if $(test), 2> $(test), )
-AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
+AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t \
+        -B${abs_top_builddir}/src/driver -g -Wall -Wno-unused-function \
+        -quiet @CFA_FLAGS@ -I. -DIN_DIR="${srcdir}/.in/" \
+        -L${abs_top_builddir}/src/libcfa \
+        -I${abs_top_srcdir}/src/libcfa \
+        -I${abs_top_srcdir}/src/libcfa/containers \
+        -I${abs_top_srcdir}/src/libcfa/concurrency \
+        -I${abs_top_srcdir}/src/libcfa/stdhdr $(am__append_1) \
+        $(am__append_2) $(am__append_3)
 fstream_test_SOURCES = fstream_test.c
-fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${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>> $(test), ) ${BUILD_FLAGS}
+
+# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
+# however, here it is more complicated because it must match the dependencies based on how
+# they are generated by gcc
+headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
+headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
+headers_deps = $(addprefix %/, $(headers_real))
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -345 +344 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+config.py: $(top_builddir)/config.status $(srcdir)/config.py.in
+        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 avltree/$(am__dirstamp):
         @$(MKDIR_P) avltree
@@ -356 +357 @@
         @$(MKDIR_P) avltree/$(DEPDIR)
         @: > avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl_test.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl_test.$(OBJEXT): avltree/$(am__dirstamp) \
         avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl0.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl0.$(OBJEXT): avltree/$(am__dirstamp) \
         avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl1.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl1.$(OBJEXT): avltree/$(am__dirstamp) \
         avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl2.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl2.$(OBJEXT): avltree/$(am__dirstamp) \
         avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl3.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl3.$(OBJEXT): avltree/$(am__dirstamp) \
         avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl4.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl4.$(OBJEXT): avltree/$(am__dirstamp) \
         avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl-private.$(OBJEXT): avltree/$(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)$(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)
+        $(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -386 +387 @@
         -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@./$(DEPDIR)/fstream_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl-private.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test.Po@am__quote@
 
 .c.o:
@@ -410 +411 @@
 @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`
 
 ID: $(am__tagged_files)
@@ -731 +620 @@
 
 all-local :
-        @+python test.py --debug=${debug} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
 
 all-tests :
-        @+python test.py --all --debug=${debug} ${concurrent}           # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -740 +629 @@
 
 list :
-        @+python test.py --list ${concurrent}
+        @+${TEST_PY} --list ${concurrent}
 
 concurrency :
-        @+python test.py --debug=${debug} -Iconcurrent
-
-.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
-
-% : %.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} -o ${@}
-
-declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
-gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
-extension : extension.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
-attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
-functions: functions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
-KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
-sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
-gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
-
-completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+        @+${TEST_PY} --debug=${debug} -Iconcurrent
+$(headers_deps) :
+        echo "Dummy rule, should never be called"
+
+# %/stdlib:
+#       echo "Dummy rule, should never be called"
+
+# implicit rule so not all test require a rule
+% : %.c $(CC)
+        echo $(headers_deps)
+        $(COMPILE) $(abspath ${<}) -o ${@}
+
+declarationSpecifier: declarationSpecifier.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+
+gccExtensions : gccExtensions.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+
+extension : extension.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+
+attributes : attributes.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+
+functions: functions.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+
+KRfunctions : KRfunctions.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+
+sched-ext-parse : sched-ext-parse.c $(CC)
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+
+gmp : gmp.c $(CC)
+        $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
+
+completeTypeError : completeTypeError.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+typedefRedef-ERR1: typedefRedef.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+alloc-ERROR: alloc.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+fallthrough-ERROR: fallthrough.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+nested-types-ERR1: nested-types.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+nested-types-ERR2: nested-types.c $(CC)
+        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
 # Constructor/destructor tests
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
-
-raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
+        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
+
+raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 # Warnings
-warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
+warnings/self-assignment: warnings/self-assignment.c $(CC)
+        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
 
 #builtins
-builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
+builtins/sync: builtins/sync.c $(CC)
+        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/tests/alloc.c

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 16 15:42:31 2018
-// Update Count     : 330
+// Last Modified On : Thu Jul 26 20:58:05 2018
+// Update Count     : 334
 //
 
@@ -54 +54 @@
         p = alloc( fill );                                  // CFA alloc, fill
         printf( "CFA alloc, fill %08x\n", *p );
+        free( p );
 
 
@@ -218 +219 @@
         printf( "\n" );
 
-        memset( sta, dim, fill );                           // CFA array memset, type safe
+        amemset( sta, fill, dim );                                                      // CFA array memset, type safe
         printf( "CFA array memset\n" );
         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x %a, ", sta[i].x, sta[i].y ); }
         printf( "\n" );
 
-        memcpy( sta1, sta, dim );                           // CFA array memcpy, type safe
-        printf( "CFA memcpy\n" );
+        amemcpy( sta1, sta, dim );                                                      // CFA array memcpy, type safe
+        printf( "CFA array memcpy\n" );
         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x %a, ", sta1[i].x, sta1[i].y ); }
         printf( "\n" );

src/tests/attributes.c

@@ -10 +10 @@
 // Created On       : Mon Feb  6 16:07:02 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul  8 21:12:07 2018
-// Update Count     : 8
+// Last Modified On : Thu Jul 19 13:50:51 2018
+// Update Count     : 15
 // 
 
@@ -42 +42 @@
     __attribute__(( unused )) int f5 __attribute__(( unused ));
     __attribute__(( used )) int f6 __attribute__(( packed )), f7 __attribute__(( unused )) __attribute__(( unused )), __attribute__(( used )) f8 __attribute__(( unused ));
-    int __attribute__(( unused ));
     int ( ( * (f9) __attribute__(( unused )) ) __attribute__(( unused )) );
 };
@@ -149 +148 @@
 struct Vad {
     int __attribute__(( unused ));
-    int __attribute__(( unused )) * __attribute__(( unused ));
-    int __attribute__(( unused )) [10] __attribute__(( unused ));
-    int __attribute__(( unused )) (*)() __attribute__(( unused ));
+    int __attribute__(( unused )) :4;
+    int __attribute__(( unused )) :4, __attribute__(( unused )) :6;
 };
 

src/tests/io2.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// io2.c -- 
-// 
+//
+// io2.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Mar  2 16:56:02 2016
@@ -12 +12 @@
 // Last Modified On : Thu May 24 21:17:41 2018
 // Update Count     : 103
-// 
+//
 
 #include <fstream>
+
+ #define xstr(s) str(s)
+#define str(s) #s
 
 int main() {
@@ -38 +41 @@
         char s1[size], s2[size];
 
-        ifstream in = { "io.data" };                                            // create / open file
+        ifstream in = { xstr(IN_DIR) "io.data" };                                               // create / open file
 
         sout | "input bacis types" | endl;

src/tests/preempt_longrun/Makefile.am

@@ -32 +32 @@
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell cat .type | tr a-z A-Z)
 CFLAGS = ${BUILD_FLAGS}
-CC = @CFA_BINDIR@/@CFA_NAME@
+CC = ${top_builddir}/src/driver/cfa
 
 TESTS = block coroutine create disjoint enter enter3 processor stack wait yield

src/tests/preempt_longrun/Makefile.in

@@ -337 +337 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = @CFA_BINDIR@/@CFA_NAME@
+CC = ${top_builddir}/src/driver/cfa
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -377 +377 @@
 LTLIBOBJS = @LTLIBOBJS@
 MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -466 +465 @@
 .SUFFIXES:
 .SUFFIXES: .log .test .test$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -490 +489 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):

src/tests/pybin/settings.py

@@ +1 @@
+from __future__ import print_function
+
+import os
 import sys
+
+try :
+        sys.path.append(os.getcwd())
+        import config
+
+        SRCDIR = os.path.abspath(config.SRCDIR)
+        BUILDDIR = os.path.abspath(config.BUILDDIR)
+except:
+        print('ERROR: missing config.py, re-run configure script.', file=sys.stderr)
+        sys.exit(1)
 
 class Architecture:
@@ -5 +18 @@
                 'x64'                   : 'x64',
                 'x86-64'                : 'x64',
+                'x86_64'                : 'x64',
                 'x86'                   : 'x86',
                 'i386'          : 'x86',
@@ -25 +39 @@
                         self.cross_compile = False
                         try:
-                                arch = machine_default()
+                                arch = config.HOSTARCH
                                 self.target = Architecture.makeCanonical( arch )
                         except KeyError:
@@ -66 +80 @@
         arch       = Architecture(options.arch)
 
+
 def updateMakeCmd(force, jobs):
         global make
 
         make = "make" if not force else ("make -j%i" % jobs)
-
-
-def set_machine_default( func ):
-        global machine_default
-
-        machine_default = func

src/tests/pybin/test_run.py

@@ -28 +28 @@
 
         def prepare(self):
-                sh("mkdir -p %s" % os.path.join(self.path, '.err'))
-                sh("mkdir -p %s" % os.path.join(self.path, '.out'))
-                sh("mkdir -p %s" % os.path.join(self.path, '.in' ))
+                mkdir( (self.output_log(), self.error_log(), self.input()            ) )
+                rm   ( (self.output_log(), self.error_log(), self.target_executable()) )
 
         def expect(self):
-                return ("%s/.expect/%s%s.txt" % (self.path, self.name, '' if not self.arch else ".%s" % self.arch))
+                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".expect", "%s%s.txt" % (self.name,'' if not self.arch else ".%s" % self.arch)) )
 
         def error_log(self):
-                return ("%s/.err/%s.log"    % (self.path, self.name))
+                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, ".err"   , "%s.log" % self.name) )
 
         def output_log(self):
-                return ("%s/.out/%s.log"    % (self.path, self.name))
+                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, ".out"   , "%s.log" % self.name) )
 
         def input(self):
-                return ("%s/.in/%s.txt"     % (self.path, self.name))
+                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".in"    , "%s.txt" % self.name) )
 
         def target_output(self):
@@ -48 +47 @@
 
         def target(self):
-                return os.path.join(self.path, self.name)
+                return os.path.normpath( os.path.join(self.path, self.name) )
+
+        def target_executable(self):
+                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
 
         @classmethod
@@ -58 +60 @@
                 test = Test()
                 test.name = os.path.basename(target)
-                test.path = os.path.dirname (target)
+                test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
                 test.arch = settings.arch.toString() if settings.arch.cross_compile else ''
                 return test

src/tests/pybin/tools.py

@@ -9 +9 @@
 import stat
 import sys
+import fileinput
 
 from pybin import settings
@@ -33 +34 @@
                 out, err = proc.communicate()
                 return proc.returncode, out
+
+def is_ascii(fname):
+        if not os.path.isfile(fname):
+                return False
+
+        code, out = sh("file %s" % fname, print2stdout = False)
+        if code != 0:
+                return False
+
+        match = re.search(".*: (.*)", out)
+
+        if not match:
+                return False
+
+        return match.group(1) == "ASCII text"
 
 # Remove 1 or more files silently
@@ -41 +57 @@
         except TypeError:
                 sh("rm -f %s > /dev/null 2>&1" % files )
+
+# Create 1 or more directory
+def mkdir( files ):
+        try:
+                for file in files:
+                        sh("mkdir -p %s" % os.path.dirname(file) )
+        except TypeError:
+                sh("mkdir -p %s" % os.path.dirname(files) )
 
 def chdir( dest = __main__.__file__ ):
@@ -105 +129 @@
 # helper function to replace patterns in a file
 def file_replace(fname, pat, s_after):
-    # first, see if the pattern is even in the file.
-    with open(fname) as f:
-        if not any(re.search(pat, line) for line in f):
-            return # pattern does not occur in file so we are done.
-
-    # pattern is in the file, so perform replace operation.
-    with open(fname) as f:
-        out_fname = fname + ".tmp"
-        out = open(out_fname, "w")
-        for line in f:
-            out.write(re.sub(pat, s_after, line))
-        out.close()
-        os.rename(out_fname, fname)
+        file = fileinput.FileInput(fname, inplace=True, backup='.bak')
+        for line in file:
+                print(line.replace(pat, s_after), end='')
+        file.close()
 
 # helper function to check if a files contains only a specific string
@@ -140 +155 @@
 # transform path to canonical form
 def canonicalPath(path):
-        return os.path.join('.', os.path.normpath(path) )
+        abspath = os.path.abspath(__main__.__file__)
+        dname = os.path.dirname(abspath)
+        return os.path.join(dname, os.path.normpath(path) )
 
 # compare path even if form is different
@@ -151 +168 @@
                 for name in names:
                         path = os.path.join(dirname, name)
-
                         op( path )
 
         # Start the walk
-        os.path.walk('.', step, '')
+        dname = settings.SRCDIR
+        os.path.walk(dname, step, '')
 
 ################################################################################
 #               system
 ################################################################################
-
-# parses the Makefile to find the machine type (32-bit / 64-bit)
-def getMachineType():
-        sh('echo "void ?{}(int&a,int b){}int main(){return 0;}" > .dummy.c')
-        ret, out = make('.dummy', silent = True)
-
-        if ret != 0:
-                print("Failed to identify architecture:")
-                print(out)
-                print("Stopping")
-                rm( (".dummy.c",".dummy") )
-                sys.exit(1)
-
-        _, out = sh("file .dummy", print2stdout=False)
-        rm( (".dummy.c",".dummy") )
-
-        if settings.dry_run :
-                return 'x64'
-
-        return re.search(r"[^,]+,([^,]+),", out).group(1).strip()
-
 # count number of jobs to create
 def jobCount( options, tests ):
@@ -244 +240 @@
         else:
                 print(text)
-
-settings.set_machine_default( getMachineType )

src/tests/structMember.c

@@ -1 @@
-typedef int T;
+typedef int TD;
+extern struct TTT {};
 
 struct S {
@@ -8 +9 @@
         int m4, m5, m6;
         int *m7, *m8, *m9;
-        int (*m10)();
-        int *(*m11)(int);
-        T (T);
+        __extension__ int (*m10)();
+        __extension__ int *(*m11)(int);
+//      TD (TD);
 
-// Cforall extensions
+// Cforall declarations
 
         * int m12, m13;
         * [ * int ] (int) m14;
-        int ;
-        int , , ;
-        int * , , ;
-        int *, *, *;
-        * int , , ;
-        int (*)();
-        int (**)( int );
-        T ;
 
-// errors
+// C anonymous declarations (padding)
 
-//    void f(void);
+        int :4;
+        int :4, :6;
+
+// Cforall anonymous declarations (padding)
+
+        int @;
+        TD @;
+        int @, @, @;
+        int * @ , @, @;
+        int * @, * @, * @;
+        * int @, @, @;
+        struct TTT @;
+        TTT @, @;
+        int @ :4, @ :6;
+        * int @, @;
+        int (*@)();
+        int (*@)(int), (*@)(int);
+        * [int](int) @, @;
+        int (**@)( int );
+        * * [int](int) @;
+
+// C aggregate open declarations
+
+        __extension__ union { int i; };
+        struct T { int k; };
+
+// Cforall forward declaration
+
+        struct PPP;
+        __extension__ struct QQQ;
+
+// C useless declarations
+
+        int;
+        TD;
+        unsigned int;
+        __extension__ long double;
+        _Complex;
+        double _Complex;
+        volatile zero_t;
+        const one_t;
+        S;
+        .S;
+        S.T;
+        .S.T;
+        forall( otype S, otype T ) struct W {
+                struct X {};
+        };
+        W(int);
+        W(int).X;
 };
 
 struct S s;
+
+// Cforall Plan 9 declarations
+
+struct UUU {};
+extern struct SSS {
+        inline struct WWW {};
+        inline UUU;
+        inline UUU *, **;
+        inline UUU (*)( int p );
+        inline int;
+        inline int *;
+        inline * int;
+        inline int (*)( int p );
+        inline * [int](int p);
+};
 
 union U {

src/tests/test.py

@@ -19 +19 @@
 
         def matchTest(path):
-                match = re.search("(\.[\w\/\-_]*)\/.expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt", path)
+                match = re.search("%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt" % settings.SRCDIR, path)
                 if match :
                         test = Test()
@@ -64 +64 @@
                         testname = canonicalPath( testname )
                         if Test.valid_name(testname):
-                                found = [test for test in allTests if test.target() == testname]
+                                found = [test for test in allTests if canonicalPath( test.target() ) == testname]
                                 tests.append( found[0] if len(found) == 1 else Test.from_target(testname) )
                         else :
@@ -116 +116 @@
 #               running test functions
 ################################################################################
+# fix the absolute paths in the output
+def fixoutput( fname ):
+        if not is_ascii(fname):
+                return
+
+        file_replace(fname, "%s/" % settings.SRCDIR, "")
+
+
 # logic to run a single test and return the result (No handling of printing or other test framework logic)
 def run_single_test(test):
 
         # find the output file based on the test name and options flag
+        exe_file = test.target_executable();
         out_file = test.target_output()
         err_file = test.error_log()
@@ -127 +136 @@
         # prepare the proper directories
         test.prepare()
-
-        # remove any outputs from the previous tests to prevent side effects
-        rm( (out_file, err_file, test.target()) )
 
         # build, skipping to next test on error
@@ -146 +152 @@
         if make_ret == 0 or settings.dry_run:
                 before = time.time()
-                if settings.dry_run or fileIsExecutable(test.target()) :
+                if settings.dry_run or fileIsExecutable(exe_file) :
                         # run test
-                        retcode, _ = sh("timeout 60 %s > %s 2>&1" % (test.target(), out_file), input = in_file)
+                        retcode, _ = sh("timeout 60 %s > %s 2>&1" % (exe_file, out_file), input = in_file)
                 else :
                         # simply cat the result into the output
-                        retcode, _ = sh("cat %s > %s" % (test.target(), out_file))
+                        retcode, _ = sh("cat %s > %s" % (exe_file, out_file))
 
                 after = time.time()
@@ -170 +176 @@
                 else :
                         # fetch return code and error from the diff command
+                        fixoutput(out_file)
                         retcode, error = diff(cmp_file, out_file)
 
@@ -241 +248 @@
 ################################################################################
 if __name__ == "__main__":
-        #always run from same folder
-        chdir()
 
         # parse the command line arguments