Changes in / [255b294:c00ddfe]

Files:

• Jenkins/FullBuild (modified) (2 diffs)
• Jenkinsfile (modified) (3 diffs)
• src/CodeTools/DeclStats.cc (modified) (5 diffs)
• src/Parser/DeclarationNode.cc (modified) (6 diffs)
• src/Parser/ParseNode.h (modified) (2 diffs)
• src/Parser/TypeData.cc (modified) (10 diffs)
• src/Parser/TypeData.h (modified) (3 diffs)
• src/Parser/core (added)
• src/Parser/parser.cc (modified) (3 diffs)
• src/Parser/parser.yy (modified) (2 diffs)
• src/benchmark/Makefile.am (modified) (4 diffs)
• src/benchmark/Makefile.in (modified) (4 diffs)
• src/benchmark/csv-data.c (modified) (2 diffs)
• src/examples/multicore.c (modified) (1 diff)
• src/libcfa/Makefile.am (modified) (1 diff)
• src/libcfa/Makefile.in (modified) (10 diffs)
• src/libcfa/concurrency/kernel.c (modified) (2 diffs)
• src/libcfa/concurrency/monitor (deleted)
• src/libcfa/concurrency/monitor.c (deleted)
• src/libcfa/concurrency/threads (modified) (1 diff)
• src/libcfa/concurrency/threads.c (modified) (1 diff)
• src/libcfa/stdlib (modified) (2 diffs)
• src/libcfa/stdlib.c (modified) (2 diffs)
• src/prelude/prelude.cf (modified) (4 diffs)
• src/tests/.expect/abs.txt (modified) (1 diff)
• src/tests/.expect/globals.txt (deleted)
• src/tests/.expect/monitor.txt (deleted)
• src/tests/abs.c (modified) (2 diffs)
• src/tests/globals.c (deleted)
• src/tests/monitor.c (deleted)

Jenkins/FullBuild

@@ -1 +1 @@
 #!groovy
 
-//===========================================================================================================
-// Main loop of the compilation
-//===========================================================================================================
-
-node ('master') {
-        def err = null
-
-        try {
-                //Prevent the build from exceeding 30 minutes
-                timeout(60) {
-
-                        //Wrap build to add timestamp to command line
-                        wrap([$class: 'TimestamperBuildWrapper']) {
-
-                                stage 'Build'
-
-                                        results = [null, null]
-
-                                        parallel (
-                                                gcc_6_x64: { trigger_build( 'gcc-6',   'x64' ) },
-                                                gcc_6_x86: { trigger_build( 'gcc-6',   'x86' ) },
-                                                gcc_5_x64: { trigger_build( 'gcc-5',   'x64' ) },
-                                                gcc_5_x86: { trigger_build( 'gcc-5',   'x86' ) },
-                                                gcc_4_x64: { trigger_build( 'gcc-4.9', 'x64' ) },
-                                                gcc_4_x86: { trigger_build( 'gcc-4.9', 'x86' ) },
-                                                clang_x64: { trigger_build( 'clang',   'x64' ) },
-                                                clang_x86: { trigger_build( 'clang',   'x86' ) },
-                                        )
-
-                                //Push latest changes to do-lang repo
-                                push_build()
-                        }
-                }
-        }
-
-        //If an exception is caught we need to change the status and remember to
-        //attach the build log to the email
-        catch (Exception caughtError) {
-                echo('error caught')
-
-                //rethrow error later
-                err = caughtError
-
-                //Store the result of the build log
-                currentBuild.result = 'FAILURE'
-
-                //Send email to notify the failure
-                promote_failure_email()
-        }
-
-        finally {
-                //Must re-throw exception to propagate error
-                if (err) {
-                        throw err
-                }
-        }
-}
 //===========================================================================================================
 // Main compilation routines
 //===========================================================================================================
 
-def trigger_build(String cc, String arch) {
+def trigger_build(String arch) {
         def result = build job: 'Cforall/master',               \
                 parameters: [                                           \
+                        [$class: 'BooleanParameterValue',               \
+                          name: 'isFullBuild',                          \
+                          value: true],                                         \
                         [$class: 'StringParameterValue',                \
-                          name: 'pCompiler',                            \
-                          value: cc],                                   \
-                        [$class: 'StringParameterValue',                \
-                          name: 'pArchitecture',                        \
-                          value: arch],                                 \
-                        [$class: 'BooleanParameterValue',               \
-                          name: 'pRunAllTests',                         \
-                          value: true],                                         \
-                        [$class: 'BooleanParameterValue',               \
-                          name: 'pRunBenchmark',                        \
-                          value: true],                                         \
-                        [$class: 'BooleanParameterValue',               \
-                          name: 'pBuildDocumentation',          \
-                          value: true],                                         \
-                        [$class: 'BooleanParameterValue',               \
-                          name: 'pPublish',                             \
-                          value: true],                                         \
-                        [$class: 'BooleanParameterValue',               \
-                          name: 'pSilent',                              \
-                          value: true],                                         \
+                          name: 'buildArchitecture',                    \
+                          value: arch]                                  \
                 ],                                                              \
                 propagate: false
@@ -141 +69 @@
 
 //===========================================================================================================
+// Main loop of the compilation
+//===========================================================================================================
+
+node ('master') {
+        def err = null
+
+        try {
+                //Prevent the build from exceeding 30 minutes
+                timeout(60) {
+
+                        //Wrap build to add timestamp to command line
+                        wrap([$class: 'TimestamperBuildWrapper']) {
+
+                                stage 'Build'
+
+                                        results = [null, null]
+
+                                        parallel (
+                                                x64: {
+                                                        trigger_build('64-bit')
+                                                },
+                                                x32: {
+                                                        trigger_build('32-bit')
+                                                }
+                                        )
+
+                                //Push latest changes to do-lang repo
+                                push_build()
+                        }
+                }
+        }
+
+        //If an exception is caught we need to change the status and remember to
+        //attach the build log to the email
+        catch (Exception caughtError) {
+                echo('error caught')
+
+                //rethrow error later
+                err = caughtError
+
+                //Store the result of the build log
+                currentBuild.result = 'FAILURE'
+
+                //Send email to notify the failure
+                promote_failure_email()
+        }
+
+        finally {
+                //Must re-throw exception to propagate error
+                if (err) {
+                        throw err
+                }
+        }
+}
+//===========================================================================================================
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================

Jenkinsfile

@@ -2 +2 @@
 
 //===========================================================================================================
+// Main compilation routines
+//===========================================================================================================
+//Compilation script is done here but environnement set-up and error handling is done in main loop
+def cfa_build(boolean full_build, String flags) {
+        build_stage 'Checkout'
+                def install_dir = pwd tmp: true
+                //checkout the source code and clean the repo
+                checkout scm
+
+                //Clean all temporary files to make sure no artifacts of the previous build remain
+                sh 'git clean -fdqx'
+
+                //Reset the git repo so no local changes persist
+                sh 'git reset --hard'
+
+        build_stage 'Build'
+
+                //Configure the conpilation (Output is not relevant)
+                //Use the current directory as the installation target so nothing
+                //escapes the sandbox
+                //Also specify the compiler by hand
+                sh "./configure CXX=${currentCC.cpp_cc} ${flags} --with-backend-compiler=${currentCC.cfa_backend_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
+
+                //Compile the project
+                sh 'make -j 8 --no-print-directory V=0 install'
+
+        build_stage 'Test'
+
+                //Run the tests from the tests directory
+                if (full_build) {
+                        sh 'make -C src/tests all-tests debug=yes'
+                        sh 'make -C src/tests all-tests debug=no'
+                }
+                else {
+                        sh 'make -C src/tests'
+                }
+
+        build_stage 'Cleanup'
+
+                //do a maintainer-clean to make sure we need to remake from scratch
+                sh 'make maintainer-clean > /dev/null'
+}
+
+def make_doc() {
+        def err = null
+
+        try {
+                sh 'make clean > /dev/null'
+                sh 'make > /dev/null 2>&1'
+        }
+
+        catch (Exception caughtError) {
+                //rethrow error later
+                err = caughtError
+
+                sh 'cat *.log'
+        }
+
+        finally {
+                /* Must re-throw exception to propagate error */
+                if (err) {
+                        throw err
+                }
+        }
+}
+
+def doc_build() {
+        stage 'Documentation'
+
+                status_prefix = 'Documentation'
+
+                dir ('doc/user') {
+                        make_doc()
+                }
+
+                dir ('doc/refrat') {
+                        make_doc()
+                }
+}
+
+def benchmark() {
+        stage 'Benchmark'
+
+                status_prefix = 'Documentation'
+
+                // //We can't just write to a file outside our repo
+                // //Copy the file locally using ssh
+                // sh 'scp plg2.cs.uwaterloo.ca:/u/cforall/public_html/perf-history/concurrency.csv bench.csv'
+
+                // //Then append to the local file
+                // sh 'make -C src/benchmark csv-data >> bench.csv'
+
+                // //Then publish the file again
+                // sh 'scp bench.csv plg2.cs.uwaterloo.ca:/u/cforall/public_html/perf-history/concurrency.csv'          
+}
+
+//===========================================================================================================
+// Helper classes/variables/routines to make the status and stage name easier to use
+//===========================================================================================================
+//Description of a compiler (Must be serializable since pipelines are persistent)
+class CC_Desc implements Serializable {
+        public String cc_name
+        public String cpp_cc
+        public String cfa_backend_cc
+
+        CC_Desc(String cc_name, String cpp_cc, String cfa_backend_cc) {
+                this.cc_name = cc_name
+                this.cpp_cc = cpp_cc
+                this.cfa_backend_cc = cfa_backend_cc
+        }
+}
+
+//Global Variables defining the compiler and at which point in the build we are
+// These variables are used but can't be declared before hand because of wierd scripting rules
+// @Field String currentCC
+// @Field String status_prefix
+
+//Wrapper to sync stage name and status name
+def build_stage(String name) {
+        def stage_name = "${currentCC.cc_name} ${name}".trim()
+        stage stage_name
+
+                status_prefix = stage_name
+}
+
+//Helper routine to collect information about the git history
+def collect_git_info() {
+
+        //create the temporary output directory in case it doesn't already exist
+        def out_dir = pwd tmp: true
+        sh "mkdir -p ${out_dir}"
+
+        //parse git logs to find what changed
+        gitRefName = env.BRANCH_NAME
+        dir("../${gitRefName}@script") {
+                sh "git reflog > ${out_dir}/GIT_COMMIT"
+        }
+        git_reflog = readFile("${out_dir}/GIT_COMMIT")
+        gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
+        gitRefNewValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][2]
+}
+
+//===========================================================================================================
 // Main loop of the compilation
 //===========================================================================================================
 node ('master'){
 
-        boolean bIsSandbox = env.BRANCH_NAME == "jenkins-sandbox"
+        boolean bIsFullBuild
         def err = null
         def log_needed = false
-
-        stage_name              = ''
-
-        compiler                = null
-        architecture    = ''
-        
-        do_alltests             = false
-        do_benchmark    = false
-        do_doc          = false
-        do_publish              = false
-        do_sendemail    = true
-
         currentBuild.result = "SUCCESS"
+        status_prefix = ''
 
         try {
-                //Wrap build to add timestamp to command line
-                wrap([$class: 'TimestamperBuildWrapper']) {
-
-                        //Prevent the build from exceeding 60 minutes
-                        timeout(60) {
-
-                                notify_server()
-
-                                prepare_build()
-
-                                checkout()
-
-                                build()
-
-                                test()
-
+                //Prevent the build from exceeding 30 minutes
+                timeout(60) {
+
+                        //Wrap build to add timestamp to command line
+                        wrap([$class: 'TimestamperBuildWrapper']) {
+
+                                collect_git_info()
+
+                                properties ([                                                                   \
+                                        [$class: 'ParametersDefinitionProperty',                                \
+                                                parameterDefinitions: [                                         \
+                                                [$class: 'BooleanParameterDefinition',                          \
+                                                  defaultValue: false,                                          \
+                                                  description: 'If true, the build will be promoted to the do-lang git repository (on successful builds only)', \
+                                                  name: 'isFullBuild'                                   \
+                                                ],                                                              \
+                                                [$class: 'ChoiceParameterDefinition',                           \
+                                                  choices: '64-bit\n32-bit',                                    \
+                                                  defaultValue: '64-bit',                                       \
+                                                  description: 'The architecture to use for compilation',       \
+                                                  name: 'buildArchitecture'                                     \
+                                                ]]                                                              \
+                                        ]])
+
+                                bIsSandbox = env.BRANCH_NAME == "jenkins-sandbox"
+                                bIsFullBuild = isFullBuild == 'true'
+                                architectureFlag = ''
+                                if (buildArchitecture == '64-bit') {
+                                        architectureFlag = '--host=x86_64 CXXFLAGS="-m64" CFAFLAGS="-m64"'
+                                } else if (buildArchitecture == '32-bit'){
+                                        architectureFlag = '--host=i386 CXXFLAGS="-m32" CFAFLAGS="-m32"'
+                                } else {
+                                        architectureFlag = 'ERROR'
+                                }
+
+                                echo "FULL BUILD = ${isFullBuild}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"
+
+                                //Compile using gcc-4.9
+                                currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
+                                cfa_build(bIsFullBuild, architectureFlag)
+
+                                //Compile latex documentation
+                                doc_build()
+
+                                //Run benchmark and save result
                                 benchmark()
 
-                                clean()
-
-                                build_doc()
-
-                                publish()
-
-                                notify_server()
+                                if( bIsFullBuild ) {
+                                        //Compile using gcc-5
+                                        currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+                                        cfa_build(true, architectureFlag)
+
+                                        //Compile using gcc-4.9
+                                        currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+                                        cfa_build(true, architectureFlag)
+                                }
                         }
                 }
@@ -63 +226 @@
 
                 //Store the result of the build log
-                currentBuild.result = "${stage_name} FAILURE".trim()
+                currentBuild.result = "${status_prefix} FAILURE".trim()
         }
 
         finally {
+                echo 'Build Completed'
+
                 //Send email with final results if this is not a full build
-                if( do_sendemail && !bIsSandbox ) {
+                if( !bIsFullBuild && !bIsSandbox ) {
                         echo 'Notifying users of result'
                         email(currentBuild.result, log_needed)
                 }
-
-                echo 'Build Completed'
 
                 /* Must re-throw exception to propagate error */
@@ -80 +243 @@
                 }
         }
-}
-
-//===========================================================================================================
-// Helper classes/variables/routines
-//===========================================================================================================
-//Helper routine to collect information about the git history
-def collect_git_info() {
-
-        //create the temporary output directory in case it doesn't already exist
-        def out_dir = pwd tmp: true
-        sh "mkdir -p ${out_dir}"
-
-        //parse git logs to find what changed
-        gitRefName = env.BRANCH_NAME
-        dir("../${gitRefName}@script") {
-                sh "git reflog > ${out_dir}/GIT_COMMIT"
-        }
-        git_reflog = readFile("${out_dir}/GIT_COMMIT")
-        gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
-        gitRefNewValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][2]
-}
-
-def prepare_build() {
-        properties ([                                                                                                   \
-                [$class: 'ParametersDefinitionProperty',                                                                \
-                        parameterDefinitions: [                                                                         \
-                                [$class: 'ChoiceParameterDefinition',                                           \
-                                        description: 'Which compiler to use',                                   \
-                                        name: 'pCompiler',                                                              \
-                                        choices: 'gcc-6\ngcc-5\ngcc-4.9\nclang',                                        \
-                                        defaultValue: 'gcc-6',                                                          \
-                                ],                                                                                              \
-                                [$class: 'ChoiceParameterDefinition',                                           \
-                                        description: 'The target architecture',                                 \
-                                        name: 'pArchitecture',                                                          \
-                                        choices: 'x64\nx86',                                                            \
-                                        defaultValue: 'x64',                                                            \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If false, only the quick test suite is ran',              \
-                                        name: 'pRunAllTests',                                                           \
-                                        defaultValue: false,                                                            \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, jenkins also runs benchmarks',           \
-                                        name: 'pRunBenchmark',                                                          \
-                                        defaultValue: true,                                                             \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, jenkins also builds documentation',              \
-                                        name: 'pBuildDocumentation',                                                            \
-                                        defaultValue: true,                                                             \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, jenkins also publishes results',                 \
-                                        name: 'pPublish',                                                               \
-                                        defaultValue: true,                                                             \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, jenkins will not send emails',           \
-                                        name: 'pSilent',                                                \
-                                        defaultValue: false,                                                            \
-                                ],                                                                                              \
-                        ],
-                ]])
-
-        compiler                = compiler_from_params( pCompiler )
-        architecture    = architecture_from_params( pArchitecture )
-
-        do_alltests             = (pRunAllTests == 'true')
-        do_benchmark    = (pRunBenchmark == 'true')
-        do_doc          = (pBuildDocumentation == 'true')
-        do_publish              = (pPublish == 'true')
-        do_sendemail    = ! (pSilent == 'true')
-
-        echo """Compiler                : ${compiler.cc_name} (${compiler.cpp_cc}/${compiler.cfa_cc})
-Architecture            : ${architecture}
-Run All Tests           : ${ pRunAllTests.toString() }
-Run Benchmark           : ${ pRunBenchmark.toString() }
-Build Documentation     : ${ pBuildDocumentation.toString() }
-Publish         : ${ pPublish.toString() }
-Silent                  : ${ pSilent.toString() }
-"""
-
-        collect_git_info()
-}
-
-def build_stage(String name) {
-        stage_name = name
-        stage name
-}
-
-def notify_server() {
-        sh 'curl --silent -X POST http://plg2:8082/jenkins/notify > /dev/null'
-        return
-}
-
-def make_doc() {
-        def err = null
-        try {
-                sh 'make clean > /dev/null'
-                sh 'make > /dev/null 2>&1'
-        } 
-        catch (Exception caughtError) {
-                err = caughtError //rethrow error later
-                sh 'cat *.log'
-        }
-        finally {
-                if (err) throw err // Must re-throw exception to propagate error
-        }
-}
-
-//Description of a compiler (Must be serializable since pipelines are persistent)
-class CC_Desc implements Serializable {
-        public String cc_name
-        public String cpp_cc
-        public String cfa_cc
-
-        CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
-                this.cc_name = cc_name
-                this.cpp_cc = cpp_cc
-                this.cfa_cc = cfa_cc
-        }
-}
-
-def compiler_from_params(cc) {
-        switch( cc ) {
-                case 'gcc-6':
-                        return new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-                break
-                case 'gcc-5':
-                        return new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-                break
-                case 'gcc-4.9':
-                        return new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
-                break
-                case 'clang':
-                        return new CC_Desc('clang', 'clang++', 'gcc-6')
-                break
-                default :
-                        error "Unhandled compiler : ${cc}"
-        }
-}
-
-def architecture_from_params( arch ) {
-        switch( arch ) {
-                case 'x64':
-                        return '--host=x86_64 CXXFLAGS="-m64" CFAFLAGS="-m64"'
-                break
-                case 'x86':
-                        return '--host=i386   CXXFLAGS="-m32" CFAFLAGS="-m32"'
-                break
-                default :
-                        error "Unhandled architecture : ${arch}"
-        }
-}
-
-//===========================================================================================================
-// Main compilation routines
-//===========================================================================================================
-//Compilation script is done here but environnement set-up and error handling is done in main loop
-def checkout() {
-        build_stage'Checkout'
-                //checkout the source code and clean the repo
-                checkout scm
-
-                //Clean all temporary files to make sure no artifacts of the previous build remain
-                sh 'git clean -fdqx'
-
-                //Reset the git repo so no local changes persist
-                sh 'git reset --hard'
-}
-
-def build() {
-        build_stage'Build'
-        
-                def install_dir = pwd tmp: true
-                
-                //Configure the conpilation (Output is not relevant)
-                //Use the current directory as the installation target so nothing
-                //escapes the sandbox
-                //Also specify the compiler by hand
-                sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
-
-                //Compile the project
-                sh 'make -j 8 --no-print-directory V=0 install'
-}
-
-def test() {
-        build_stage'Test'
-
-                //Run the tests from the tests directory
-                if ( do_alltests ) {
-                        sh 'make -C src/tests all-tests debug=yes'
-                        sh 'make -C src/tests all-tests debug=no'
-                }
-                else {
-                        sh 'make -C src/tests'
-                }
-}
-
-def benchmark() {
-        build_stage'Benchmark'
-
-                if( !do_benchmark ) return
-
-                //Write the commit id to Benchmark
-                writeFile  file: 'bench.csv', text:'data=' + gitRefNewValue + ',' 
- 
-                //Append bench results
-                sh 'make -C src/benchmark --no-print-directory csv-data >> bench.csv'
-}
-
-def clean() {
-        build_stage'Cleanup'
-
-                //do a maintainer-clean to make sure we need to remake from scratch
-                sh 'make maintainer-clean > /dev/null'
-}
-
-def build_doc() {
-        build_stage'Documentation'
-
-                if( !do_doc ) return
-
-                dir ('doc/user') {
-                        make_doc()
-                }
-
-                dir ('doc/refrat') {
-                        make_doc()
-                }
-}
-
-def publish() {
-        build_stage'Publish'
-
-                if( !do_publish ) return
-
-                //Then publish the results
-                sh 'curl --silent --data @bench.csv http://plg2:8082/jenkins/publish > /dev/null'
 }
 

src/CodeTools/DeclStats.cc

@@ -62 +62 @@
                         std::map<unsigned, unsigned> p_basic;  ///< Count of decls with each percentage of basic type elements
                         std::map<unsigned, unsigned> p_poly;   ///< Count of decls with each percentage of polymorphic elements
-                        VectorMap<unsigned> n_types;           ///< Count of decls with each number of distinct types in the pack
 
                         ArgPackStats& operator+= (const ArgPackStats& o) {
@@ -70 +69 @@
                                 sum(p_basic, o.p_basic);
                                 sum(p_poly, o.p_poly);
-                                sum(n_types, o.n_types);
                                 
                                 return *this;
@@ -123 +121 @@
                 /// Update arg pack stats based on a declaration list
                 void analyze( Stats& stats, ArgPackStats& pstats, std::list<DeclarationWithType*>& decls ) {
-                        std::unordered_set<std::string> types;
                         unsigned n = 0;
                         unsigned n_basic = 0;
                         unsigned n_poly = 0;
                         for ( auto decl : decls ) {
-                                Type* dt = decl->get_type();
-
-                                n += dt->size();
-                                
-                                std::stringstream ss;
-                                dt->print( ss );
-                                types.insert( ss.str() );
-
-                                if ( dynamic_cast<BasicType*>( dt ) ) {
+                                n += decl->get_type()->size();
+                                if ( BasicType* bt = dynamic_cast<BasicType*>( decl->get_type() ) ) {
                                         ++n_basic;
+                                        std::stringstream ss;
+                                        bt->print( ss );
                                         ++stats.basic_type_names[ ss.str() ];
-                                } else if ( GenPoly::hasPolyBase( dt ) ) {
+                                } else if ( GenPoly::hasPolyBase( decl->get_type() ) ) {
                                         ++n_poly;
                                 } else {
+                                        std::stringstream ss;
+                                        decl->get_type()->print( ss );
                                         ++stats.compound_type_names[ ss.str() ];
                                 }
@@ -152 +146 @@
                                 ++pstats.p_poly[ n_poly*100/n ];
                         }
-                        ++pstats.n_types.at( types.size() );
                 }
                 
@@ -274 +267 @@
                         printAllMap("%_basic_" + name, [&extract](const Stats& stats) { return extract(stats).p_basic; });
                         printAllMap("%_poly_" + name, [&extract](const Stats& stats) { return extract(stats).p_poly; });
-                        printAllMap("n_distinct_types_" + name, [&extract](const Stats& stats) { return extract(stats).n_types; });
                 }
                 

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 15:45:02 2017
-// Update Count     : 759
+// Last Modified On : Thu Feb 16 13:06:50 2017
+// Update Count     : 753
 //
 
@@ -174 +174 @@
         } // if
 
+        if ( body ) {
+                newnode->type->function.hasBody = true;
+        } // if
+
         if ( ret ) {
                 newnode->type->base = ret->type;
@@ -255 +259 @@
 } // DeclarationNode::newAggregate
 
-DeclarationNode * DeclarationNode::newEnum( string * name, DeclarationNode * constants, bool body ) {
+DeclarationNode * DeclarationNode::newEnum( string * name, DeclarationNode * constants ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Enum );
@@ -264 +268 @@
         } // if
         newnode->type->enumeration.constants = constants;
-        newnode->type->enumeration.body = body;
         return newnode;
 } // DeclarationNode::newEnum
@@ -695 +698 @@
         assert( ! type->function.body );
         type->function.body = body;
+        type->function.hasBody = true;
         return this;
 }
@@ -1036 +1040 @@
         switch ( type->kind ) {
           case TypeData::Enum: {
-                  if ( type->enumeration.body ) {
-                          EnumDecl * typedecl = buildEnum( type, attributes );
-                          return new EnumInstType( buildQualifiers( type ), typedecl );
-                  } else {
-                          return new EnumInstType( buildQualifiers( type ), *type->enumeration.name );
-                  }
+                  EnumDecl * typedecl = buildEnum( type, attributes );
+                  return new EnumInstType( buildQualifiers( type ), typedecl );
           }
           case TypeData::Aggregate: {
+                  AggregateDecl * typedecl = buildAggregate( type, attributes );
                   ReferenceToType * ret;
-                  if ( type->aggregate.body ) {
-                          AggregateDecl * typedecl = buildAggregate( type, attributes );
-                          switch ( type->aggregate.kind ) {
-                                case DeclarationNode::Struct:
-                                  ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
-                                  break;
-                                case DeclarationNode::Union:
-                                  ret = new UnionInstType( buildQualifiers( type ), (UnionDecl *)typedecl );
-                                  break;
-                                case DeclarationNode::Trait:
-                                  assert( false );
-                                  //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
-                                  break;
-                                default:
-                                  assert( false );
-                          } // switch
-                  } else {
-                          switch ( type->aggregate.kind ) {
-                                case DeclarationNode::Struct:
-                                  ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
-                                  break;
-                                case DeclarationNode::Union:
-                                  ret = new UnionInstType( buildQualifiers( type ), *type->aggregate.name );
-                                  break;
-                                case DeclarationNode::Trait:
-                                  assert( false );
-                                  //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
-                                  break;
-                                default:
-                                  assert( false );
-                          } // switch
-                  } // if
+                  switch ( type->aggregate.kind ) {
+                        case DeclarationNode::Struct:
+                          ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
+                          break;
+                        case DeclarationNode::Union:
+                          ret = new UnionInstType( buildQualifiers( type ), (UnionDecl *)typedecl );
+                          break;
+                        case DeclarationNode::Trait:
+                          assert( false );
+                          //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
+                          break;
+                        default:
+                          assert( false );
+                  } // switch
                   buildList( type->aggregate.actuals, ret->get_parameters() );
                   return ret;

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 15:22:10 2017
-// Update Count     : 662
+// Last Modified On : Thu Feb 16 13:15:55 2017
+// Update Count     : 661
 //
 
@@ -238 +238 @@
         static DeclarationNode * newFromTypedef( std::string * );
         static DeclarationNode * newAggregate( Aggregate kind, const std::string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body );
-        static DeclarationNode * newEnum( std::string * name, DeclarationNode * constants, bool body );
+        static DeclarationNode * newEnum( std::string * name, DeclarationNode * constants );
         static DeclarationNode * newEnumConstant( std::string * name, ExpressionNode * constant );
         static DeclarationNode * newName( std::string * );

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 Feb 23 16:26:39 2017
-// Update Count     : 477
+// Last Modified On : Sun Feb 19 09:49:33 2017
+// Update Count     : 467
 //
 
@@ -48 +48 @@
                 function.oldDeclList = nullptr;
                 function.body = nullptr;
+                function.hasBody = false;
                 function.newStyle = false;
                 break;
@@ -67 +68 @@
                 enumeration.name = nullptr;
                 enumeration.constants = nullptr;
-                enumeration.body = false;
                 break;
           case Symbolic:
@@ -182 +182 @@
                 newtype->function.oldDeclList = maybeClone( function.oldDeclList );
                 newtype->function.body = maybeClone( function.body );
+                newtype->function.hasBody = function.hasBody;
                 newtype->function.newStyle = function.newStyle;
                 break;
@@ -199 +200 @@
                 newtype->enumeration.name = enumeration.name ? new string( *enumeration.name ) : nullptr;
                 newtype->enumeration.constants = maybeClone( enumeration.constants );
-                newtype->enumeration.body = enumeration.body;
                 break;
           case Symbolic:
@@ -293 +293 @@
                 } // if
                 os << endl;
+                if ( function.hasBody ) {
+                        os << string( indent + 2, ' ' ) << "with body " << endl;
+                } // if
                 if ( function.body ) {
-                        os << string( indent + 2, ' ' ) << "with body " << endl;
                         function.body->printList( os, indent + 2 );
                 } // if
@@ -333 +335 @@
                         os << "with constants" << endl;
                         enumeration.constants->printList( os, indent + 2 );
-                } // if
-                if ( enumeration.body ) {
-                        os << string( indent + 2, ' ' ) << " with body " << endl;
                 } // if
                 break;
@@ -697 +696 @@
                 } // if
         } // for
-        ret->set_body( td->enumeration.body );
         return ret;
 } // buildEnum
@@ -726 +724 @@
 Declaration * buildDecl( const TypeData * td, const string &name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, ConstantExpr *asmName, Initializer * init, std::list< Attribute * > attributes ) {
         if ( td->kind == TypeData::Function ) {
-                if ( td->function.idList ) {                                    // KR function ?
-                        buildKRFunction( td->function );                        // transform into C11 function
+                if ( td->function.idList ) {
+                        buildKRFunction( td->function );
                 } // if
 
                 FunctionDecl * decl;
-                Statement * stmt = maybeBuild<Statement>( td->function.body );
-                CompoundStmt * body = dynamic_cast< CompoundStmt* >( stmt );
-                decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), body, isInline, isNoreturn, attributes );
+                if ( td->function.hasBody ) {
+                        if ( td->function.body ) {
+                                Statement * stmt = td->function.body->build();
+                                CompoundStmt * body = dynamic_cast< CompoundStmt* >( stmt );
+                                assert( body );
+                                decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), body, isInline, isNoreturn, attributes );
+                        } else {
+                                // list< Label > ls;
+                                decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), new CompoundStmt( list< Label >() ), isInline, isNoreturn, attributes );
+                        } // if
+                } else {
+                        decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), nullptr, isInline, isNoreturn, attributes );
+                } // if
                 return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {
@@ -808 +816 @@
 
         for ( DeclarationNode * param = function.idList; param != nullptr; param = dynamic_cast< DeclarationNode* >( param->get_next() ) ) {
-                if ( ! param->type ) {                                                  // generate type int for empty parameter type
+                if ( ! param->type ) {                                                  // generate type int for empty parameters
                         param->type = new TypeData( TypeData::Basic );
                         param->type->basictype = DeclarationNode::Int;

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 Feb 23 15:16:18 2017
-// Update Count     : 155
+// Last Modified On : Thu Feb 16 14:30:05 2017
+// Update Count     : 153
 //
 
@@ -49 +49 @@
                 const std::string * name;
                 DeclarationNode * constants;
-                bool body;
         };
 
@@ -57 +56 @@
                 mutable DeclarationNode * oldDeclList;
                 StatementNode * body;
+                bool hasBody;
                 bool newStyle;
         };

src/Parser/parser.cc

@@ -7292 +7292 @@
 /* Line 1806 of yacc.c  */
 #line 1651 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnum( nullptr, (yyvsp[(4) - (6)].decl), true )->addQualifiers( (yyvsp[(2) - (6)].decl) ); }
+    { (yyval.decl) = DeclarationNode::newEnum( nullptr, (yyvsp[(4) - (6)].decl) )->addQualifiers( (yyvsp[(2) - (6)].decl) ); }
     break;
 
@@ -7301 +7301 @@
     {
                         typedefTable.makeTypedef( *(yyvsp[(3) - (3)].tok) );
-                        (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(3) - (3)].tok), 0, false )->addQualifiers( (yyvsp[(2) - (3)].decl) );
+                        (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(3) - (3)].tok), 0 )->addQualifiers( (yyvsp[(2) - (3)].decl) );
                 }
     break;
@@ -7316 +7316 @@
 /* Line 1806 of yacc.c  */
 #line 1660 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(3) - (8)].tok), (yyvsp[(6) - (8)].decl), true )->addQualifiers( (yyvsp[(2) - (8)].decl) ); }
+    { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(3) - (8)].tok), (yyvsp[(6) - (8)].decl) )->addQualifiers( (yyvsp[(2) - (8)].decl) ); }
     break;
 

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 Feb 23 15:23:49 2017
-// Update Count     : 2187
+// Last Modified On : Thu Feb 16 15:56:33 2017
+// Update Count     : 2186
 //
 
@@ -1649 +1649 @@
 enum_type:
         ENUM attribute_list_opt '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( nullptr, $4, true )->addQualifiers( $2 ); }
+                { $$ = DeclarationNode::newEnum( nullptr, $4 )->addQualifiers( $2 ); }
         | ENUM attribute_list_opt no_attr_identifier_or_type_name
                 {
                         typedefTable.makeTypedef( *$3 );
-                        $$ = DeclarationNode::newEnum( $3, 0, false )->addQualifiers( $2 );
+                        $$ = DeclarationNode::newEnum( $3, 0 )->addQualifiers( $2 );
                 }
         | ENUM attribute_list_opt no_attr_identifier_or_type_name
                 { typedefTable.makeTypedef( *$3 ); }
           '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( $3, $6, true )->addQualifiers( $2 ); }
+                { $$ = DeclarationNode::newEnum( $3, $6 )->addQualifiers( $2 ); }
         ;
 

src/benchmark/Makefile.am

@@ -24 +24 @@
 bench :
         @for ccflags in "-debug" "-nodebug"; do \
-                echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
+                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
                 ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
                 ./a.out ; \
@@ -31 +31 @@
 
 ctxswitch-coroutine:
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
+        ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 CorCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
                 ./a.out ; \
@@ -38 +38 @@
 
 ctxswitch-thread:
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
+        ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
                 ./a.out ; \
@@ -45 +45 @@
 
 csv-data:
-        @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
+        @${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -quiet -DN=10000000 csv-data.c
         @./a.out
         @rm -f ./a.out

src/benchmark/Makefile.in

@@ -471 +471 @@
 bench :
         @for ccflags in "-debug" "-nodebug"; do \
-                echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
+                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
                 ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
                 ./a.out ; \
@@ -478 +478 @@
 
 ctxswitch-coroutine:
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
+        ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 CorCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
                 ./a.out ; \
@@ -485 +485 @@
 
 ctxswitch-thread:
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
+        ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
                 ./a.out ; \
@@ -492 +492 @@
 
 csv-data:
-        @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
+        @${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -quiet -DN=10000000 csv-data.c
         @./a.out
         @rm -f ./a.out

src/benchmark/csv-data.c

@@ -3 +3 @@
 #include <threads>
 
-extern "C" {
 #include <unistd.h>                                     // sysconf
 #include <sys/times.h>                                  // times
 #include <time.h>
-}
 
 inline unsigned long long int Time() {
@@ -86 +84 @@
 int main()
 {
-        sout | time(NULL) | ',' | measure_coroutine() | ',' | measure_thread() | endl;
+        sout | time(NULL) | "," | measure_coroutine() | "," | measure_thread() | endl;
 }

src/examples/multicore.c

@@ -19 +19 @@
                 processor p;
                 {
-                        scoped(MyThread) f[4];
+                        scoped(MyThread) f1;
+                        scoped(MyThread) f2;
+                        scoped(MyThread) f3;
+                        scoped(MyThread) f4;
                 }
         }

src/libcfa/Makefile.am

@@ -44 +44 @@
 # not all platforms support concurrency, add option do disable it
 if BUILD_CONCURRENCY
-headers += containers/vector concurrency/coroutines concurrency/threads concurrency/kernel concurrency/monitor
+headers += containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
 endif
 

src/libcfa/Makefile.in

@@ -43 +43 @@
 
 # not all platforms support concurrency, add option do disable it
-@BUILD_CONCURRENCY_TRUE@am__append_3 = containers/vector concurrency/coroutines concurrency/threads concurrency/kernel concurrency/monitor
+@BUILD_CONCURRENCY_TRUE@am__append_3 = containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
 
 # not all platforms support concurrency, add option do disable it
@@ -101 +101 @@
         containers/vector.c concurrency/coroutines.c \
         concurrency/threads.c concurrency/kernel.c \
-        concurrency/monitor.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \
-        concurrency/invoke.c
+        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
 am__dirstamp = $(am__leading_dot)dirstamp
 @BUILD_CONCURRENCY_TRUE@am__objects_1 = containers/libcfa_d_a-vector.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-coroutines.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-threads.$(OBJEXT) \
-@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-kernel.$(OBJEXT) \
-@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-monitor.$(OBJEXT)
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-kernel.$(OBJEXT)
 am__objects_2 = libcfa_d_a-limits.$(OBJEXT) \
         libcfa_d_a-stdlib.$(OBJEXT) libcfa_d_a-math.$(OBJEXT) \
@@ -126 +124 @@
         containers/vector.c concurrency/coroutines.c \
         concurrency/threads.c concurrency/kernel.c \
-        concurrency/monitor.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \
-        concurrency/invoke.c
+        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
 @BUILD_CONCURRENCY_TRUE@am__objects_5 =  \
 @BUILD_CONCURRENCY_TRUE@        containers/libcfa_a-vector.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-coroutines.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-threads.$(OBJEXT) \
-@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-kernel.$(OBJEXT) \
-@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-monitor.$(OBJEXT)
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-kernel.$(OBJEXT)
 am__objects_6 = libcfa_a-limits.$(OBJEXT) libcfa_a-stdlib.$(OBJEXT) \
         libcfa_a-math.$(OBJEXT) libcfa_a-iostream.$(OBJEXT) \
@@ -176 +172 @@
         fstream iterator rational assert containers/vector \
         concurrency/coroutines concurrency/threads concurrency/kernel \
-        concurrency/monitor ${shell echo stdhdr/*} \
-        concurrency/invoke.h
+        ${shell echo stdhdr/*} concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 ETAGS = etags
@@ -403 +398 @@
 concurrency/libcfa_d_a-kernel.$(OBJEXT): concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/libcfa_d_a-monitor.$(OBJEXT): concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
 concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT):  \
         concurrency/$(am__dirstamp) \
@@ -423 +416 @@
 concurrency/libcfa_a-kernel.$(OBJEXT): concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/libcfa_a-monitor.$(OBJEXT): concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
 concurrency/libcfa_a-invoke.$(OBJEXT): concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
@@ -438 +429 @@
         -rm -f concurrency/libcfa_a-invoke.$(OBJEXT)
         -rm -f concurrency/libcfa_a-kernel.$(OBJEXT)
-        -rm -f concurrency/libcfa_a-monitor.$(OBJEXT)
         -rm -f concurrency/libcfa_a-threads.$(OBJEXT)
         -rm -f concurrency/libcfa_d_a-coroutines.$(OBJEXT)
         -rm -f concurrency/libcfa_d_a-invoke.$(OBJEXT)
         -rm -f concurrency/libcfa_d_a-kernel.$(OBJEXT)
-        -rm -f concurrency/libcfa_d_a-monitor.$(OBJEXT)
         -rm -f concurrency/libcfa_d_a-threads.$(OBJEXT)
         -rm -f containers/libcfa_a-vector.$(OBJEXT)
@@ -473 +462 @@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-invoke.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-kernel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-monitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-threads.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-coroutines.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-invoke.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-kernel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-monitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-threads.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/libcfa_a-vector.Po@am__quote@
@@ -690 +677 @@
 @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-kernel.obj `if test -f 'concurrency/kernel.c'; then $(CYGPATH_W) 'concurrency/kernel.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/kernel.c'; fi`
 
-concurrency/libcfa_d_a-monitor.o: concurrency/monitor.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-monitor.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-monitor.Tpo -c -o concurrency/libcfa_d_a-monitor.o `test -f 'concurrency/monitor.c' || echo '$(srcdir)/'`concurrency/monitor.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-monitor.Tpo concurrency/$(DEPDIR)/libcfa_d_a-monitor.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/monitor.c' object='concurrency/libcfa_d_a-monitor.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 concurrency/libcfa_d_a-monitor.o `test -f 'concurrency/monitor.c' || echo '$(srcdir)/'`concurrency/monitor.c
-
-concurrency/libcfa_d_a-monitor.obj: concurrency/monitor.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-monitor.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-monitor.Tpo -c -o concurrency/libcfa_d_a-monitor.obj `if test -f 'concurrency/monitor.c'; then $(CYGPATH_W) 'concurrency/monitor.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/monitor.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-monitor.Tpo concurrency/$(DEPDIR)/libcfa_d_a-monitor.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/monitor.c' object='concurrency/libcfa_d_a-monitor.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 concurrency/libcfa_d_a-monitor.obj `if test -f 'concurrency/monitor.c'; then $(CYGPATH_W) 'concurrency/monitor.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/monitor.c'; fi`
-
 concurrency/libcfa_d_a-invoke.obj: concurrency/invoke.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-invoke.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-invoke.Tpo -c -o concurrency/libcfa_d_a-invoke.obj `if test -f 'concurrency/invoke.c'; then $(CYGPATH_W) 'concurrency/invoke.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/invoke.c'; fi`
@@ -885 +858 @@
 @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-kernel.obj `if test -f 'concurrency/kernel.c'; then $(CYGPATH_W) 'concurrency/kernel.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/kernel.c'; fi`
-
-concurrency/libcfa_a-monitor.o: concurrency/monitor.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-monitor.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-monitor.Tpo -c -o concurrency/libcfa_a-monitor.o `test -f 'concurrency/monitor.c' || echo '$(srcdir)/'`concurrency/monitor.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-monitor.Tpo concurrency/$(DEPDIR)/libcfa_a-monitor.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/monitor.c' object='concurrency/libcfa_a-monitor.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 concurrency/libcfa_a-monitor.o `test -f 'concurrency/monitor.c' || echo '$(srcdir)/'`concurrency/monitor.c
-
-concurrency/libcfa_a-monitor.obj: concurrency/monitor.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-monitor.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-monitor.Tpo -c -o concurrency/libcfa_a-monitor.obj `if test -f 'concurrency/monitor.c'; then $(CYGPATH_W) 'concurrency/monitor.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/monitor.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-monitor.Tpo concurrency/$(DEPDIR)/libcfa_a-monitor.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/monitor.c' object='concurrency/libcfa_a-monitor.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 concurrency/libcfa_a-monitor.obj `if test -f 'concurrency/monitor.c'; then $(CYGPATH_W) 'concurrency/monitor.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/monitor.c'; fi`
 
 concurrency/libcfa_a-invoke.obj: concurrency/invoke.c

src/libcfa/concurrency/kernel.c

@@ -456 +456 @@
 
 void append( simple_thread_list * this, thread * t ) {
-        assert(this->tail != NULL);
+        assert( t->next == NULL );
         *this->tail = t;
         this->tail = &t->next;
@@ -470 +470 @@
                 head->next = NULL;
         }       
+        
         return head;
 }

src/libcfa/concurrency/threads

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2017
+// Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Thierry Delisle
 // Last Modified On : --

src/libcfa/concurrency/threads.c

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2017
+// Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Thierry Delisle
 // Last Modified On : --

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 14:11:47 2017
-// Update Count     : 100
+// Last Modified On : Wed Jul  6 14:28:55 2016
+// Update Count     : 99
 //
 
@@ -50 +50 @@
 forall( dtype T, ttype Params | sized(T) | { void ?{}(T *, Params); } ) T * new( Params p );
 forall( dtype T | { void ^?{}(T *); } ) void delete( T * ptr );
-forall( dtype T, ttype Params | { void ^?{}(T *); void delete(Params); } ) void delete( T * ptr, Params rest );
+
 
 //---------------------------------------

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 14:11:29 2017
-// Update Count     : 170
+// Last Modified On : Wed Jul  6 14:28:57 2016
+// Update Count     : 169
 //
 
@@ -91 +91 @@
 }
 
-forall( dtype T, ttype Params | { void ^?{}(T *); void delete(Params); } )
-void delete( T * ptr, Params rest ) {
-        if ( ptr ) {
-                ^ptr{};
-                free( ptr );
-        }
-        delete( rest );
-}
-
 //---------------------------------------
 

src/prelude/prelude.cf

@@ -58 +58 @@
 long double _Complex    ?--( long double _Complex * ),          ?--( volatile long double _Complex * );
 
-forall( dtype T | sized(T) ) T *                         ?++(                T ** );
-forall( dtype T | sized(T) ) const T *           ?++( const          T ** );
-forall( dtype T | sized(T) ) volatile T *                ?++(       volatile T ** );
-forall( dtype T | sized(T) ) const volatile T *  ?++( const volatile T ** );
-forall( dtype T | sized(T) ) T *                         ?--(                T ** );
-forall( dtype T | sized(T) ) const T *           ?--( const          T ** );
-forall( dtype T | sized(T) ) volatile T *                ?--(       volatile T ** );
-forall( dtype T | sized(T) ) const volatile T *  ?--( const volatile T ** );
-
-forall( dtype T | sized(T) ) lvalue T            ?[?](                T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) const lvalue T      ?[?]( const          T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) volatile lvalue T   ?[?](       volatile T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) const volatile lvalue T ?[?]( const volatile T *,      ptrdiff_t );
-forall( dtype T | sized(T) ) lvalue T            ?[?](          ptrdiff_t,                T * );
-forall( dtype T | sized(T) ) const lvalue T      ?[?](          ptrdiff_t, const          T * );
-forall( dtype T | sized(T) ) volatile lvalue T   ?[?](          ptrdiff_t,       volatile T * );
-forall( dtype T | sized(T) ) const volatile lvalue T ?[?](              ptrdiff_t, const volatile T * );
+forall( otype T ) T *                    ?++(                T ** );
+forall( otype T ) const T *              ?++( const          T ** );
+forall( otype T ) volatile T *           ?++(       volatile T ** );
+forall( otype T ) const volatile T *     ?++( const volatile T ** );
+forall( otype T ) T *                    ?--(                T ** );
+forall( otype T ) const T *              ?--( const          T ** );
+forall( otype T ) volatile T *           ?--(       volatile T ** );
+forall( otype T ) const volatile T *     ?--( const volatile T ** );
+
+forall( otype T ) lvalue T               ?[?](                T *,          ptrdiff_t );
+forall( otype T ) const lvalue T         ?[?]( const          T *,          ptrdiff_t );
+forall( otype T ) volatile lvalue T      ?[?](       volatile T *,          ptrdiff_t );
+forall( otype T ) const volatile lvalue T ?[?]( const volatile T *,         ptrdiff_t );
+forall( otype T ) lvalue T               ?[?](          ptrdiff_t,                T * );
+forall( otype T ) const lvalue T         ?[?](          ptrdiff_t, const          T * );
+forall( otype T ) volatile lvalue T      ?[?](          ptrdiff_t,       volatile T * );
+forall( otype T ) const volatile lvalue T ?[?](         ptrdiff_t, const volatile T * );
 
 // ------------------------------------------------------------
@@ -96 +96 @@
 long double _Complex    ++?( long double _Complex * ),          --?( long double _Complex * );
 
-forall( dtype T | sized(T) ) T *                         ++?(                T ** );
-forall( dtype T | sized(T) ) const T *           ++?( const          T ** );
-forall( dtype T | sized(T) ) volatile T *                ++?(       volatile T ** );
-forall( dtype T | sized(T) ) const volatile T *  ++?( const volatile T ** );
-forall( dtype T | sized(T) ) T *                         --?(                T ** );
-forall( dtype T | sized(T) ) const T *           --?( const          T ** );
-forall( dtype T | sized(T) ) volatile T *                --?(       volatile T ** );
-forall( dtype T | sized(T) ) const volatile T *  --?( const volatile T ** );
+forall( otype T ) T *                    ++?(                T ** );
+forall( otype T ) const T *              ++?( const          T ** );
+forall( otype T ) volatile T *           ++?(       volatile T ** );
+forall( otype T ) const volatile T *     ++?( const volatile T ** );
+forall( otype T ) T *                    --?(                T ** );
+forall( otype T ) const T *              --?( const          T ** );
+forall( otype T ) volatile T *           --?(       volatile T ** );
+forall( otype T ) const volatile T *     --?( const volatile T ** );
 
 forall( dtype T | sized(T) ) lvalue T            *?(                 T * );
@@ -178 +178 @@
 long double _Complex    ?+?( long double _Complex, long double _Complex ),      ?-?( long double _Complex, long double _Complex );
 
-forall( dtype T | sized(T) ) T *                        ?+?(                T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) T *                        ?+?(          ptrdiff_t,                T * );
-forall( dtype T | sized(T) ) const T *          ?+?( const          T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) const T *          ?+?(          ptrdiff_t, const          T * );
-forall( dtype T | sized(T) ) volatile T *               ?+?(       volatile T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) volatile T *               ?+?(          ptrdiff_t,       volatile T * );
-forall( dtype T | sized(T) ) const volatile T * ?+?( const volatile T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) const volatile T * ?+?(          ptrdiff_t, const volatile T * );
-forall( dtype T | sized(T) ) T *                        ?-?(                T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) const T *          ?-?( const          T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) volatile T *               ?-?(       volatile T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) const volatile T * ?-?( const volatile T *,          ptrdiff_t );
-forall( dtype T | sized(T) ) ptrdiff_t          ?-?( const volatile T *, const volatile T * );
+forall( otype T ) T *                   ?+?(                T *,          ptrdiff_t );
+forall( otype T ) T *                   ?+?(          ptrdiff_t,                T * );
+forall( otype T ) const T *             ?+?( const          T *,          ptrdiff_t );
+forall( otype T ) const T *             ?+?(          ptrdiff_t, const          T * );
+forall( otype T ) volatile T *          ?+?(       volatile T *,          ptrdiff_t );
+forall( otype T ) volatile T *          ?+?(          ptrdiff_t,       volatile T * );
+forall( otype T ) const volatile T *    ?+?( const volatile T *,          ptrdiff_t );
+forall( otype T ) const volatile T *    ?+?(          ptrdiff_t, const volatile T * );
+forall( otype T ) T *                   ?-?(                T *,          ptrdiff_t );
+forall( otype T ) const T *             ?-?( const          T *,          ptrdiff_t );
+forall( otype T ) volatile T *          ?-?(       volatile T *,          ptrdiff_t );
+forall( otype T ) const volatile T *    ?-?( const volatile T *,          ptrdiff_t );
+forall( otype T ) ptrdiff_t             ?-?( const volatile T *, const volatile T * );
 
 // ------------------------------------------------------------
@@ -428 +428 @@
 forall( ftype FT ) FT *                 ?=?( FT * volatile *, forall( ftype FT2 ) FT2 * );
 
-forall( dtype T | sized(T) ) T *                        ?+=?(                T *          *, ptrdiff_t );
-forall( dtype T | sized(T) ) T *                        ?+=?(                T * volatile *, ptrdiff_t );
-forall( dtype T | sized(T) ) const T *          ?+=?( const          T *          *, ptrdiff_t );
-forall( dtype T | sized(T) ) const T *          ?+=?( const          T * volatile *, ptrdiff_t );
-forall( dtype T | sized(T) ) volatile T *               ?+=?(       volatile T *          *, ptrdiff_t );
-forall( dtype T | sized(T) ) volatile T *               ?+=?(       volatile T * volatile *, ptrdiff_t );
-forall( dtype T | sized(T) ) const volatile T * ?+=?( const volatile T *          *, ptrdiff_t );
-forall( dtype T | sized(T) ) const volatile T * ?+=?( const volatile T * volatile *, ptrdiff_t );
-forall( dtype T | sized(T) ) T *                        ?-=?(                T *          *, ptrdiff_t );
-forall( dtype T | sized(T) ) T *                        ?-=?(                T * volatile *, ptrdiff_t );
-forall( dtype T | sized(T) ) const T *          ?-=?( const          T *          *, ptrdiff_t );
-forall( dtype T | sized(T) ) const T *          ?-=?( const          T * volatile *, ptrdiff_t );
-forall( dtype T | sized(T) ) volatile T *               ?-=?(       volatile T *          *, ptrdiff_t );
-forall( dtype T | sized(T) ) volatile T *               ?-=?(       volatile T * volatile *, ptrdiff_t );
-forall( dtype T | sized(T) ) const volatile T * ?-=?( const volatile T *          *, ptrdiff_t );
-forall( dtype T | sized(T) ) const volatile T * ?-=?( const volatile T * volatile *, ptrdiff_t );
+forall( otype T ) T *                   ?+=?(                T *          *, ptrdiff_t );
+forall( otype T ) T *                   ?+=?(                T * volatile *, ptrdiff_t );
+forall( otype T ) const T *             ?+=?( const          T *          *, ptrdiff_t );
+forall( otype T ) const T *             ?+=?( const          T * volatile *, ptrdiff_t );
+forall( otype T ) volatile T *          ?+=?(       volatile T *          *, ptrdiff_t );
+forall( otype T ) volatile T *          ?+=?(       volatile T * volatile *, ptrdiff_t );
+forall( otype T ) const volatile T *    ?+=?( const volatile T *          *, ptrdiff_t );
+forall( otype T ) const volatile T *    ?+=?( const volatile T * volatile *, ptrdiff_t );
+forall( otype T ) T *                   ?-=?(                T *          *, ptrdiff_t );
+forall( otype T ) T *                   ?-=?(                T * volatile *, ptrdiff_t );
+forall( otype T ) const T *             ?-=?( const          T *          *, ptrdiff_t );
+forall( otype T ) const T *             ?-=?( const          T * volatile *, ptrdiff_t );
+forall( otype T ) volatile T *          ?-=?(       volatile T *          *, ptrdiff_t );
+forall( otype T ) volatile T *          ?-=?(       volatile T * volatile *, ptrdiff_t );
+forall( otype T ) const volatile T *    ?-=?( const volatile T *          *, ptrdiff_t );
+forall( otype T ) const volatile T *    ?-=?( const volatile T * volatile *, ptrdiff_t );
 
 _Bool                   ?=?( _Bool *, _Bool ),                                  ?=?( volatile _Bool *, _Bool );

src/tests/.expect/abs.txt

@@ -1 @@
-char                    -65     abs 65
+char                    ¿       abs A
 signed int              -65     abs 65
 signed long int         -65     abs 65

src/tests/abs.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 18:26:16 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 22 22:31:03 2017
-// Update Count     : 52
+// Last Modified On : Wed Mar  2 15:07:26 2016
+// Update Count     : 51
 //
 
@@ -18 +18 @@
 
 int main( void ) {
-        signed char ch = -65;
+        char ch = -65;
         sout | "char\t\t\t"                                     | ch     | "\tabs " | abs( ch ) | endl;
         sout | "signed int\t\t"                         | -65    | "\tabs" | abs( -65 ) | endl;