Diff [7951100792a07c19db9c4545944115863471bb93:b067d9b9c445bf3cee86e9d129e51949e669d4f5] for / – Cforall

.gitignore

-              r7951100
+              rb067d9b
 config.status
 config.log
+config.py
 stamp-h1
+libtool
 /Makefile
+src/**/Makefile
+tools/**/Makefile
+**/Makefile
 /version
 …
 .deps
 .dirstamp
+bin
+lib
+include
+share
+/bin
+/lib
+/include
+/share
+/build
 *.class
 # src executables, for lib and bin
+src/driver/cc1
+src/driver/cfa
+src/driver/cfa-cpp
+driver/as
+driver/cfa
+driver/cfa-cpp
+driver/cc1
+src/prelude/builtins.cf
+src/prelude/gcc-builtins.cf
+src/prelude/gcc-builtins.c
+src/prelude/extras.cf
+src/prelude/bootloader.c
+src/libcfa/libcfa-prelude.c
+libcfa/prelude/bootloader.c
+libcfa/prelude/builtins.cf
+libcfa/prelude/extras.cf
+libcfa/prelude/gcc-builtins.cf
+libcfa/prelude/gcc-builtins.c
+libcfa/prelude/prelude.cfa
+libcfa/x64-debug/
+libcfa/x64-nodebug/
+libcfa/x64-nolib/
+libcfa/x86-debug/
+libcfa/x86-nodebug/
+libcfa/x86-nolib/
+libcfa/arm-debug/
+libcfa/arm-nodebug/
+libcfa/arm-nolib/
 # generated by bison and lex from parser.yy and lex.ll
 …
 src/Parser/parser.h
 src/Parser/parser.hh
+src/demangler
 tools/prettyprinter/parser.output

INSTALL

-              r7951100
+              rb067d9b
   it is important not to put quotes around the directory path; Cforall may
   appear to build, but the installed version may not work properly.
---with-backend-compiler=PROGRAM specifies the installed path of gcc.  It
-  defaults to the first command named 'gcc' in the current PATH.
-cfa-cc itself is built with the version of g++ specified by the environment
-variable CXX.  If CXX is unset, cfa-cc is built using the first command named
-'g++' in the current PATH.

Jenkins/FullBuild

-              r7951100
+              rb067d9b
                                 parallel (
+                                        gcc_6_x64: { trigger_build( 'gcc-6',   'x64', true  ) },
+                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86', true  ) },
+                                        gcc_5_x64: { trigger_build( 'gcc-5',   'x64', false ) },
+                                        gcc_5_x86: { trigger_build( 'gcc-5',   'x86', false ) },
+                                        gcc_4_x64: { trigger_build( 'gcc-4.9', 'x64', false ) },
+                                        gcc_4_x86: { trigger_build( 'gcc-4.9', 'x86', false ) },
+                                        clang_x64: { trigger_build( 'clang',   'x64', false ) },
+                                        clang_x86: { trigger_build( 'clang',   'x86', false ) },
+                                        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' ) },
+                                        clang_x64: { trigger_build( 'clang',   'x64' ) },
+                                        clang_x86: { trigger_build( 'clang',   'x86' ) },
+                                )
+                        }
+                }
+                        //Push latest changes to do-lang repo
+                        push_build()
+                }
+                promote_email(true)
+        }
 …
                 //Send email to notify the failure
                 promote_failure_email()
+                promote_email(false)
+        }
 …
 //===========================================================================================================
 def trigger_build(String cc, String arch, Boolean publish) {
+def trigger_build(String cc, String arch) {
         def result = build job: 'Cforall/master',               \
                 parameters: [                                           \
                         [$class: 'StringParameterValue',                \
                           name: 'pCompiler',                            \
+                          name: 'Compiler',                             \
                           value: cc],                                   \
                         [$class: 'StringParameterValue',                \
                           name: 'pArchitecture',                        \
+                          name: 'Architecture',                         \
                           value: arch],                                 \
                         [$class: 'BooleanParameterValue',               \
                           name: 'pRunAllTests',                         \
+                          name: 'RunAllTests',                          \
                           value: true],                                         \
                         [$class: 'BooleanParameterValue',               \
                           name: 'pRunBenchmark',                        \
+                          name: 'RunBenchmark',                         \
                           value: true],                                         \
                         [$class: 'BooleanParameterValue',               \
                           name: 'pBuildDocumentation',          \
+                          name: 'BuildDocumentation',           \
                           value: true],                                         \
                         [$class: 'BooleanParameterValue',               \
                           name: 'pPublish',                             \
                           value: publish],                                      \
+                          name: 'Publish',                              \
+                          value: true],                                 \
                         [$class: 'BooleanParameterValue',               \
                           name: 'pSilent',                              \
+                          name: 'Silent',                               \
                           value: true],                                         \
                 ],                                                              \
 …
         if(result.result != 'SUCCESS') {
                 sh("wget -q -O - ${result.absoluteUrl}/consoleText")
+                sh("wget -q -O - http://localhost:8084/jenkins/job/Cforall/job/master/${result.number}/consoleText")
                 error(result.result)
+        }
+}
-def push_build() {
-        //Don't use the build_stage function which outputs the compiler
-        stage('Push') {
-                status_prefix = 'Push'
-                def out_dir = pwd tmp: true
-                sh "mkdir -p ${out_dir}"
-                //checkout the code to make sure this is a valid git repo
-                checkout scm
-                collect_git_info()
-                //parse git logs to find what changed
-                sh "git remote > ${out_dir}/GIT_REMOTE"
-                git_remote = readFile("${out_dir}/GIT_REMOTE")
-                remoteDoLangExists = git_remote.contains("DoLang")
-                if( !remoteDoLangExists ) {
-                        sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
+                }
-                //sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
-                echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN')
+        }
+}
 …
 //Email notification on a full build failure
 def promote_failure_email() {
+def promote_email(boolean success) {
         echo('notifying users')
+        def result = success ? "PROMOTE - SUCCESS" : "PROMOTE - FAILURE"
         //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
         //Configurations for email format
+        def email_subject = "[cforall git][PROMOTE - FAILURE]"
+        def email_body = """This is an automated email from the Jenkins build machine. It was
+generated because of a git hooks/post-receive script following
+a ref change was pushed to the repository containing
+the project "UNNAMED PROJECT".
+        def email_subject = "[cforall git][${result}]"
+        def email_body = """<p>This is an automated email from the Jenkins build machine. It was
+generated following the result of the C\u2200 nightly build.</p>
+Check console output at ${env.BUILD_URL} to view the results.
+<p>Check console output at ${env.BUILD_URL} to view the results.</p>
+- Status --------------------------------------------------------------
+<p>- Status --------------------------------------------------------------</p>
+PROMOTE FAILURE
+<p>${result}</p>
+<p>- Performance ---------------------------------------------------------</p>
+<img src="https://cforall.uwaterloo.ca/jenkins/job/Cforall/job/master/plot/Compilation/getPlot?index=0" >
+<img src="https://cforall.uwaterloo.ca/jenkins/job/Cforall/job/master/plot/Compilation/getPlot?index=1" >
+<p>- Logs ----------------------------------------------------------------</p>
 """
 …
         //send email notification
         emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
+        emailext body: email_body, subject: email_subject, to: email_to, attachLog: !success
+}

Jenkins/TestRegen

-              r7951100
+              rb067d9b
         //escapes the sandbox
         //Also specify the compiler by hand
         sh "./configure CXX=clang++ --host=${arch} --with-backend-compiler=gcc-6 --prefix=${install_dir} --enable-silent-rules --quiet"
+        sh "./configure CXX=clang++ CC=gcc-6 --host=${arch} --enable-silent-rules --quiet"
         //Compile the project
         sh 'make -j 8 --no-print-directory install'
+        sh 'make -j 8 --no-print-directory'
         //Regenerate the desired tests

Jenkinsfile

-              r7951100
+              rb067d9b
 #!groovy
+import groovy.transform.Field
+// For skipping stages
+import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 //===========================================================================================================
 // Main loop of the compilation
 //===========================================================================================================
+node ('master'){
+        boolean bIsSandbox = env.BRANCH_NAME == "jenkins-sandbox"
+node('master') {
+        // Globals
+        BuildDir  = pwd tmp: true
+        SrcDir    = pwd tmp: false
+        Settings  = null
+        StageName = ''
+        // Local variables
         def err = null
         def log_needed = false
-        stage_name              = ''
-        compiler                = null
-        arch_name               = ''
-        architecture    = ''
-        do_alltests             = false
-        do_benchmark    = false
-        do_doc          = false
-        do_publish              = false
-        do_sendemail    = true
         currentBuild.result = "SUCCESS"
 …
                 wrap([$class: 'TimestamperBuildWrapper']) {
+                        notify_server(0)
+                        prepare_build()
+                        checkout()
+                        notify_server(0)
+                        build()
+                        test()
+                        benchmark()
+                        clean()
+                        build_doc()
+                        publish()
+                        notify_server(45)
+                        Settings = prepare_build()
+                        node(Settings.Architecture.node) {
+                                BuildDir  = pwd tmp: true
+                                SrcDir    = pwd tmp: false
+                                clean()
+                                checkout()
+                                build()
+                                test()
+                                benchmark()
+                                build_doc()
+                                publish()
+                        }
+                        // Update the build directories when exiting the node
+                        BuildDir  = pwd tmp: true
+                        SrcDir    = pwd tmp: false
+                }
+        }
 …
                 err = caughtError
+                echo err.toString()
                 //An error has occured, the build log is relevent
                 log_needed = true
                 //Store the result of the build log
                 currentBuild.result = "${stage_name} FAILURE".trim()
+                currentBuild.result = "${StageName} FAILURE".trim()
+        }
         finally {
                 //Send email with final results if this is not a full build
+                if( do_sendemail && !bIsSandbox ) {
+                        echo 'Notifying users of result'
+                        email(currentBuild.result, log_needed)
+                }
+                email(log_needed)
                 echo 'Build Completed'
 …
+        }
+}
+//===========================================================================================================
+// Main compilation routines
+//===========================================================================================================
+def clean() {
+        build_stage('Cleanup', true) {
+                // clean the build by wipping the build directory
+                dir(BuildDir) {
+                        deleteDir()
+                }
+        }
+}
+//Compilation script is done here but environnement set-up and error handling is done in main loop
+def checkout() {
+        build_stage('Checkout', true) {
+                //checkout the source code and clean the repo
+                final scmVars = checkout scm
+                Settings.GitNewRef = scmVars.GIT_COMMIT
+                Settings.GitOldRef = scmVars.GIT_PREVIOUS_COMMIT
+                echo GitLogMessage()
+        }
+}
+def build() {
+        debug = true
+        release = Settings.RunAllTests || Settings.RunBenchmark
+        build_stage('Build : configure', true) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        //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
+                        targets=""
+                        if( Settings.RunAllTests || Settings.RunBenchmark ) {
+                                targets="--with-target-hosts='host:debug,host:nodebug'"
+                        } else {
+                                targets="--with-target-hosts='host:debug'"
+                        }
+                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
+                        // Configure libcfa
+                        sh 'make -j 8 --no-print-directory configure-libcfa'
+                }
+        }
+        build_stage('Build : cfa-cpp', true) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        // Build driver
+                        sh 'make -j 8 --no-print-directory -C driver'
+                        // Build translator
+                        sh 'make -j 8 --no-print-directory -C src'
+                }
+        }
+        build_stage('Build : libcfa(debug)', debug) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-debug"
+                }
+        }
+        build_stage('Build : libcfa(nodebug)', release) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-nodebug"
+                }
+        }
+}
+def test() {
+        try {
+                build_stage('Test: short', !Settings.RunAllTests) {
+                        dir (BuildDir) {
+                                //Run the tests from the tests directory
+                                sh "make --no-print-directory -C tests archiveerrors=${BuildDir}/tests/crashes/short"
+                        }
+                }
+                build_stage('Test: full', Settings.RunAllTests) {
+                        dir (BuildDir) {
+                                        //Run the tests from the tests directory
+                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
+                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
+                        }
+                }
+        }
+        catch (Exception err) {
+                echo "Archiving core dumps"
+                dir (BuildDir) {
+                        archiveArtifacts artifacts: "tests/crashes/**/*", fingerprint: true
+                }
+                throw err
+        }
+}
+def benchmark() {
+        build_stage('Benchmark', Settings.RunBenchmark) {
+                dir (BuildDir) {
+                        //Append bench results
+                        sh "make --no-print-directory -C benchmark jenkins arch=${Settings.Architecture.name}"
+                }
+        }
+}
+def build_doc() {
+        build_stage('Documentation', Settings.BuildDocumentation) {
+                dir ('doc/user') {
+                        make_doc()
+                }
+                dir ('doc/refrat') {
+                        make_doc()
+                }
+        }
+}
+def publish() {
+        build_stage('Publish', true) {
+                if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
+                def groupCompile = new PlotGroup('Compilation', 'duration (s) - lower is better', true)
+                def groupConcurrency = new PlotGroup('Concurrency', 'duration (n) - lower is better', false)
+                //Then publish the results
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , false, 'Compilation')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'  , groupCompile    , true , 'Compilation (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, false, 'Context Switching')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff', groupConcurrency, true , 'Context Switching (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, false, 'Mutual Exclusion')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'    , groupConcurrency, true , 'Mutual Exclusion (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, false, 'Internal and External Scheduling')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal.diff'   , groupConcurrency, true , 'Internal and External Scheduling (relative)')
+        }
+}
+//===========================================================================================================
+//Routine responsible of sending the email notification once the build is completed
+//===========================================================================================================
+@NonCPS
+def SplitLines(String text) {
+        def list = []
+        text.eachLine {
+                list += it
+        }
+        return list
+}
+def GitLogMessage() {
+        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
+        def oldRef = Settings.GitOldRef
+        def newRef = Settings.GitNewRef
+        def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
+        def revList = SplitLines( revText )
+        def gitUpdate = ""
+        revList.each { rev ->
+                def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+                gitUpdate = gitUpdate + "       via  ${rev} (${type})"
+        }
+        def rev = oldRef
+        def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+        gitUpdate = gitUpdate + "      from  ${rev} (${type})"
+        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}").trim()
+        def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}").trim()
+        gitDiff = gitDiff.replace('[32m', '<span style="color: #00AA00;">')
+        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
+        gitDiff = gitDiff.replace('[m', '</span>')
+        return """
+<pre>
+The branch ${env.BRANCH_NAME} has been updated.
+${gitUpdate}
+</pre>
+<p>Check console output at ${env.BUILD_URL} to view the results.</p>
+<p>- Status --------------------------------------------------------------</p>
+<p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
+<p>- Log -----------------------------------------------------------------</p>
+<pre>
+${gitLog}
+</pre>
+<p>-----------------------------------------------------------------------</p>
+<pre>
+Summary of changes:
+${gitDiff}
+</pre>
+"""
+}
+//Standard build email notification
+def email(boolean log) {
+        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
+        //Configurations for email format
+        echo 'Notifying users of result'
+        def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
+        def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
+        def email_body = """<p>This is an automated email from the Jenkins build machine. It was
+generated because of a git hooks/post-receive script following
+a ref change which was pushed to the C\u2200 repository.</p>
+""" + GitLogMessage()
+        def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
+        if( Settings && !Settings.Silent ) {
+                //send email notification
+                emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
+        } else {
+                echo "Would send email to: ${email_to}"
+                echo "With title: ${email_subject}"
+                echo "Content: \n${email_body}"
+        }
+}
 //===========================================================================================================
 // Helper classes/variables/routines
 //===========================================================================================================
+//Helper routine to collect information about the git history
+def collect_git_info() {
+        checkout scm
+        //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
+        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]
+//Description of a compiler (Must be serializable since pipelines are persistent)
+class CC_Desc implements Serializable {
+        public String name
+        public String CXX
+        public String CC
+        CC_Desc(String name, String CXX, String CC) {
+                this.name = name
+                this.CXX = CXX
+                this.CC = CC
+        }
+}
+//Description of an architecture (Must be serializable since pipelines are persistent)
+class Arch_Desc implements Serializable {
+        public String name
+        public String flags
+        public String node
+        Arch_Desc(String name, String flags, String node) {
+                this.name  = name
+                this.flags = flags
+                this.node  = node
+        }
+}
+class BuildSettings implements Serializable {
+        public final CC_Desc Compiler
+        public final Arch_Desc Architecture
+        public final Boolean RunAllTests
+        public final Boolean RunBenchmark
+        public final Boolean BuildDocumentation
+        public final Boolean Publish
+        public final Boolean Silent
+        public final Boolean IsSandbox
+        public final String DescLong
+        public final String DescShort
+        public String GitNewRef
+        public String GitOldRef
+        BuildSettings(java.util.Collections$UnmodifiableMap param, String branch) {
+                switch( param.Compiler ) {
+                        case 'gcc-6':
+                                this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+                        break
+                        case 'gcc-5':
+                                this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+                        break
+                        case 'gcc-4.9':
+                                this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
+                        break
+                        case 'clang':
+                                this.Compiler = new CC_Desc('clang', 'clang++', 'gcc-6')
+                        break
+                        default :
+                                error "Unhandled compiler : ${cc}"
+                }
+                switch( param.Architecture ) {
+                        case 'x64':
+                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
+                        break
+                        case 'x86':
+                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
+                        break
+                        default :
+                                error "Unhandled architecture : ${arch}"
+                }
+                this.IsSandbox          = (branch == "jenkins-sandbox")
+                this.RunAllTests        = param.RunAllTests
+                this.RunBenchmark       = param.RunBenchmark
+                this.BuildDocumentation = param.BuildDocumentation
+                this.Publish            = param.Publish
+                this.Silent             = param.Silent
+                def full = param.RunAllTests ? " (Full)" : ""
+                this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
+                this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
+Architecture            : ${ this.Architecture.name }
+Arc Flags               : ${ this.Architecture.flags }
+Run All Tests           : ${ this.RunAllTests.toString() }
+Run Benchmark           : ${ this.RunBenchmark.toString() }
+Build Documentation     : ${ this.BuildDocumentation.toString() }
+Publish                 : ${ this.Publish.toString() }
+Silent                  : ${ this.Silent.toString() }
+"""
+                this.GitNewRef = ''
+                this.GitOldRef = ''
+        }
+}
+class PlotGroup implements Serializable {
+        public String name
+        public String unit
+        public boolean log
+        PlotGroup(String name, String unit, boolean log) {
+                this.name = name
+                this.unit = unit
+                this.log = log
+        }
+}
 def prepare_build() {
+        // prepare the properties
         properties ([                                                                                                   \
                 [$class: 'ParametersDefinitionProperty',                                                                \
 …
                                 [$class: 'ChoiceParameterDefinition',                                           \
                                         description: 'Which compiler to use',                                   \
                                         name: 'pCompiler',                                                              \
+                                        name: 'Compiler',                                                                       \
                                         choices: 'gcc-6\ngcc-5\ngcc-4.9\nclang',                                        \
                                         defaultValue: 'gcc-6',                                                          \
 …
                                 [$class: 'ChoiceParameterDefinition',                                           \
                                         description: 'The target architecture',                                 \
                                         name: 'pArchitecture',                                                          \
+                                        name: 'Architecture',                                                           \
                                         choices: 'x64\nx86',                                                            \
                                         defaultValue: 'x64',                                                            \
 …
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If false, only the quick test suite is ran',              \
                                         name: 'pRunAllTests',                                                           \
+                                        name: 'RunAllTests',                                                            \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also runs benchmarks',           \
                                         name: 'pRunBenchmark',                                                          \
                                         defaultValue: true,                                                             \
+                                        name: 'RunBenchmark',                                                           \
+                                        defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also builds documentation',              \
                                         name: 'pBuildDocumentation',                                                    \
+                                        name: 'BuildDocumentation',                                                     \
                                         defaultValue: true,                                                             \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also publishes results',                 \
                                         name: 'pPublish',                                                               \
+                                        name: 'Publish',                                                                        \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins will not send emails',           \
                                         name: 'pSilent',                                                                        \
+                                        name: 'Silent',                                                                         \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
 …
                 ]])
+        compiler                = compiler_from_params( pCompiler )
+        arch_name               = pArchitecture
+        architecture    = architecture_from_params( arch_name )
+        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            : ${arch_name}
+Arc Flags               : ${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, Closure block ) {
+        stage_name = name
+        stage(name, block)
+}
+def notify_server(int wait) {
+        sh """curl --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
+        return
+        // It's unfortunate but it looks like we need to checkout the entire repo just to get the pretty git printer
+        checkout scm
+        final settings = new BuildSettings(params, env.BRANCH_NAME)
+        currentBuild.description = settings.DescShort
+        echo                       settings.DescLong
+        return settings
+}
+def build_stage(String name, boolean run, Closure block ) {
+        StageName = name
+        echo " -------- ${StageName} -------- "
+        if(run) {
+                stage(name, block)
+        } else {
+                stage(name) { Utils.markStageSkippedForConditional(STAGE_NAME) }
+        }
+}
 …
         catch (Exception caughtError) {
                 err = caughtError //rethrow error later
                 sh 'cat *.log'
+                sh 'cat build/*.log'
+        }
         finally {
 …
+}
+//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'
+                break
+                case 'x86':
+                        return '--host=i386'
+                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
+                //Output compiler version to help with debug
+                echo """C++ Compiler :"""
+                sh "which ${compiler.cpp_cc} && ${compiler.cpp_cc} --version"
+                echo """C   Compiler :"""
+                sh "which ${compiler.cfa_cc} && ${compiler.cfa_cc} --version"
+                //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 --no-print-directory'
+                        sh 'make -C src/tests all-tests debug=no --no-print-directory'
+                }
+                else {
+                        sh 'make -C src/tests --no-print-directory'
+                }
+        }
+}
+def benchmark() {
+        build_stage('Benchmark') {
+                if( !do_benchmark ) return
+                //Append bench results
+                sh 'make -C src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
+        }
+}
+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 -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
+        }
+}
+//===========================================================================================================
+//Routine responsible of sending the email notification once the build is completed
+//===========================================================================================================
+//Standard build email notification
+def email(String status, boolean log) {
+        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
+        //Configurations for email format
+        def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
+        def gitLog = 'Error retrieving git logs'
+        def gitDiff = 'Error retrieving git diff'
+        try {
+                sh "git rev-list --format=short ${gitRefOldValue}...${gitRefNewValue} > GIT_LOG"
+                gitLog = readFile('GIT_LOG')
+                sh "git diff --stat ${gitRefNewValue} ${gitRefOldValue} > GIT_DIFF"
+                gitDiff = readFile('GIT_DIFF')
+        }
+        catch (Exception error) {}
+        def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"
+        def email_body = """This is an automated email from the Jenkins build machine. It was
+generated because of a git hooks/post-receive script following
+a ref change was pushed to the repository containing
+the project "UNNAMED PROJECT".
+The branch ${env.BRANCH_NAME} has been updated.
+   via  ${gitRefOldValue} (commit)
+  from  ${gitRefNewValue} (commit)
+Check console output at ${env.BUILD_URL} to view the results.
+- Status --------------------------------------------------------------
+BUILD# ${env.BUILD_NUMBER} - ${status}
+- Log -----------------------------------------------------------------
+${gitLog}
+-----------------------------------------------------------------------
+Summary of changes:
+${gitDiff}
+"""
+        def email_to = "cforall@lists.uwaterloo.ca"
+        //send email notification
+        emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
+}
+def do_plot(boolean new_data, String file, PlotGroup group, boolean relative, String title) {
+        if(new_data) {
+                echo "Publishing new data"
+        }
+        def series = new_data ? [[
+                                file: "${file}.csv",
+                                exclusionValues: '',
+                                displayTableFlag: false,
+                                inclusionFlag: 'OFF',
+                                url: ''
+                        ]] : [];
+        echo "file is ${BuildDir}/benchmark/${file}.csv, group ${group}, title ${title}"
+        dir("${BuildDir}/benchmark/") {
+                plot csvFileName: "cforall-${env.BRANCH_NAME}-${file}.csv",
+                        csvSeries: series,
+                        group: "${group.name}",
+                        title: "${title}",
+                        style: 'lineSimple',
+                        exclZero: false,
+                        keepRecords: false,
+                        logarithmic: !relative && group.log,
+                        numBuilds: '120',
+                        useDescr: true,
+                        yaxis: group.unit,
+                        yaxisMaximum: '',
+                        yaxisMinimum: ''
+        }
+}

Makefile.am

-              r7951100
+              rb067d9b
 ## file "LICENCE" distributed with Cforall.
 ##
 ## Makefile.am --
+## Makefile.am --
 ##
 ## Author           : Peter A. Buhr
 ## Created On       : Sun May 31 22:14:18 2015
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Wed Dec 14 14:20:48 2016
 ## Update Count     : 15
+## Last Modified On : Sat Feb  2 16:54:42 2019
+## Update Count     : 21
 ###############################################################################
+AUTOMAKE_OPTIONS = foreign              # do not require all the GNU file names
+SUBDIRS = src/driver src src/prelude src/libcfa # order important, src before prelude because cfa-cpp used to build prelude
+EXTRA_DIST = Docs                       # non-source files
+BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS  = -I automake
+MAINTAINERCLEANFILES = lib/* bin/* src/examples/.deps/* src/tests/.deps/* src/tests/.out/*
+MAINTAINERCLEANFILES = lib/* bin/* tests/.deps/* tests/.out/* # order important
+SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
+@LIBCFA_TARGET_MAKEFILES@ : Makefile $(srcdir)/libcfa/configure
+        @$(eval config_file = $(dir $@)config.data)
+        @ls $(config_file) || (echo "Missing config.data, re-run configure script again" && false)
+        @$(eval config_data = $(shell cat $(config_file)))
+        @echo "Configuring libcfa with '$(config_data)''"
+        @cd $(dir $@) && $(abs_top_srcdir)/libcfa/configure $(config_data)
+noinst_DATA = @LIBCFA_TARGET_MAKEFILES@
 man1_MANS = doc/man/cfa.1
+debug=yes
+check:
+        $(MAKE) -C tests all-tests installed=no debug=${debug}
+installcheck:
+        $(MAKE) -C tests all-tests installed=yes debug=${debug}
+configure-libcfa: @LIBCFA_TARGET_MAKEFILES@
+        @true
+status: @LIBCFA_TARGET_MAKEFILES@
+        @echo -ne "translator\n\t"
+        @./config.status --config | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
+        @find libcfa -name config.status -printf "\n%h\n\t" -exec {} --config \; | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"

Makefile.in

-              r7951100
+              rb067d9b
 ######################## -*- Mode: Makefile-Automake -*- ######################
 ###############################################################################
 VPATH = @srcdir@
 am__is_gnu_make = { \
 …
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
+        $(top_srcdir)/automake/ltoptions.m4 \
+        $(top_srcdir)/automake/ltsugar.m4 \
+        $(top_srcdir)/automake/ltversion.m4 \
+        $(top_srcdir)/automake/lt~obsolete.m4 \
+        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 …
 NROFF = nroff
 MANS = $(man1_MANS)
+DATA = $(noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
   distclean-recursive maintainer-clean-recursive
 …
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
         cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+        $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 …
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+        $(top_srcdir)/automake/compile \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/compile \
         $(top_srcdir)/automake/config.guess \
         $(top_srcdir)/automake/config.sub \
         $(top_srcdir)/automake/install-sh \
+        $(top_srcdir)/automake/missing INSTALL README automake/compile \
+        automake/config.guess automake/config.sub automake/depcomp \
+        automake/install-sh automake/missing automake/ylwrap
+        $(top_srcdir)/automake/ltmain.sh \
+        $(top_srcdir)/automake/missing $(top_srcdir)/src/config.h.in \
+        INSTALL README automake/compile automake/config.guess \
+        automake/config.sub automake/depcomp automake/install-sh \
+        automake/ltmain.sh automake/missing automake/ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 …
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @CC@
 CCAS = @CCAS@
 …
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 …
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
+HAS_DISTCC = @HAS_DISTCC@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 …
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MACHINE_TYPE = @MACHINE_TYPE@
+MAINT = @MAINT@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 …
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
 …
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 …
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign              # do not require all the GNU file names
+SUBDIRS = src/driver src src/prelude src/libcfa # order important, src before prelude because cfa-cpp used to build prelude
+EXTRA_DIST = Docs                       # non-source files
+MAINTAINERCLEANFILES = lib/* bin/* src/examples/.deps/* src/tests/.deps/* src/tests/.out/*
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS = -I automake
+MAINTAINERCLEANFILES = lib/* bin/* tests/.deps/* tests/.out/* # order important
+SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
+noinst_DATA = @LIBCFA_TARGET_MAKEFILES@
 man1_MANS = doc/man/cfa.1
+debug = yes
 all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-recursive
 …
 am--refresh: Makefile
         @:
 $(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 \
 …
         $(SHELL) ./config.status --recheck
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         $(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 …
         @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status
         @rm -f stamp-h1
         cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/src/config.h.in:  $(am__configure_deps)
         ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
         rm -f stamp-h1
 …
 distclean-hdr:
         -rm -f config.h stamp-h1
+mostlyclean-libtool:
+        -rm -f *.lo
+clean-libtool:
+        -rm -rf .libs _libs
+distclean-libtool:
+        -rm -f libtool config.lt
 install-man1: $(man1_MANS)
         @$(NORMAL_INSTALL)
 …
 check-am: all-am
 check: check-recursive
 all-am: Makefile $(MANS) config.h
+all-am: Makefile $(MANS) $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
 …
 install-am: all-am
         @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-recursive
 install-strip:
         if test -z '$(STRIP)'; then \
 …
 clean: clean-recursive
 clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 distclean: distclean-recursive
         -rm -f $(am__CONFIG_DISTCLEAN_FILES)
         -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr \
+        distclean-libtool distclean-tags
 dvi: dvi-recursive
 …
 mostlyclean: mostlyclean-recursive
 mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 pdf: pdf-recursive
 …
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
         am--refresh check check-am clean clean-cscope clean-generic \
+        cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+        dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+        distcheck distclean distclean-generic distclean-hdr \
+        distclean-tags distcleancheck distdir distuninstallcheck dvi \
+        dvi-am html html-am info info-am install install-am \
+        install-data install-data-am install-dvi install-dvi-am \
+        install-exec install-exec-am install-html install-html-am \
+        install-info install-info-am install-man install-man1 \
+        install-pdf install-pdf-am install-ps install-ps-am \
+        install-strip installcheck installcheck-am installdirs \
+        installdirs-am maintainer-clean maintainer-clean-generic \
+        mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+        tags-am uninstall uninstall-am uninstall-man uninstall-man1
+        clean-libtool cscope cscopelist-am ctags ctags-am dist \
+        dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+        dist-xz dist-zip distcheck distclean distclean-generic \
+        distclean-hdr distclean-libtool distclean-tags distcleancheck \
+        distdir distuninstallcheck dvi dvi-am html html-am info \
+        info-am install install-am install-data install-data-am \
+        install-dvi install-dvi-am install-exec install-exec-am \
+        install-html install-html-am install-info install-info-am \
+        install-man install-man1 install-pdf install-pdf-am install-ps \
+        install-ps-am install-strip installcheck installcheck-am \
+        installdirs installdirs-am maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-generic \
+        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+        uninstall-am uninstall-man uninstall-man1
 .PRECIOUS: Makefile
+@LIBCFA_TARGET_MAKEFILES@ : Makefile $(srcdir)/libcfa/configure
+        @$(eval config_file = $(dir $@)config.data)
+        @ls $(config_file) || (echo "Missing config.data, re-run configure script again" && false)
+        @$(eval config_data = $(shell cat $(config_file)))
+        @echo "Configuring libcfa with '$(config_data)''"
+        @cd $(dir $@) && $(abs_top_srcdir)/libcfa/configure $(config_data)
+check:
+        $(MAKE) -C tests all-tests installed=no debug=${debug}
+installcheck:
+        $(MAKE) -C tests all-tests installed=yes debug=${debug}
+configure-libcfa: @LIBCFA_TARGET_MAKEFILES@
+        @true
+status: @LIBCFA_TARGET_MAKEFILES@
+        @echo -ne "translator\n\t"
+        @./config.status --config | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
+        @find libcfa -name config.status -printf "\n%h\n\t" -exec {} --config \; | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

aclocal.m4

-              r7951100
+              rb067d9b
 # Expand $ac_aux_dir to an absolute path.
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
-])
-# AM_COND_IF                                            -*- Autoconf -*-
-# Copyright (C) 2008-2014 Free Software Foundation, Inc.
+#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# _AM_COND_IF
-# _AM_COND_ELSE
-# _AM_COND_ENDIF
-# --------------
-# These macros are only used for tracing.
-m4_define([_AM_COND_IF])
-m4_define([_AM_COND_ELSE])
-m4_define([_AM_COND_ENDIF])
-# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
-# ---------------------------------------
-# If the shell condition COND is true, execute IF-TRUE, otherwise execute
-# IF-FALSE.  Allow automake to learn about conditional instantiating macros
-# (the AC_CONFIG_FOOS).
-AC_DEFUN([AM_COND_IF],
-[m4_ifndef([_AM_COND_VALUE_$1],
-           [m4_fatal([$0: no such condition "$1"])])dnl
-_AM_COND_IF([$1])dnl
-if test -z "$$1_TRUE"; then :
-  m4_n([$2])[]dnl
-m4_ifval([$3],
-[_AM_COND_ELSE([$1])dnl
-else
-  $3
-])dnl
-_AM_COND_ENDIF([$1])dnl
-fi[]dnl
 ])
 …
 AC_SUBST([am__leading_dot])])
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless 'enable' is passed literally.
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
-      am_maintainer_other[ make rules and dependencies not useful
-      (and sometimes confusing) to the casual installer])],
-    [USE_MAINTAINER_MODE=$enableval],
-    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
+]
+)
 # Check to see how 'make' treats includes.                  -*- Autoconf -*-
 …
 ]) # _AM_PROG_TAR
+m4_include([automake/libtool.m4])
+m4_include([automake/ltoptions.m4])
+m4_include([automake/ltsugar.m4])
+m4_include([automake/ltversion.m4])
+m4_include([automake/lt~obsolete.m4])

automake/compile

Property mode changed from 100755 to 120000

-              r7951100
+              rb067d9b
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+scriptversion=2012-10-14.11; # UTC
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+nl='
+'
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""        $nl"
+file_conv=
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+        # lazily determine how to convert abs files
+        case `uname -s` in
+          MINGW*)
+            file_conv=mingw
+            ;;
+          CYGWIN*)
+            file_conv=cygwin
+            ;;
+          *)
+            file_conv=wine
+            ;;
+        esac
+      fi
+      case $file_conv/,$2, in
+        *,$file_conv,*)
+          ;;
+        mingw/*)
+          file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+          ;;
+        cygwin/*)
+          file=`cygpath -m "$file" || echo "$file"`
+          ;;
+        wine/*)
+          file=`winepath -w "$file" || echo "$file"`
+          ;;
+      esac
+      ;;
+  esac
+}
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+        -o)
+          # configure might choose to run compile as 'compile cc -o foo foo.c'.
+          eat=1
+          case $2 in
+            *.o | *.[oO][bB][jJ])
+              func_file_conv "$2"
+              set x "$@" -Fo"$file"
+              shift
+              ;;
+            *)
+              func_file_conv "$2"
+              set x "$@" -Fe"$file"
+              shift
+              ;;
+          esac
+          ;;
+        -I)
+          eat=1
+          func_file_conv "$2" mingw
+          set x "$@" -I"$file"
+          shift
+          ;;
+        -I*)
+          func_file_conv "${1#-I}" mingw
+          set x "$@" -I"$file"
+          shift
+          ;;
+        -l)
+          eat=1
+          func_cl_dashl "$2"
+          set x "$@" "$lib"
+          shift
+          ;;
+        -l*)
+          func_cl_dashl "${1#-l}"
+          set x "$@" "$lib"
+          shift
+          ;;
+        -L)
+          eat=1
+          func_cl_dashL "$2"
+          ;;
+        -L*)
+          func_cl_dashL "${1#-L}"
+          ;;
+        -static)
+          shared=false
+          ;;
+        -Wl,*)
+          arg=${1#-Wl,}
+          save_ifs="$IFS"; IFS=','
+          for flag in $arg; do
+            IFS="$save_ifs"
+            linker_opts="$linker_opts $flag"
+          done
+          IFS="$save_ifs"
+          ;;
+        -Xlinker)
+          eat=1
+          linker_opts="$linker_opts $2"
+          ;;
+        -*)
+          set x "$@" "$1"
+          shift
+          ;;
+        *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+          func_file_conv "$1"
+          set x "$@" -Tp"$file"
+          shift
+          ;;
+        *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+          func_file_conv "$1" mingw
+          set x "$@" "$file"
+          shift
+          ;;
+        *)
+          set x "$@" "$1"
+          shift
+          ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+eat=
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+ofile=
+cfile=
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+        # configure might choose to run compile as 'compile cc -o foo foo.c'.
+        # So we strip '-o arg' only if arg is an object.
+        eat=1
+        case $2 in
+          *.o | *.obj)
+            ofile=$2
+            ;;
+          *)
+            set x "$@" -o "$2"
+            shift
+            ;;
+        esac
+        ;;
+      *.c)
+        cfile=$1
+        set x "$@" "$1"
+        shift
+        ;;
+      *)
+        set x "$@" "$1"
+        shift
+        ;;
+    esac
+  fi
+  shift
+done
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+# Run the compile.
+"$@"
+ret=$?
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+rmdir "$lockdir"
+exit $ret
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
+/usr/share/automake-1.15/compile

automake/config.guess

Property mode changed from 100755 to 120000

-              r7951100
+              rb067d9b
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
+timestamp='2015-08-20'
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches to <config-patches@gnu.org>.
+me=`echo "$0" | sed -e 's,.*/,,'`
+usage="\
+Usage: $0 [OPTION]
+Output the configuration name of the system \`$me' is run on.
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+Report bugs and patches to <config-patches@gnu.org>."
+version="\
+GNU config.guess ($timestamp)
+Originally written by Per Bothner.
+Copyright 1992-2015 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+help="
+Try \`$me --help' for more information."
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - ) # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+trap 'exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+# Portable tmp directory creation inspired by the Autoconf team.
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+        for c in cc gcc c89 c99 ; do
+          if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+             CC_FOR_BUILD="$c"; break ;
+          fi ;
+        done ;
+        if test x"$CC_FOR_BUILD" = x ; then
+          CC_FOR_BUILD=no_compiler_found ;
+        fi
+        ;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+        PATH=$PATH:/.attbin ; export PATH
+fi
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+        # If the system lacks a compiler, then just pick glibc.
+        # We could probably try harder.
+        LIBC=gnu
+        eval $set_cc_for_build
+        cat <<-EOF > $dummy.c
+        #include <features.h>
+        #if defined(__UCLIBC__)
+        LIBC=uclibc
+        #elif defined(__dietlibc__)
+        LIBC=dietlibc
+        #else
+        LIBC=gnu
+        #endif
+        EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+        ;;
+esac
+# Note: order is significant - the case branches are not exclusive.
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+        # NetBSD (nbsd) targets should (where applicable) match one or
+        # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+        # switched to ELF, *-*-netbsd* would select the old
+        # object file format.  This provides both forward
+        # compatibility and a consistent mechanism for selecting the
+        # object file format.
+        #
+        # Note: NetBSD doesn't particularly care about the vendor
+        # portion of the name.  We always set it to "unknown".
+        sysctl="sysctl -n hw.machine_arch"
+        UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+            /sbin/$sysctl 2>/dev/null || \
+            /usr/sbin/$sysctl 2>/dev/null || \
+            echo unknown)`
+        case "${UNAME_MACHINE_ARCH}" in
+            armeb) machine=armeb-unknown ;;
+            arm*) machine=arm-unknown ;;
+            sh3el) machine=shl-unknown ;;
+            sh3eb) machine=sh-unknown ;;
+            sh5el) machine=sh5le-unknown ;;
+            earmv*)
+                arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+                endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+                machine=${arch}${endian}-unknown
+                ;;
+            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+        esac
+        # The Operating System including object format, if it has switched
+        # to ELF recently, or will in the future.
+        case "${UNAME_MACHINE_ARCH}" in
+            arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+                eval $set_cc_for_build
+                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+                        | grep -q __ELF__
+                then
+                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+                    # Return netbsd for either.  FIX?
+                    os=netbsd
+                else
+                    os=netbsdelf
+                fi
+                ;;
+            *)
+                os=netbsd
+                ;;
+        esac
+        # Determine ABI tags.
+        case "${UNAME_MACHINE_ARCH}" in
+            earm*)
+                expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+                abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+                ;;
+        esac
+        # The OS release
+        # Debian GNU/NetBSD machines have a different userland, and
+        # thus, need a distinct triplet. However, they do not need
+        # kernel version information, so it can be replaced with a
+        # suitable tag, in the style of linux-gnu.
+        case "${UNAME_VERSION}" in
+            Debian*)
+                release='-gnu'
+                ;;
+            *)
+                release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+                ;;
+        esac
+        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+        # contains redundant information, the shorter form:
+        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+        echo "${machine}-${os}${release}${abi}"
+        exit ;;
+    *:Bitrig:*:*)
+        UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+        echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+        exit ;;
+    *:OpenBSD:*:*)
+        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+        exit ;;
+    *:ekkoBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+        exit ;;
+    *:SolidBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+        exit ;;
+    macppc:MirBSD:*:*)
+        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+        exit ;;
+    *:MirBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+        exit ;;
+    *:Sortix:*:*)
+        echo ${UNAME_MACHINE}-unknown-sortix
+        exit ;;
+    alpha:OSF1:*:*)
+        case $UNAME_RELEASE in
+        *4.0)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+                ;;
+        *5.*)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+                ;;
+        esac
+        # According to Compaq, /usr/sbin/psrinfo has been available on
+        # OSF/1 and Tru64 systems produced since 1995.  I hope that
+        # covers most systems running today.  This code pipes the CPU
+        # types through head -n 1, so we only detect the type of CPU 0.
+        ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+        case "$ALPHA_CPU_TYPE" in
+            "EV4 (21064)")
+                UNAME_MACHINE="alpha" ;;
+            "EV4.5 (21064)")
+                UNAME_MACHINE="alpha" ;;
+            "LCA4 (21066/21068)")
+                UNAME_MACHINE="alpha" ;;
+            "EV5 (21164)")
+                UNAME_MACHINE="alphaev5" ;;
+            "EV5.6 (21164A)")
+                UNAME_MACHINE="alphaev56" ;;
+            "EV5.6 (21164PC)")
+                UNAME_MACHINE="alphapca56" ;;
+            "EV5.7 (21164PC)")
+                UNAME_MACHINE="alphapca57" ;;
+            "EV6 (21264)")
+                UNAME_MACHINE="alphaev6" ;;
+            "EV6.7 (21264A)")
+                UNAME_MACHINE="alphaev67" ;;
+            "EV6.8CB (21264C)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.8AL (21264B)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.8CX (21264D)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.9A (21264/EV69A)")
+                UNAME_MACHINE="alphaev69" ;;
+            "EV7 (21364)")
+                UNAME_MACHINE="alphaev7" ;;
+            "EV7.9 (21364A)")
+                UNAME_MACHINE="alphaev79" ;;
+        esac
+        # A Pn.n version is a patched version.
+        # A Vn.n version is a released version.
+        # A Tn.n version is a released field test version.
+        # A Xn.n version is an unreleased experimental baselevel.
+        # 1.2 uses "1.2" for uname -r.
+        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+        exitcode=$?
+        trap '' 0
+        exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+        # How do we know it's Interix rather than the generic POSIX subsystem?
+        # Should we change UNAME_MACHINE based on the output of uname instead
+        # of the specific Alpha model?
+        echo alpha-pc-interix
+        exit ;;
+:Windows_NT:50:3)
+        echo alpha-dec-winnt3.5
+        exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+        echo m68k-unknown-sysv4
+        exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+        echo ${UNAME_MACHINE}-unknown-amigaos
+        exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+        echo ${UNAME_MACHINE}-unknown-morphos
+        exit ;;
+    *:OS/390:*:*)
+        echo i370-ibm-openedition
+        exit ;;
+    *:z/VM:*:*)
+        echo s390-ibm-zvmoe
+        exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+        exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+        echo arm-acorn-riscix${UNAME_RELEASE}
+        exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+        echo arm-unknown-riscos
+        exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+        echo hppa1.1-hitachi-hiuxmpp
+        exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+        if test "`(/bin/universe) 2>/dev/null`" = att ; then
+                echo pyramid-pyramid-sysv3
+        else
+                echo pyramid-pyramid-bsd
+        fi
+        exit ;;
+    NILE*:*:*:dcosx)
+        echo pyramid-pyramid-svr4
+        exit ;;
+    DRS?6000:unix:4.0:6*)
+        echo sparc-icl-nx6
+        exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+        case `/usr/bin/uname -p` in
+            sparc) echo sparc-icl-nx7; exit ;;
+        esac ;;
+    s390x:SunOS:*:*)
+        echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
+    sun4H:SunOS:5.*:*)
+        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+        echo i386-pc-auroraux${UNAME_RELEASE}
+        exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+        eval $set_cc_for_build
+        SUN_ARCH="i386"
+        # If there is a compiler, see if it is configured for 64-bit objects.
+        # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+        # This test works for both compilers.
+        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+            if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                grep IS_64BIT_ARCH >/dev/null
+            then
+                SUN_ARCH="x86_64"
+            fi
+        fi
+        echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
+    sun4*:SunOS:6*:*)
+        # According to config.sub, this is the proper way to canonicalize
+        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+        # it's likely to be more like Solaris than SunOS4.
+        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
+    sun4*:SunOS:*:*)
+        case "`/usr/bin/arch -k`" in
+            Series*|S4*)
+                UNAME_RELEASE=`uname -v`
+                ;;
+        esac
+        # Japanese Language versions have a version number like `4.1.3-JL'.
+        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+        exit ;;
+    sun3*:SunOS:*:*)
+        echo m68k-sun-sunos${UNAME_RELEASE}
+        exit ;;
+    sun*:*:4.2BSD:*)
+        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+        case "`/bin/arch`" in
+            sun3)
+                echo m68k-sun-sunos${UNAME_RELEASE}
+                ;;
+            sun4)
+                echo sparc-sun-sunos${UNAME_RELEASE}
+                ;;
+        esac
+        exit ;;
+    aushp:SunOS:*:*)
+        echo sparc-auspex-sunos${UNAME_RELEASE}
+        exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+        echo m68k-apple-machten${UNAME_RELEASE}
+        exit ;;
+    powerpc:machten:*:*)
+        echo powerpc-apple-machten${UNAME_RELEASE}
+        exit ;;
+    RISC*:Mach:*:*)
+        echo mips-dec-mach_bsd4.3
+        exit ;;
+    RISC*:ULTRIX:*:*)
+        echo mips-dec-ultrix${UNAME_RELEASE}
+        exit ;;
+    VAX*:ULTRIX*:*:*)
+        echo vax-dec-ultrix${UNAME_RELEASE}
+        exit ;;
+:CLIX:*:* | 2430:CLIX:*:*)
+        echo clipper-intergraph-clix${UNAME_RELEASE}
+        exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
+        #if defined (host_mips) && defined (MIPSEB)
+        #if defined (SYSTYPE_SYSV)
+          printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+        #endif
+        #if defined (SYSTYPE_SVR4)
+          printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+        #endif
+        #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+          printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+        #endif
+        #endif
+          exit (-1);
+        }
+EOF
+        $CC_FOR_BUILD -o $dummy $dummy.c &&
+          dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+          SYSTEM_NAME=`$dummy $dummyarg` &&
+            { echo "$SYSTEM_NAME"; exit; }
+        echo mips-mips-riscos${UNAME_RELEASE}
+        exit ;;
+    Motorola:PowerMAX_OS:*:*)
+        echo powerpc-motorola-powermax
+        exit ;;
+    Motorola:*:4.3:PL8-*)
+        echo powerpc-harris-powermax
+        exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+        echo powerpc-harris-powermax
+        exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+        echo powerpc-harris-powerunix
+        exit ;;
+    m88k:CX/UX:7*:*)
+        echo m88k-harris-cxux7
+        exit ;;
+    m88k:*:4*:R4*)
+        echo m88k-motorola-sysv4
+        exit ;;
+    m88k:*:3*:R3*)
+        echo m88k-motorola-sysv3
+        exit ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+        then
+            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+               [ ${TARGET_BINARY_INTERFACE}x = x ]
+            then
+                echo m88k-dg-dgux${UNAME_RELEASE}
+            else
+                echo m88k-dg-dguxbcs${UNAME_RELEASE}
+            fi
+        else
+            echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+        exit ;;
+    M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+        echo m88k-dolphin-sysv3
+        exit ;;
+    M88*:*:R3*:*)
+        # Delta 88k system running SVR3
+        echo m88k-motorola-sysv3
+        exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+        echo m88k-tektronix-sysv3
+        exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+        echo m68k-tektronix-bsd
+        exit ;;
+    *:IRIX*:*:*)
+        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+        exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+        echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+        exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+        echo i386-ibm-aix
+        exit ;;
+    ia64:AIX:*:*)
+        if [ -x /usr/bin/oslevel ] ; then
+                IBM_REV=`/usr/bin/oslevel`
+        else
+                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+        fi
+        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+        exit ;;
+    *:AIX:2:3)
+        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+                eval $set_cc_for_build
+                sed 's/^                //' << EOF >$dummy.c
+                #include <sys/systemcfg.h>
+                main()
+                        {
+                        if (!__power_pc())
+                                exit(1);
+                        puts("powerpc-ibm-aix3.2.5");
+                        exit(0);
+                        }
+EOF
+                if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+                then
+                        echo "$SYSTEM_NAME"
+                else
+                        echo rs6000-ibm-aix3.2.5
+                fi
+        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+                echo rs6000-ibm-aix3.2.4
+        else
+                echo rs6000-ibm-aix3.2
+        fi
+        exit ;;
+    *:AIX:*:[4567])
+        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+                IBM_ARCH=rs6000
+        else
+                IBM_ARCH=powerpc
+        fi
+        if [ -x /usr/bin/lslpp ] ; then
+                IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+                           awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+        else
+                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+        fi
+        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+        exit ;;
+    *:AIX:*:*)
+        echo rs6000-ibm-aix
+        exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+        echo romp-ibm-bsd4.4
+        exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+        exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+        echo rs6000-bull-bosx
+        exit ;;
+    DPX/2?00:B.O.S.:*:*)
+        echo m68k-bull-sysv3
+        exit ;;
+/[34]??:4.3bsd:1.*:*)
+        echo m68k-hp-bsd
+        exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+        echo m68k-hp-bsd4.4
+        exit ;;
+/[34678]??:HP-UX:*:*)
+        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+        case "${UNAME_MACHINE}" in
+/31? )            HP_ARCH=m68000 ;;
+/[34]?? )         HP_ARCH=m68k ;;
+/[678][0-9][0-9])
+                if [ -x /usr/bin/getconf ]; then
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+) HP_ARCH="hppa2.0n" ;;
+) HP_ARCH="hppa2.0w" ;;
+                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+                fi
+                if [ "${HP_ARCH}" = "" ]; then
+                    eval $set_cc_for_build
+                    sed 's/^            //' << EOF >$dummy.c
+                #define _HPUX_SOURCE
+                #include <stdlib.h>
+                #include <unistd.h>
+                int main ()
+                {
+                #if defined(_SC_KERNEL_BITS)
+                    long bits = sysconf(_SC_KERNEL_BITS);
+                #endif
+                    long cpu  = sysconf (_SC_CPU_VERSION);
+                    switch (cpu)
+                        {
+                        case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+                        case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+                        case CPU_PA_RISC2_0:
+                #if defined(_SC_KERNEL_BITS)
+                            switch (bits)
+                                {
+                                case 64: puts ("hppa2.0w"); break;
+                                case 32: puts ("hppa2.0n"); break;
+                                default: puts ("hppa2.0"); break;
+                                } break;
+                #else  /* !defined(_SC_KERNEL_BITS) */
+                            puts ("hppa2.0"); break;
+                #endif
+                        default: puts ("hppa1.0"); break;
+                        }
+                    exit (0);
+                }
+EOF
+                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+                    test -z "$HP_ARCH" && HP_ARCH=hppa
+                fi ;;
+        esac
+        if [ ${HP_ARCH} = "hppa2.0w" ]
+        then
+            eval $set_cc_for_build
+            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+            # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+            # generating 64-bit code.  GNU and HP use different nomenclature:
+            #
+            # $ CC_FOR_BUILD=cc ./config.guess
+            # => hppa2.0w-hp-hpux11.23
+            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+            # => hppa64-hp-hpux11.23
+            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+                grep -q __LP64__
+            then
+                HP_ARCH="hppa2.0w"
+            else
+                HP_ARCH="hppa64"
+            fi
+        fi
+        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+        exit ;;
+    ia64:HP-UX:*:*)
+        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+        echo ia64-hp-hpux${HPUX_REV}
+        exit ;;
+*:HI-UX:*:*)
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #include <unistd.h>
+        int
+        main ()
+        {
+          long cpu = sysconf (_SC_CPU_VERSION);
+          /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+             true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+             results, however.  */
+          if (CPU_IS_PA_RISC (cpu))
+            {
+              switch (cpu)
+                {
+                  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+                  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+                  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+                  default: puts ("hppa-hitachi-hiuxwe2"); break;
+                }
+            }
+          else if (CPU_IS_HP_MC68K (cpu))
+            puts ("m68k-hitachi-hiuxwe2");
+          else puts ("unknown-hitachi-hiuxwe2");
+          exit (0);
+        }
+EOF
+        $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+                { echo "$SYSTEM_NAME"; exit; }
+        echo unknown-hitachi-hiuxwe2
+        exit ;;
+/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+        echo hppa1.1-hp-bsd
+        exit ;;
+/8??:4.3bsd:*:*)
+        echo hppa1.0-hp-bsd
+        exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+        echo hppa1.0-hp-mpeix
+        exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+        echo hppa1.1-hp-osf
+        exit ;;
+    hp8??:OSF1:*:*)
+        echo hppa1.0-hp-osf
+        exit ;;
+    i*86:OSF1:*:*)
+        if [ -x /usr/sbin/sysversion ] ; then
+            echo ${UNAME_MACHINE}-unknown-osf1mk
+        else
+            echo ${UNAME_MACHINE}-unknown-osf1
+        fi
+        exit ;;
+    parisc*:Lites*:*:*)
+        echo hppa1.1-hp-lites
+        exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+        echo c1-convex-bsd
+        exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+        if getsysinfo -f scalar_acc
+        then echo c32-convex-bsd
+        else echo c2-convex-bsd
+        fi
+        exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+        echo c34-convex-bsd
+        exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+        echo c38-convex-bsd
+        exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+        echo c4-convex-bsd
+        exit ;;
+    CRAY*Y-MP:*:*:*)
+        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    CRAY*[A-Z]90:*:*:*)
+        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+              -e 's/\.[^.]*$/.X/'
+        exit ;;
+    CRAY*TS:*:*:*)
+        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    CRAY*T3E:*:*:*)
+        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    CRAY*SV1:*:*:*)
+        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    *:UNICOS/mp:*:*)
+        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+        exit ;;
+    sparc*:BSD/OS:*:*)
+        echo sparc-unknown-bsdi${UNAME_RELEASE}
+        exit ;;
+    *:BSD/OS:*:*)
+        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+        exit ;;
+    *:FreeBSD:*:*)
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        case ${UNAME_PROCESSOR} in
+            amd64)
+                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            *)
+                echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        esac
+        exit ;;
+    i*:CYGWIN*:*)
+        echo ${UNAME_MACHINE}-pc-cygwin
+        exit ;;
+    *:MINGW64*:*)
+        echo ${UNAME_MACHINE}-pc-mingw64
+        exit ;;
+    *:MINGW*:*)
+        echo ${UNAME_MACHINE}-pc-mingw32
+        exit ;;
+    *:MSYS*:*)
+        echo ${UNAME_MACHINE}-pc-msys
+        exit ;;
+    i*:windows32*:*)
+        # uname -m includes "-pc" on this system.
+        echo ${UNAME_MACHINE}-mingw32
+        exit ;;
+    i*:PW*:*)
+        echo ${UNAME_MACHINE}-pc-pw32
+        exit ;;
+    *:Interix*:*)
+        case ${UNAME_MACHINE} in
+            x86)
+                echo i586-pc-interix${UNAME_RELEASE}
+                exit ;;
+            authenticamd | genuineintel | EM64T)
+                echo x86_64-unknown-interix${UNAME_RELEASE}
+                exit ;;
+            IA64)
+                echo ia64-unknown-interix${UNAME_RELEASE}
+                exit ;;
+        esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+        echo i${UNAME_MACHINE}-pc-mks
+        exit ;;
+:Windows_NT:*)
+        echo x86_64-pc-mks
+        exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+        # How do we know it's Interix rather than the generic POSIX subsystem?
+        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+        # UNAME_MACHINE based on the output of uname instead of i386?
+        echo i586-pc-interix
+        exit ;;
+    i*:UWIN*:*)
+        echo ${UNAME_MACHINE}-pc-uwin
+        exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+        echo x86_64-unknown-cygwin
+        exit ;;
+    p*:CYGWIN*:*)
+        echo powerpcle-unknown-cygwin
+        exit ;;
+    prep*:SunOS:5.*:*)
+        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
+    *:GNU:*:*)
+        # the GNU system
+        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+        exit ;;
+    *:GNU/*:*:*)
+        # other systems with GNU libc and userland
+        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+        exit ;;
+    i*86:Minix:*:*)
+        echo ${UNAME_MACHINE}-pc-minix
+        exit ;;
+    aarch64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    aarch64_be:Linux:*:*)
+        UNAME_MACHINE=aarch64_be
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    alpha:Linux:*:*)
+        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+          EV5)   UNAME_MACHINE=alphaev5 ;;
+          EV56)  UNAME_MACHINE=alphaev56 ;;
+          PCA56) UNAME_MACHINE=alphapca56 ;;
+          PCA57) UNAME_MACHINE=alphapca56 ;;
+          EV6)   UNAME_MACHINE=alphaev6 ;;
+          EV67)  UNAME_MACHINE=alphaev67 ;;
+          EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+        objdump --private-headers /bin/sh | grep -q ld.so.1
+        if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    arm*:Linux:*:*)
+        eval $set_cc_for_build
+        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+            | grep -q __ARM_EABI__
+        then
+            echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        else
+            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+                | grep -q __ARM_PCS_VFP
+            then
+                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+            else
+                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+            fi
+        fi
+        exit ;;
+    avr32*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    cris:Linux:*:*)
+        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+        exit ;;
+    crisv32:Linux:*:*)
+        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+        exit ;;
+    e2k:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    frv:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    hexagon:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    i*86:Linux:*:*)
+        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+        exit ;;
+    ia64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    m32r*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    m68*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #undef CPU
+        #undef ${UNAME_MACHINE}
+        #undef ${UNAME_MACHINE}el
+        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+        CPU=${UNAME_MACHINE}el
+        #else
+        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+        CPU=${UNAME_MACHINE}
+        #else
+        CPU=
+        #endif
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+        ;;
+    openrisc*:Linux:*:*)
+        echo or1k-unknown-linux-${LIBC}
+        exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    padre:Linux:*:*)
+        echo sparc-unknown-linux-${LIBC}
+        exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+        echo hppa64-unknown-linux-${LIBC}
+        exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+        # Look for CPU level
+        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+          PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+          PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+          *)    echo hppa-unknown-linux-${LIBC} ;;
+        esac
+        exit ;;
+    ppc64:Linux:*:*)
+        echo powerpc64-unknown-linux-${LIBC}
+        exit ;;
+    ppc:Linux:*:*)
+        echo powerpc-unknown-linux-${LIBC}
+        exit ;;
+    ppc64le:Linux:*:*)
+        echo powerpc64le-unknown-linux-${LIBC}
+        exit ;;
+    ppcle:Linux:*:*)
+        echo powerpcle-unknown-linux-${LIBC}
+        exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+        echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+        exit ;;
+    sh64*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    sh*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    tile*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    vax:Linux:*:*)
+        echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+        exit ;;
+    x86_64:Linux:*:*)
+        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+        exit ;;
+    xtensa*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    i*86:DYNIX/ptx:4*:*)
+        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+        # earlier versions are messed up and put the nodename in both
+        # sysname and nodename.
+        echo i386-sequent-sysv4
+        exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+        # I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+        exit ;;
+    i*86:OS/2:*:*)
+        # If we were able to find `uname', then EMX Unix compatibility
+        # is probably installed.
+        echo ${UNAME_MACHINE}-pc-os2-emx
+        exit ;;
+    i*86:XTS-300:*:STOP)
+        echo ${UNAME_MACHINE}-unknown-stop
+        exit ;;
+    i*86:atheos:*:*)
+        echo ${UNAME_MACHINE}-unknown-atheos
+        exit ;;
+    i*86:syllable:*:*)
+        echo ${UNAME_MACHINE}-pc-syllable
+        exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+        echo i386-unknown-lynxos${UNAME_RELEASE}
+        exit ;;
+    i*86:*DOS:*:*)
+        echo ${UNAME_MACHINE}-pc-msdosdjgpp
+        exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+        else
+                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+        fi
+        exit ;;
+    i*86:*:5:[678]*)
+        # UnixWare 7.x, OpenUNIX and OpenServer 6.
+        case `/bin/uname -X | grep "^Machine"` in
+            *486*)           UNAME_MACHINE=i486 ;;
+            *Pentium)        UNAME_MACHINE=i586 ;;
+            *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+        esac
+        echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+        exit ;;
+    i*86:*:3.2:*)
+        if test -f /usr/options/cb.name; then
+                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+                echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+        elif /bin/uname -X 2>/dev/null >/dev/null ; then
+                UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+                (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+                (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+                        && UNAME_MACHINE=i586
+                (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+                        && UNAME_MACHINE=i686
+                (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+                        && UNAME_MACHINE=i686
+                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+        else
+                echo ${UNAME_MACHINE}-pc-sysv32
+        fi
+        exit ;;
+    pc:*:*:*)
+        # Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i586.
+        # Note: whatever this is, it MUST be the same as what config.sub
+        # prints for the "djgpp" host, or else GDB configury will decide that
+        # this is a cross-build.
+        echo i586-pc-msdosdjgpp
+        exit ;;
+    Intel:Mach:3*:*)
+        echo i386-pc-mach3
+        exit ;;
+    paragon:*:*:*)
+        echo i860-intel-osf1
+        exit ;;
+    i860:*:4.*:*) # i860-SVR4
+        if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+          echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+        else # Add other i860-SVR4 vendors below as they are discovered.
+          echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+        fi
+        exit ;;
+    mini*:CTIX:SYS*5:*)
+        # "miniframe"
+        echo m68010-convergent-sysv
+        exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+        echo m68k-convergent-sysv
+        exit ;;
+    M680?0:D-NIX:5.3:*)
+        echo m68k-diab-dnix
+        exit ;;
+    M68*:*:R3V[5678]*:*)
+        test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+        OS_REL=''
+        test -r /etc/.relid \
+        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+        OS_REL='.3'
+        test -r /etc/.relid \
+            && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+            && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+            && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+        /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+            && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+        echo m68k-unknown-lynxos${UNAME_RELEASE}
+        exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+        echo m68k-atari-sysv4
+        exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+        echo sparc-unknown-lynxos${UNAME_RELEASE}
+        exit ;;
+    rs6000:LynxOS:2.*:*)
+        echo rs6000-unknown-lynxos${UNAME_RELEASE}
+        exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+        echo powerpc-unknown-lynxos${UNAME_RELEASE}
+        exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+        echo mips-dde-sysv${UNAME_RELEASE}
+        exit ;;
+    RM*:ReliantUNIX-*:*:*)
+        echo mips-sni-sysv4
+        exit ;;
+    RM*:SINIX-*:*:*)
+        echo mips-sni-sysv4
+        exit ;;
+    *:SINIX-*:*:*)
+        if uname -p 2>/dev/null >/dev/null ; then
+                UNAME_MACHINE=`(uname -p) 2>/dev/null`
+                echo ${UNAME_MACHINE}-sni-sysv4
+        else
+                echo ns32k-sni-sysv
+        fi
+        exit ;;
+    PENTIUM:*:4.0*:*)   # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                        # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+    *:UNIX_System_V:4*:FTX*)
+        # From Gerald Hewes <hewes@openmarket.com>.
+        # How about differentiating between stratus architectures? -djm
+        echo hppa1.1-stratus-sysv4
+        exit ;;
+    *:*:*:FTX*)
+        # From seanf@swdc.stratus.com.
+        echo i860-stratus-sysv4
+        exit ;;
+    i*86:VOS:*:*)
+        # From Paul.Green@stratus.com.
+        echo ${UNAME_MACHINE}-stratus-vos
+        exit ;;
+    *:VOS:*:*)
+        # From Paul.Green@stratus.com.
+        echo hppa1.1-stratus-vos
+        exit ;;
+    mc68*:A/UX:*:*)
+        echo m68k-apple-aux${UNAME_RELEASE}
+        exit ;;
+    news*:NEWS-OS:6*:*)
+        echo mips-sony-newsos6
+        exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+        if [ -d /usr/nec ]; then
+                echo mips-nec-sysv${UNAME_RELEASE}
+        else
+                echo mips-unknown-sysv${UNAME_RELEASE}
+        fi
+        exit ;;
+    BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
+        echo powerpc-be-beos
+        exit ;;
+    BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
+        echo powerpc-apple-beos
+        exit ;;
+    BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
+        echo i586-pc-beos
+        exit ;;
+    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
+        echo i586-pc-haiku
+        exit ;;
+    x86_64:Haiku:*:*)
+        echo x86_64-unknown-haiku
+        exit ;;
+    SX-4:SUPER-UX:*:*)
+        echo sx4-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-5:SUPER-UX:*:*)
+        echo sx5-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-6:SUPER-UX:*:*)
+        echo sx6-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-7:SUPER-UX:*:*)
+        echo sx7-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-8:SUPER-UX:*:*)
+        echo sx8-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-8R:SUPER-UX:*:*)
+        echo sx8r-nec-superux${UNAME_RELEASE}
+        exit ;;
+    Power*:Rhapsody:*:*)
+        echo powerpc-apple-rhapsody${UNAME_RELEASE}
+        exit ;;
+    *:Rhapsody:*:*)
+        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+        exit ;;
+    *:Darwin:*:*)
+        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+        eval $set_cc_for_build
+        if test "$UNAME_PROCESSOR" = unknown ; then
+            UNAME_PROCESSOR=powerpc
+        fi
+        if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+            if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+                if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                    grep IS_64BIT_ARCH >/dev/null
+                then
+                    case $UNAME_PROCESSOR in
+                        i386) UNAME_PROCESSOR=x86_64 ;;
+                        powerpc) UNAME_PROCESSOR=powerpc64 ;;
+                    esac
+                fi
+            fi
+        elif test "$UNAME_PROCESSOR" = i386 ; then
+            # Avoid executing cc on OS X 10.9, as it ships with a stub
+            # that puts up a graphical alert prompting to install
+            # developer tools.  Any system running Mac OS X 10.7 or
+            # later (Darwin 11 and later) is required to have a 64-bit
+            # processor. This is not true of the ARM version of Darwin
+            # that Apple uses in portable devices.
+            UNAME_PROCESSOR=x86_64
+        fi
+        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+        exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+        UNAME_PROCESSOR=`uname -p`
+        if test "$UNAME_PROCESSOR" = "x86"; then
+                UNAME_PROCESSOR=i386
+                UNAME_MACHINE=pc
+        fi
+        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+        exit ;;
+    *:QNX:*:4*)
+        echo i386-pc-qnx
+        exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+        echo neo-tandem-nsk${UNAME_RELEASE}
+        exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+        echo nse-tandem-nsk${UNAME_RELEASE}
+        exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+        echo nsr-tandem-nsk${UNAME_RELEASE}
+        exit ;;
+    *:NonStop-UX:*:*)
+        echo mips-compaq-nonstopux
+        exit ;;
+    BS2000:POSIX*:*:*)
+        echo bs2000-siemens-sysv
+        exit ;;
+    DS/*:UNIX_System_V:*:*)
+        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+        exit ;;
+    *:Plan9:*:*)
+        # "uname -m" is not consistent, so use $cputype instead. 386
+        # is converted to i386 for consistency with other x86
+        # operating systems.
+        if test "$cputype" = "386"; then
+            UNAME_MACHINE=i386
+        else
+            UNAME_MACHINE="$cputype"
+        fi
+        echo ${UNAME_MACHINE}-unknown-plan9
+        exit ;;
+    *:TOPS-10:*:*)
+        echo pdp10-unknown-tops10
+        exit ;;
+    *:TENEX:*:*)
+        echo pdp10-unknown-tenex
+        exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+        echo pdp10-dec-tops20
+        exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+        echo pdp10-xkl-tops20
+        exit ;;
+    *:TOPS-20:*:*)
+        echo pdp10-unknown-tops20
+        exit ;;
+    *:ITS:*:*)
+        echo pdp10-unknown-its
+        exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+        exit ;;
+    *:DragonFly:*:*)
+        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        exit ;;
+    *:*VMS:*:*)
+        UNAME_MACHINE=`(uname -p) 2>/dev/null`
+        case "${UNAME_MACHINE}" in
+            A*) echo alpha-dec-vms ; exit ;;
+            I*) echo ia64-dec-vms ; exit ;;
+            V*) echo vax-dec-vms ; exit ;;
+        esac ;;
+    *:XENIX:*:SysV)
+        echo i386-pc-xenix
+        exit ;;
+    i*86:skyos:*:*)
+        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+        exit ;;
+    i*86:rdos:*:*)
+        echo ${UNAME_MACHINE}-pc-rdos
+        exit ;;
+    i*86:AROS:*:*)
+        echo ${UNAME_MACHINE}-pc-aros
+        exit ;;
+    x86_64:VMkernel:*:*)
+        echo ${UNAME_MACHINE}-unknown-esx
+        exit ;;
+esac
+cat >&2 <<EOF
+$0: unable to guess system type
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+config.guess timestamp = $timestamp
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+exit 1
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
+/usr/share/automake-1.15/config.guess

automake/config.sub

Property mode changed from 100755 to 120000

-              r7951100
+              rb067d9b
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
+timestamp='2015-08-20'
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+# Please send patches to <config-patches@gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#       CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#       CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+me=`echo "$0" | sed -e 's,.*/,,'`
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+Canonicalize a configuration name.
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+Report bugs and patches to <config-patches@gnu.org>."
+version="\
+GNU config.sub ($timestamp)
+Copyright 1992-2015 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+help="
+Try \`$me --help' for more information."
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - ) # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+    * )
+       break ;;
+  esac
+done
+case $# in
+) echo "$me: missing argument$help" >&2
+    exit 1;;
+) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+        -sun*os*)
+                # Prevent following clause from handling this invalid input.
+                ;;
+        -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+        -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+        -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+        -apple | -axis | -knuth | -cray | -microblaze*)
+                os=
+                basic_machine=$1
+                ;;
+        -bluegene*)
+                os=-cnk
+                ;;
+        -sim | -cisco | -oki | -wec | -winbond)
+                os=
+                basic_machine=$1
+                ;;
+        -scout)
+                ;;
+        -wrs)
+                os=-vxworks
+                basic_machine=$1
+                ;;
+        -chorusos*)
+                os=-chorusos
+                basic_machine=$1
+                ;;
+        -chorusrdb)
+                os=-chorusrdb
+                basic_machine=$1
+                ;;
+        -hiux*)
+                os=-hiuxwe2
+                ;;
+        -sco6)
+                os=-sco5v6
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco5)
+                os=-sco3.2v5
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco4)
+                os=-sco3.2v4
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco3.2.[4-9]*)
+                os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco3.2v[4-9]*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco5v6*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco*)
+                os=-sco3.2v2
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -udk*)
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -isc)
+                os=-isc2.2
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -clix*)
+                basic_machine=clipper-intergraph
+                ;;
+        -isc*)
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -lynx*178)
+                os=-lynxos178
+                ;;
+        -lynx*5)
+                os=-lynxos5
+                ;;
+        -lynx*)
+                os=-lynxos
+                ;;
+        -ptx*)
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+                ;;
+        -windowsnt*)
+                os=`echo $os | sed -e 's/windowsnt/winnt/'`
+                ;;
+        -psos*)
+                os=-psos
+                ;;
+        -mint | -mint[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
+esac
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+        # Recognize the basic CPU types without company name.
+        # Some are omitted here because they have special meanings below.
+a | 580 \
+        | a29k \
+        | aarch64 | aarch64_be \
+        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+        | am33_2.0 \
+        | arc | arceb \
+        | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+        | avr | avr32 \
+        | ba \
+        | be32 | be64 \
+        | bfin \
+        | c4x | c8051 | clipper \
+        | d10v | d30v | dlx | dsp16xx \
+        | e2k | epiphany \
+        | fido | fr30 | frv | ft32 \
+        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+        | hexagon \
+        | i370 | i860 | i960 | ia64 \
+        | ip2k | iq2000 \
+        | k1om \
+        | le32 | le64 \
+        | lm32 \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+        | mips | mipsbe | mipseb | mipsel | mipsle \
+        | mips16 \
+        | mips64 | mips64el \
+        | mips64octeon | mips64octeonel \
+        | mips64orion | mips64orionel \
+        | mips64r5900 | mips64r5900el \
+        | mips64vr | mips64vrel \
+        | mips64vr4100 | mips64vr4100el \
+        | mips64vr4300 | mips64vr4300el \
+        | mips64vr5000 | mips64vr5000el \
+        | mips64vr5900 | mips64vr5900el \
+        | mipsisa32 | mipsisa32el \
+        | mipsisa32r2 | mipsisa32r2el \
+        | mipsisa32r6 | mipsisa32r6el \
+        | mipsisa64 | mipsisa64el \
+        | mipsisa64r2 | mipsisa64r2el \
+        | mipsisa64r6 | mipsisa64r6el \
+        | mipsisa64sb1 | mipsisa64sb1el \
+        | mipsisa64sr71k | mipsisa64sr71kel \
+        | mipsr5900 | mipsr5900el \
+        | mipstx39 | mipstx39el \
+        | mn10200 | mn10300 \
+        | moxie \
+        | mt \
+        | msp430 \
+        | nds32 | nds32le | nds32be \
+        | nios | nios2 | nios2eb | nios2el \
+        | ns16k | ns32k \
+        | open8 | or1k | or1knd | or32 \
+        | pdp10 | pdp11 | pj | pjl \
+        | powerpc | powerpc64 | powerpc64le | powerpcle \
+        | pyramid \
+        | riscv32 | riscv64 \
+        | rl78 | rx \
+        | score \
+        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+        | sh64 | sh64le \
+        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+        | spu \
+        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+        | ubicom32 \
+        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+        | visium \
+        | we32k \
+        | x86 | xc16x | xstormy16 | xtensa \
+        | z8k | z80)
+                basic_machine=$basic_machine-unknown
+                ;;
+        c54x)
+                basic_machine=tic54x-unknown
+                ;;
+        c55x)
+                basic_machine=tic55x-unknown
+                ;;
+        c6x)
+                basic_machine=tic6x-unknown
+                ;;
+        leon|leon[3-9])
+                basic_machine=sparc-$basic_machine
+                ;;
+        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+                basic_machine=$basic_machine-unknown
+                os=-none
+                ;;
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+                ;;
+        ms1)
+                basic_machine=mt-unknown
+                ;;
+        strongarm | thumb | xscale)
+                basic_machine=arm-unknown
+                ;;
+        xgate)
+                basic_machine=$basic_machine-unknown
+                os=-none
+                ;;
+        xscaleeb)
+                basic_machine=armeb-unknown
+                ;;
+        xscaleel)
+                basic_machine=armel-unknown
+                ;;
+        # We use `pc' rather than `unknown'
+        # because (1) that's what they normally are, and
+        # (2) the word "unknown" tends to confuse beginning users.
+        i*86 | x86_64)
+          basic_machine=$basic_machine-pc
+          ;;
+        # Object if more than one company name word.
+        *-*-*)
+                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+                exit 1
+                ;;
+        # Recognize the basic CPU types with company name.
+-* \
+        | a29k-* \
+        | aarch64-* | aarch64_be-* \
+        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+        | avr-* | avr32-* \
+        | ba-* \
+        | be32-* | be64-* \
+        | bfin-* | bs2000-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* \
+        | c8051-* | clipper-* | craynv-* | cydra-* \
+        | d10v-* | d30v-* | dlx-* \
+        | e2k-* | elxsi-* \
+        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+        | h8300-* | h8500-* \
+        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+        | hexagon-* \
+        | i*86-* | i860-* | i960-* | ia64-* \
+        | ip2k-* | iq2000-* \
+        | k1om-* \
+        | le32-* | le64-* \
+        | lm32-* \
+        | m32c-* | m32r-* | m32rle-* \
+        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+        | microblaze-* | microblazeel-* \
+        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+        | mips16-* \
+        | mips64-* | mips64el-* \
+        | mips64octeon-* | mips64octeonel-* \
+        | mips64orion-* | mips64orionel-* \
+        | mips64r5900-* | mips64r5900el-* \
+        | mips64vr-* | mips64vrel-* \
+        | mips64vr4100-* | mips64vr4100el-* \
+        | mips64vr4300-* | mips64vr4300el-* \
+        | mips64vr5000-* | mips64vr5000el-* \
+        | mips64vr5900-* | mips64vr5900el-* \
+        | mipsisa32-* | mipsisa32el-* \
+        | mipsisa32r2-* | mipsisa32r2el-* \
+        | mipsisa32r6-* | mipsisa32r6el-* \
+        | mipsisa64-* | mipsisa64el-* \
+        | mipsisa64r2-* | mipsisa64r2el-* \
+        | mipsisa64r6-* | mipsisa64r6el-* \
+        | mipsisa64sb1-* | mipsisa64sb1el-* \
+        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+        | mipsr5900-* | mipsr5900el-* \
+        | mipstx39-* | mipstx39el-* \
+        | mmix-* \
+        | mt-* \
+        | msp430-* \
+        | nds32-* | nds32le-* | nds32be-* \
+        | nios-* | nios2-* | nios2eb-* | nios2el-* \
+        | none-* | np1-* | ns16k-* | ns32k-* \
+        | open8-* \
+        | or1k*-* \
+        | orion-* \
+        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+        | pyramid-* \
+        | riscv32-* | riscv64-* \
+        | rl78-* | romp-* | rs6000-* | rx-* \
+        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+        | sparclite-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+        | tahoe-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tile*-* \
+        | tron-* \
+        | ubicom32-* \
+        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+        | vax-* \
+        | visium-* \
+        | we32k-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* \
+        | xstormy16-* | xtensa*-* \
+        | ymp-* \
+        | z8k-* | z80-*)
+                ;;
+        # Recognize the basic CPU types without company name, with glob match.
+        xtensa*)
+                basic_machine=$basic_machine-unknown
+                ;;
+        # Recognize the various machine names and aliases which stand
+        # for a CPU type and a company and sometimes even an OS.
+bsd)
+                basic_machine=i386-unknown
+                os=-bsd
+                ;;
+b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+                basic_machine=m68000-att
+                ;;
+b*)
+                basic_machine=we32k-att
+                ;;
+        a29khif)
+                basic_machine=a29k-amd
+                os=-udi
+                ;;
+        abacus)
+                basic_machine=abacus-unknown
+                ;;
+        adobe68k)
+                basic_machine=m68010-adobe
+                os=-scout
+                ;;
+        alliant | fx80)
+                basic_machine=fx80-alliant
+                ;;
+        altos | altos3068)
+                basic_machine=m68k-altos
+                ;;
+        am29k)
+                basic_machine=a29k-none
+                os=-bsd
+                ;;
+        amd64)
+                basic_machine=x86_64-pc
+                ;;
+        amd64-*)
+                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        amdahl)
+                basic_machine=580-amdahl
+                os=-sysv
+                ;;
+        amiga | amiga-*)
+                basic_machine=m68k-unknown
+                ;;
+        amigaos | amigados)
+                basic_machine=m68k-unknown
+                os=-amigaos
+                ;;
+        amigaunix | amix)
+                basic_machine=m68k-unknown
+                os=-sysv4
+                ;;
+        apollo68)
+                basic_machine=m68k-apollo
+                os=-sysv
+                ;;
+        apollo68bsd)
+                basic_machine=m68k-apollo
+                os=-bsd
+                ;;
+        aros)
+                basic_machine=i386-pc
+                os=-aros
+                ;;
+        asmjs)
+                basic_machine=asmjs-unknown
+                ;;
+        aux)
+                basic_machine=m68k-apple
+                os=-aux
+                ;;
+        balance)
+                basic_machine=ns32k-sequent
+                os=-dynix
+                ;;
+        blackfin)
+                basic_machine=bfin-unknown
+                os=-linux
+                ;;
+        blackfin-*)
+                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
+        bluegene*)
+                basic_machine=powerpc-ibm
+                os=-cnk
+                ;;
+        c54x-*)
+                basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c55x-*)
+                basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c6x-*)
+                basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c90)
+                basic_machine=c90-cray
+                os=-unicos
+                ;;
+        cegcc)
+                basic_machine=arm-unknown
+                os=-cegcc
+                ;;
+        convex-c1)
+                basic_machine=c1-convex
+                os=-bsd
+                ;;
+        convex-c2)
+                basic_machine=c2-convex
+                os=-bsd
+                ;;
+        convex-c32)
+                basic_machine=c32-convex
+                os=-bsd
+                ;;
+        convex-c34)
+                basic_machine=c34-convex
+                os=-bsd
+                ;;
+        convex-c38)
+                basic_machine=c38-convex
+                os=-bsd
+                ;;
+        cray | j90)
+                basic_machine=j90-cray
+                os=-unicos
+                ;;
+        craynv)
+                basic_machine=craynv-cray
+                os=-unicosmp
+                ;;
+        cr16 | cr16-*)
+                basic_machine=cr16-unknown
+                os=-elf
+                ;;
+        crds | unos)
+                basic_machine=m68k-crds
+                ;;
+        crisv32 | crisv32-* | etraxfs*)
+                basic_machine=crisv32-axis
+                ;;
+        cris | cris-* | etrax*)
+                basic_machine=cris-axis
+                ;;
+        crx)
+                basic_machine=crx-unknown
+                os=-elf
+                ;;
+        da30 | da30-*)
+                basic_machine=m68k-da30
+                ;;
+        decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+                basic_machine=mips-dec
+                ;;
+        decsystem10* | dec10*)
+                basic_machine=pdp10-dec
+                os=-tops10
+                ;;
+        decsystem20* | dec20*)
+                basic_machine=pdp10-dec
+                os=-tops20
+                ;;
+        delta | 3300 | motorola-3300 | motorola-delta \
+              | 3300-motorola | delta-motorola)
+                basic_machine=m68k-motorola
+                ;;
+        delta88)
+                basic_machine=m88k-motorola
+                os=-sysv3
+                ;;
+        dicos)
+                basic_machine=i686-pc
+                os=-dicos
+                ;;
+        djgpp)
+                basic_machine=i586-pc
+                os=-msdosdjgpp
+                ;;
+        dpx20 | dpx20-*)
+                basic_machine=rs6000-bull
+                os=-bosx
+                ;;
+        dpx2* | dpx2*-bull)
+                basic_machine=m68k-bull
+                os=-sysv3
+                ;;
+        ebmon29k)
+                basic_machine=a29k-amd
+                os=-ebmon
+                ;;
+        elxsi)
+                basic_machine=elxsi-elxsi
+                os=-bsd
+                ;;
+        encore | umax | mmax)
+                basic_machine=ns32k-encore
+                ;;
+        es1800 | OSE68k | ose68k | ose | OSE)
+                basic_machine=m68k-ericsson
+                os=-ose
+                ;;
+        fx2800)
+                basic_machine=i860-alliant
+                ;;
+        genix)
+                basic_machine=ns32k-ns
+                ;;
+        gmicro)
+                basic_machine=tron-gmicro
+                os=-sysv
+                ;;
+        go32)
+                basic_machine=i386-pc
+                os=-go32
+                ;;
+        h3050r* | hiux*)
+                basic_machine=hppa1.1-hitachi
+                os=-hiuxwe2
+                ;;
+        h8300hms)
+                basic_machine=h8300-hitachi
+                os=-hms
+                ;;
+        h8300xray)
+                basic_machine=h8300-hitachi
+                os=-xray
+                ;;
+        h8500hms)
+                basic_machine=h8500-hitachi
+                os=-hms
+                ;;
+        harris)
+                basic_machine=m88k-harris
+                os=-sysv3
+                ;;
+        hp300-*)
+                basic_machine=m68k-hp
+                ;;
+        hp300bsd)
+                basic_machine=m68k-hp
+                os=-bsd
+                ;;
+        hp300hpux)
+                basic_machine=m68k-hp
+                os=-hpux
+                ;;
+        hp3k9[0-9][0-9] | hp9[0-9][0-9])
+                basic_machine=hppa1.0-hp
+                ;;
+        hp9k2[0-9][0-9] | hp9k31[0-9])
+                basic_machine=m68000-hp
+                ;;
+        hp9k3[2-9][0-9])
+                basic_machine=m68k-hp
+                ;;
+        hp9k6[0-9][0-9] | hp6[0-9][0-9])
+                basic_machine=hppa1.0-hp
+                ;;
+        hp9k7[0-79][0-9] | hp7[0-79][0-9])
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k78[0-9] | hp78[0-9])
+                # FIXME: really hppa2.0-hp
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+                # FIXME: really hppa2.0-hp
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k8[0-9][13679] | hp8[0-9][13679])
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k8[0-9][0-9] | hp8[0-9][0-9])
+                basic_machine=hppa1.0-hp
+                ;;
+        hppa-next)
+                os=-nextstep3
+                ;;
+        hppaosf)
+                basic_machine=hppa1.1-hp
+                os=-osf
+                ;;
+        hppro)
+                basic_machine=hppa1.1-hp
+                os=-proelf
+                ;;
+        i370-ibm* | ibm*)
+                basic_machine=i370-ibm
+                ;;
+        i*86v32)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-sysv32
+                ;;
+        i*86v4*)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-sysv4
+                ;;
+        i*86v)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-sysv
+                ;;
+        i*86sol2)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-solaris2
+                ;;
+        i386mach)
+                basic_machine=i386-mach
+                os=-mach
+                ;;
+        i386-vsta | vsta)
+                basic_machine=i386-unknown
+                os=-vsta
+                ;;
+        iris | iris4d)
+                basic_machine=mips-sgi
+                case $os in
+                    -irix*)
+                        ;;
+                    *)
+                        os=-irix4
+                        ;;
+                esac
+                ;;
+        isi68 | isi)
+                basic_machine=m68k-isi
+                os=-sysv
+                ;;
+        leon-*|leon[3-9]-*)
+                basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+                ;;
+        m68knommu)
+                basic_machine=m68k-unknown
+                os=-linux
+                ;;
+        m68knommu-*)
+                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
+        m88k-omron*)
+                basic_machine=m88k-omron
+                ;;
+        magnum | m3230)
+                basic_machine=mips-mips
+                os=-sysv
+                ;;
+        merlin)
+                basic_machine=ns32k-utek
+                os=-sysv
+                ;;
+        microblaze*)
+                basic_machine=microblaze-xilinx
+                ;;
+        mingw64)
+                basic_machine=x86_64-pc
+                os=-mingw64
+                ;;
+        mingw32)
+                basic_machine=i686-pc
+                os=-mingw32
+                ;;
+        mingw32ce)
+                basic_machine=arm-unknown
+                os=-mingw32ce
+                ;;
+        miniframe)
+                basic_machine=m68000-convergent
+                ;;
+        *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
+        mips3*-*)
+                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+                ;;
+        mips3*)
+                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+                ;;
+        monitor)
+                basic_machine=m68k-rom68k
+                os=-coff
+                ;;
+        morphos)
+                basic_machine=powerpc-unknown
+                os=-morphos
+                ;;
+        moxiebox)
+                basic_machine=moxie-unknown
+                os=-moxiebox
+                ;;
+        msdos)
+                basic_machine=i386-pc
+                os=-msdos
+                ;;
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+                ;;
+        msys)
+                basic_machine=i686-pc
+                os=-msys
+                ;;
+        mvs)
+                basic_machine=i370-ibm
+                os=-mvs
+                ;;
+        nacl)
+                basic_machine=le32-unknown
+                os=-nacl
+                ;;
+        ncr3000)
+                basic_machine=i486-ncr
+                os=-sysv4
+                ;;
+        netbsd386)
+                basic_machine=i386-unknown
+                os=-netbsd
+                ;;
+        netwinder)
+                basic_machine=armv4l-rebel
+                os=-linux
+                ;;
+        news | news700 | news800 | news900)
+                basic_machine=m68k-sony
+                os=-newsos
+                ;;
+        news1000)
+                basic_machine=m68030-sony
+                os=-newsos
+                ;;
+        news-3600 | risc-news)
+                basic_machine=mips-sony
+                os=-newsos
+                ;;
+        necv70)
+                basic_machine=v70-nec
+                os=-sysv
+                ;;
+        next | m*-next )
+                basic_machine=m68k-next
+                case $os in
+                    -nextstep* )
+                        ;;
+                    -ns2*)
+                      os=-nextstep2
+                        ;;
+                    *)
+                      os=-nextstep3
+                        ;;
+                esac
+                ;;
+        nh3000)
+                basic_machine=m68k-harris
+                os=-cxux
+                ;;
+        nh[45]000)
+                basic_machine=m88k-harris
+                os=-cxux
+                ;;
+        nindy960)
+                basic_machine=i960-intel
+                os=-nindy
+                ;;
+        mon960)
+                basic_machine=i960-intel
+                os=-mon960
+                ;;
+        nonstopux)
+                basic_machine=mips-compaq
+                os=-nonstopux
+                ;;
+        np1)
+                basic_machine=np1-gould
+                ;;
+        neo-tandem)
+                basic_machine=neo-tandem
+                ;;
+        nse-tandem)
+                basic_machine=nse-tandem
+                ;;
+        nsr-tandem)
+                basic_machine=nsr-tandem
+                ;;
+        op50n-* | op60c-*)
+                basic_machine=hppa1.1-oki
+                os=-proelf
+                ;;
+        openrisc | openrisc-*)
+                basic_machine=or32-unknown
+                ;;
+        os400)
+                basic_machine=powerpc-ibm
+                os=-os400
+                ;;
+        OSE68000 | ose68000)
+                basic_machine=m68000-ericsson
+                os=-ose
+                ;;
+        os68k)
+                basic_machine=m68k-none
+                os=-os68k
+                ;;
+        pa-hitachi)
+                basic_machine=hppa1.1-hitachi
+                os=-hiuxwe2
+                ;;
+        paragon)
+                basic_machine=i860-intel
+                os=-osf
+                ;;
+        parisc)
+                basic_machine=hppa-unknown
+                os=-linux
+                ;;
+        parisc-*)
+                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
+        pbd)
+                basic_machine=sparc-tti
+                ;;
+        pbb)
+                basic_machine=m68k-tti
+                ;;
+        pc532 | pc532-*)
+                basic_machine=ns32k-pc532
+                ;;
+        pc98)
+                basic_machine=i386-pc
+                ;;
+        pc98-*)
+                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentium | p5 | k5 | k6 | nexgen | viac3)
+                basic_machine=i586-pc
+                ;;
+        pentiumpro | p6 | 6x86 | athlon | athlon_*)
+                basic_machine=i686-pc
+                ;;
+        pentiumii | pentium2 | pentiumiii | pentium3)
+                basic_machine=i686-pc
+                ;;
+        pentium4)
+                basic_machine=i786-pc
+                ;;
+        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentiumpro-* | p6-* | 6x86-* | athlon-*)
+                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentium4-*)
+                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pn)
+                basic_machine=pn-gould
+                ;;
+        power)  basic_machine=power-ibm
+                ;;
+        ppc | ppcbe)    basic_machine=powerpc-unknown
+                ;;
+        ppc-* | ppcbe-*)
+                basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ppcle | powerpclittle | ppc-le | powerpc-little)
+                basic_machine=powerpcle-unknown
+                ;;
+        ppcle-* | powerpclittle-*)
+                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ppc64)  basic_machine=powerpc64-unknown
+                ;;
+        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+                basic_machine=powerpc64le-unknown
+                ;;
+        ppc64le-* | powerpc64little-*)
+                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ps2)
+                basic_machine=i386-ibm
+                ;;
+        pw32)
+                basic_machine=i586-unknown
+                os=-pw32
+                ;;
+        rdos | rdos64)
+                basic_machine=x86_64-pc
+                os=-rdos
+                ;;
+        rdos32)
+                basic_machine=i386-pc
+                os=-rdos
+                ;;
+        rom68k)
+                basic_machine=m68k-rom68k
+                os=-coff
+                ;;
+        rm[46]00)
+                basic_machine=mips-siemens
+                ;;
+        rtpc | rtpc-*)
+                basic_machine=romp-ibm
+                ;;
+        s390 | s390-*)
+                basic_machine=s390-ibm
+                ;;
+        s390x | s390x-*)
+                basic_machine=s390x-ibm
+                ;;
+        sa29200)
+                basic_machine=a29k-amd
+                os=-udi
+                ;;
+        sb1)
+                basic_machine=mipsisa64sb1-unknown
+                ;;
+        sb1el)
+                basic_machine=mipsisa64sb1el-unknown
+                ;;
+        sde)
+                basic_machine=mipsisa32-sde
+                os=-elf
+                ;;
+        sei)
+                basic_machine=mips-sei
+                os=-seiux
+                ;;
+        sequent)
+                basic_machine=i386-sequent
+                ;;
+        sh)
+                basic_machine=sh-hitachi
+                os=-hms
+                ;;
+        sh5el)
+                basic_machine=sh5le-unknown
+                ;;
+        sh64)
+                basic_machine=sh64-unknown
+                ;;
+        sparclite-wrs | simso-wrs)
+                basic_machine=sparclite-wrs
+                os=-vxworks
+                ;;
+        sps7)
+                basic_machine=m68k-bull
+                os=-sysv2
+                ;;
+        spur)
+                basic_machine=spur-unknown
+                ;;
+        st2000)
+                basic_machine=m68k-tandem
+                ;;
+        stratus)
+                basic_machine=i860-stratus
+                os=-sysv4
+                ;;
+        strongarm-* | thumb-*)
+                basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        sun2)
+                basic_machine=m68000-sun
+                ;;
+        sun2os3)
+                basic_machine=m68000-sun
+                os=-sunos3
+                ;;
+        sun2os4)
+                basic_machine=m68000-sun
+                os=-sunos4
+                ;;
+        sun3os3)
+                basic_machine=m68k-sun
+                os=-sunos3
+                ;;
+        sun3os4)
+                basic_machine=m68k-sun
+                os=-sunos4
+                ;;
+        sun4os3)
+                basic_machine=sparc-sun
+                os=-sunos3
+                ;;
+        sun4os4)
+                basic_machine=sparc-sun
+                os=-sunos4
+                ;;
+        sun4sol2)
+                basic_machine=sparc-sun
+                os=-solaris2
+                ;;
+        sun3 | sun3-*)
+                basic_machine=m68k-sun
+                ;;
+        sun4)
+                basic_machine=sparc-sun
+                ;;
+        sun386 | sun386i | roadrunner)
+                basic_machine=i386-sun
+                ;;
+        sv1)
+                basic_machine=sv1-cray
+                os=-unicos
+                ;;
+        symmetry)
+                basic_machine=i386-sequent
+                os=-dynix
+                ;;
+        t3e)
+                basic_machine=alphaev5-cray
+                os=-unicos
+                ;;
+        t90)
+                basic_machine=t90-cray
+                os=-unicos
+                ;;
+        tile*)
+                basic_machine=$basic_machine-unknown
+                os=-linux-gnu
+                ;;
+        tx39)
+                basic_machine=mipstx39-unknown
+                ;;
+        tx39el)
+                basic_machine=mipstx39el-unknown
+                ;;
+        toad1)
+                basic_machine=pdp10-xkl
+                os=-tops20
+                ;;
+        tower | tower-32)
+                basic_machine=m68k-ncr
+                ;;
+        tpf)
+                basic_machine=s390x-ibm
+                os=-tpf
+                ;;
+        udi29k)
+                basic_machine=a29k-amd
+                os=-udi
+                ;;
+        ultra3)
+                basic_machine=a29k-nyu
+                os=-sym1
+                ;;
+        v810 | necv810)
+                basic_machine=v810-nec
+                os=-none
+                ;;
+        vaxv)
+                basic_machine=vax-dec
+                os=-sysv
+                ;;
+        vms)
+                basic_machine=vax-dec
+                os=-vms
+                ;;
+        vpp*|vx|vx-*)
+                basic_machine=f301-fujitsu
+                ;;
+        vxworks960)
+                basic_machine=i960-wrs
+                os=-vxworks
+                ;;
+        vxworks68)
+                basic_machine=m68k-wrs
+                os=-vxworks
+                ;;
+        vxworks29k)
+                basic_machine=a29k-wrs
+                os=-vxworks
+                ;;
+        w65*)
+                basic_machine=w65-wdc
+                os=-none
+                ;;
+        w89k-*)
+                basic_machine=hppa1.1-winbond
+                os=-proelf
+                ;;
+        xbox)
+                basic_machine=i686-pc
+                os=-mingw32
+                ;;
+        xps | xps100)
+                basic_machine=xps100-honeywell
+                ;;
+        xscale-* | xscalee[bl]-*)
+                basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+                ;;
+        ymp)
+                basic_machine=ymp-cray
+                os=-unicos
+                ;;
+        z8k-*-coff)
+                basic_machine=z8k-unknown
+                os=-sim
+                ;;
+        z80-*-coff)
+                basic_machine=z80-unknown
+                os=-sim
+                ;;
+        none)
+                basic_machine=none-none
+                os=-none
+                ;;
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+        w89k)
+                basic_machine=hppa1.1-winbond
+                ;;
+        op50n)
+                basic_machine=hppa1.1-oki
+                ;;
+        op60c)
+                basic_machine=hppa1.1-oki
+                ;;
+        romp)
+                basic_machine=romp-ibm
+                ;;
+        mmix)
+                basic_machine=mmix-knuth
+                ;;
+        rs6000)
+                basic_machine=rs6000-ibm
+                ;;
+        vax)
+                basic_machine=vax-dec
+                ;;
+        pdp10)
+                # there are many clones, so DEC is not a safe bet
+                basic_machine=pdp10-unknown
+                ;;
+        pdp11)
+                basic_machine=pdp11-dec
+                ;;
+        we32k)
+                basic_machine=we32k-att
+                ;;
+        sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+                basic_machine=sh-unknown
+                ;;
+        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+                basic_machine=sparc-sun
+                ;;
+        cydra)
+                basic_machine=cydra-cydrome
+                ;;
+        orion)
+                basic_machine=orion-highlevel
+                ;;
+        orion105)
+                basic_machine=clipper-highlevel
+                ;;
+        mac | mpw | mac-mpw)
+                basic_machine=m68k-apple
+                ;;
+        pmac | pmac-mpw)
+                basic_machine=powerpc-apple
+                ;;
+        *-unknown)
+                # Make sure to match an already-canonicalized machine name.
+                ;;
+        *)
+                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+                exit 1
+                ;;
+esac
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+        *-digital*)
+                basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+                ;;
+        *-commodore*)
+                basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+                ;;
+        *)
+                ;;
+esac
+# Decode manufacturer-specific aliases for certain operating systems.
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+        # -solaris* is a basic system type, with this one exception.
+        -auroraux)
+                os=-auroraux
+                ;;
+        -solaris1 | -solaris1.*)
+                os=`echo $os | sed -e 's|solaris1|sunos4|'`
+                ;;
+        -solaris)
+                os=-solaris2
+                ;;
+        -svr4*)
+                os=-sysv4
+                ;;
+        -unixware*)
+                os=-sysv4.2uw
+                ;;
+        -gnu/linux*)
+                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+                ;;
+        # First accept the basic system types.
+        # The portable systems comes first.
+        # Each alternative MUST END IN A *, to match a version number.
+        # -sysv* is not here because it comes later, after sysvr4.
+        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+              | -sym* | -kopensolaris* | -plan9* \
+              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+              | -aos* | -aros* | -cloudabi* | -sortix* \
+              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+              | -bitrig* | -openbsd* | -solidbsd* \
+              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+              | -chorusos* | -chorusrdb* | -cegcc* \
+              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+              | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+        # Remember, each alternative MUST END IN *, to match a version number.
+                ;;
+        -qnx*)
+                case $basic_machine in
+                    x86-* | i*86-*)
+                        ;;
+                    *)
+                        os=-nto$os
+                        ;;
+                esac
+                ;;
+        -nto-qnx*)
+                ;;
+        -nto*)
+                os=`echo $os | sed -e 's|nto|nto-qnx|'`
+                ;;
+        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+                ;;
+        -mac*)
+                os=`echo $os | sed -e 's|mac|macos|'`
+                ;;
+        -linux-dietlibc)
+                os=-linux-dietlibc
+                ;;
+        -linux*)
+                os=`echo $os | sed -e 's|linux|linux-gnu|'`
+                ;;
+        -sunos5*)
+                os=`echo $os | sed -e 's|sunos5|solaris2|'`
+                ;;
+        -sunos6*)
+                os=`echo $os | sed -e 's|sunos6|solaris3|'`
+                ;;
+        -opened*)
+                os=-openedition
+                ;;
+        -os400*)
+                os=-os400
+                ;;
+        -wince*)
+                os=-wince
+                ;;
+        -osfrose*)
+                os=-osfrose
+                ;;
+        -osf*)
+                os=-osf
+                ;;
+        -utek*)
+                os=-bsd
+                ;;
+        -dynix*)
+                os=-bsd
+                ;;
+        -acis*)
+                os=-aos
+                ;;
+        -atheos*)
+                os=-atheos
+                ;;
+        -syllable*)
+                os=-syllable
+                ;;
+        -386bsd)
+                os=-bsd
+                ;;
+        -ctix* | -uts*)
+                os=-sysv
+                ;;
+        -nova*)
+                os=-rtmk-nova
+                ;;
+        -ns2 )
+                os=-nextstep2
+                ;;
+        -nsk*)
+                os=-nsk
+                ;;
+        # Preserve the version number of sinix5.
+        -sinix5.*)
+                os=`echo $os | sed -e 's|sinix|sysv|'`
+                ;;
+        -sinix*)
+                os=-sysv4
+                ;;
+        -tpf*)
+                os=-tpf
+                ;;
+        -triton*)
+                os=-sysv3
+                ;;
+        -oss*)
+                os=-sysv3
+                ;;
+        -svr4)
+                os=-sysv4
+                ;;
+        -svr3)
+                os=-sysv3
+                ;;
+        -sysvr4)
+                os=-sysv4
+                ;;
+        # This must come after -sysvr4.
+        -sysv*)
+                ;;
+        -ose*)
+                os=-ose
+                ;;
+        -es1800*)
+                os=-ose
+                ;;
+        -xenix)
+                os=-xenix
+                ;;
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                os=-mint
+                ;;
+        -aros*)
+                os=-aros
+                ;;
+        -zvmoe)
+                os=-zvmoe
+                ;;
+        -dicos*)
+                os=-dicos
+                ;;
+        -nacl*)
+                ;;
+        -none)
+                ;;
+        *)
+                # Get rid of the `-' at the beginning of $os.
+                os=`echo $os | sed 's/[^-]*-//'`
+                echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+                exit 1
+                ;;
+esac
+else
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+case $basic_machine in
+        score-*)
+                os=-elf
+                ;;
+        spu-*)
+                os=-elf
+                ;;
+        *-acorn)
+                os=-riscix1.2
+                ;;
+        arm*-rebel)
+                os=-linux
+                ;;
+        arm*-semi)
+                os=-aout
+                ;;
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
+        c8051-*)
+                os=-elf
+                ;;
+        hexagon-*)
+                os=-elf
+                ;;
+        tic54x-*)
+                os=-coff
+                ;;
+        tic55x-*)
+                os=-coff
+                ;;
+        tic6x-*)
+                os=-coff
+                ;;
+        # This must come before the *-dec entry.
+        pdp10-*)
+                os=-tops20
+                ;;
+        pdp11-*)
+                os=-none
+                ;;
+        *-dec | vax-*)
+                os=-ultrix4.2
+                ;;
+        m68*-apollo)
+                os=-domain
+                ;;
+        i386-sun)
+                os=-sunos4.0.2
+                ;;
+        m68000-sun)
+                os=-sunos3
+                ;;
+        m68*-cisco)
+                os=-aout
+                ;;
+        mep-*)
+                os=-elf
+                ;;
+        mips*-cisco)
+                os=-elf
+                ;;
+        mips*-*)
+                os=-elf
+                ;;
+        or32-*)
+                os=-coff
+                ;;
+        *-tti)  # must be before sparc entry or we get the wrong os.
+                os=-sysv3
+                ;;
+        sparc-* | *-sun)
+                os=-sunos4.1.1
+                ;;
+        *-be)
+                os=-beos
+                ;;
+        *-haiku)
+                os=-haiku
+                ;;
+        *-ibm)
+                os=-aix
+                ;;
+        *-knuth)
+                os=-mmixware
+                ;;
+        *-wec)
+                os=-proelf
+                ;;
+        *-winbond)
+                os=-proelf
+                ;;
+        *-oki)
+                os=-proelf
+                ;;
+        *-hp)
+                os=-hpux
+                ;;
+        *-hitachi)
+                os=-hiux
+                ;;
+        i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+                os=-sysv
+                ;;
+        *-cbm)
+                os=-amigaos
+                ;;
+        *-dg)
+                os=-dgux
+                ;;
+        *-dolphin)
+                os=-sysv3
+                ;;
+        m68k-ccur)
+                os=-rtu
+                ;;
+        m88k-omron*)
+                os=-luna
+                ;;
+        *-next )
+                os=-nextstep
+                ;;
+        *-sequent)
+                os=-ptx
+                ;;
+        *-crds)
+                os=-unos
+                ;;
+        *-ns)
+                os=-genix
+                ;;
+        i370-*)
+                os=-mvs
+                ;;
+        *-next)
+                os=-nextstep3
+                ;;
+        *-gould)
+                os=-sysv
+                ;;
+        *-highlevel)
+                os=-bsd
+                ;;
+        *-encore)
+                os=-bsd
+                ;;
+        *-sgi)
+                os=-irix
+                ;;
+        *-siemens)
+                os=-sysv4
+                ;;
+        *-masscomp)
+                os=-rtu
+                ;;
+        f30[01]-fujitsu | f700-fujitsu)
+                os=-uxpv
+                ;;
+        *-rom68k)
+                os=-coff
+                ;;
+        *-*bug)
+                os=-coff
+                ;;
+        *-apple)
+                os=-macos
+                ;;
+        *-atari*)
+                os=-mint
+                ;;
+        *)
+                os=-none
+                ;;
+esac
+fi
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+        *-unknown)
+                case $os in
+                        -riscix*)
+                                vendor=acorn
+                                ;;
+                        -sunos*)
+                                vendor=sun
+                                ;;
+                        -cnk*|-aix*)
+                                vendor=ibm
+                                ;;
+                        -beos*)
+                                vendor=be
+                                ;;
+                        -hpux*)
+                                vendor=hp
+                                ;;
+                        -mpeix*)
+                                vendor=hp
+                                ;;
+                        -hiux*)
+                                vendor=hitachi
+                                ;;
+                        -unos*)
+                                vendor=crds
+                                ;;
+                        -dgux*)
+                                vendor=dg
+                                ;;
+                        -luna*)
+                                vendor=omron
+                                ;;
+                        -genix*)
+                                vendor=ns
+                                ;;
+                        -mvs* | -opened*)
+                                vendor=ibm
+                                ;;
+                        -os400*)
+                                vendor=ibm
+                                ;;
+                        -ptx*)
+                                vendor=sequent
+                                ;;
+                        -tpf*)
+                                vendor=ibm
+                                ;;
+                        -vxsim* | -vxworks* | -windiss*)
+                                vendor=wrs
+                                ;;
+                        -aux*)
+                                vendor=apple
+                                ;;
+                        -hms*)
+                                vendor=hitachi
+                                ;;
+                        -mpw* | -macos*)
+                                vendor=apple
+                                ;;
+                        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                                vendor=atari
+                                ;;
+                        -vos*)
+                                vendor=stratus
+                                ;;
+                esac
+                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+                ;;
+esac
+echo $basic_machine$os
+exit
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
+/usr/share/automake-1.15/config.sub

automake/depcomp

Property mode changed from 100755 to 120000

-              r7951100
+              rb067d9b
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+scriptversion=2013-05-30.07; # UTC
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+# A tabulation character.
+tab='   '
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+none)
+  exec "$@"
+  ;;
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+exit 0
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
+/usr/share/automake-1.15/depcomp

automake/install-sh

Property mode changed from 100755 to 120000

-              r7951100
+              rb067d9b
+#!/bin/sh
+# install - install a program, script, or datafile
+scriptversion=2014-09-12.12; # UTC
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+tab='   '
+nl='
+'
+IFS=" $tab$nl"
+# Set DOITPROG to "echo" to test this script.
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+posix_mkdir=
+# Desired mode of installed file.
+mode=0755
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+src=
+dst=
+dir_arg=
+dst_arg=
+copy_on_change=false
+is_target_a_directory=possibly
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+    -C) copy_on_change=true;;
+    -d) dir_arg=true;;
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+    --help) echo "$usage"; exit $?;;
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+    -o) chowncmd="$chownprog $2"
+        shift;;
+    -s) stripcmd=$stripprog;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+    -T) is_target_a_directory=never;;
+    --version) echo "$0 $scriptversion"; exit $?;;
+    --) shift
+        break;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+    *)  break;;
+  esac
+  shift
+done
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+  obsolete_mkdir_used=false
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
+    esac
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+      prefixes=
+      for d
+      do
+        test X"$d" = X && continue
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+    trap '' 0
+  fi
+done
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
+/usr/share/automake-1.15/install-sh

automake/missing

Property mode changed from 100755 to 120000

-              r7951100
+              rb067d9b
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+scriptversion=2013-10-28.13; # UTC
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+case $1 in
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+  printf '%s\n' "'$1' is $msg."
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
+/usr/share/automake-1.15/missing

automake/test-driver

Property mode changed from 100755 to 120000

-              r7951100
+              rb067d9b
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+scriptversion=2013-07-13.22; # UTC
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+   *) break;;
+  esac
+  shift
+done
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='[0;31m' # Red.
+  grn='[0;32m' # Green.
+  lgn='[1;32m' # Light green.
+  blu='[1;34m' # Blue.
+  mgn='[0;35m' # Magenta.
+  std='[m'     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
+fi
+case $tweaked_estatus:$expect_failure in
+:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
+/usr/share/automake-1.15/test-driver

automake/ylwrap

Property mode changed from 100755 to 120000

-              r7951100
+              rb067d9b
+#! /bin/sh
+# ylwrap - wrapper for lex/yacc invocations.
+scriptversion=2013-01-12.17; # UTC
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+get_dirname ()
+{
+  case $1 in
+    */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';;
+    # Otherwise,  we want the empty string (not ".").
+  esac
+}
+# guard FILE
+# ----------
+# The CPP macro used to guard inclusion of FILE.
+guard ()
+{
+  printf '%s\n' "$1"                                                    \
+    | sed                                                               \
+        -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'   \
+        -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'                        \
+        -e 's/__*/_/g'
+}
+# quote_for_sed [STRING]
+# ----------------------
+# Return STRING (or stdin) quoted to be used as a sed pattern.
+quote_for_sed ()
+{
+  case $# in
+) cat;;
+) printf '%s\n' "$1";;
+  esac \
+    | sed -e 's|[][\\.*]|\\&|g'
+}
+case "$1" in
+  '')
+    echo "$0: No files given.  Try '$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+Wrapper for lex/yacc invocations, renaming files as desired.
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+Any number of OUTPUT,DESIRED pairs may be used.
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
+esac
+# The input.
+input=$1
+shift
+# We'll later need for a correct munging of "#line" directives.
+input_sub_rx=`get_dirname "$input" | quote_for_sed`
+case $input in
+  [\\/]* | ?:[\\/]*)
+    # Absolute path; do nothing.
+    ;;
+  *)
+    # Relative path.  Make it absolute.
+    input=`pwd`/$input
+    ;;
+esac
+input_rx=`get_dirname "$input" | quote_for_sed`
+# Since DOS filename conventions don't allow two dots,
+# the DOS version of Bison writes out y_tab.c instead of y.tab.c
+# and y_tab.h instead of y.tab.h. Test to see if this is the case.
+y_tab_nodot=false
+if test -f y_tab.c || test -f y_tab.h; then
+  y_tab_nodot=true
+fi
+# The parser itself, the first file, is the destination of the .y.c
+# rule in the Makefile.
+parser=$1
+# A sed program to s/FROM/TO/g for all the FROM/TO so that, for
+# instance, we rename #include "y.tab.h" into #include "parse.h"
+# during the conversion from y.tab.c to parse.c.
+sed_fix_filenames=
+# Also rename header guards, as Bison 2.7 for instance uses its header
+# guard in its implementation file.
+sed_fix_header_guards=
+while test $# -ne 0; do
+  if test x"$1" = x"--"; then
+    shift
+    break
+  fi
+  from=$1
+  # Handle y_tab.c and y_tab.h output by DOS
+  if $y_tab_nodot; then
+    case $from in
+      "y.tab.c") from=y_tab.c;;
+      "y.tab.h") from=y_tab.h;;
+    esac
+  fi
+  shift
+  to=$1
+  shift
+  sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;"
+  sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;"
+done
+# The program to run.
+prog=$1
+shift
+# Make any relative path in $prog absolute.
+case $prog in
+  [\\/]* | ?:[\\/]*) ;;
+  *[\\/]*) prog=`pwd`/$prog ;;
+esac
+dirname=ylwrap$$
+do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
+mkdir $dirname || exit 1
+cd $dirname
+case $# in
+) "$prog" "$input" ;;
+  *) "$prog" "$@" "$input" ;;
+esac
+ret=$?
+if test $ret -eq 0; then
+  for from in *
+  do
+    to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"`
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend '../'.
+      case $to in
+        [\\/]* | ?:[\\/]*) target=$to;;
+        *) target=../$to;;
+      esac
+      # Do not overwrite unchanged header files to avoid useless
+      # recompilations.  Always update the parser itself: it is the
+      # destination of the .y.c rule in the Makefile.  Divert the
+      # output of all other files to a temporary file so we can
+      # compare them to existing versions.
+      if test $from != $parser; then
+        realtarget=$target
+        target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
+      fi
+      # Munge "#line" or "#" directives.  Don't let the resulting
+      # debug information point at an absolute srcdir.  Use the real
+      # output file name, not yy.lex.c for instance.  Adjust the
+      # include guards too.
+      sed -e "/^#/!b"                           \
+          -e "s|$input_rx|$input_sub_rx|"       \
+          -e "$sed_fix_filenames"               \
+          -e "$sed_fix_header_guards"           \
+        "$from" >"$target" || ret=$?
+      # Check whether files must be updated.
+      if test "$from" != "$parser"; then
+        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+          echo "$to is unchanged"
+          rm -f "$target"
+        else
+          echo "updating $to"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the parser.  This is a
+      # blatant hack to let us support using "yacc -d".  If -d is not
+      # specified, don't fail when the header file is "missing".
+      if test "$from" = "$parser"; then
+        ret=1
+      fi
+    fi
+  done
+fi
+# Remove the directory.
+cd ..
+rm -rf $dirname
+exit $ret
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
+/usr/share/automake-1.15/ylwrap

configure

-              r7951100
+              rb067d9b
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
 …
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+SHELL=${CONFIG_SHELL-/bin/sh}
 test -n "$DJDIR" || exec 7<&0 </dev/null
 …
 LTLIBOBJS
 LIBOBJS
+ALLOCA
+CFA_BACKEND_CC
+DEMANGLER
+LIBDEMANGLE
+WITH_LIBTCMALLOC_FALSE
+WITH_LIBTCMALLOC_TRUE
+WITH_LIBPROFILER_FALSE
+WITH_LIBPROFILER_TRUE
+WITH_LIBFIBRE_FALSE
+WITH_LIBFIBRE_TRUE
+CXXCPP
+CPP
+LT_SYS_LIBRARY_PATH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+FGREP
 EGREP
 GREP
+CPP
+RANLIB
+SED
+LIBTOOL
 LEXLIB
 LEX_OUTPUT_ROOT
 …
 LDFLAGS
 CXXFLAGS
-CXX
 CFA_FLAGS
+MACHINE_TYPE
+LIBCFA_TARGET_MAKEFILES
+LIBCFA_TARGET_DIRS
+TARGET_HOSTS
+HOST_FLAGS
 host_os
 host_vendor
 …
 build_cpu
 build
+BUILD_IN_TREE_FLAGS
+CFACPP
+CFACC_INSTALL
+CFACC
+DRIVER_DIR
 CFA_LIBDIR
 CFA_BINDIR
 CFA_INCDIR
 CFA_PREFIX
+HAS_DISTCC
+LD
+CXX
+ENABLE_DISTCC_FALSE
+ENABLE_DISTCC_TRUE
 DOendif
 DOifskipcompile
-BUILD_CONCURRENCY_FALSE
-BUILD_CONCURRENCY_TRUE
-BUILD_NO_LIB_FALSE
-BUILD_NO_LIB_TRUE
-BUILD_DEBUG_FALSE
-BUILD_DEBUG_TRUE
-BUILD_RELEASE_FALSE
-BUILD_RELEASE_TRUE
-CFA_BACKEND_CC
-BACKEND_CC
 CFA_NAME
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 …
 enable_option_checking
 enable_silent_rules
-enable_maintainer_mode
 with_cfa_name
+with_backend_compiler
+enable_target_release
 enable_target_debug
 enable_threading
+enable_distcc
+with_target_hosts
+enable_gprofiler
+enable_demangler
 enable_dependency_tracking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+'
       ac_precious_vars='build_alias
 …
 YACC
 YFLAGS
+CPP'
+LT_SYS_LIBRARY_PATH
+CPP
+CXXCPP'
 …
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --disable-maintainer-mode
+                          disable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-target-release Build and install the release target
+  --enable-target-debug   Build and install the debug target
+  --enable-threading      Build and install libcfa with threading support
+                          (Enabled by default)
+  --enable-distcc     whether or not to enable distributed compilation
+  --enable-gprofiler     whether or not to enable gprofiler tools (if available)
+  --enable-demangler     whether or not to build the demangler (executable and library)
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
                           speeds up one-time build
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
 Optional Packages:
 …
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-cfa-name=NAME     NAME too which cfa will be installed
+  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible)
+  --with-target-hosts=HOSTS     HOSTS comma seperated list of hosts to build for, format ARCH:debug|nodebug|nolib
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
 Some influential environment variables:
 …
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   CPP         C preprocessor
+  CXXCPP      C++ preprocessor
 Use these variables to override the choices made by `configure' or to help
 …
 } # ac_fn_c_try_link
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
 # variable VAR accordingly.
 ac_fn_c_check_type ()
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 …
   $as_echo_n "(cached) " >&6
 else
-  eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
+int
+main ()
+{
+if (sizeof ($2))
+         return 0;
+  ;
+  return 0;
+}
+#include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
+{
-if (sizeof (($2)))
-            return 0;
+  ;
-  return 0;
+}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-else
   eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 …
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 } # ac_fn_c_check_type
+} # ac_fn_c_check_header_compile
 # ac_fn_c_try_cpp LINENO
 …
 } # ac_fn_c_try_run
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
+{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_c_check_header_compile
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 …
 } # ac_fn_c_check_func
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+         test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+} # ac_fn_cxx_try_cpp
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+         test -z "$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+         test "$cross_compiling" = yes ||
+         test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+        ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+} # ac_fn_cxx_try_link
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 …
 } # ac_fn_c_check_header_mongrel
 # ac_fn_c_find_intX_t LINENO BITS VAR
 # -----------------------------------
 # Finds a signed integer type with width BITS, setting cache variable VAR
 # accordingly.
 ac_fn_c_find_intX_t ()
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
 $as_echo_n "checking for int$2_t... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in int$2_t 'int' 'long int' \
+         'long long int' 'short int' 'signed char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+$ac_includes_default
+             enum { N = $2 / 2 - 1 };
+$4
 int
 main ()
+{
+static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+test_array [0] = 0;
+return test_array [0];
+if (sizeof ($2))
+         return 0;
+  ;
   return 0;
 …
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+$ac_includes_default
+                enum { N = $2 / 2 - 1 };
+$4
 int
 main ()
+{
+static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+                 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
+test_array [0] = 0;
+return test_array [0];
+if (sizeof (($2)))
+            return 0;
+  ;
   return 0;
 …
 else
+  case $ac_type in #(
+  int$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+  eval "$3=yes"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       if eval test \"x\$"$3"\" = x"no"; then :
-else
-  break
-fi
-     done
 fi
 eval ac_res=\$$3
 …
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+} # ac_fn_c_find_intX_t
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+         'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0;
+return test_array [0];
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  case $ac_type in #(
+  uint$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
+else
+  break
+fi
+     done
+fi
+eval ac_res=\$$3
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+} # ac_fn_c_find_uintX_t
+} # ac_fn_c_check_type
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 …
 #AC_CONFIG_SRCDIR([src/main.cc])
 ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h:src/config.h.in"
 # Check whether --enable-silent-rules was given.
 …
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
     *) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
 am_make=${MAKE-make}
 …
 AM_BACKSLASH='\'
+# http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_check_compile_flag.m4
+# don't use the default CFLAGS as they unconditonnaly add -O2
+: ${CFLAGS=""}
 am__api_version='1.15'
 …
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=yes
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-                        # may require auto* software to be installed
 # Allow program name tansformation
 # will fill program_transform_name with appropriate sed regex
+#==============================================================================
 #Trasforming cc1 will break compilation
+if test "${program_transform_name}" = ""; then
+    as_fn_error $? "Program transform not supported.
+                Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
+fi
+        if test "${program_transform_name}" = ""; then
+        as_fn_error $? "Program transform not supported.
+                        Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
+        fi
+        #Define the new name of the installed command
 # Check whether --with-cfa-name was given.
 …
+#Define the new name of the installed command
+CFA_NAME=${cfa_name}
+        CFA_NAME=${cfa_name}
+#==============================================================================
+# version information
 rm -f version
 …
+# Installation paths
+# Check whether --with-backend-compiler was given.
+if test "${with_backend_compiler+set}" = set; then :
+  withval=$with_backend_compiler; backendcompiler=$withval
+else
+  backendcompiler=""
+fi
+if test "x$backendcompiler" != "x"; then
+        BACKEND_CC=${backendcompiler}
+else
+        # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BACKEND_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BACKEND_CC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BACKEND_CC="$BACKEND_CC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BACKEND_CC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+BACKEND_CC=$ac_cv_path_BACKEND_CC
+if test -n "$BACKEND_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BACKEND_CC" >&5
+$as_echo "$BACKEND_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+        # check gcc installed
+        if test "x$BACKEND_CC" = "x"; then
+                as_fn_error $? "some version of gcc is needed. Get it at ftp://ftp.gnu.org" "$LINENO" 5
+                exit 1
+        fi
+fi
+cat >>confdefs.h <<_ACEOF
+#define CFA_BACKEND_CC "${BACKEND_CC}"
+_ACEOF
+# Check whether --enable-target-release was given.
+if test "${enable_target_release+set}" = set; then :
+  enableval=$enable_target_release;
+fi
+# Check whether --enable-target-debug was given.
+if test "${enable_target_debug+set}" = set; then :
+  enableval=$enable_target_debug;
+fi
+# Check whether --enable-threading was given.
+if test "${enable_threading+set}" = set; then :
+  enableval=$enable_threading; case "${enableval}" in
+  yes) build_threading="yes" ;;
+  no)  build_threading="no" ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
+esac
+else
+  build_threading="yes"
+fi
+case "$enable_target_release" in
+        yes)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="yes"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                esac
+                ;;
+        no)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="no"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                esac
+                ;;
+        *)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="yes"
+                                build_debug="yes"
+                                ;;
+                esac
+                ;;
+esac
+ if test "x$build_release" = "xyes"; then
+  BUILD_RELEASE_TRUE=
+  BUILD_RELEASE_FALSE='#'
+else
+  BUILD_RELEASE_TRUE='#'
+  BUILD_RELEASE_FALSE=
+fi
+ if test "x$build_debug" = "xyes"; then
+  BUILD_DEBUG_TRUE=
+  BUILD_DEBUG_FALSE='#'
+else
+  BUILD_DEBUG_TRUE='#'
+  BUILD_DEBUG_FALSE=
+fi
+ if test "x$build_release$build_debug" = "xnono"; then
+  BUILD_NO_LIB_TRUE=
+  BUILD_NO_LIB_FALSE='#'
+else
+  BUILD_NO_LIB_TRUE='#'
+  BUILD_NO_LIB_FALSE=
+fi
+ if test "x$build_threading" = "xyes"; then
+  BUILD_CONCURRENCY_TRUE=
+  BUILD_CONCURRENCY_FALSE='#'
+else
+  BUILD_CONCURRENCY_TRUE='#'
+  BUILD_CONCURRENCY_FALSE=
+fi
+#==============================================================================
+# HACK to be able to use conditionnals inside makefiles
 DOifskipcompile='ifeq ($(skipcompile),yes)
 else'
 …
+if test "x$prefix" = "xNONE"; then
+        cfa_prefix=${ac_default_prefix}
+else
+        cfa_prefix=${prefix}
+fi
+#==============================================================================
+# distcc support
+# Check whether --enable-distcc was given.
+if test "${enable_distcc+set}" = set; then :
+  enableval=$enable_distcc; enable_distcc=$enableval
+else
+  enable_distcc=no
+fi
+ if test x$enable_distcc = xyes; then
+  ENABLE_DISTCC_TRUE=
+  ENABLE_DISTCC_FALSE='#'
+else
+  ENABLE_DISTCC_TRUE='#'
+  ENABLE_DISTCC_FALSE=
+fi
+HAS_DISTCC="False"
+if test x$enable_distcc = xyes; then
+        CXX="distcc ${CXX}"
+        LD="distcc ${LD} -lstdc++"
+        HAS_DISTCC="True"
+        echo "Enabling distributed builds"
+fi
+#==============================================================================
+# Installation paths
+        if test "x$prefix" = "xNONE"; then
+                cfa_prefix=${ac_default_prefix}
+        else
+                cfa_prefix=${prefix}
+        fi
+        cfa_prefix="$(readlink -m ${cfa_prefix})/"
 cat >>confdefs.h <<_ACEOF
 …
 _ACEOF
+CFA_PREFIX=${cfa_prefix}
+if test "$includedir" = '${prefix}/include'; then
+        cfa_incdir="${cfa_prefix}/include/${cfa_name}"
+else
+        cfa_incdir=${includedir}
+fi
+        CFA_PREFIX=${cfa_prefix}
+        if test "$includedir" = '${prefix}/include'; then
+                cfa_incdir="${cfa_prefix}include/${cfa_name}"
+        else
+                cfa_incdir=${includedir}
+        fi
+        cfa_incdir="$(readlink -m ${cfa_incdir})/"
 cat >>confdefs.h <<_ACEOF
 …
 _ACEOF
+CFA_INCDIR=${cfa_incdir}
+if test "$bindir" = '${exec_prefix}/bin'; then
+        cfa_bindir="${cfa_prefix}/bin"
+else
+        cfa_bindir=${bindir}
+fi
+        CFA_INCDIR=${cfa_incdir}
+        if test "$bindir" = '${exec_prefix}/bin'; then
+                cfa_bindir="${cfa_prefix}bin"
+        else
+                cfa_bindir=${bindir}
+        fi
+        cfa_bindir="$(readlink -m ${cfa_bindir})/"
 cat >>confdefs.h <<_ACEOF
 …
 _ACEOF
+CFA_BINDIR=${cfa_bindir}
+if test "$libdir" = '${exec_prefix}/lib'; then
+        cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
+else
+        cfa_libdir=${libdir}
+fi
+        CFA_BINDIR=${cfa_bindir}
+        if test "$libdir" = '${exec_prefix}/lib'; then
+                if test "${ARCHITECTURE}" != ""; then
+                        cfa_libdir="${cfa_prefix}lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
+                else
+                        cfa_libdir="${cfa_prefix}lib/${cfa_name}/"
+                fi
+        else
+                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
+        fi
+        cfa_libdir="$(readlink -m ${cfa_libdir})/"
 cat >>confdefs.h <<_ACEOF
 …
 _ACEOF
+CFA_LIBDIR=${cfa_libdir}
+        CFA_LIBDIR=${cfa_libdir}
+#==============================================================================
+# Create variables for commonly used targets
+TOP_SRCDIR="$(readlink -m $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -m $ac_pwd/)/"
+cat >>confdefs.h <<_ACEOF
+#define TOP_SRCDIR "$TOP_SRCDIR"
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define TOP_BUILDDIR "$TOP_BUILDDIR"
+_ACEOF
+DRIVER_DIR=${TOP_BUILDDIR}driver/
+CFACC=${DRIVER_DIR}cfa
+CFACC_INSTALL=${CFA_BINDIR}${CFA_NAME}
+CFACPP=${DRIVER_DIR}cfa-cpp
+#==============================================================================
+# Flag variables needed to build in tree
+LIBCFA_SRC='${TOP_SRCDIR}/libcfa/src'
+BUILD_IN_TREE_FLAGS="-XCFA -t -B${DRIVER_DIR}"
+#==============================================================================
+# handle the list of hosts to build for
+for var in $ac_configure_args
+do
+        #strip quotes surrouding values
+        case $var in
+                # skip cross compilation related arguments
+                \'--host=*) ;; \'host_alias=*) ;; \'--build=*) ;; \'build_alias=*) ;; \'--target=*) ;; \'target_alias=*) ;;
+                # skip the target hosts
+                \'--with-target-hosts=*) ;;
+                # skip gprofiler for libcfa
+                \'--enable-gprofiler=*) ;;
+                \'--disable-gprofiler) ;;
+                # append all other arguments to the sub configure arguments
+                *) LIBCFA_GENERAL_ARGS="${LIBCFA_GENERAL_ARGS} $var";;
+        esac
+done
+#==============================================================================
+# handle the list of hosts to build for
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 …
-MACHINE_TYPE=$host_cpu
 if ! test "$host_cpu" = "$build_cpu"; then
         case $host_cpu in
                 i386)
+                        CFLAGS+=" -m32 "
+                        CXXFLAGS+=" -m32 "
+                        CFAFLAGS+=" -m32 "
+                        LDFLAGS+=" -m32 "
+                        HOST_FLAGS="-m32"
                         ;;
                 i686)
+                        CFLAGS+=" -m32 "
+                  CXXFLAGS+=" -m32 "
+                  CFAFLAGS+=" -m32 "
+                  LDFLAGS+=" -m32 "
+                        HOST_FLAGS="-m32"
                         ;;
                 x86_64)
+                        CFLAGS+=" -m64 "
+                        CXXFLAGS+=" -m64 "
+                        CFAFLAGS+=" -m64 "
+                        LDFLAGS+=" -m64 "
+                        HOST_FLAGS="-m64"
                         ;;
         esac
 fi
+default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
+# Check whether --with-target-hosts was given.
+if test "${with_target_hosts+set}" = set; then :
+  withval=$with_target_hosts; target_hosts=$withval
+else
+  target_hosts=${default_target}
+fi
+# Check whether --enable-gprofiler was given.
+if test "${enable_gprofiler+set}" = set; then :
+  enableval=$enable_gprofiler; enable_gprofiler=$enableval
+else
+  enable_gprofiler=yes
+fi
+# Check whether --enable-demangler was given.
+if test "${enable_demangler+set}" = set; then :
+  enableval=$enable_demangler; enable_demangler=$enableval
+else
+  enable_demangler=yes
+fi
+TARGET_HOSTS=${target_hosts}
+LIBCFA_PATHS="DRIVER_DIR=${DRIVER_DIR}"
+for i in $(echo $target_hosts | sed "s/,/ /g")
+do
+        # call your procedure/other scripts here below
+        arch_name=$(echo $i | sed -r "s/:(.*)//g")
+        lib_config=$(echo $i | sed -r "s/(.*)://g")
+        case $lib_config in
+                "nodebug") ;;
+                "debug") ;;
+                "nolib") ;;
+                "profile") ;;
+                *)
+                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
+                        exit 1
+                ;;
+        esac
+        case ${arch_name} in
+                "host") arch_name=${host_cpu};;
+                *) arch_name=${arch_name};;
+        esac
+        case $arch_name in
+                "x64"        ) cannon_arch_name="x64";;
+                "x86-64"     ) cannon_arch_name="x64";;
+                "x86_64"     ) cannon_arch_name="x64";;
+                "aarch64"    ) cannon_arch_name="arm";;
+                "x86"        ) cannon_arch_name="x86";;
+                "i386"       ) cannon_arch_name="x86";;
+                "i486"       ) cannon_arch_name="x86";;
+                "i686"       ) cannon_arch_name="x86";;
+                "Intel 80386") cannon_arch_name="x86";;
+                "arm"        ) cannon_arch_name="arm";;
+                "ARM"        ) cannon_arch_name="arm";;
+                "armv7l"     ) cannon_arch_name="arm";;
+                *)
+                >&2 echo "Unknown architecture " $arch_name;
+                exit 1
+                ;;
+        esac
+        lib_arch=${cannon_arch_name}
+        lib_dir="libcfa/${lib_arch}-${lib_config}"
+        LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
+        LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
+        mkdir -p ${lib_dir}
+        echo -n "${LIBCFA_GENERAL_ARGS} " > ${lib_dir}/config.data
+        echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data
+        echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data
+        echo -n "CONFIGURATION=${lib_config} " >> ${lib_dir}/config.data
+        echo -n "CFA_VERSION=${ver_major}:${ver_minor}:${ver_patch}" >> ${lib_dir}/config.data
+done
+        case ${host_cpu} in
+                "host") arch_name=${host_cpu};;
+                *) arch_name=${host_cpu};;
+        esac
+        case $arch_name in
+                "x64"        ) cannon_arch_name="x64";;
+                "x86-64"     ) cannon_arch_name="x64";;
+                "x86_64"     ) cannon_arch_name="x64";;
+                "aarch64"    ) cannon_arch_name="arm";;
+                "x86"        ) cannon_arch_name="x86";;
+                "i386"       ) cannon_arch_name="x86";;
+                "i486"       ) cannon_arch_name="x86";;
+                "i686"       ) cannon_arch_name="x86";;
+                "Intel 80386") cannon_arch_name="x86";;
+                "arm"        ) cannon_arch_name="arm";;
+                "ARM"        ) cannon_arch_name="arm";;
+                "armv7l"     ) cannon_arch_name="arm";;
+                *)
+                >&2 echo "Unknown architecture " $arch_name;
+                exit 1
+                ;;
+        esac
+cat >>confdefs.h <<_ACEOF
+#define CFA_DEFAULT_CPU "$cannon_arch_name"
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define CFA_64_CPU "x64"
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define CFA_32_CPU "x86"
+_ACEOF
+#==============================================================================
+# CAFLAGS
 cat >>confdefs.h <<_ACEOF
 …
+#==============================================================================
 # Checks for programs.
 ac_ext=cpp
 …
-        # deprecated
 # These are often not installed and people miss seeing the "no", so stop the configure.
 for ac_prog in 'bison -y' byacc
 …
 fi
 if test "${LEX}" = "lex" ; then echo "Error: flex required." ; exit 1 ; fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+case `pwd` in
+  *\ * | *\     *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+macro_version='2.4.6'
+macro_revision='2.4.6'
+ltmain=$ac_aux_dir/ltmain.sh
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+        @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+      $ac_path_SED_found && break 3
+    done
+  done
   done
 IFS=$as_save_IFS
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+# Checks for libraries.
+# Checks for header files.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+    done
+    ac_cv_prog_CPP=$CPP
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+else
+  ac_cv_path_SED=$SED
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
 …
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+test -z "$GREP" && GREP=grep
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+        test no != "$with_gnu_ld" && break
+        ;;
+      *)
+        test yes != "$with_gnu_ld" && break
+        ;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+        # Check to see if the nm accepts a BSD-compat flag.
+        # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+        #   nm: unknown option "B" ignored
+        # Tru64's nm complains that /dev/null is an invalid object file
+        # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+        case $build_os in
+        mingw*) lt_bad_file=conftest.nm/nofile ;;
+        *) lt_bad_file=/dev/null ;;
+        esac
+        case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+        *$lt_bad_file* | *'Invalid file or object type'*)
+          lt_cv_path_NM="$tmp_nm -B"
+          break 2
+          ;;
+        *)
+          case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+          */dev/null*)
+            lt_cv_path_NM="$tmp_nm -p"
+            break 2
+            ;;
+          *)
+            lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+            continue # so that we can try to find one that supports BSD flags
+            ;;
+          esac
+          ;;
+        esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  test -n "$ac_ct_DUMPBIN" && break
+done
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring=ABCD
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536       # usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[  ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+                 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+              test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+fi
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+fi
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+fi
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+test -z "$OBJDUMP" && OBJDUMP=objdump
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  test -n "$ac_ct_AR" && break
+done
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+        # Ensure the archiver fails upon bogus file names.
+        rm -f conftest.$ac_objext libconftest.a
+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+        if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+test -z "$STRIP" && STRIP=:
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+test -z "$RANLIB" && RANLIB=:
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+# Allow CC to be a program name with arguments.
+compiler=$CC
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[      ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+        mv -f "$nlist"T "$nlist"
+      else
+        rm -f "$nlist"T
+      fi
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+        if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+          cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+_LT_EOF
+          # Now generate the symbol file.
+          eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+          cat <<_LT_EOF >> conftest.$ac_ext
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+          $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+          cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+          # Now try linking the two files.
+          mv conftest.$ac_objext conftstm.$ac_objext
+          lt_globsym_save_LIBS=$LIBS
+          lt_globsym_save_CFLAGS=$CFLAGS
+          LIBS=conftstm.$ac_objext
+          CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+          if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+            pipe_works=yes
+          fi
+          LIBS=$lt_globsym_save_LIBS
+          CFLAGS=$lt_globsym_save_CFLAGS
+        else
+          echo "cannot find nm_test_func in $nlist" >&5
+        fi
+      else
+        echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+        HPUX_IA64_MODE=32
+        ;;
+      *ELF-64*)
+        HPUX_IA64_MODE=64
+        ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+        *32-bit*)
+          LD="${LD-ld} -melf32bsmip"
+          ;;
+        *N32*)
+          LD="${LD-ld} -melf32bmipn32"
+          ;;
+        *64-bit*)
+          LD="${LD-ld} -melf64bmip"
+        ;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+        *32-bit*)
+          LD="${LD-ld} -32"
+          ;;
+        *N32*)
+          LD="${LD-ld} -n32"
+          ;;
+        *64-bit*)
+          LD="${LD-ld} -64"
+          ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+        emul="${emul}32"
+        ;;
+      *64-bit*)
+        emul="${emul}64"
+        ;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+        emul="${emul}btsmip"
+        ;;
+      *LSB*)
+        emul="${emul}ltsmip"
+        ;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+        emul="${emul}n32"
+        ;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+        case $host in
+          x86_64-*kfreebsd*-gnu)
+            LD="${LD-ld} -m elf_i386_fbsd"
+            ;;
+          x86_64-*linux*)
+            case `/usr/bin/file conftest.o` in
+              *x86-64*)
+                LD="${LD-ld} -m elf32_x86_64"
+                ;;
+              *)
+                LD="${LD-ld} -m elf_i386"
+                ;;
+            esac
+            ;;
+          powerpc64le-*linux*)
+            LD="${LD-ld} -m elf32lppclinux"
+            ;;
+          powerpc64-*linux*)
+            LD="${LD-ld} -m elf32ppclinux"
+            ;;
+          s390x-*linux*)
+            LD="${LD-ld} -m elf_s390"
+            ;;
+          sparc64-*linux*)
+            LD="${LD-ld} -m elf32_sparc"
+            ;;
+        esac
+        ;;
+      *64-bit*)
+        case $host in
+          x86_64-*kfreebsd*-gnu)
+            LD="${LD-ld} -m elf_x86_64_fbsd"
+            ;;
+          x86_64-*linux*)
+            LD="${LD-ld} -m elf_x86_64"
+            ;;
+          powerpcle-*linux*)
+            LD="${LD-ld} -m elf64lppc"
+            ;;
+          powerpc-*linux*)
+            LD="${LD-ld} -m elf64ppc"
+            ;;
+          s390*-*linux*|s390*-*tpf*)
+            LD="${LD-ld} -m elf64_s390"
+            ;;
+          sparc*-*linux*)
+            LD="${LD-ld} -m elf64_sparc"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+          LD="${LD-ld} -64"
+        fi
+        ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+need_locks=$enable_libtool_lock
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+        # By default we will add the -single_module flag. You can override
+        # by either setting the environment variable LT_MULTI_MODULE
+        # non-empty at configure time, or by adding -multi_module to the
+        # link flags.
+        rm -rf libconftest.dylib*
+        echo "int foo(void){return 1;}" > conftest.c
+        echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+        $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+          -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+        # If there is a non-empty error log, and "single_module"
+        # appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+          cat conftest.err >&5
+        # Otherwise, if the output was created with a 0 exit code from
+        # the compiler, it worked.
+        elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+          lt_cv_apple_cc_single_mod=yes
+        else
+          cat conftest.err >&5
+        fi
+        rm -rf libconftest.dylib*
+        rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+        cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+        lt_cv_ld_force_load=yes
+      else
+        cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+.0,*86*-darwin8*|10.0,*-darwin[91]*)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+.[012][,.]*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+.*)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+    done
+    ac_cv_prog_CPP=$CPP
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 …
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+else
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+fi
+done
+func_stripname_cnf ()
+{
+  case $2 in
+  .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
+  esac
+} # func_stripname_cnf
+# Set options
+        enable_dlopen=no
+  enable_win32_dll=no
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+        IFS=$lt_save_ifs
+        if test "X$pkg" = "X$p"; then
+          enable_shared=yes
+        fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+        IFS=$lt_save_ifs
+        if test "X$pkg" = "X$p"; then
+          enable_static=yes
+        fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+        IFS=$lt_save_ifs
+        if test "X$lt_pkg" = "X$lt_p"; then
+          pic_mode=yes
+        fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+        IFS=$lt_save_ifs
+        if test "X$pkg" = "X$p"; then
+          enable_fast_install=yes
+        fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+test -z "$LN_S" && LN_S="ln -s"
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
 cat >>confdefs.h <<_ACEOF
 #define size_t unsigned int
+#define LT_OBJDIR "$lt_cv_objdir/"
 _ACEOF
+fi
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+with_gnu_ld=$lt_cv_prog_gnu_ld
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+        case $deplibs_check_method in
+        "file_magic "*)
+          file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+          MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+          if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+            $EGREP "$file_magic_regex" > /dev/null; then
+            :
+          else
+            cat <<_LT_EOF 1>&2
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+_LT_EOF
+          fi ;;
+        esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      if test -n "$file_magic_test_file"; then
+        case $deplibs_check_method in
+        "file_magic "*)
+          file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+          MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+          if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+            $EGREP "$file_magic_regex" > /dev/null; then
+            :
+          else
+            cat <<_LT_EOF 1>&2
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+_LT_EOF
+          fi ;;
+        esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  else
+    MAGIC_CMD=:
+  fi
+fi
+  fi
+  ;;
+esac
+# Use C for the default configuration in the libtool script
+lt_save_CC=$CC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+# Source file extension for C test sources.
+ac_ext=c
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+# Allow CC to be a program name with arguments.
+compiler=$CC
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+lt_prog_compiler_no_builtin_flag=
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+fi
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+        # AIX 5 now supports IA64 processor
+        lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+        lt_prog_compiler_static='$wl-static'
+        ;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+        # +Z the default
+        ;;
+      *)
+        lt_prog_compiler_pic='-fPIC'
+        ;;
+      esac
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+        # AIX 5 now supports IA64 processor
+        lt_prog_compiler_static='-Bstatic'
+      else
+        lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+        lt_prog_compiler_static='$wl-static'
+        ;;
+      esac
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+        # +Z the default
+        ;;
+      *)
+        lt_prog_compiler_pic='+Z'
+        ;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+        lt_prog_compiler_wl='-Wl,'
+        lt_prog_compiler_pic='-KPIC'
+        lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+        lt_prog_compiler_wl='-Wl,'
+        lt_prog_compiler_pic='-fPIC'
+        lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+        lt_prog_compiler_wl='-Wl,'
+        lt_prog_compiler_pic='--shared'
+        lt_prog_compiler_static='--static'
+        ;;
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      tcc*)
+        # Fabrice Bellard et al's Tiny C Compiler
+        lt_prog_compiler_wl='-Wl,'
+        lt_prog_compiler_pic='-fPIC'
+        lt_prog_compiler_static='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+        # which looks to be a dead project)
+        lt_prog_compiler_wl='-Wl,'
+        lt_prog_compiler_pic='-fpic'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+        # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+        lt_prog_compiler_wl='-Wl,'
+        lt_prog_compiler_pic='-qpic'
+        lt_prog_compiler_static='-qstaticlink'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+        *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+          # Sun Fortran 8.3 passes all unrecognized flags to the linker
+          lt_prog_compiler_pic='-KPIC'
+          lt_prog_compiler_static='-Bstatic'
+          lt_prog_compiler_wl=''
+          ;;
+        *Sun\ F* | *Sun*Fortran*)
+          lt_prog_compiler_pic='-KPIC'
+          lt_prog_compiler_static='-Bstatic'
+          lt_prog_compiler_wl='-Qoption ld '
+          ;;
+        *Sun\ C*)
+          # Sun C 5.9
+          lt_prog_compiler_pic='-KPIC'
+          lt_prog_compiler_static='-Bstatic'
+          lt_prog_compiler_wl='-Wl,'
+          ;;
+        *Intel*\ [CF]*Compiler*)
+          lt_prog_compiler_wl='-Wl,'
+          lt_prog_compiler_pic='-fPIC'
+          lt_prog_compiler_static='-static'
+          ;;
+        *Portland\ Group*)
+          lt_prog_compiler_wl='-Wl,'
+          lt_prog_compiler_pic='-fpic'
+          lt_prog_compiler_static='-Bstatic'
+          ;;
+        esac
+        ;;
+      esac
+      ;;
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+        lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+        lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        lt_prog_compiler_pic='-Kconform_pic'
+        lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+fi
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
+  esac
+  ld_shlibs=yes
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+        # The AIX port of GNU ld has always aspired to compatibility
+        # with the native linker.  However, as the warning in the GNU ld
+        # block says, versions before 2.19.5* couldn't really create working
+        # shared libraries, regardless of the interface used.
+        case `$LD -v 2>&1` in
+          *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+          *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+          *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+          *)
+            lt_use_gnu_ld_interface=yes
+            ;;
+        esac
+        ;;
+      *)
+        lt_use_gnu_ld_interface=yes
+        ;;
+    esac
+  fi
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+        ld_shlibs=no
+        cat <<_LT_EOF 1>&2
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+_LT_EOF
+      fi
+      ;;
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+        allow_undefined_flag=unsupported
+        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+        # support --undefined.  This deserves some investigation.  FIXME
+        archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        # If the export-symbols file already is a .def file, use it as
+        # is; otherwise, prepend EXPORTS...
+        archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[   ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([     ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+        $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+        $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+        $ECHO EXPORTS >> $output_objdir/$libname.def~
+        emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+        emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+        $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+        $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+        $ECHO EXPORTS >> $output_objdir/$libname.def~
+        prefix_cmds="$SED"~
+        if test EXPORTS = "`$SED 1q $export_symbols`"; then
+          prefix_cmds="$prefix_cmds -e 1d";
+        fi~
+        prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+        cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+        emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+        case $cc_basename in
+          diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
+        esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+         && test no = "$tmp_diet"
+      then
+        tmp_addflag=' $pic_flag'
+        tmp_sharedflag='-shared'
+        case $cc_basename,$host_cpu in
+        pgcc*)                          # Portland Group C compiler
+          whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+          tmp_addflag=' $pic_flag'
+          ;;
+        pgf77* | pgf90* | pgf95* | pgfortran*)
+                                        # Portland Group f77 and f90 compilers
+          whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+          tmp_addflag=' $pic_flag -Mnomain' ;;
+        ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
+          tmp_addflag=' -i_dynamic' ;;
+        efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
+          tmp_addflag=' -i_dynamic -nofor_main' ;;
+        ifc* | ifort*)                  # Intel Fortran compiler
+          tmp_addflag=' -nofor_main' ;;
+        lf95*)                          # Lahey Fortran 8.1
+          whole_archive_flag_spec=
+          tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+        xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+          tmp_sharedflag='-qmkshrobj'
+          tmp_addflag= ;;
+        nvcc*)  # Cuda Compiler Driver 2.2
+          whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+          compiler_needs_object=yes
+          ;;
+        esac
+        case `$CC -V 2>&1 | sed 5q` in
+        *Sun\ C*)                       # Sun C 5.9
+          whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+          compiler_needs_object=yes
+          tmp_sharedflag='-G' ;;
+        *Sun\ F*)                       # Sun Fortran 8.3
+          tmp_sharedflag='-G' ;;
+        esac
+        archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+        case $cc_basename in
+        tcc*)
+          export_dynamic_flag_spec='-rdynamic'
+          ;;
+        xlf* | bgf* | bgxlf* | mpixlf*)
+          # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+          whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+          hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+          archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+          if test yes = "$supports_anon_versioning"; then
+            archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+          fi
+          ;;
+        esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+        wlarc=
+      else
+        archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+        cat <<_LT_EOF 1>&2
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+        archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+        ld_shlibs=no
+        cat <<_LT_EOF 1>&2
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+_LT_EOF
+        ;;
+        *)
+          # For security reasons, it is highly recommended that you always
+          # use absolute paths for naming shared libraries, and exclude the
+          # DT_RUNPATH tag from executables and libraries.  But doing so
+          # requires that you compile everything twice, which is a pain.
+          if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+          else
+            ld_shlibs=no
+          fi
+        ;;
+      esac
+      ;;
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+        archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    esac
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+        exp_sym_flag='-Bexport'
+        no_entry_flag=
+      else
+        # If we're using GNU nm, then we don't want the "-C" option.
+        # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+        # Without the "-l" option, or with the "-B" option, AIX nm treats
+        # weak defined symbols like other global defined symbols, whereas
+        # GNU nm marks them as "W".
+        # While the 'weak' keyword is ignored in the Export File, we need
+        # it in the Import File for the 'aix-soname' feature, so we have
+        # to replace the "-B" option with "-P" for AIX nm.
+        if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+          export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+        else
+          export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+        fi
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # have runtime linking enabled, and use it for executables.
+        # For shared libraries, we enable/disable runtime linking
+        # depending on the kind of the shared library created -
+        # when "with_aix_soname,aix_use_runtimelinking" is:
+        # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+        # "aix,yes"  lib.so          shared, rtl:yes, for executables
+        #            lib.a           static archive
+        # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+        #            lib.a(lib.so.V) shared, rtl:no,  for executables
+        # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+        #            lib.a(lib.so.V) shared, rtl:no
+        # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+        #            lib.a           static archive
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+          if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+            aix_use_runtimelinking=yes
+            break
+          fi
+          done
+          if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+            # With aix-soname=svr4, we create the lib.so.V shared archives only,
+            # so we don't have lib.a shared libs to link our executables.
+            # We have to force runtime linking in this case.
+            aix_use_runtimelinking=yes
+            LDFLAGS="$LDFLAGS -Wl,-brtl"
+          fi
+          ;;
+        esac
+        exp_sym_flag='-bexport'
+        no_entry_flag='-bnoentry'
+      fi
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+        # The Import File defines what to hardcode.
+        hardcode_direct=no
+        hardcode_direct_absolute=no
+        ;;
+      esac
+      if test yes = "$GCC"; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+        # We only want to do this on AIX 4.2 and lower, the check
+        # below for broken collect2 doesn't work under 4.3+
+          collect2name=`$CC -print-prog-name=collect2`
+          if test -f "$collect2name" &&
+           strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+          then
+          # We have reworked collect2
+          :
+          else
+          # We have old collect2
+          hardcode_direct=unsupported
+          # It fails to find uninstalled libraries when the uninstalled
+          # path is not listed in the libpath.  Setting hardcode_minus_L
+          # to unsupported forces relinking
+          hardcode_minus_L=yes
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+        shared_flag='-shared'
+        if test yes = "$aix_use_runtimelinking"; then
+          shared_flag="$shared_flag "'$wl-G'
+        fi
+        # Need to ensure runtime linking is disabled for the traditional
+        # shared library, or the linker may eventually find shared libraries
+        # /with/ Import File - we do not want to mix them.
+        shared_flag_aix='-shared'
+        shared_flag_svr4='-shared $wl-G'
+      else
+        # not using gcc
+        if test ia64 = "$host_cpu"; then
+        # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+        # chokes on -Wl,-G. The following line is correct:
+          shared_flag='-G'
+        else
+          if test yes = "$aix_use_runtimelinking"; then
+            shared_flag='$wl-G'
+          else
+            shared_flag='$wl-bM:SRE'
+          fi
+          shared_flag_aix='$wl-bM:SRE'
+          shared_flag_svr4='$wl-G'
+        fi
+      fi
+      export_dynamic_flag_spec='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+        # Warning - without using the other runtime loading flags (-brtl),
+        # -berok will link without error, but may produce a broken library.
+        allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <alloca.h>
 int
 main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+                          if (p) return 0;
+  ;
   return 0;
 …
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_working_alloca_h=yes
+else
+  ac_cv_working_alloca_h=no
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+          /^0/ {
+              s/^0  *\([^ ]*\) *$/\1/
+              p
+          }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+fi
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+        if test ia64 = "$host_cpu"; then
+          hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+          allow_undefined_flag="-z nodefs"
+          archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+        else
+         # Determine the default libpath from the value encoded in an
+         # empty executable.
+         if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
-#  endif
-# endif
-#endif
 int
 main ()
+{
+char *p = (char *) alloca (1);
+                                    if (p) return 0;
+  ;
   return 0;
 …
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_func_alloca_works=yes
+else
+  ac_cv_func_alloca_works=no
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+          /^0/ {
+              s/^0  *\([^ ]*\) *$/\1/
+              p
+          }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
+if test $ac_cv_func_alloca_works = yes; then
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+else
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+fi
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+         hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+          # Warning - without using the other run time loading flags,
+          # -berok will link without error, but may produce a broken library.
+          no_undefined_flag=' $wl-bernotok'
+          allow_undefined_flag=' $wl-berok'
+          if test yes = "$with_gnu_ld"; then
+            # We only use this code for GNU lds that support --whole-archive.
+            whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+          else
+            # Exported symbols can be pulled into shared objects from archives
+            whole_archive_flag_spec='$convenience'
+          fi
+          archive_cmds_need_lc=yes
+          archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+          # -brtl affects multiple linker settings, -berok does not and is overridden later
+          compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+          if test svr4 != "$with_aix_soname"; then
+            # This is similar to how AIX traditionally builds its shared libraries.
+            archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+          fi
+          if test aix != "$with_aix_soname"; then
+            archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+          else
+            # used by -dlpreopen to get the symbols
+            archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+          fi
+          archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+        fi
+      fi
+      ;;
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+        # Native MSVC
+        hardcode_libdir_flag_spec=' '
+        allow_undefined_flag=unsupported
+        always_export_symbols=yes
+        file_list_spec='@'
+        # Tell ltmain to make .lib files, not .a files.
+        libext=lib
+        # Tell ltmain to make .dll files, not .so files.
+        shrext_cmds=.dll
+        # FIXME: Setting linknames here is a bad hack.
+        archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+        archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[   ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([     ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+        # The linker will not automatically build a static lib if we build a DLL.
+        # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+        enable_shared_with_static_runtimes=yes
+        exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+        export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+        # Don't use ranlib
+        old_postinstall_cmds='chmod 644 $oldlib'
+        postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+        ;;
+      *)
+        # Assume MSVC wrapper
+        hardcode_libdir_flag_spec=' '
+        allow_undefined_flag=unsupported
+        # Tell ltmain to make .lib files, not .a files.
+        libext=lib
+        # Tell ltmain to make .dll files, not .so files.
+        shrext_cmds=.dll
+        # FIXME: Setting linknames here is a bad hack.
+        archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+        # The linker will automatically build a .lib file if we build a DLL.
+        old_archive_from_new_cmds='true'
+        # FIXME: Should let the user specify the lib program.
+        old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+        enable_shared_with_static_runtimes=yes
+        ;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+  else
+  ld_shlibs=no
+  fi
+      ;;
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+    hpux9*)
+      if test yes = "$GCC"; then
+        archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+        archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+        archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+        archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+        hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        hardcode_direct_absolute=yes
+        export_dynamic_flag_spec='$wl-E'
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+        case $host_cpu in
+        hppa*64*)
+          archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        ia64*)
+          archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        *)
+          archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        esac
+      else
+        case $host_cpu in
+        hppa*64*)
+          archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        ia64*)
+          archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        *)
+          # Older versions of the 11.00 compiler do not understand -b yet
+          # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
   $as_echo_n "(cached) " >&6
 else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+          ;;
+        esac
+      fi
+      if test no = "$with_gnu_ld"; then
+        hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+        hppa*64*|ia64*)
+          hardcode_direct=no
+          hardcode_shlibpath_var=no
+          ;;
+        *)
+          hardcode_direct=yes
+          hardcode_direct_absolute=yes
+          export_dynamic_flag_spec='$wl-E'
+          # hardcode_minus_L: Not really in the search PATH,
+          # but as the default location of the library.
+          hardcode_minus_L=yes
+          ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+        archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+        # Try to use the -exported_symbol ld option, if it does not
+        # work, assume that -exports_file does not work either and
+        # implicitly export all symbols.
+        # This should be the same for all languages, so no per-tag cache variable.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+           LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+        if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+        fi
+        link_all_deplibs=no
+      else
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+        archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+    linux*)
+      case $cc_basename in
+      tcc*)
+        # Fabrice Bellard et al's Tiny C Compiler
+        ld_shlibs=yes
+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+        ;;
+      esac
+      ;;
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+        archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+    *nto* | *qnx*)
+      ;;
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        hardcode_shlibpath_var=no
+        hardcode_direct_absolute=yes
+        if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+          archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+          archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+          hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+          export_dynamic_flag_spec='$wl-E'
+        else
+          archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+          hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+        $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+        $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+        $ECHO EXPORTS >> $output_objdir/$libname.def~
+        emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+        emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+        $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+        $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+        $ECHO EXPORTS >> $output_objdir/$libname.def~
+        prefix_cmds="$SED"~
+        if test EXPORTS = "`$SED 1q $export_symbols`"; then
+          prefix_cmds="$prefix_cmds -e 1d";
+        fi~
+        prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+        cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+        emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+    osf3*)
+      if test yes = "$GCC"; then
+        allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+        archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+        allow_undefined_flag=' -expect_unresolved \*'
+        archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)      # as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+        allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+        archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+        hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+        allow_undefined_flag=' -expect_unresolved \*'
+        archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+        archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+        # Both c and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+        wlarc='$wl'
+        archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+        archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+        case `$CC -V 2>&1` in
+        *"Compilers 5.0"*)
+          wlarc=''
+          archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+          archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+          ;;
+        *)
+          wlarc='$wl'
+          archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+          archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          ;;
+        esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+        # The compiler driver will combine and reorder linker options,
+        # but understands '-z linker_flag'.  GCC discards it without '$wl',
+        # but is careful enough not to reorder.
+        # Supported since Solaris 2.6 (maybe 2.5.1?)
+        if test yes = "$GCC"; then
+          whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+        else
+          whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+        fi
+        ;;
+      esac
+      link_all_deplibs=yes
+      ;;
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+        # Use $CC to link under sequent, because it throws in some extra .o
+        # files that make .init and .fini sections work.
+        archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+        archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+          hardcode_direct=yes # is this really true???
+        ;;
+        siemens)
+          ## LD is ld it makes a PLAMLIB
+          ## CC just makes a GrossModule.
+          archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+          reload_cmds='$CC -r -o $output$reload_objs'
+          hardcode_direct=no
+        ;;
+        motorola)
+          archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+        ;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+        hardcode_shlibpath_var=no
+        runpath_var=LD_RUN_PATH
+        hardcode_runpath_var=yes
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+      if test yes = "$GCC"; then
+        archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+        archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+        archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+        archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+      if test yes = "$GCC"; then
+        archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+        archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+        archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+        archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+        export_dynamic_flag_spec='$wl-Blargedynsym'
+        ;;
+      esac
+    fi
+  fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+with_gnu_ld=$with_gnu_ld
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+        echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+          soname=conftest
+          lib=conftest
+          libobjs=conftest.$ac_objext
+          deplibs=
+          wl=$lt_prog_compiler_wl
+          pic_flag=$lt_prog_compiler_pic
+          compiler_flags=-v
+          linker_flags=-v
+          verstring=
+          output_objdir=.
+          libname=conftest
+          lt_save_allow_undefined_flag=$allow_undefined_flag
+          allow_undefined_flag=
+          if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+          then
+            lt_cv_archive_cmds_need_lc=no
+          else
+            lt_cv_archive_cmds_need_lc=yes
+          fi
+          allow_undefined_flag=$lt_save_allow_undefined_flag
+        else
+          cat conftest.err 1>&5
+        fi
+        $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+        lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+           echo ' yes '
+           echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+        :
+      else
+        can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+        if test yes = "$lt_cv_prog_gnu_ld"; then
+                version_type=linux # correct to gnu/linux during the next big refactor
+        else
+                version_type=irix
+        fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+fi
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+rdos*)
+  dynamic_linker=no
+  ;;
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+        ;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+  if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+  darwin*)
+    # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+fi
+    ;;
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+fi
+fi
+fi
+fi
+fi
+    ;;
+  esac
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+          if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+#include <stdio.h>
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL           RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL         DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL         0
+#  endif
+#endif
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW            RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW          DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW        RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW      DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW      0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+          if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+        }
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+          if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+#include <stdio.h>
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL           RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL         DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL         0
+#  endif
+#endif
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW            RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW          DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW        RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW      DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW      0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+          if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+        }
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+  # Report what library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && enable_shared=no
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;                   # shared object as lib.so file only
+      yes,svr4,*) ;;                    # shared object as lib.so archive member only
+      yes,*) enable_static=no ;;        # shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+CC=$lt_save_CC
+      if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
+webecray
+#ifdef __STDC__
+# include <limits.h>
 #else
+wenotbecray
+# include <assert.h>
 #endif
+                     Syntax error
 _ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then :
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+    break
+fi
+  done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_c_stack_direction=0
+else
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+$ac_includes_default
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+else
+  _lt_caught_CXX_error=yes
+fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+# Source file extension for C++ test sources.
+ac_ext=cpp
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+# Allow CC to be a program name with arguments.
+compiler=$CC
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  compiler_CXX=$CC
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+        test no != "$with_gnu_ld" && break
+        ;;
+      *)
+        test yes != "$with_gnu_ld" && break
+        ;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+          $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+            for ld_flag in $LDFLAGS; do
+              case $ld_flag in
+              *-brtl*)
+                aix_use_runtimelinking=yes
+                break
+                ;;
+              esac
+            done
+            if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+              # With aix-soname=svr4, we create the lib.so.V shared archives only,
+              # so we don't have lib.a shared libs to link our executables.
+              # We have to force runtime linking in this case.
+              aix_use_runtimelinking=yes
+              LDFLAGS="$LDFLAGS -Wl,-brtl"
+            fi
+            ;;
+          esac
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;       # no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          hardcode_direct_CXX=no
+          hardcode_direct_absolute_CXX=no
+          ;;
+        esac
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+          collect2name=`$CC -print-prog-name=collect2`
+          if test -f "$collect2name" &&
+             strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct_CXX=unsupported
+            # It fails to find uninstalled libraries when the uninstalled
+            # path is not listed in the libpath.  Setting hardcode_minus_L
+            # to unsupported forces relinking
+            hardcode_minus_L_CXX=yes
+            hardcode_libdir_flag_spec_CXX='-L$libdir'
+            hardcode_libdir_separator_CXX=
+          fi
+          esac
+          shared_flag='-shared'
+          if test yes = "$aix_use_runtimelinking"; then
+            shared_flag=$shared_flag' $wl-G'
+          fi
+          # Need to ensure runtime linking is disabled for the traditional
+          # shared library, or the linker may eventually find shared libraries
+          # /with/ Import File - we do not want to mix them.
+          shared_flag_aix='-shared'
+          shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+          # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+          # chokes on -Wl,-G. The following line is correct:
+          shared_flag='-G'
+          else
+            if test yes = "$aix_use_runtimelinking"; then
+              shared_flag='$wl-G'
+            else
+              shared_flag='$wl-bM:SRE'
+            fi
+            shared_flag_aix='$wl-bM:SRE'
+            shared_flag_svr4='$wl-G'
+          fi
+        fi
+        export_dynamic_flag_spec_CXX='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+        # export.
+        always_export_symbols_CXX=yes
+        if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          no_undefined_flag_CXX='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 int
 find_stack_direction (int *addr, int depth)
+main ()
+{
+  int dir, dummy = 0;
+  if (! addr)
+    addr = &dummy;
+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+  return dir + dummy;
+}
+int
+main (int argc, char **argv)
+{
+  return find_stack_direction (0, argc + !argv + 20) < 0;
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_stack_direction=1
+else
+  ac_cv_c_stack_direction=-1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+if ac_fn_cxx_try_link "$LINENO"; then :
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+          /^0/ {
+              s/^0  *\([^ ]*\) *$/\1/
+              p
+          }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+fi
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+          hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+            hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
+            allow_undefined_flag_CXX="-z nodefs"
+            archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+            # Determine the default libpath from the value encoded in an
+            # empty executable.
+            if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+  ;
+  return 0;
+}
 _ACEOF
+fi
+for ac_header in fenv.h float.h inttypes.h libintl.h limits.h malloc.h stddef.h stdlib.h string.h unistd.h
+if ac_fn_cxx_try_link "$LINENO"; then :
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+          /^0/ {
+              s/^0  *\([^ ]*\) *$/\1/
+              p
+          }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+fi
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+            hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
+            # Warning - without using the other run time loading flags,
+            # -berok will link without error, but may produce a broken library.
+            no_undefined_flag_CXX=' $wl-bernotok'
+            allow_undefined_flag_CXX=' $wl-berok'
+            if test yes = "$with_gnu_ld"; then
+              # We only use this code for GNU lds that support --whole-archive.
+              whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+            else
+              # Exported symbols can be pulled into shared objects from archives
+              whole_archive_flag_spec_CXX='$convenience'
+            fi
+            archive_cmds_need_lc_CXX=yes
+            archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+            # -brtl affects multiple linker settings, -berok does not and is overridden later
+            compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+            if test svr4 != "$with_aix_soname"; then
+              # This is similar to how AIX traditionally builds its shared
+              # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+              archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+            fi
+            if test aix != "$with_aix_soname"; then
+              archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+            else
+              # used by -dlpreopen to get the symbols
+              archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+            fi
+            archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+      beos*)
+        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+          allow_undefined_flag_CXX=unsupported
+          # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+          # support --undefined.  This deserves some investigation.  FIXME
+          archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        else
+          ld_shlibs_CXX=no
+        fi
+        ;;
+      chorus*)
+        case $cc_basename in
+          *)
+          # FIXME: insert proper C++ library support
+          ld_shlibs_CXX=no
+          ;;
+        esac
+        ;;
+      cygwin* | mingw* | pw32* | cegcc*)
+        case $GXX,$cc_basename in
+        ,cl* | no,cl*)
+          # Native MSVC
+          # hardcode_libdir_flag_spec is actually meaningless, as there is
+          # no search path for DLLs.
+          hardcode_libdir_flag_spec_CXX=' '
+          allow_undefined_flag_CXX=unsupported
+          always_export_symbols_CXX=yes
+          file_list_spec_CXX='@'
+          # Tell ltmain to make .lib files, not .a files.
+          libext=lib
+          # Tell ltmain to make .dll files, not .so files.
+          shrext_cmds=.dll
+          # FIXME: Setting linknames here is a bad hack.
+          archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+          archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[     ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([     ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+          # The linker will not automatically build a static lib if we build a DLL.
+          # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+          enable_shared_with_static_runtimes_CXX=yes
+          # Don't use ranlib
+          old_postinstall_cmds_CXX='chmod 644 $oldlib'
+          postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+          ;;
+        *)
+          # g++
+          # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+          # as there is no search path for DLLs.
+          hardcode_libdir_flag_spec_CXX='-L$libdir'
+          export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
+          allow_undefined_flag_CXX=unsupported
+          always_export_symbols_CXX=no
+          enable_shared_with_static_runtimes_CXX=yes
+          if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+            archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+            # If the export-symbols file already is a .def file, use it as
+            # is; otherwise, prepend EXPORTS...
+            archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[   ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([     ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          else
+            ld_shlibs_CXX=no
+          fi
+          ;;
+        esac
+        ;;
+      darwin* | rhapsody*)
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+       if test yes != "$lt_cv_apple_cc_single_mod"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+  else
+  ld_shlibs_CXX=no
+  fi
+        ;;
+      os2*)
+        hardcode_libdir_flag_spec_CXX='-L$libdir'
+        hardcode_minus_L_CXX=yes
+        allow_undefined_flag_CXX=unsupported
+        shrext_cmds=.dll
+        archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+          $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+          $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+          $ECHO EXPORTS >> $output_objdir/$libname.def~
+          emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+          $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+          emximp -o $lib $output_objdir/$libname.def'
+        archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+          $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+          $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+          $ECHO EXPORTS >> $output_objdir/$libname.def~
+          prefix_cmds="$SED"~
+          if test EXPORTS = "`$SED 1q $export_symbols`"; then
+            prefix_cmds="$prefix_cmds -e 1d";
+          fi~
+          prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+          cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+          $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+          emximp -o $lib $output_objdir/$libname.def'
+        old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+        enable_shared_with_static_runtimes_CXX=yes
+        ;;
+      dgux*)
+        case $cc_basename in
+          ec++*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          ghcx*)
+            # Green Hills C++ Compiler
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          *)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+        esac
+        ;;
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+        # switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='$wl-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+                                             # but as the default
+                                             # location of the library.
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+          hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
+          hardcode_libdir_separator_CXX=:
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+              export_dynamic_flag_spec_CXX='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+                                                 # but as the default
+                                                 # location of the library.
+            ;;
+        esac
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            case $host_cpu in
+              hppa*64*)
+                archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                ;;
+              ia64*)
+                archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                ;;
+              *)
+                archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                ;;
+            esac
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              if test no = "$with_gnu_ld"; then
+                case $host_cpu in
+                  hppa*64*)
+                    archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                    ;;
+                  ia64*)
+                    archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                    ;;
+                  *)
+                    archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                    ;;
+                esac
+              fi
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+      interix[3-9]*)
+        hardcode_direct_CXX=no
+        hardcode_shlibpath_var_CXX=no
+        hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+        export_dynamic_flag_spec_CXX='$wl-E'
+        # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+        # Instead, shared libraries are loaded at an image base (0x10000000 by
+        # default) and relocated if they conflict, which is a slow very memory
+        # consuming and fragmenting process.  To avoid this, we pick a random,
+        # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+        # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+        archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+        archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+        ;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+            # SGI C++
+            archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+            # Archives containing C++ object files must be created using
+            # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+            # necessary to make sure instantiated templates are included
+            # in the archive.
+            old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              if test no = "$with_gnu_ld"; then
+                archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+              else
+                archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+              fi
+            fi
+            link_all_deplibs_CXX=yes
+            ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+            # Kuck and Associates, Inc. (KAI) C++ Compiler
+            # KCC will only create a shared library if the output file
+            # ends with ".so" (or ".sl" for HP-UX), so rename the library
+            # to its proper name (with version) after linking.
+            archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+            archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+            export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+            # Archives containing C++ object files must be created using
+            # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+            old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+            ;;
+          icpc* | ecpc* )
+            # Intel C++
+            with_gnu_ld=yes
+            # version 8.0 and above of icpc choke on multiply defined symbols
+            # if we add $predep_objects and $postdep_objects, however 7.1 and
+            # earlier do not add the objects themselves.
+            case `$CC -V 2>&1` in
+              *"Version 7."*)
+                archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+                archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+                ;;
+              *)  # Version 8.0 or newer
+                tmp_idyn=
+                case $host_cpu in
+                  ia64*) tmp_idyn=' -i_dynamic';;
+                esac
+                archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+                archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+                ;;
+            esac
+            archive_cmds_need_lc_CXX=no
+            hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+            export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+            whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+            ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+            case `$CC -V` in
+            *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+              prelink_cmds_CXX='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+              old_archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+              archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+              archive_expsym_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+              ;;
+            *) # Version 6 and above use weak symbols
+              archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+              archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+              ;;
+            esac
+            hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+            export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+            whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+          cxx*)
+            # Compaq C++
+            archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+            runpath_var=LD_RUN_PATH
+            hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+            hardcode_libdir_separator_CXX=:
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+            ;;
+          xl* | mpixl* | bgxl*)
+            # IBM XL 8.0 on PPC, with GNU ld
+            hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+            export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+            archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            if test yes = "$supports_anon_versioning"; then
+              archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+            fi
+            ;;
+          *)
+            case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              # Sun C++ 5.9
+              no_undefined_flag_CXX=' -zdefs'
+              archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+              archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+              hardcode_libdir_flag_spec_CXX='-R$libdir'
+              whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+              compiler_needs_object_CXX=yes
+              # Not sure whether something based on
+              # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+              # would be better.
+              output_verbose_link_cmd='func_echo_all'
+              # Archives containing C++ object files must be created using
+              # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+              # necessary to make sure instantiated templates are included
+              # in the archive.
+              old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+              ;;
+            esac
+            ;;
+        esac
+        ;;
+      lynxos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      mvs*)
+        case $cc_basename in
+          cxx*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          *)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+        esac
+        ;;
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+          archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+          wlarc=
+          hardcode_libdir_flag_spec_CXX='-R$libdir'
+          hardcode_direct_CXX=yes
+          hardcode_shlibpath_var_CXX=no
+        fi
+        # Workaround some broken pre-1.5 toolchains
+        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+        ;;
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+        ;;
+      openbsd* | bitrig*)
+        if test -f /usr/libexec/ld.so; then
+          hardcode_direct_CXX=yes
+          hardcode_shlibpath_var_CXX=no
+          hardcode_direct_absolute_CXX=yes
+          archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+          hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+          if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+            archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+            export_dynamic_flag_spec_CXX='$wl-E'
+            whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+          fi
+          output_verbose_link_cmd=func_echo_all
+        else
+          ld_shlibs_CXX=no
+        fi
+        ;;
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+            # Kuck and Associates, Inc. (KAI) C++ Compiler
+            # KCC will only create a shared library if the output file
+            # ends with ".so" (or ".sl" for HP-UX), so rename the library
+            # to its proper name (with version) after linking.
+            archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+            hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+            hardcode_libdir_separator_CXX=:
+            # Archives containing C++ object files must be created using
+            # the KAI C++ compiler.
+            case $host in
+              osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+              *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+            esac
+            ;;
+          RCC*)
+            # Rational C++ 2.4.1
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          cxx*)
+            case $host in
+              osf3*)
+                allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+                archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+                hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+                ;;
+              *)
+                allow_undefined_flag_CXX=' -expect_unresolved \*'
+                archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+                archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+                hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+                ;;
+            esac
+            hardcode_libdir_separator_CXX=:
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes,no = "$GXX,$with_gnu_ld"; then
+              allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+              case $host in
+                osf3*)
+                  archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+                  ;;
+                *)
+                  archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+                  ;;
+              esac
+              hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+              hardcode_libdir_separator_CXX=:
+              # Commands to make compiler produce verbose output that lists
+              # what "hidden" libraries, object files and flags are used when
+              # linking a shared library.
+              output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      sunos4*)
+        case $cc_basename in
+          CC*)
+            # Sun C++ 4.x
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          lcc*)
+            # Lucid
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          *)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+        esac
+        ;;
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+            # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+            no_undefined_flag_CXX=' -zdefs'
+            archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+            archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+            hardcode_libdir_flag_spec_CXX='-R$libdir'
+            hardcode_shlibpath_var_CXX=no
+            case $host_os in
+              solaris2.[0-5] | solaris2.[0-5].*) ;;
+              *)
+                # The compiler driver will combine and reorder linker options,
+                # but understands '-z linker_flag'.
+                # Supported since Solaris 2.6 (maybe 2.5.1?)
+                whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+                ;;
+            esac
+            link_all_deplibs_CXX=yes
+            output_verbose_link_cmd='func_echo_all'
+            # Archives containing C++ object files must be created using
+            # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+            # necessary to make sure instantiated templates are included
+            # in the archive.
+            old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+            ;;
+          gcx*)
+            # Green Hills C++ Compiler
+            archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+            # The C++ compiler must be used to create the archive.
+            old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+            ;;
+          *)
+            # GNU C++ compiler with Solaris linker
+            if test yes,no = "$GXX,$with_gnu_ld"; then
+              no_undefined_flag_CXX=' $wl-z ${wl}defs'
+              if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+                archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+                archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                # Commands to make compiler produce verbose output that lists
+                # what "hidden" libraries, object files and flags are used when
+                # linking a shared library.
+                output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+              else
+                # g++ 2.7 appears to require '-G' NOT '-shared' on this
+                # platform.
+                archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+                archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                # Commands to make compiler produce verbose output that lists
+                # what "hidden" libraries, object files and flags are used when
+                # linking a shared library.
+                output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+              fi
+              hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
+              case $host_os in
+                solaris2.[0-5] | solaris2.[0-5].*) ;;
+                *)
+                  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+                  ;;
+              esac
+            fi
+            ;;
+        esac
+        ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='$wl-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+      case $cc_basename in
+        CC*)
+          archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+          archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        *)
+          archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+          archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+      esac
+      ;;
+      sysv5* | sco3.2v5* | sco5v6*)
+        # Note: We CANNOT use -z defs as we might desire, because we do not
+        # link with -lc, and that would cause any symbols used from libc to
+        # always be unresolved, which means just about no library would
+        # ever link correctly.  If we're not using GNU ld we use -z text
+        # though, which does catch some bad symbols but isn't as heavy-handed
+        # as -z defs.
+        no_undefined_flag_CXX='$wl-z,text'
+        allow_undefined_flag_CXX='$wl-z,nodefs'
+        archive_cmds_need_lc_CXX=no
+        hardcode_shlibpath_var_CXX=no
+        hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        export_dynamic_flag_spec_CXX='$wl-Bexport'
+        runpath_var='LD_RUN_PATH'
+        case $cc_basename in
+          CC*)
+            archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+            archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+            old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+              '"$old_archive_cmds_CXX"
+            reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+              '"$reload_cmds_CXX"
+            ;;
+          *)
+            archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+            archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+            ;;
+        esac
+      ;;
+      tandem*)
+        case $cc_basename in
+          NCC*)
+            # NonStop-UX NCC 3.20
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          *)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+        esac
+        ;;
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test no = "$ld_shlibs_CXX" && can_build_shared=no
+    GCC_CXX=$GXX
+    LD_CXX=$LD
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+         prev=$p
+         continue
+       fi
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+         case $prev in
+         -L | -R)
+           # Internal compiler library paths should come after those
+           # provided the user.  The postdeps already come after the
+           # user supplied libs so there is no need to process them.
+           if test -z "$compiler_lib_search_path_CXX"; then
+             compiler_lib_search_path_CXX=$prev$p
+           else
+             compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
+           fi
+           ;;
+         # The "-l" case would never come before the object being
+         # linked, so don't bother handling this case.
+         esac
+       else
+         if test -z "$postdeps_CXX"; then
+           postdeps_CXX=$prev$p
+         else
+           postdeps_CXX="${postdeps_CXX} $prev$p"
+         fi
+       fi
+       prev=
+       ;;
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+         pre_test_object_deps_done=yes
+         continue
+       fi
+       if test no = "$pre_test_object_deps_done"; then
+         if test -z "$predep_objects_CXX"; then
+           predep_objects_CXX=$p
+         else
+           predep_objects_CXX="$predep_objects_CXX $p"
+         fi
+       else
+         if test -z "$postdep_objects_CXX"; then
+           postdep_objects_CXX=$p
+         else
+           postdep_objects_CXX="$postdep_objects_CXX $p"
+         fi
+       fi
+       ;;
+    *) ;; # Ignore the rest.
+    esac
+  done
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+esac
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+        # AIX 5 now supports IA64 processor
+        lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+        lt_prog_compiler_static_CXX='$wl-static'
+        ;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+        ;;
+      *)
+        lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+        # All AIX code is PIC.
+        if test ia64 = "$host_cpu"; then
+          # AIX 5 now supports IA64 processor
+          lt_prog_compiler_static_CXX='-Bstatic'
+        else
+          lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+        fi
+        ;;
+      chorus*)
+        case $cc_basename in
+        cxch68*)
+          # Green Hills C++ Compiler
+          # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+          ;;
+        esac
+        ;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+        # This hack is so that the source file can tell whether it is being
+        # built for inclusion in a dll (and should export symbols for example).
+        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+        ;;
+      dgux*)
+        case $cc_basename in
+          ec++*)
+            lt_prog_compiler_pic_CXX='-KPIC'
+            ;;
+          ghcx*)
+            # Green Hills C++ Compiler
+            lt_prog_compiler_pic_CXX='-pic'
+            ;;
+          *)
+            ;;
+        esac
+        ;;
+      freebsd* | dragonfly*)
+        # FreeBSD uses GNU C++
+        ;;
+      hpux9* | hpux10* | hpux11*)
+        case $cc_basename in
+          CC*)
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+            if test ia64 != "$host_cpu"; then
+              lt_prog_compiler_pic_CXX='+Z'
+            fi
+            ;;
+          aCC*)
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+            case $host_cpu in
+            hppa*64*|ia64*)
+              # +Z the default
+              ;;
+            *)
+              lt_prog_compiler_pic_CXX='+Z'
+              ;;
+            esac
+            ;;
+          *)
+            ;;
+        esac
+        ;;
+      interix*)
+        # This is c89, which is MS Visual C++ (no shared libs)
+        # Anyone wants to do a port?
+        ;;
+      irix5* | irix6* | nonstopux*)
+        case $cc_basename in
+          CC*)
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_static_CXX='-non_shared'
+            # CC pic flag -KPIC is the default.
+            ;;
+          *)
+            ;;
+        esac
+        ;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+            # KAI C++ Compiler
+            lt_prog_compiler_wl_CXX='--backend -Wl,'
+            lt_prog_compiler_pic_CXX='-fPIC'
+            ;;
+          ecpc* )
+            # old Intel C++ for x86_64, which still supported -KPIC.
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_pic_CXX='-KPIC'
+            lt_prog_compiler_static_CXX='-static'
+            ;;
+          icpc* )
+            # Intel C++, used to be incompatible with GCC.
+            # ICC 10 doesn't accept -KPIC any more.
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_pic_CXX='-fPIC'
+            lt_prog_compiler_static_CXX='-static'
+            ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_pic_CXX='-fpic'
+            lt_prog_compiler_static_CXX='-Bstatic'
+            ;;
+          cxx*)
+            # Compaq C++
+            # Make sure the PIC flag is empty.  It appears that all Alpha
+            # Linux and Compaq Tru64 Unix objects are PIC.
+            lt_prog_compiler_pic_CXX=
+            lt_prog_compiler_static_CXX='-non_shared'
+            ;;
+          xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+            # IBM XL 8.0, 9.0 on PPC and BlueGene
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_pic_CXX='-qpic'
+            lt_prog_compiler_static_CXX='-qstaticlink'
+            ;;
+          *)
+            case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              # Sun C++ 5.9
+              lt_prog_compiler_pic_CXX='-KPIC'
+              lt_prog_compiler_static_CXX='-Bstatic'
+              lt_prog_compiler_wl_CXX='-Qoption ld '
+              ;;
+            esac
+            ;;
+        esac
+        ;;
+      lynxos*)
+        ;;
+      m88k*)
+        ;;
+      mvs*)
+        case $cc_basename in
+          cxx*)
+            lt_prog_compiler_pic_CXX='-W c,exportall'
+            ;;
+          *)
+            ;;
+        esac
+        ;;
+      netbsd* | netbsdelf*-gnu)
+        ;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+            lt_prog_compiler_wl_CXX='--backend -Wl,'
+            ;;
+          RCC*)
+            # Rational C++ 2.4.1
+            lt_prog_compiler_pic_CXX='-pic'
+            ;;
+          cxx*)
+            # Digital/Compaq C++
+            lt_prog_compiler_wl_CXX='-Wl,'
+            # Make sure the PIC flag is empty.  It appears that all Alpha
+            # Linux and Compaq Tru64 Unix objects are PIC.
+            lt_prog_compiler_pic_CXX=
+            lt_prog_compiler_static_CXX='-non_shared'
+            ;;
+          *)
+            ;;
+        esac
+        ;;
+      psos*)
+        ;;
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+            # Sun C++ 4.2, 5.x and Centerline C++
+            lt_prog_compiler_pic_CXX='-KPIC'
+            lt_prog_compiler_static_CXX='-Bstatic'
+            lt_prog_compiler_wl_CXX='-Qoption ld '
+            ;;
+          gcx*)
+            # Green Hills C++ Compiler
+            lt_prog_compiler_pic_CXX='-PIC'
+            ;;
+          *)
+            ;;
+        esac
+        ;;
+      sunos4*)
+        case $cc_basename in
+          CC*)
+            # Sun C++ 4.x
+            lt_prog_compiler_pic_CXX='-pic'
+            lt_prog_compiler_static_CXX='-Bstatic'
+            ;;
+          lcc*)
+            # Lucid
+            lt_prog_compiler_pic_CXX='-pic'
+            ;;
+          *)
+            ;;
+        esac
+        ;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+        case $cc_basename in
+          CC*)
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_pic_CXX='-KPIC'
+            lt_prog_compiler_static_CXX='-Bstatic'
+            ;;
+        esac
+        ;;
+      tandem*)
+        case $cc_basename in
+          NCC*)
+            # NonStop-UX NCC 3.20
+            lt_prog_compiler_pic_CXX='-KPIC'
+            ;;
+          *)
+            ;;
+        esac
+        ;;
+      vxworks*)
+        ;;
+      *)
+        lt_prog_compiler_can_build_shared_CXX=no
+        ;;
+    esac
+  fi
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+fi
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs_CXX=no
+    ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test no = "$ld_shlibs_CXX" && can_build_shared=no
+with_gnu_ld_CXX=$with_gnu_ld
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+        echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+          soname=conftest
+          lib=conftest
+          libobjs=conftest.$ac_objext
+          deplibs=
+          wl=$lt_prog_compiler_wl_CXX
+          pic_flag=$lt_prog_compiler_pic_CXX
+          compiler_flags=-v
+          linker_flags=-v
+          verstring=
+          output_objdir=.
+          libname=conftest
+          lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+          allow_undefined_flag_CXX=
+          if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+          then
+            lt_cv_archive_cmds_need_lc_CXX=no
+          else
+            lt_cv_archive_cmds_need_lc_CXX=yes
+          fi
+          allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+        else
+          cat conftest.err 1>&5
+        fi
+        $RM conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+      ;;
+    esac
+  fi
+  ;;
+esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+           echo ' yes '
+           echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+        :
+      else
+        can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+        if test yes = "$lt_cv_prog_gnu_ld"; then
+                version_type=linux # correct to gnu/linux during the next big refactor
+        else
+                version_type=irix
+        fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec_CXX='-L$libdir'
+  ;;
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+fi
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+rdos*)
+  dynamic_linker=no
+  ;;
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+        ;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test yes = "$hardcode_automatic_CXX"; then
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct_CXX" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+     test no != "$hardcode_minus_L_CXX"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+if test relink = "$hardcode_action_CXX" ||
+   test yes = "$inherit_rpath_CXX"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+  fi # test -n "$compiler"
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+        ac_config_commands="$ac_config_commands libtool"
+# Only expand once:
+# Checks for libraries.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fibre::yield in -lfibre" >&5
+$as_echo_n "checking for Fibre::yield in -lfibre... " >&6; }
+if ${ac_cv_lib_fibre_Fibre__yield+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfibre  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char Fibre::yield ();
+int
+main ()
+{
+return Fibre::yield ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_fibre_Fibre__yield=yes
+else
+  ac_cv_lib_fibre_Fibre__yield=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fibre_Fibre__yield" >&5
+$as_echo "$ac_cv_lib_fibre_Fibre__yield" >&6; }
+if test "x$ac_cv_lib_fibre_Fibre__yield" = xyes; then :
+  HAVE_LIBFIBRE=1
+else
+  HAVE_LIBFIBRE=0
+fi
+ if test "$HAVE_LIBFIBRE" -eq 1; then
+  WITH_LIBFIBRE_TRUE=
+  WITH_LIBFIBRE_FALSE='#'
+else
+  WITH_LIBFIBRE_TRUE='#'
+  WITH_LIBFIBRE_FALSE=
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ProfilingIsEnabledForAllThreads in -lprofiler" >&5
+$as_echo_n "checking for ProfilingIsEnabledForAllThreads in -lprofiler... " >&6; }
+if ${ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lprofiler  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ProfilingIsEnabledForAllThreads ();
+int
+main ()
+{
+return ProfilingIsEnabledForAllThreads ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads=yes
+else
+  ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" >&5
+$as_echo "$ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" >&6; }
+if test "x$ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" = xyes; then :
+  HAVE_LIBPROFILER=1
+else
+  HAVE_LIBPROFILER=0
+fi
+ if test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBPROFILER" -eq 1; then
+  WITH_LIBPROFILER_TRUE=
+  WITH_LIBPROFILER_FALSE='#'
+else
+  WITH_LIBPROFILER_TRUE='#'
+  WITH_LIBPROFILER_FALSE=
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5
+$as_echo_n "checking for malloc in -ltcmalloc... " >&6; }
+if ${ac_cv_lib_tcmalloc_malloc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltcmalloc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char malloc ();
+int
+main ()
+{
+return malloc ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_tcmalloc_malloc=yes
+else
+  ac_cv_lib_tcmalloc_malloc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&5
+$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; }
+if test "x$ac_cv_lib_tcmalloc_malloc" = xyes; then :
+  HAVE_LIBTCMALLOC=1
+else
+  HAVE_LIBTCMALLOC=0
+fi
+ if test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBTCMALLOC" -eq 1; then
+  WITH_LIBTCMALLOC_TRUE=
+  WITH_LIBTCMALLOC_FALSE='#'
+else
+  WITH_LIBTCMALLOC_TRUE='#'
+  WITH_LIBTCMALLOC_FALSE=
+fi
+# conditionnally build the demangler
+if test "x$enable_demangler" == xyes; then
+        LIBDEMANGLE="libdemangle.a"
+        DEMANGLER="demangler"
+else
+        LIBDEMANGLE=""
+        DEMANGLER=""
+fi
+# Checks for header files.
+for ac_header in libintl.h malloc.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 …
 _ACEOF
+else
+  echo "Error: Missing required header"; exit 1
 fi
 …
 # Checks for typedefs, structures, and compiler characteristics.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if ${ac_cv_header_stdbool_h+:} false; then :
+ac_fn_c_check_type "$LINENO" "_Float32" "ac_cv_type__Float32" "
+"
+if test "x$ac_cv_type__Float32" = xyes; then :
+cat >>confdefs.h <<_ACEOF
+#define HAVE__FLOAT32 1
+_ACEOF
+$as_echo "#define HAVE_KEYWORDS_FLOATXX /**/" >>confdefs.h
+fi
+# Checks for compiler flags.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wcast-function-type" >&5
+$as_echo_n "checking whether C compiler accepts -Wcast-function-type... " >&6; }
+if ${m4cfa_cv_check_cflags___Wcast_function_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        m4cfa_check_save_flags=$CFLAGS
+        CFLAGS="$CFLAGS  -Wcast-function-type"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
-             #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
-             struct s { _Bool s: 1; _Bool t; } s;
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-              */
-             _Bool q = true;
-             _Bool *pq = &q;
 int
 main ()
+{
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
+  ;
 …
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdbool_h=yes
 else
   ac_cv_header_stdbool_h=no
+  m4cfa_cv_check_cflags___Wcast_function_type=yes
+else
+  m4cfa_cv_check_cflags___Wcast_function_type=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = xyes; then :
+        CFLAGS=$m4cfa_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $m4cfa_cv_check_cflags___Wcast_function_type" >&5
+$as_echo "$m4cfa_cv_check_cflags___Wcast_function_type" >&6; }
+if test "x$m4cfa_cv_check_cflags___Wcast_function_type" = xyes; then :
+$as_echo "#define HAVE_CAST_FUNCTION_TYPE /**/" >>confdefs.h
+else
+  :
+fi
+#==============================================================================
+# backend compiler implementation
 cat >>confdefs.h <<_ACEOF
 #define HAVE__BOOL 1
+#define CFA_BACKEND_CC "${CC}"
 _ACEOF
+fi
+if test $ac_cv_header_stdbool_h = yes; then
+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t"
+case $ac_cv_c_int16_t in #(
+  no|yes) ;; #(
+  *)
+cat >>confdefs.h <<_ACEOF
+#define int16_t $ac_cv_c_int16_t
+_ACEOF
+;;
+esac
+ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
+case $ac_cv_c_int32_t in #(
+  no|yes) ;; #(
+  *)
+cat >>confdefs.h <<_ACEOF
+#define int32_t $ac_cv_c_int32_t
+_ACEOF
+;;
+esac
+ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t"
+case $ac_cv_c_int8_t in #(
+  no|yes) ;; #(
+  *)
+cat >>confdefs.h <<_ACEOF
+#define int8_t $ac_cv_c_int8_t
+_ACEOF
+;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
+if ${ac_cv_c_restrict+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+typedef int * int_ptr;
+        int foo (int_ptr $ac_kw ip) {
+        return ip[0];
+       }
+int
+main ()
+{
+int s[1];
+        int * $ac_kw t = s;
+        t[0] = 0;
+        return foo(t)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_restrict=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     test "$ac_cv_c_restrict" != no && break
+   done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+$as_echo "$ac_cv_c_restrict" >&6; }
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) $as_echo "#define restrict /**/" >>confdefs.h
+ ;;
+   *)  cat >>confdefs.h <<_ACEOF
+#define restrict $ac_cv_c_restrict
+_ACEOF
+ ;;
+ esac
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+else
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+fi
+ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
+case $ac_cv_c_uint16_t in #(
+  no|yes) ;; #(
+  *)
+cat >>confdefs.h <<_ACEOF
+#define uint16_t $ac_cv_c_uint16_t
+_ACEOF
+;;
+  esac
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+  no|yes) ;; #(
+  *)
+$as_echo "#define _UINT32_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define uint32_t $ac_cv_c_uint32_t
+_ACEOF
+;;
+  esac
+ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
+case $ac_cv_c_uint8_t in #(
+  no|yes) ;; #(
+  *)
+$as_echo "#define _UINT8_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define uint8_t $ac_cv_c_uint8_t
+_ACEOF
+;;
+  esac
+# Checks for library functions.
+for ac_func in memset putenv strchr strtol
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+fi
+done
+ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/benchmark/Makefile src/examples/Makefile src/tests/Makefile src/tests/preempt_longrun/Makefile src/prelude/Makefile src/libcfa/Makefile tools/Makefile tools/prettyprinter/Makefile"
+#==============================================================================
+ac_config_files="$ac_config_files Makefile driver/Makefile src/Makefile benchmark/Makefile tests/Makefile longrun_tests/Makefile tools/Makefile tools/prettyprinter/Makefile"
+ac_config_links="$ac_config_links tests/test.py:tests/test.py"
+ac_config_files="$ac_config_files tests/config.py"
 cat >confcache <<\_ACEOF
 …
 fi
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_RELEASE_TRUE}" && test -z "${BUILD_RELEASE_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_RELEASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_DEBUG_TRUE}" && test -z "${BUILD_DEBUG_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_NO_LIB_TRUE}" && test -z "${BUILD_NO_LIB_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_NO_LIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_CONCURRENCY_TRUE}" && test -z "${BUILD_CONCURRENCY_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_CONCURRENCY\" was never defined.
+if test -z "${ENABLE_DISTCC_TRUE}" && test -z "${ENABLE_DISTCC_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_DISTCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 …
 if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_LIBFIBRE_TRUE}" && test -z "${WITH_LIBFIBRE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_LIBFIBRE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_LIBPROFILER_TRUE}" && test -z "${WITH_LIBPROFILER_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_LIBPROFILER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_LIBTCMALLOC_TRUE}" && test -z "${WITH_LIBTCMALLOC_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_LIBTCMALLOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 …
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
+config_links="$ac_config_links"
 config_commands="$ac_config_commands"
 …
 Configuration headers:
 $config_headers
+Configuration links:
+$config_links
 Configuration commands:
 …
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+reload_flag_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_separator_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
+reload_cmds_CXX \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+ac_aux_dir='$ac_aux_dir'
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'
 _ACEOF
 …
 do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:src/config.h.in" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/driver/Makefile" ;;
+    "driver/Makefile") CONFIG_FILES="$CONFIG_FILES driver/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/benchmark/Makefile") CONFIG_FILES="$CONFIG_FILES src/benchmark/Makefile" ;;
+    "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
+    "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
+    "src/tests/preempt_longrun/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/preempt_longrun/Makefile" ;;
+    "src/prelude/Makefile") CONFIG_FILES="$CONFIG_FILES src/prelude/Makefile" ;;
+    "src/libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcfa/Makefile" ;;
+    "benchmark/Makefile") CONFIG_FILES="$CONFIG_FILES benchmark/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "longrun_tests/Makefile") CONFIG_FILES="$CONFIG_FILES longrun_tests/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/prettyprinter/Makefile") CONFIG_FILES="$CONFIG_FILES tools/prettyprinter/Makefile" ;;
+    "tests/test.py") CONFIG_LINKS="$CONFIG_LINKS tests/test.py:tests/test.py" ;;
+    "tests/config.py") CONFIG_FILES="$CONFIG_FILES tests/config.py" ;;
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 …
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 …
 eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS  :L $CONFIG_LINKS  :C $CONFIG_COMMANDS"
 shift
 for ac_tag
 …
           s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
+  :L)
+  #
+  # CONFIG_LINK
+  #
+  if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
+    :
+  else
+    # Prefer the file from the source tree if names are identical.
+    if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
+      ac_source=$srcdir/$ac_source
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
+$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
+    if test ! -r "$ac_source"; then
+      as_fn_error $? "$ac_source: file not found" "$LINENO" 5
+    fi
+    rm -f "$ac_file"
+    # Try a relative symlink, then a hard link, then a copy.
+    case $ac_source in
+    [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
+        *) ac_rel_source=$ac_top_build_prefix$ac_source ;;
+    esac
+    ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
+      ln "$ac_source" "$ac_file" 2>/dev/null ||
+      cp -p "$ac_source" "$ac_file" ||
+      as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
+  fi
+ ;;
   :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
 …
+}
  ;;
+    "libtool":C)
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# The names of the tagged configurations supported by this script.
+available_tags='CXX '
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+# ### BEGIN LIBTOOL CONFIG
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+# What type of objects to build.
+pic_mode=$pic_mode
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+# A sed program that does not truncate output.
+SED=$lt_SED
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+# A grep program that handles long lines.
+GREP=$lt_GREP
+# An ERE matcher.
+EGREP=$lt_EGREP
+# A literal string matcher.
+FGREP=$lt_FGREP
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+# Object file suffix (normally "o").
+objext=$ac_objext
+# Executable file suffix (normally "").
+exeext=$exeext
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+# The archiver.
+AR=$lt_AR
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+# A symbol stripping program.
+STRIP=$lt_STRIP
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+# A C compiler.
+LTCC=$lt_CC
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+# Old archive suffix (normally "a").
+libext=$libext
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+# Do we need a version for libraries?
+need_version=$need_version
+# Library versioning type.
+version_type=$version_type
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+# The linker used to build libraries.
+LD=$lt_LD
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+# A language specific compiler.
+CC=$lt_compiler
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+# ### END LIBTOOL CONFIG
+_LT_EOF
+    cat <<'_LT_EOF' >> "$cfgfile"
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+_LT_EOF
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+ltmain=$ac_aux_dir/ltmain.sh
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+    cat <<_LT_EOF >> "$ofile"
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+# A language specific compiler.
+CC=$lt_compiler_CXX
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+ ;;
   esac
 …
-if test -z "$BUILD_RELEASE_TRUE"; then :
-  if test -z "$BUILD_DEBUG_TRUE"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Building libcfa for target: release & debug" >&5
-$as_echo "$as_me: Building libcfa for target: release & debug" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Building libcfa for target: release" >&5
-$as_echo "$as_me: Building libcfa for target: release" >&6;}
-fi
-else
-  if test -z "$BUILD_DEBUG_TRUE"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Building libcfa for target: debug" >&5
-$as_echo "$as_me: Building libcfa for target: debug" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Running cfa without libcfa" >&5
-$as_echo "$as_me: Running cfa without libcfa" >&6;}
-fi
-fi
 # Final text
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cforall configuraton completed. Type \"make -j 8 install\"." >&5

configure.ac

-              r7951100
+              rb067d9b
 AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
 AC_CONFIG_AUX_DIR([automake])
+AC_CONFIG_MACRO_DIRS([automake])
 #AC_CONFIG_SRCDIR([src/main.cc])
+AC_CONFIG_HEADERS([config.h])
+AM_SILENT_RULES([no])
+AC_CONFIG_HEADERS([config.h:src/config.h.in])
+AM_SILENT_RULES([yes])
+m4_include([automake/cfa.m4])
+# don't use the default CFLAGS as they unconditonnaly add -O2
+: ${CFLAGS=""}
 AM_INIT_AUTOMAKE([subdir-objects])
-AM_MAINTAINER_MODE(enable)                      # may require auto* software to be installed
 # Allow program name tansformation
 …
 AC_ARG_PROGRAM
+#==============================================================================
 #Trasforming cc1 will break compilation
+if test "${program_transform_name}" = ""; then
+    AC_MSG_ERROR([Program transform not supported.
+                Use --with-cfa-name='[[Desired name here]]' instead])
+fi
+AC_ARG_WITH(cfa-name,
+        [  --with-cfa-name=NAME     NAME too which cfa will be installed],
+        cfa_name=$withval, cfa_name="cfa")
+#Define the new name of the installed command
+AC_SUBST(CFA_NAME, ${cfa_name})
+M4CFA_PROGRAM_NAME
+#==============================================================================
+# version information
 rm -f version
 …
 AC_DEFINE_UNQUOTED(CFA_VERSION_FULL, ["${ver_major}.${ver_minor}.${ver_patch}.${ver_build}"], [Major.Minor.Patch.Build])
+# Installation paths
+AC_ARG_WITH(backend-compiler,
+        [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
+        backendcompiler=$withval, backendcompiler="")
+if test "x$backendcompiler" != "x"; then
+        BACKEND_CC=${backendcompiler}
+else
+        AC_PATH_PROG(BACKEND_CC, gcc, [])       # check gcc installed
+        if test "x$BACKEND_CC" = "x"; then
+                AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
+                exit 1
+        fi
+fi
+AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
+AC_SUBST(CFA_BACKEND_CC)
+AC_ARG_ENABLE(target-release, AS_HELP_STRING([--enable-target-release], [Build and install the release target]))
+AC_ARG_ENABLE(target-debug, AS_HELP_STRING([--enable-target-debug], [Build and install the debug target]))
+AC_ARG_ENABLE(threading, AS_HELP_STRING([--enable-threading], [Build and install libcfa with threading support (Enabled by default)]),
+[case "${enableval}" in
+  yes) build_threading="yes" ;;
+  no)  build_threading="no" ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
+esac],[build_threading="yes"])
+case "$enable_target_release" in
+        yes)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="yes"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                esac
+                ;;
+        no)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="no"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                esac
+                ;;
+        *)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="yes"
+                                build_debug="yes"
+                                ;;
+                esac
+                ;;
+esac
+AM_CONDITIONAL([BUILD_RELEASE], [test "x$build_release" = "xyes"])
+AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
+AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
+AM_CONDITIONAL([BUILD_CONCURRENCY], [test "x$build_threading" = "xyes"])
+#==============================================================================
+# HACK to be able to use conditionnals inside makefiles
 DOifskipcompile='ifeq ($(skipcompile),yes)
 else'
 …
 AM_SUBST_NOTMAKE([DOendif])
+if test "x$prefix" = "xNONE"; then
+        cfa_prefix=${ac_default_prefix}
+else
+        cfa_prefix=${prefix}
+#==============================================================================
+# distcc support
+AC_ARG_ENABLE(distcc,
+        [  --enable-distcc     whether or not to enable distributed compilation],
+        enable_distcc=$enableval, enable_distcc=no)
+AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
+HAS_DISTCC="False"
+if test x$enable_distcc = xyes; then
+        CXX="distcc ${CXX}"
+        LD="distcc ${LD} -lstdc++"
+        HAS_DISTCC="True"
+        echo "Enabling distributed builds"
 fi
+AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
+AC_SUBST(CFA_PREFIX, ${cfa_prefix})
+if test "$includedir" = '${prefix}/include'; then
+        cfa_incdir="${cfa_prefix}/include/${cfa_name}"
+else
+        cfa_incdir=${includedir}
+fi
+AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
+AC_SUBST(CFA_INCDIR, ${cfa_incdir})
+if test "$bindir" = '${exec_prefix}/bin'; then
+        cfa_bindir="${cfa_prefix}/bin"
+else
+        cfa_bindir=${bindir}
+fi
+AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
+AC_SUBST(CFA_BINDIR, ${cfa_bindir})
+if test "$libdir" = '${exec_prefix}/lib'; then
+        cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
+else
+        cfa_libdir=${libdir}
+fi
+AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
+AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
+AC_SUBST(CXX)
+AC_SUBST(LD)
+AC_SUBST(HAS_DISTCC)
+#==============================================================================
+# Installation paths
+M4CFA_PARSE_PREFIX
+#==============================================================================
+# Create variables for commonly used targets
+TOP_SRCDIR="$(readlink -m $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -m $ac_pwd/)/"
+AC_DEFINE_UNQUOTED(TOP_SRCDIR, "$TOP_SRCDIR", [Top src directory])
+AC_DEFINE_UNQUOTED(TOP_BUILDDIR, "$TOP_BUILDDIR", [Top build directory])
+DRIVER_DIR=${TOP_BUILDDIR}driver/
+CFACC=${DRIVER_DIR}cfa
+CFACC_INSTALL=${CFA_BINDIR}${CFA_NAME}
+CFACPP=${DRIVER_DIR}cfa-cpp
+AC_SUBST(DRIVER_DIR)
+AC_SUBST(CFACC)
+AC_SUBST(CFACC_INSTALL)
+AC_SUBST(CFACPP)
+#==============================================================================
+# Flag variables needed to build in tree
+LIBCFA_SRC='${TOP_SRCDIR}/libcfa/src'
+BUILD_IN_TREE_FLAGS="-XCFA -t -B${DRIVER_DIR}"
+AC_SUBST(BUILD_IN_TREE_FLAGS)
+#==============================================================================
+# handle the list of hosts to build for
+for var in $ac_configure_args
+do
+        #strip quotes surrouding values
+        case $var in
+                # skip cross compilation related arguments
+                \'--host=*) ;; \'host_alias=*) ;; \'--build=*) ;; \'build_alias=*) ;; \'--target=*) ;; \'target_alias=*) ;;
+                # skip the target hosts
+                \'--with-target-hosts=*) ;;
+                # skip gprofiler for libcfa
+                \'--enable-gprofiler=*) ;;
+                \'--disable-gprofiler) ;;
+                # append all other arguments to the sub configure arguments
+                *) LIBCFA_GENERAL_ARGS="${LIBCFA_GENERAL_ARGS} $var";;
+        esac
+done
+#==============================================================================
+# handle the list of hosts to build for
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-AC_SUBST([MACHINE_TYPE],[$host_cpu])
 if ! test "$host_cpu" = "$build_cpu"; then
         case $host_cpu in
                 i386)
+                        CFLAGS+=" -m32 "
+                        CXXFLAGS+=" -m32 "
+                        CFAFLAGS+=" -m32 "
+                        LDFLAGS+=" -m32 "
+                        HOST_FLAGS="-m32"
                         ;;
                 i686)
+                        CFLAGS+=" -m32 "
+                  CXXFLAGS+=" -m32 "
+                  CFAFLAGS+=" -m32 "
+                  LDFLAGS+=" -m32 "
+                        HOST_FLAGS="-m32"
                         ;;
                 x86_64)
+                        CFLAGS+=" -m64 "
+                        CXXFLAGS+=" -m64 "
+                        CFAFLAGS+=" -m64 "
+                        LDFLAGS+=" -m64 "
+                        HOST_FLAGS="-m64"
                         ;;
         esac
 fi
+AC_SUBST(HOST_FLAGS)
+default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
+AC_ARG_WITH(target-hosts,
+        [  --with-target-hosts=HOSTS     HOSTS comma seperated list of hosts to build for, format ARCH:[debug|nodebug|nolib]],
+        target_hosts=$withval, target_hosts=${default_target})
+AC_ARG_ENABLE(gprofiler,
+        [  --enable-gprofiler     whether or not to enable gprofiler tools (if available)],
+        enable_gprofiler=$enableval, enable_gprofiler=yes)
+AC_ARG_ENABLE(demangler,
+        [  --enable-demangler     whether or not to build the demangler (executable and library)],
+        enable_demangler=$enableval, enable_demangler=yes)
+AC_SUBST(TARGET_HOSTS, ${target_hosts})
+LIBCFA_PATHS="DRIVER_DIR=${DRIVER_DIR}"
+for i in $(echo $target_hosts | sed "s/,/ /g")
+do
+        # call your procedure/other scripts here below
+        arch_name=$(echo $i | sed -r "s/:(.*)//g")
+        lib_config=$(echo $i | sed -r "s/(.*)://g")
+        case $lib_config in
+                "nodebug") ;;
+                "debug") ;;
+                "nolib") ;;
+                "profile") ;;
+                *)
+                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
+                        exit 1
+                ;;
+        esac
+        M4CFA_CANNON_CPU([${arch_name}])
+        lib_arch=${cannon_arch_name}
+        lib_dir="libcfa/${lib_arch}-${lib_config}"
+        LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
+        LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
+        mkdir -p ${lib_dir}
+        echo -n "${LIBCFA_GENERAL_ARGS} " > ${lib_dir}/config.data
+        echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data
+        echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data
+        echo -n "CONFIGURATION=${lib_config} " >> ${lib_dir}/config.data
+        echo -n "CFA_VERSION=${ver_major}:${ver_minor}:${ver_patch}" >> ${lib_dir}/config.data
+done
+AC_SUBST(LIBCFA_TARGET_DIRS)
+AC_SUBST(LIBCFA_TARGET_MAKEFILES)
+M4CFA_CANNON_CPU([${host_cpu}])
+AC_DEFINE_UNQUOTED(CFA_DEFAULT_CPU, "$cannon_arch_name", [Default cpu to use if neither -m32 or -m64 are defined.])
+AC_DEFINE_UNQUOTED(CFA_64_CPU, "x64", [CPU to use if the -m64 flags is given.])
+AC_DEFINE_UNQUOTED(CFA_32_CPU, "x86", [CPU to use if the -m32 flags is given.])
+#==============================================================================
+# CAFLAGS
 AC_DEFINE_UNQUOTED(CFA_FLAGS, "${CFAFLAGS}", [compilation flags for cfa libraries and test programs.])
 AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
+#==============================================================================
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
 AM_PROG_AS
-AM_PROG_CC_C_O  # deprecated
 # These are often not installed and people miss seeing the "no", so stop the configure.
 AC_PROG_YACC
 …
 AC_PROG_LEX
 if test "${LEX}" = "lex" ; then echo "Error: flex required." ; exit 1 ; fi
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 # Checks for libraries.
+AC_CHECK_LIB([fibre], [Fibre::yield], [HAVE_LIBFIBRE=1], [HAVE_LIBFIBRE=0])
+AM_CONDITIONAL([WITH_LIBFIBRE], [test "$HAVE_LIBFIBRE" -eq 1])
+AC_CHECK_LIB([profiler], [ProfilingIsEnabledForAllThreads], [HAVE_LIBPROFILER=1], [HAVE_LIBPROFILER=0])
+AM_CONDITIONAL([WITH_LIBPROFILER], [test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBPROFILER" -eq 1])
+AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=1], [HAVE_LIBTCMALLOC=0])
+AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBTCMALLOC" -eq 1])
+# conditionnally build the demangler
+if test "x$enable_demangler" == xyes; then
+        LIBDEMANGLE="libdemangle.a"
+        DEMANGLER="demangler"
+else
+        LIBDEMANGLE=""
+        DEMANGLER=""
+fi
+AC_SUBST([LIBDEMANGLE])
+AC_SUBST([DEMANGLER])
 # Checks for header files.
+AC_FUNC_ALLOCA
+AC_CHECK_HEADERS([fenv.h float.h inttypes.h libintl.h limits.h malloc.h stddef.h stdlib.h string.h unistd.h])
+AC_CHECK_HEADERS([libintl.h malloc.h unistd.h], [], [echo "Error: Missing required header"; exit 1])
 # Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_INLINE
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT8_T
+AC_C_RESTRICT
+AC_TYPE_SIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
+# Checks for library functions.
+AC_CHECK_FUNCS([memset putenv strchr strtol])
+AC_CHECK_TYPES([_Float32], AC_DEFINE([HAVE_KEYWORDS_FLOATXX], [], [Have keywords _FloatXX.]), [], [[]])
+# Checks for compiler flags.
+M4CFA_CHECK_COMPILE_FLAG([-Wcast-function-type], AC_DEFINE([HAVE_CAST_FUNCTION_TYPE], [], [Have compiler warning cast-function-type.]))
+#==============================================================================
+# backend compiler implementation
+AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${CC}", [Backend compiler to use.])
+AC_SUBST(CFA_BACKEND_CC)
+#==============================================================================
 AC_CONFIG_FILES([
         Makefile
         src/driver/Makefile
+        driver/Makefile
         src/Makefile
+        src/benchmark/Makefile
+        src/examples/Makefile
+        src/tests/Makefile
+        src/tests/preempt_longrun/Makefile
+        src/prelude/Makefile
+        src/libcfa/Makefile
+        benchmark/Makefile
+        tests/Makefile
+        longrun_tests/Makefile
         tools/Makefile
         tools/prettyprinter/Makefile
         ])
+AC_OUTPUT
+AM_COND_IF([BUILD_RELEASE],
+        [AM_COND_IF([BUILD_DEBUG],
+                [AC_MSG_NOTICE(Building libcfa for target: release & debug)],
+                [AC_MSG_NOTICE(Building libcfa for target: release)])],
+        [AM_COND_IF([BUILD_DEBUG],
+                [AC_MSG_NOTICE(Building libcfa for target: debug)],
+                [AC_MSG_NOTICE(Running cfa without libcfa)])])
+AC_CONFIG_LINKS([tests/test.py:tests/test.py])
+AC_OUTPUT(tests/config.py)
 # Final text

doc/LaTeXmacros/common.tex

-              r7951100
+              rb067d9b
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Mar 19 17:18:23 2018
 %% Update Count     : 379
+%% Last Modified On : Fri May 24 07:59:54 2019
+%% Update Count     : 382
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \setlength{\parindentlnth}{\parindent}
+\newcommand{\LstBasicStyle}[1]{{\lst@basicstyle{#1}}}
 \newcommand{\LstKeywordStyle}[1]{{\lst@basicstyle{\lst@keywordstyle{#1}}}}
 \newcommand{\LstCommentStyle}[1]{{\lst@basicstyle{\lst@commentstyle{#1}}}}
 …
 \newlength{\gcolumnposn}                                % temporary hack because lstlisting does not handle tabs correctly
 \newlength{\columnposn}
 \setlength{\gcolumnposn}{2.5in}
+\setlength{\gcolumnposn}{2.75in}
 \setlength{\columnposn}{\gcolumnposn}
 \newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}}

doc/LaTeXmacros/lstlang.sty

-              r7951100
+              rb067d9b
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Fri Apr  6 23:44:50 2018
 %% Update Count     : 20
+%% Last Modified On : Tue Jan  8 14:40:33 2019
+%% Update Count     : 21
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
                 _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__,
                 auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__,
                 coroutine, disable, dtype, enable, __extension__, exception, fallthrough, fallthru, finally,
+                coroutine, disable, dtype, enable, exception, __extension__, fallthrough, fallthru, finally,
                 __float80, float80, __float128, float128, forall, ftype, _Generic, _Imaginary, __imag, __imag__,
                 inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or,

doc/bibliography/pl.bib

-              r7951100
+              rb067d9b
 %  toplas: ACM Trans. on Prog. Lang. & Sys.
 %  tcs: Theoretical Computer Science
+@string{ieeepds="IEEE Transactions on Parallel and Distributed Systems"}
+% @string{ieeepds="IEEE Trans. Parallel Distrib. Syst."}
+@string{ieeese="IEEE Transactions on Software Engineering"}
+% @string{ieeese="IEEE Trans. Softw. Eng."}
+@string{spe="Software---\-Practice and Experience"}
+% @string{spe="Softw. Pract. Exp."}
+@string{ccpe="Concurrency and Computation: Practice and Experience"}
+% @string{ccpe="Concurrency Comput: Pract Experience"}
+@string{sigplan="SIGPLAN Notices"}
+% @string{sigplan="SIGPLAN Not."}
+@string{joop="Journal of Object-Oriented Programming"}
+% @string{joop="J. of Object-Oriented Program."}
+string{ieeepds="IEEE Transactions on Parallel and Distributed Systems"}
+@string{ieeepds="IEEE Trans. Parallel Distrib. Syst."}
+string{ieeese="IEEE Transactions on Software Engineering"}
+@string{ieeese="IEEE Trans. Softw. Eng."}
+string{spe="Software---\-Practice and Experience"}
+@string{spe="Softw. Pract. Exper."}
+string{ccpe="Concurrency and Computation: Practice and Experience"}
+@string{ccpe="Concurrency Comput.: Pract. Exper."}
+string{sigplan="SIGPLAN Notices"}
+@string{sigplan="SIGPLAN Not."}
+string{joop="Journal of Object-Oriented Programming"}
+@string{joop="J. of Object-Oriented Program."}
 @string{popl="Conference Record of the ACM Symposium on Principles of Programming Languages"}
 @string{osr="Operating Systems Review"}
 @string{pldi="Programming Language Design and Implementation"}
 @string{toplas="Transactions on Programming Languages and Systems"}
 @string{mathann="Mathematische Annalen"}
 % @string{mathann="Math. Ann."}
+string{mathann="Mathematische Annalen"}
+@string{mathann="Math. Ann."}
 % A
 …
     contributer = {pabuhr@plg},
     author      = {Nissim Francez},
     title       = {Another Advantage of Key word Notation for Parameter Communication with Subprograms},
+    title       = {Another Advantage of Keyword Notation for Parameter Communication with Subprograms},
     journal     = cacm,
     volume      = 20,
 …
+}
+@inproceedings {Qin18,
+    author      = {Henry Qin and Qian Li and Jacqueline Speiser and Peter Kraft and John Ousterhout},
+    title       = {Arachne: Core-Aware Thread Management},
+    booktitle   = {13th {USENIX} Symp. on Oper. Sys. Design and Impl. ({OSDI} 18)},
+    year        = {2018},
+    address     = {Carlsbad, CA},
+    pages       = {145-160},
+    publisher   = {{USENIX} Association},
+    note        = {\href{https://www.usenix.org/conference/osdi18/presentation/qin}{https://\-www.usenix.org/\-conference/\-osdi18/\-presentation/\-qin}},
+}
 @article{Kessels82,
     keywords    = {concurrency, critical section},
 …
     author      = {Joung, Yuh-Jzer},
     title       = {Asynchronous group mutual exclusion},
+    journal     = {Distributed Computing},
+    journal     = {Dist. Comput.},
+    optjournal  = {Distributed Computing},
     year        = {2000},
     month       = {Nov},
 …
 % B
+@article{Michael13,
+    contributer = {pabuhr@plg},
+    author      = {Maged M. Michael},
+    title       = {The Balancing Act of Choosing Nonblocking Features},
+    journal     = cacm,
+    volume      = 56,
+    number      = 9,
+    month       = sep,
+    year        = 2013,
+    pages       = {46--53},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 @incollection{beta:old,
 …
         time computable inheritance hierarchy.
     },
     comment = {
+    comment     = {
         Classes are predicates; if object {\tt o} is in class {\tt C}, then
         {\tt C} is true of {\tt o}.  Classes are combined with {\tt :AND},
 …
     year        = 2015,
     howpublished= {\href{http://www.boost.org/doc/libs/1_61_0/libs/coroutine/doc/html/index.html}
+                  {{http://www.boost.org/\-doc/\-libs/1\_61\_0/\-libs/\-coroutine/\-doc/\-html/\-index.html}}},
+    optnote     = {Accessed: 2016-09},
+                  {http://www.boost.org/\-doc/\-libs/1\_61\_0/\-libs/\-coroutine/\-doc/\-html/\-index.html}},
+}
+@misc{BoostThreads,
+    keywords    = {Boost Thread Library},
+    contributer = {pabuhr@plg},
+    author      = {Anthony Williams and Vicente J. Botet Escriba},
+    title       = {Boost Thread Library},
+    year        = 2015,
+    howpublished= {\href{https://www.boost.org/doc/libs/1_61_0/doc/html/thread.html}
+                  {https://\-www.boost.org/\-doc/\-libs/\-1\_61\_0/\-doc/\-html/\-thread.html}},
+}
 …
     month       = oct,
     type        = {Diplomarbeit},
     note        = {{\small\textsf{ftp://\-plg.uwaterloo.ca/\-pub/\-theses/\-KrischerThesis.ps.gz}}},
+    note        = {\href{https://plg.uwaterloo.ca/~usystem/theses/KrischerThesis.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-theses/\-KrischerThesis.pdf}},
+}
 …
+}
+@article{Moss18,
+    keywords    = {type systems, polymorphism, tuples, Cforall},
+    contributer = {pabuhr@plg},
+    author      = {Aaron Moss and Robert Schluntz and Peter A. Buhr},
+    title       = {\textsf{C}$\mathbf{\forall}$ : Adding Modern Programming Language Features to {C}},
+    journal     = spe,
+    volume      = 48,
+    number      = 12,
+    month       = dec,
+    year        = 2018,
+    pages       = {2111-2146},
+    note        = {\href{http://dx.doi.org/10.1002/spe.2624}{http://\-dx.doi.org/\-10.1002/\-spe.2624}},
+}
+@misc{CforallBenchMarks,
+    contributer = {pabuhr@plg},
+    key         = {Cforall Benchmarks},
+    author      = {{\textsf{C}{$\mathbf{\forall}$} Benchmarks}},
+    howpublished= {\href{https://plg.uwaterloo.ca/~cforall/benchmark.tar}{https://\-plg.uwaterloo.ca/\-$\sim$cforall/\-benchmark.tar}},
+}
 @misc{Cforall,
+    contributer = {pabuhr@plg},
     key         = {Cforall},
+    title       = {\textsf{C}{$\mathbf{\forall}$} Features},
+    howpublished= {\url{https://plg.uwaterloo.ca/~cforall/features}},
+    optnote     = {Accessed: 2018-01-01},
+    author      = {{\textsf{C}{$\mathbf{\forall}$} Features}},
+    howpublished= {\href{https://plg.uwaterloo.ca/~cforall/features}{https://\-plg.uwaterloo.ca/\-$\sim$cforall/\-features}},
+}
+@misc{CFAStackEvaluation,
+    contributer = {a3moss@plg},
+    author      = {Aaron Moss},
+    title       = {\textsf{C}$\mathbf{\forall}$ Stack Evaluation Programs},
+    year        = 2018,
+    howpublished= {\href{https://cforall.uwaterloo.ca/CFAStackEvaluation.zip}{https://cforall.uwaterloo.ca/\-CFAStackEvaluation.zip}},
+}
 …
+}
+@misc{CFAStackEvaluation,
+@phdthesis{Moss19,
+    keywords    = {type system, generic type, resolution algorithm, type environment, Cforall},
     author      = {Aaron Moss},
+    title       = {\textsf{C}$\mathbf{\forall}$ Stack Evaluation Programs},
+    year        = 2018,
+    howpublished= {\href{https://plg.uwaterloo.ca/~cforall/evaluation.zip}{https://plg.uwaterloo.ca/\-\-$\sim$cforall/\-StackEvaluation.zip}},
+    optnote     = {[Accessed May 2018]},
+}
+@article{Moss18,
+    keywords    = {concurrency, C++},
+    contributer = {pabuhr@plg},
+    author      = {Aaron Moss and Robert Schluntz and Peter A. Buhr},
+    title       = {\textsf{C}$\mathbf{\forall}$ : Adding Modern Programming Language Features to C},
+    year        = 2018,
+    journal     = spe,
+    note        = {Accepted, to appear},
+    title       = {\textsf{C}$\mathbf{\forall}$ Type System Implementation},
+    school      = {School of Computer Science, University of Waterloo},
+    year        = 2019,
+    optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
+    note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/14584}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/\-14584}},
+}
 …
     comment     = {
         The evidence given is thin.
+        }
+    },
+}
 …
     journal     = {Dr. Dobb's Journal of Software Tools},
     year        = 1989,
+    month       = feb, volume = 14, number = 2, pages = {45-51},
+    month       = feb,
+    volume      = 14,
+    number      = 2,
+    pages       = {45-51},
     comment     = {
        A light-weight multitasking kernel for MS-DOS.  A task\_control
 …
     year        = 2006,
     edition     = {4th},
+}
+@techreport{Prokopec11,
+    keywords    = {ctrie, concurrent map},
+    contributer = {a3moss@uwaterloo.ca},
+    title       ={Cache-aware lock-free concurrent hash tries},
+    author      ={Prokopec, Aleksandar and Bagwell, Phil and Odersky, Martin},
+    institution ={EPFL},
+    year        ={2011}
+}
 …
     month       = oct,
     year        = 2001,
     note        = {\href{http://plg.uwaterloo.ca/~cforall/cfa.ps}{http://\-plg.uwaterloo.ca/\-\char`\~cforall/\-cfa.ps}},
+    note        = {\href{http://plg.uwaterloo.ca/~cforall/cfa.ps}{http://\-plg.uwaterloo.ca/\-$\sim$cforall/\-cfa.ps}},
+}
 …
     year        = 1998,
     note        = {{\small\textsf{ftp://\-plg.uwaterloo.ca/\-pub/\-Cforall/\-refrat.ps.gz}}},
+}
+@phdthesis{Norrish98,
+    title       = {C formalised in HOL},
+    author      = {Norrish, Michael},
+    year        = {1998},
+    school      = {University of Cambridge}
+}
+@inproceedings{Tarditi18,
+    keywords    = {Checked C},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Tarditi, David and Elliott, Archibald Samuel and Ruef, Andrew and Hicks, Michael},
+    title       = {Checked C: Making C Safe by Extension},
+    booktitle   = {2018 IEEE Cybersecurity Development (SecDev)},
+    publisher   = {IEEE},
+    year        = {2018},
+    month       = sep,
+    pages       = {53-60},
+    url         = {https://www.microsoft.com/en-us/research/publication/checkedc-making-c-safe-by-extension/},
+}
+@misc{Clang,
+    keywords    = {clang},
+    contributer = {a3moss@uwaterloo.ca},
+    title       = {Clang: a {C} language family frontend for {LLVM}},
+    howpublished= {\href{https://clang.llvm.org/}{https://\-clang.llvm.org/}}
+}
 …
         that is ``compiled''.
     },
-    comment     = {
-        Imagine the program, including the subroutines, spread out over a
-        table, with the compiler dropping Jello on the parts as they are
-        compiled.  At first little drops appear in seemingly random places.
-        These get bigger and combine with other drops to form growing
-        globs.  When two globs meet, ripples will go out through each as
-        they adjust to each other's presence, although the parts of the
-        globs that formed first are less affected by the ripples.  When
-        compilation is complete, there is one congealed mass.
+    }
+}
 …
     number      = 11,
     pages       = {853-860},
+}
+@inproceedings{Odersky01,
+    keywords    = {Scala},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Odersky, Martin and Zenger, Christoph and Zenger, Matthias},
+    title       = {Colored Local Type Inference},
+    booktitle   = {Proceedings of the 28th ACM SIGPLAN-SIGACT Symposium on Principles of Programming Languages},
+    series      = {POPL '01},
+    year        = {2001},
+    isbn        = {1-58113-336-7},
+    location    = {London, United Kingdom},
+    pages       = {41--53},
+    numpages    = {13},
+    url         = {http://doi.acm.org/10.1145/360204.360207},
+    doi         = {10.1145/360204.360207},
+    acmid       = {360207},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 …
     journal     = sigplan,
     year        = 1986,
+    month       = oct, volume = 21, number = 10, pages = {19-28},
+    month       = oct,
+    volume      = 21,
+    number      = 10,
+    pages       = {19-28},
     note        = {Object Oriented Programming Workshop}
+}
 …
         Process-valued expressions and process variables.  Processes have
         execution priority: Create {\em process-type-name}(args) [with
+        priority(p)],
+        and the priority can be changed on the fly.  Complicated guard/
+        screen structure on accept: accept {\em transaction}(param names)
+        priority(p)], and the priority can be changed on the fly.  Complicated
+        guard/screen structure on accept: accept {\em transaction}(param names)
         [suchthat (exp)] [by (exp)] [compoundstatement].  Accepts cannot
         appear in functions!  Can specify timeouts on transaction calls.
 …
                 Many errors in the two solutions.
+    }
+}
+@misc{NThreadCode13,
+    keywords    = {N-thread software-solution mutual exclusion},
+    contributer = {pabuhr@plg},
+    key         = {concurrent locking},
+    author      = {Peter A. Buhr and David Dice and Wim H. Hesselink},
+    title       = {concurrent-locking},
+    howpublished= {\href{https://github.com/pabuhr/concurrent-locking}{https://\-github.com/\-pabuhr/\-concurrent-locking}},
+}
 …
+}
 @techreport{uC++,
+@manual{uC++,
     keywords    = {C++, concurrency, light-weight process, shared memory},
     contributer = {pabuhr@plg},
+    key         = {uC++},
     author      = {Peter A. Buhr},
     title       = {$\mu${C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Annotated Reference Manual, Version 7.0.0},
+    institution = {School of Computer Science, University of Waterloo},
+    address     = {Waterloo, Ontario, Canada, N2L 3G1},
+    month       = dec,
+    year        = 2017,
+    note        = {\href{http://plg.uwaterloo.ca/~usystem/pub/uSystem/u++-7.0.0.sh}{http://\-plg.\-uwaterloo.\-ca/\-$\sim$usystem/\-pub/\-uSystem/\-u++-7.0.0.sh}},
+    organization= {University of Waterloo},
+    month       = sep,
+    year        = 2018,
+    note        = {\href{https://plg.uwaterloo.ca/~usystem/pub/uSystem/uC++.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-pub/\-uSystem/uC++.pdf}},
+}
 …
+}
+@mastersthesis{Sun15,
+    author      = {Sun, Xianda},
+    title       = {Concurrent High-performance Persistent Hash Table In {J}ava},
+    school      = {School of Computer Sc., University of Waterloo},
+    year        = 2015,
+    optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
+    note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/10013}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/\-10013}},
+}
 @book{Andrews91:book,
     keywords    = {concurrency},
 …
     address     = {Redwood City},
     year        = 1991,
+}
+@inproceedings{Prokopec12,
+    keywords    = {ctrie, hash trie, concurrent map},
+    contributer = {a3moss@uwaterloo.ca},
+    title       = {Concurrent tries with efficient non-blocking snapshots},
+    author      = {Prokopec, Aleksandar and Bronson, Nathan Grasso and Bagwell, Phil and Odersky, Martin},
+    booktitle   = {ACM SIGPLAN Notices},
+    volume      = {47},
+    number      = {8},
+    pages       = {151--160},
+    year        = {2012},
+    organization={ACM}
+}
 …
 @mastersthesis{Delisle18,
+    author      = {Thierry Delisle },
+    keywords    = {concurrency, Cforall},
+    contributer = {pabuhr@plg},
+    author      = {Thierry Delisle},
     title       = {Concurrency in \textsf{C}$\mathbf{\forall}$},
     school      = {School of Computer Science, University of Waterloo},
     year        = 2018,
     address     = {Waterloo, Ontario, Canada, N2L 3G1},
+    optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
     note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/12888}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/\-12888}},
+}
+@article{Delisle19,
+    keywords    = {concurrency, Cforall},
+    contributer = {pabuhr@plg},
+    author      = {Thierry Delisle and Peter A. Buhr},
+    title       = {Advanced Control-flow and Concurrency in \textsf{C}$\mathbf{\forall}$},
+    year        = 2019,
+    journal     = spe,
+    pages       = {1-33},
+    note        = {submitted},
+}
 …
     howpublished= {\href{https://www.airs.com/blog/archives/428}
                   {https://www.airs.com/\-blog/\-archives/\-428}},
-    optnote     = {Accessed: 2018-05},
+}
 …
     author      = {Glen Ditchfield},
     title       = {Conversions for \textsf{C}$\mathbf{\forall}$},
     note        = {\href{http://plg.uwaterloo.ca/~cforall/Conversions/index.html}{http://\-plg.uwaterloo.ca/\-\textasciitilde cforall/\-Conversions/\-index.html}},
+    note        = {\href{http://plg.uwaterloo.ca/~cforall/Conversions/index.html}{http://\-plg.uwaterloo.ca/\-$\sim$cforall/\-Conversions/\-index.html}},
     month       = {Nov},
     year        = {2002},
 …
     year        = 1965,
     note        = {Reprinted in \cite{Genuys68} pp. 43--112.}
+}
+@inproceedings{Adya02,
+    contributer = {pabuhr@plg},
+    author      = {Adya, Atul and Howell, Jon and Theimer, Marvin and Bolosky, William J. and Douceur, John R.},
+    title       = {Cooperative Task Management Without Manual Stack Management},
+    booktitle   = {Proceedings of the General Track of the Annual Conference on USENIX Annual Technical Conference},
+    series      = {ATEC '02},
+    year        = {2002},
+    pages       = {289-302},
+    publisher   = {USENIX Association},
+    address     = {Berkeley, CA, USA},
+}
+@misc{CoroutineTS,
+    keywords    = {Coroutines TS, C++20, working draft},
+    contributer = {pabuhr@plg},
+    author      = {Gor Nishanov},
+    title       = {Merge Coroutines TS into C++20 Working Draft},
+    year        = 2019,
+    month       = feb,
+    howpublished= {\href{http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p0912r5.html}
+                  {http://\-www.open-std.org/\-jtc1/\-sc22/\-wg21/\-docs/\-papers/\-2019/p0912r5.html}},
+}
+@manual{C++20Coroutine19,
+    keywords    = {coroutine},
+    contributer = {pabuhr@plg},
+    title       = {Coroutines (C++20)},
+    organization= {cppreference.com},
+    month       = apr,
+    year        = 2019,
+    note        = {\href{https://en.cppreference.com/w/cpp/language/coroutines}{https://\-en.cppreference.com/\-w/\-cpp/\-language/\-coroutines}},
+}
 …
+}
+@article{Moore75,
+    keywords    = {approximation methods, integrated circuits},
+    contributer = {pabuhr@plg},
+    author      = {Gordon E. Moore},
+    title       = {Progress in Digital Integrated Electronics},
+    journal     = {Technical Digest, International Electron Devices Meeting, IEEE},
+    year        = 1975,
+    pages       = {11-13},
+@misc{CS343,
+    keywords    = {uC++ teaching},
+    contributer = {pabuhr@plg},
+    key         = {Peter Buhr},
+    title       = {CS343},
+    year        = 2018,
+    howpublished= {\href{https://www.student.cs.uwaterloo.ca/~cs343}{https://\-www.student.cs.uwaterloo.ca/\-$\sim$cs343}},
+}
 …
     note        = {Svensk Standard SS 63 61 14},
     year        = 1987,
+    abstract    = {
+        Standard for the programming language SIMULA.  Written in English.
+    }
+    abstract    = {Standard for the programming language SIMULA. Written in English.}
+}
+@article{Galil91,
+    keywords    = {union-find},
+    contributer = {a3moss@uwaterloo.ca},
+    title       = {Data structures and algorithms for disjoint set union problems},
+    author      = {Galil, Zvi and Italiano, Giuseppe F},
+    journal     = {ACM Computing Surveys (CSUR)},
+    volume      = 23,
+    number      = 3,
+    pages       = {319--344},
+    year        = 1991,
+    publisher   = {ACM},
+}
 …
     year        = {1998},
     pages       = {393-407},
+}
+@book{Aho74,
+    keywords    = {algorithms, textbook, union-find},
+    contributer = {a3moss@uwaterloo.ca},
+    title       = {The Design and Analysis of Computer Algorithms},
+    author      = {Aho, Alfred V and Hopcroft, John E and Ullman, Jeffrey D},
+    year        = {1974},
+    publisher   = {Addison-Wesley},
+    address     = {Reading, MA, USA}
+}
 …
+}
+@article{Ritchie93,
+    keywords    = {C, history},
+    contributer = {pabuhr@plg},
+    author      = {Ritchie, Dennis M.},
+    title       = {The Development of the {C} Language},
+    journal     = sigplan,
+    volume      = 28,
+    number      = 3,
+    month       = mar,
+    year        = 1993,
+    pages       = {201--208},
+    url         = {http://doi.acm.org/10.1145/155360.155580},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 @article{design,
     keywords    = {Smalltalk, designing classes},
 …
     journal     = joop,
     year        = 1988,
+    volume      = 1, number = 2, pages = {22-35},
+    volume      = 1,
+    number      = 2,
+    pages       = {22-35},
     comment     = {
         Abstract classes represent standard protocols.  ``It is better to
 …
     year        = 1990,
     pages       = {315-323}
+}
+@misc{Dotty-github,
+    keywords    = {dotty,scala},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Martin Odersky},
+    title       = {Dotty},
+    howpublished= {\href{https://github.com/lampepfl/dotty}{https://\-github.com/\-lampepfl/\-dotty}},
+    note        = {Acessed: 2019-02-22}
+}
 …
+}
+@article{Tarjan75,
+    keywords    = {union-find},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Tarjan, Robert Endre},
+    title       = {Efficiency of a Good But Not Linear Set Union Algorithm},
+    journal     = {J. ACM},
+    issue_date  = {April 1975},
+    volume      = {22},
+    number      = {2},
+    month       = apr,
+    year        = {1975},
+    issn        = {0004-5411},
+    pages       = {215--225},
+    numpages    = {11},
+    url         = {http://doi.acm.org/10.1145/321879.321884},
+    doi         = {10.1145/321879.321884},
+    acmid       = {321884},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 @book{Eiffel,
     keywords    = {Eiffel},
 …
     journal     = ipl,
     year        = 1980,
+    month       = apr, volume = 10, number = 3, pages = {120-123},
+    month       = apr,
+    volume      = 10,
+    number      = 3,
+    pages       = {120-123},
     comment     = {
         The ``two-pass'' algorithm.  An upward pass over a parse tree
 …
+}
 @InProceedings{chambers89a,
+@inproceedings{chambers89a,
     keywords    = {maps, delegation},
     author      = "Craig Chambers and David Ungar and Elgin Lee",
+    title       = "An Efficient Implementation of {SELF}, a Dynamically-Typed
+                 Object-Oriented Language Based on Prototypes",
+    title       = "An Efficient Implementation of {SELF}, a Dynamically-Typed Object-Oriented Language Based on Prototypes",
     crossref    = "OOPSLA89",
     pages       = {49-70}
+}
+@misc{Turley99,
+    keywords    = {embedded system, micrprocessor},
+    contributer = {pabuhr@plg},
+    author      = {Jim Turley},
+    title       = {Embedded Processors by the Numbers},
+    year        = 1999,
+    month       = may,
+    note        = {Electronic Engineering Times},
+    howpublished= {\href{https://www.eetimes.com/author.asp?sectionid=36&doc_id=1287712}
+                  {https://\-www.eetimes.com/\-author.asp?sectionid=\-36&doc_id=1287712}},
+}
 @article{oop:encapsulation,
     keywords    = {Encapsulation, Inheritance, Subclasses, Multiple Inheritance},
     contributer = {gjditchfield@plg},
     author      = {Alan Snyder},
+    title       = {Encapsulation and Inheritance in Object-Oriented Programming
+        Languages},
+    title       = {Encapsulation and Inheritance in Object-Oriented Programming Languages},
     journal     = sigplan,
     volume      = {21},    number = {11},
 …
     title       = {Encapsulators: A New Software Paradigm in Smalltalk-80},
     journal     = sigplan,
+    volume      = {21},    number       = {11},
+    volume      = {21},
+    number      = {11},
     pages       = {341-346},
+    month       = nov, year = 1986,
+    month       = nov,
+    year        = 1986,
     comment     = {
         Encapsulators are objects that surround other objects.
 …
     year        = 1979,
     pages       = {24-32}
+}
+@inproceedings{XaaS,
+    keywords    = {Everything as a Service, Anything as a Service, Cloud computing, SOA},
+    contributer = {pabuhr@plg},
+    author      = {Duan, Yucong and Fu, Guohua and Zhou, Nianjun and Sun, Xiaobing and Narendra, Nanjangud C. and Hu, Bo},
+    title       = {Everything As a Service (XaaS) on the Cloud: Origins, Current and Future Trends},
+    booktitle   = {Proceedings of the 2015 IEEE 8th International Conference on Cloud Computing},
+    series      = {CLOUD'15},
+    year        = {2015},
+    pages       = {621--628},
+    publisher   = {IEEE Computer Society},
+    address     = {Washington, DC, USA},
+}
 …
     title       = {Extending Modula-2 to Build Large, Integrated Systems},
     journal     = {IEEE Software},
+    month       = nov, year = 1986,
+    volume      = 3, number = 6, pages = {46-57},
+    month       = nov,
+    year        = 1986,
+    volume      = 3,
+    number      = 6,
+    pages       = {46-57},
     comment     = {
         Exceptions can have a parameter.  Procedures can declare the
 …
     year        = 2014,
     howpublished= {\href{https://gcc.gnu.org/onlinedocs/gcc-4.7.2/gcc/C-Extensions.html}{https://\-gcc.gnu.org/\-onlinedocs/\-gcc-4.7.2/\-gcc/\-C\-Extensions.html}},
-    optnote     = {Accessed: 2017-04-02},
+}
 …
     year        = 1988,
     pages       = {143-149}
+}
+@inproceedings{Patwary10,
+    keywords    = {union-find},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Patwary, Md. Mostofa Ali and Blair, Jean and Manne, Fredrik},
+    editor      = {Festa, Paola},
+    title       = {Experiments on Union-Find Algorithms for the Disjoint-Set Data Structure},
+    booktitle   = {Experimental Algorithms},
+    year        = 2010,
+    publisher   = {Springer Berlin Heidelberg},
+    address     = {Berlin, Heidelberg},
+    pages       = {411--423},
+    isbn        = {978-3-642-13193-6}
+}
 …
     keywords    = {concurrency, mutual exclusion, performance experiment, software solutions},
     title       = {Fast mutual exclusion by the {T}riangle algorithm},
     author      = {Wim H. Hesselink and Peter Buhr and David Dice},
+    author      = {Wim H. Hesselink and Peter A. Buhr and David Dice},
     journal     = ccpe,
     volume      = 30,
 …
     month       = feb,
     publisher   = {John Wiley \& Sons},
     note        = {\url{https://doi.org/10.1002/cpe.4183}}
+    note        = {\href{https://doi.org/10.1002/cpe.4183}{https://\-doi.org/\-10.1002/\-cpe.4183}}
+}
 …
+}
+@manual{WindowsFibers,
+    keywords    = {threads, fibers},
+    contributer = {pabuhr@plg},
+    author      = {Windows},
+    title       = {Fibers},
+    organization= {Microsoft, Windows Development Center},
+    address     = {\href{https://docs.microsoft.com/en-us/windows/desktop/ProcThread/fibers}{https://\-docs.microsoft.com/\-en-us/\-windows/\-desktop/\-ProcThread/\-fibers}},
+    year        = 2018,
+}
 @inproceedings{F-bound,
     keywords    = {},
 …
+}
+@manual{Folly,
+    keywords    = {Folly},
+    contributer = {pabuhr@plg},
+    author      = {Folly},
+    title       = {Facebook Open-source Library},
+    organization= {Facebook},
+    address     = {\href{https://github.com/facebook/folly}{https://\-github.com/\-facebook/\-folly}},
+    year        = 2018,
+}
+@article{Leroy09,
+    keywords    = {C formalization},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Leroy, Xavier},
+    title       = {Formal Verification of a Realistic Compiler},
+    journal     = {Commun. ACM},
+    issue_date  = {July 2009},
+    volume      = {52},
+    number      = {7},
+    month       = jul,
+    year        = {2009},
+    issn        = {0001-0782},
+    pages       = {107--115},
+    numpages    = {9},
+    url         = {http://doi.acm.org/10.1145/1538788.1538814},
+    doi         = {10.1145/1538788.1538814},
+    acmid       = {1538814},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 @manual{Fortran95,
     keywords    = {Fortran 95},
 …
     address     = {\href{https://www.iso.org/standard/50459.html}{https://\-www.iso.org/\-standard/\-50459.html}},
     year        = 2010,
+}
+@manual{Fortran18,
+    keywords    = {ISO/IEC Fortran 10},
+    contributer = {pabuhr@plg},
+    author      = {Fortran18},
+    title       = {Programming Languages -- {Fortran} Part 1:Base Language ISO/IEC 1539-1:2018},
+    edition     = {4rd},
+    publisher   = {International Standard Organization},
+    address     = {\href{https://www.iso.org/standard/72320.html}{https://\-www.iso.org/\-standard/\-72320.html}},
+    year        = 2018,
+}
 …
     keywords    = {Go programming language},
     contributer = {pabuhr@plg},
+    author      = {Robert Griesemer and Rob Pike and Ken Thompson},
     title       = {{Go} Programming Language},
-    author      = {Robert Griesemer and Rob Pike and Ken Thompson},
     organization= {Google},
     year        = 2009,
 …
     year        = 2014,
     howpublished= {https://developer.gnome.org/gobject/stable/},
-    optnote     = {Accessed: 2017-04},
+}
 …
     edition     = {{S}imon {M}arlow},
     year        = 2010,
     note        = {\href{https://haskell.org/definition/haskell2010.pdf}{https://haskell.org/\-definition/\-haskell2010.pdf}},
+    note        = {\href{https://haskell.org/definition/haskell2010.pdf}{https://\-haskell.org/\-definition/\-haskell2010.pdf}},
+}
 …
+}
+@article{Hesselink17b,
+    keywords    = {concurrency, mutual exclusion, performance experiment, software solutions},
+    title       = {High-Contention Mutual Exclusion by Elevator Algorithms},
+    author      = {Peter A. Buhr and David Dice and Wim H. Hesselink},
+    journal     = ccpe,
+    volume      = 30,
+    number      = 18,
+    year        = 2018,
+    month       = sep,
+    publisher   = {John Wiley \& Sons},
+    note        = {\href{https://doi.org/10.1002/cpe.4475}{https://\-doi.org/\-10.1002/\-cpe.4475}},
+}
 @article{Buhr15a,
     keywords    = {software solution, mutual exclusion, performance experiment},
 …
     publisher   = {ACM Press},
     address     = {New York, NY, USA},
+}
+@article{Galler64,
+    keywords    = {union-find, original},
+    contributer = {a3moss@uwaterloo.ca},
+    title       = {An improved equivalence algorithm},
+    author      = {Galler, Bernard A and Fisher, Michael J},
+    journal     = {Communications of the ACM},
+    volume      = {7},
+    number      = {5},
+    pages       = {301--303},
+    year        = {1964},
+    publisher   = {ACM}
+}
+@phdthesis{Barghi18,
+    keywords    = {concurrency, user threads, actors},
+    contributer = {pabuhr@plg},
+    author      = {Saman Barghi},
+    title       = {Improving the Performance of User-level Runtime Systems for Concurrent Applications},
+    school      = {School of Computer Science, University of Waterloo},
+    year        = 2018,
+    month       = sep,
+    optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
+    note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/13935}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/\-13935}},
+}
+@article{Swift05,
+   contributer  = {pabuhr@plg},
+   author       = {Michael M. Swift and Brian N. Bershad and Henry M. Levy},
+   title        = {Improving the Reliability of Commodity Operating Systems},
+   journal      = tocs,
+   volume       = 23,
+   number       = 1,
+   month        = feb,
+   year         = 2005,
+   pages        = {77-110},
+}
 …
+}
+@article{Morgado13,
+    keywords    = {expression resolution},
+    contributer = {a3moss@uwaterloo.ca},
+    title       = {Iterative and core-guided {MaxSAT} solving: A survey and assessment},
+    author      = {Morgado, Antonio and Heras, Federico and Liffiton, Mark and Planes, Jordi and Marques-Silva, Joao},
+    journal     = {Constraints},
+    volume      = {18},
+    number      = {4},
+    pages       = {478--534},
+    year        = {2013},
+    publisher   = {Springer}
+}
 % J
 …
+}
+@manual{Java11,
+    keywords    = {Java SE 11},
+    contributer = {pabuhr@plg},
+    author      = {James Gosling and Bill Joy and Guy Steele and Gilad Bracha and Alex Buckley and Daniel Smith},
+    title       = {{Java} Language Specification},
+    publisher   = {Oracle},
+    month       = sep,
+    year        = 2018,
+    edition     = {{J}ava {SE} 11},
+}
+@manual{JDK1.1,
+    keywords    = {JDK 1.1},
+    contributer = {pabuhr@plg},
+    author      = {{Multithreading Models}},
+    title       = {JDK 1.1 for Solaris Developer's Guide},
+    publisher   = {Oracle},
+    address     = {\href{https://docs.oracle.com/cd/E19455-01/806-3461/6jck06gqk/index.html#ch2mt-41}{https://\-docs.oracle.com/\-cd/\-E19455-01/\-806-3461/\-6jck06gqk/\-index.html\#ch2mt-41}},
+    year        = 2010,
+}
 @manual{JUC,
     keywords    = {Java concurrency library},
 …
 % K
+@inproceedings{Buhr96b,
+    author      = {Peter A. Buhr and Martin Karsten and Jun Shih},
+    title       = {{\small\textsf{KDB}}: A Multi-threaded Debugger for Multi-threaded Applications},
+    booktitle   = {Proc. of SPDT'96: SIGMETRICS Symp. on Parallel and Distributed Tools},
+    publisher   = {ACM Press},
+    address     = {Philadelphia, Pennsylvania, U.S.A.},
+    month       = may,
+    year        = 1996,
+    pages       = {80-87},
+}
 @article{Duggan96,
     keywords    = {concurrency, critical section},
     contributer = {pabuhr@plg},
     author      = {Dominic Duggan and G. V. Cormack and John Ophel},
+    author      = {Dominic Duggan and Gordon V. Cormack and John Ophel},
     title       = {Kinded Type Inference for Parametric Overloading},
     journal     = acta,
 …
+}
+@misc{libdill,
+    keywords    = {libdill/libmill Thread Library},
+    contributer = {pabuhr@plg},
+    author      = {Alex Cornejo, et al},
+    title       = {libdill Thread Library},
+    year        = 2019,
+    howpublished= {\href{http://libdill.org/libdill-2.14.tar.gz}
+                  {http://\-libdill.org/\-libdill-2.14.tar.gz}},
+}
 @article{Linda,
     keywords    = {Linda, concurrency},
 …
+}
+@manual{libmill,
+    keywords    = {libmill},
+    contributer = {pabuhr@plg},
+    author      = {libmill},
+    title       = {{G}o-style concurrency in {C}, Version 1.18},
+    organization= {libmill},
+    address     = {\href{http://libmill.org/documentation.html}{http://\-libmill.org/\-documentation.html}},
+    month       = jan,
+    year        = 2017,
+}
 @book{Weissman67,
     keywords    = {lisp},
 …
+}
+@article{Pierce00,
+    keywords    = {Scala},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Pierce, Benjamin C. and Turner, David N.},
+    title       = {Local Type Inference},
+    journal     = {ACM Trans. Program. Lang. Syst.},
+    issue_date  = {Jan. 2000},
+    volume      = {22},
+    number      = {1},
+    month       = jan,
+    year        = {2000},
+    issn        = {0164-0925},
+    pages       = {1--44},
+    numpages    = {44},
+    url         = {http://doi.acm.org/10.1145/345099.345100},
+    doi         = {10.1145/345099.345100},
+    acmid       = {345100},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+    keywords    = {polymorphism, subtyping, type inference},
+}
 @article{Sundell08,
     keywords    = {lock free, deque},
 …
     year        = 2008,
     pages       = {1008-1020},
+}
+@misc{Matsakis17,
+    keywords    = {Rust, Chalk, PROLOG},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Nicholas Matsakis},
+    title       = {Lowering {Rust} traits to logic},
+    month       = jan,
+    year        = 2017,
+    howpublished= {\href{http://smallcultfollowing.com/babysteps/blog/2017/01/26/lowering-rust-traits-to-logic/}
+                  {http://smallcultfollowing.com/\-babysteps/\-blog/\-2017/\-01/\-26/\-lowering-rust-traits-to-logic/}},
+    optnote     = {Accessed: 2019-01},
+}
 …
+}
+@manual{Lua,
+    keywords    = {Lua},
+    contributer = {pabuhr@plg},
+    author      = {Lua},
+    title       = {Lua 5.3 Reference Manual},
+    address     = {\href{https://www.lua.org/manual/5.3}{https://\-www.lua.org/\-manual/\-5.3}},
+    year        = 2018,
+}
 % M
 …
     publisher   = {Motorola},
     year        = 1992,
+}
+@misc{Haberman16,
+    keywords    = {C++ template expansion},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Josh Haberman},
+    title       = {Making arbitrarily-large binaries from fixed-size {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} code},
+    year        = 2016,
+    howpublished= {\href{http://blog.reverberate.org/2016/01/making-arbitrarily-large-binaries-from.html}
+                  {http://blog.reverberate.org/\-2016/\-01/\-making-arbitrarily-large-binaries-from.html}},
+    optnote     = {Accessed: 2016-09},
+}
 …
+}
+@misc{Marcel,
+    keywords    = {Marcel Thread Library},
+    contributer = {pabuhr@plg},
+    author      = {Gabriel Antoniu, et al},
+    title       = {Marcel Thread Library},
+    year        = 2011,
+    howpublished= {\href{https://gforge.inria.fr/frs/download.php/file/28643/marcel-2.99.3.tar.gz}
+                  {https://\-gforge.inria.fr/\-frs/\-download.php/\-file/\-28643/\-marcel-2.99.3.tar.gz}},
+}
 @inproceedings{mprof,
     keywords    = {malloc},
 …
     month       = sep,
     year        = 2006,
     note        = {\textsf{http://cs.anu.edu.au/\-\char`\~Robin.Garner/\-mmtk-guide.pdf}},
+    note        = {\textsf{http://cs.anu.edu.au/\-$\sim$Robin.Garner/\-mmtk-guide.pdf}},
+}
 …
     month       = sep,
     year        = 1994,
     note        = {{\small\textsf{ftp://\-plg.uwaterloo.ca/\-pub/\-uSystem/\-uSystem.ps.gz}}},
+    note        = {\href{https://plg.uwaterloo.ca/~usystem/pub/uSystem/uSystem.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-pub/\-uSystem/\-uSystem.pdf}},
+}
 …
+}
 %    editor     = {Allen Kent and James G. Williams},
+@incollection{MPC,
+    keywords    = {user-level threading},
+    contributer = {pabuhr@plg},
+    author      = {Marc P\'erache and Herv\'e Jourdren and Raymond Namyst},
+    title       = {MPC: A Unified Parallel Runtime for Clusters of {NUMA} Machines},
+    booktitle   = {Euro-Par 2008},
+    pages       = {329-342},
+    publisher   = {Springer},
+    address     = {Berlin, Heidelberg},
+    year        = 2008,
+    volume      = 5168,
+    series      = {Lecture Notes in Computer Science},
+}
 @manual{MPI,
 …
 % N
+@techreport{Drepper03,
+    keywords    = {NPTL, threading, 1:1 model},
+    contributer = {pabuhr@plg},
+    author      = {Ulrich Drepper and Ingo Molnar},
+    title       = {The Native POSIX Thread Library for Linux},
+    institution = {Red Hat},
+    year        = 2003,
+    note        = {\href{http://www.cs.utexas.edu/~witchel/372/lectures/POSIX_Linux_Threading.pdf}{http://www.cs.utexas.edu/\-$\sim$witchel/\-372/\-lectures/\-POSIX\_Linux\_Threading.pdf}},
+}
 @article{Haddon77,
 …
+}
+@misc{nginx,
+    key         = {nginx},
+    author      = {{NGINX}},
+    howpublished= {\href{https://www.nginx.com}{https://\-www.nginx.com}},
+}
 @article{Herlihy05,
     keywords    = {Multiprocessors, concurrent data structures, dynamic data structures, memory management, nonblocking synchronization},
 …
     year        = 1995,
     number      = 31,
     note        = {{\small\textsf{http://\-www.cs.wustl.edu/\-\char`\~schmidt/\-PDF/\-IPC\_SAP-92.pdf}}},
+    note        = {{\small\textsf{http://\-www.cs.wustl.edu/\-$\sim$schmidt/\-PDF/\-IPC\_SAP-92.pdf}}},
+}
 …
 @misc{obj-c-book,
     keywords    = {objective-c},
     contributor = {a3moss@uwaterloo.ca},
+    contributor = {pabuhr@plg},
     key         = {Objective-C},
     title       = {Objective-C},
+    author      = {Objective-C},
     publisher   = {Apple Inc.},
+    year        = 2015,
+    howpublished= {\href{https://developer.apple.com/library/content/documentation/General/Conceptual/DevPedia-CocoaCore/ObjectiveC.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-General/\-Conceptual/\-DevPedia-\-CocoaCore/\-ObjectiveC.html}},
+    optnote     = {Accessed: 2018-03}
+    year        = 2014,
+    howpublished= {\href{https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/ProgrammingWithObjectiveC}{https://\-developer.apple.com/\-library/archive/\-documentation/\-Cocoa/\-Conceptual/\-ProgrammingWithObjectiveC}},
+}
 …
     title       = {{X}code 7 Release Notes},
     year        = 2015,
+    howpublished= {\href{https://developer.apple.com/library/content/documentation/Xcode/Conceptual/RN-Xcode-Archive/Chapters/xc7_release_notes.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-Xcode/\-Conceptual/\-RN-Xcode-Archive/\-Chapters/\-xc7\_release\_notes.html}},
+    optnote     = {Accessed: 2017-04}
+    howpublished= {\href{https://developer.apple.com/library/content/documentation/Xcode/Conceptual/RN-Xcode-Archive/Chapters/xc7_release_notes.html}{https://\-developer.apple.com/\-library/\-content/\-documentation/\-Xcode/\-Conceptual/\-RN-Xcode-Archive/\-Chapters/\-xc7\_release\_notes.html}},
+}
 …
+}
 @techreport{OpenMP,
+@manual{OpenMP,
     keywords    = {concurrency, openmp, spmd},
     contributer = {pabuhr@plg},
+    author      = {OpenMP Architecture Review Board},
+    title       = {OpenMP Application Program Interface, Version 4.0},
+    month       = jul,
+    year        = 2013,
+    note        = {\href{http://www.openmp.org/mp-documents/OpenMP4.0.0.pdf}{http://\-www.openmp.org/\-mp-documents/\-OpenMP4.0.0.pdf}},
+}
+    key         = {OpenMP},
+    title       = {OpenMP Application Program Interface, Version 4.5},
+    month       = nov,
+    year        = 2015,
+    note        = {\href{https://www.openmp.org/wp-content/uploads/openmp-4.5.pdf}{https://\-www.openmp.org/\-wp-content/\-uploads/\-openmp-4.5.pdf}},
+}
+@inproceedings{Krebbers14,
+    keywords    = {c formalization},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Krebbers, Robbert},
+    title       = {An Operational and Axiomatic Semantics for Non-determinism and Sequence Points in C},
+    booktitle   = {Proceedings of the 41st ACM SIGPLAN-SIGACT Symposium on Principles of Programming Languages},
+    series      = {POPL '14},
+    year        = {2014},
+    isbn        = {978-1-4503-2544-8},
+    location    = {San Diego, California, USA},
+    pages       = {101--112},
+    numpages    = {12},
+    url         = {http://doi.acm.org/10.1145/2535838.2535878},
+    doi         = {10.1145/2535838.2535878},
+    acmid       = {2535878},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 @book{Deitel04,
 …
+}
+@misc{perf,
+    contributer = {pabuhr@plg},
+    key         = {perf},
+    author      = {perf},
+    howpublished= {\href{https://perf.wiki.kernel.org/index.php/Tutorial}{https://\-perf.wiki.kernel.org/\-index.php/\-Tutorial}},
+}
+@misc{Verch12,
+    contributer = {pabuhr@plg},
+    author      = {Shaun Verch},
+    title       = {Performance Analysis of 64-Bit Capriccio},
+    month       = may,
+    year        = 2012,
+    howpublished= {\href{http://cs.brown.edu/research/pubs/theses/masters/2012/verch.pdf}{http://cs.brown.edu/\-research/\-pubs/\-theses/\-masters/\-2012/\-verch.pdf}},
+}
 @article{Anderson90,
     keywords    = {spin locks, back off, performance},
 …
     number      = 1,
     pages       = {6-16},
+}
+@inproceedings{Conchon07,
+    keywords    = {persistent array, union-find},
+    contributer = {a3moss@uwaterloo.ca},
+    title       = {A persistent union-find data structure},
+    author      = {Conchon, Sylvain and Filli{\^a}tre, Jean-Christophe},
+    booktitle   = {Proceedings of the 2007 workshop on Workshop on ML},
+    pages       = {37--46},
+    year        = {2007},
+    organization= {ACM}
+}
 …
+}
+@inproceedings{Buhr98,
+    keywords    = {profiling, monitoring, visualization},
+    contributer = {pabuhr@plg},
+    author      = {Peter A. Buhr and Robert Denda},
+    title       = {{$\mu$Profiler} : Profiling User-Level Threads in a Shared-Memory Programming Environment},
+    booktitle   = {Proc. of 2nd Inter. Symp. on Computing in Object-Oriented Parallel Environments},
+    series      = {Lecture Notes in Computer Science},
+    publisher   = {Springer-Verlag},
+    volume      = 1505,
+    opteditor   = {Dennis Caromel and Rodney R. Oldehoeft and Marydell Tholburn},
+    address     = {Santa Fe, New Mexico, U.S.A.},
+    month       = dec,
+    year        = 1998,
+    pages       = {159-166},
+}
 @book{PowerPC,
     key         = {PowerPC processor},
 …
     address     = {\href{https://www.iso.org/standard/64029.html}{https://\-www.iso.org/\-standard/\-64029.html}},
     year        = 2014,
+}
+@manual{C++17,
+    keywords    = {ISO/IEC C++ 17},
+    contributer = {pabuhr@plg},
+    key         = {C++17},
+    title       = {{C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Programming Language ISO/IEC 14882:2017},
+    edition     = {5th},
+    publisher   = {International Standard Organization},
+    address     = {\href{https://www.iso.org/standard/68564.html}{https://\-www.iso.org/\-standard/\-68564.html}},
+    year        = 2017,
+}
 …
     institution = {Carnegie Mellon University},
     year        = 1991,
+    month       = feb, number = "CMU-CS-91-106",
+    month       = feb,
+    number      = {CMU-CS-91-106},
     annote      = {
         Discusses a typed lambda calculus with
 …
+}
+@article{Moore75,
+    keywords    = {approximation methods, integrated circuits},
+    contributer = {pabuhr@plg},
+    author      = {Gordon E. Moore},
+    title       = {Progress in Digital Integrated Electronics},
+    journal     = {Technical Digest, International Electron Devices Meeting, IEEE},
+    year        = 1975,
+    pages       = {11-13},
+}
 @article{promises,
     keywords    = {futures, Argus, call streams, rpc},
     contributer = {gjditchfield@plg},
     author      = {Barbara Liskov and Liuba Shrira},
+    title       = {Promises: Linguistic Support for Efficient Asynchronous
+          Procedure Calls in Distributed Systems},
+    title       = {Promises: Linguistic Support for Efficient Asynchronous Procedure Calls in Distributed Systems},
     journal     = sigplan,
     year        = 1988,
+    month       = jul, volume = 23, number = 7, pages = {260-267},
+    note        = {Proceedings of the SIGPLAN '88 Conference on Programming Language
+         Design and Implementation},
+    month       = jul,
+    volume      = 23,
+    number      = 7,
+    pages       = {260-267},
+    note        = {Proceedings of the SIGPLAN '88 Conference on Programming Language Design and Implementation},
     abstract    = {
         This paper deals with the integration of an efficient asynchronous
 …
+}
+@misc{Pthreads,
+    keywords    = {pthreads, C concurrency},
+    contributer = {pabuhr@plg},
+    key         = {pthreads},
+    title       = {{Pthread}.h, Specifications Issue 7, {IEEE} Std 1003.1-2017},
+    author      = {IEEE and {The Open Group}},
+    year        = 2018,
+    howpublished= {\href{http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/pthread.h.html}
+                  {http://\-pubs.opengroup.org/\-onlinepubs/\-9699919799/\-basedefs/\-pthread.h.html}},
+}
 @manual{Python,
     keywords    = {Python},
     contributer = {pabuhr@plg},
     title       = {Python Reference Manual, Release 2.5},
     author      = {Guido van Rossum},
+    author      = {Python},
+    title       = {Python Language Reference, Release 3.7.2},
     organization= {Python Software Foundation},
+    month       = sep,
+    year        = 2006,
+    note        = {Fred L. Drake, Jr., editor},
+    address     = {\href{https://docs.python.org/3/reference/index.html}{https://\-docs.python.org/\-3/\-reference/\-index.html}},
+    year        = 2018,
+}
 % Q
+@inproceedings{Qthreads,
+    keywords    = {user-level threading},
+    author      = {Kyle B. Wheeler and Richard C. Murphy and Douglas Thain},
+    title       = {Qthreads: An API for Programming with Millions of Lightweight Threads},
+    booktitle   = {International Symposium on Parallel and Distributed Processing},
+    organization= {IEEE},
+    address     = {Miami, FL, USA},
+    month       = apr,
+    year        = 2008,
+}
 @article{Grossman06,
     keywords    = {Cyclone, existential types, polymorphism, type variables},
     contributer = {a3moss@plg},
     author      = {D. Grossman},
+    author      = {Dan Grossman},
     title       = {Quantified Types in an Imperative Language},
     journal     = toplas,
 …
     issn        = {0164-0925},
     pages       = {429-475},
     url         = {http://doi.acm.org.proxy.lib.uwaterloo.ca/10.1145/1133651.1133653},
+    url         = {http://doi.acm.org/10.1145/1133651.1133653},
     doi         = {10.1145/1133651.1133653},
     acmid       = {1133653},
 …
+}
+@manual{Quasar,
+    keywords    = {Quasar},
+    contributer = {pabuhr@plg},
+    author      = {Quasar},
+    title       = {Quasar Documentation, Release 0.8.0},
+    organization= {Parallel Universe},
+    address     = {\href{http://docs.paralleluniverse.co/quasar}{http://\-docs.paralleluniverse.co/\-quasar}},
+    year        = 2018,
+}
 % R
 …
+}
+@article{Ronsse03,
+    keywords    = {profiling, replay},
+    contributer = {pabuhr@plg},
+    author      = {Michiel Ronsse and De Bosschere, Koen and Mark Christiaens and Jacques Chassin de Kergommeaux and Dieter Kranzlm\"{u}ller},
+    title       = {Record/Replay for Nondeterministic Program Executions},
+    journal     = cacm,
+    month       = sep,
+    year        = 2003,
+    volume      = 46,
+    number      = 9,
+    pages       = {62-67},
+}
 @article{Robinson48,
     keywords    = {recursion, Ackermann function},
 …
+}
+@article{Hesselink06,
+    author      = {Wim H. Hesselink},
+    title       = {Refinement Verification of the Lazy Caching Algorithm},
+    journal     = acta,
+    year        = 2006,
+    month       = oct,
+    volume      = 43,
+    number      = 3,
+    pages       = {195--222},
+}
 @article{RemoteRendezvous,
     keywords    = {rendezvous, concurrency},
 …
+}
+@mastersthesis{Schuster99,
+    author      = {Oliver Schuster},
+    title       = {Replay of Concurrent Shared-Memory Programs},
+    school      = {Universit\"at Mannheim},
+    address     = {Mannheim, Deutschland},
+    year        = 1999,
+    month       = apr,
+    type        = {Diplomarbeit},
+    note        = {\href{https://plg.uwaterloo.ca/~usystem/theses/SchusterThesis.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-theses/\-SchusterThesis.pdf}},
+}
 @article{Euclid,
     keywords    = {Euclid},
 …
     school      = {School of Computer Science, University of Waterloo},
     year        = 2017,
     address     = {Waterloo, Ontario, Canada, N2L 3G1},
+    optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
     note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/11830}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/\-11830}},
+}
 …
     contributer = {pabuhr@plg},
     key         = {Rust},
     title       = {The {R}ust Programming Language},
     address     = {The Rust Project Developers},
+    title       = {{R}ust Programming Language},
+    optaddress  = {Rust Project Developers},
     year        = 2015,
     note        = {\href{https://doc.rust-lang.org/reference.html}{https://\-doc.rust-lang\-.org/\-reference.html}},
+}
+@manual{Ruby,
+    keywords    = {Ruby},
+    contributer = {pabuhr@plg},
+    author      = {Ruby},
+    title       = {Ruby Documentation, Release 2.6.0},
+    organization= {Python Software Foundation},
+    address     = {\href{https://www.ruby-lang.org/en/documentation}{https://\-www.ruby-lang.org/\-en/\-documentation}},
+    year        = 2018,
+}
 …
     publisher   = {Springer},
     note        = {Lecture Notes in Computer Science v. 173},
+}
+@article{Baker78,
+    keywords    = {Algol display, FUNARG's, Lisp 1.5, deep binding, environment trees, multiprogramming, shallow binding},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Baker,Jr., Henry G.},
+    title       = {Shallow Binding in Lisp 1.5},
+    journal     = {Commun. ACM},
+    issue_date  = {July 1978},
+    volume      = 21,
+    number      = 7,
+    month       = jul,
+    year        = 1978,
+    issn        = {0001-0782},
+    pages       = {565--569},
+    numpages    = {5},
+    url         = {http://doi.acm.org/10.1145/359545.359566},
+    doi         = {10.1145/359545.359566},
+    acmid       = {359566},
+    publisher   = {ACM},
+    address     = {New York, NY, USA}
+}
+@article{Baker91,
+    keywords    = {shallow binding, functional arrays},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Baker, Henry G.},
+    title       = {Shallow Binding Makes Functional Arrays Fast},
+    journal     = {SIGPLAN Not.},
+    issue_date  = {Aug. 1991},
+    volume      = 26,
+    number      = 8,
+    month       = aug,
+    year        = 1991,
+    issn        = {0362-1340},
+    pages       = {145--147},
+    numpages    = {3},
+    url         = {http://doi.acm.org/10.1145/122598.122614},
+    doi         = {10.1145/122598.122614},
+    acmid       = {122614},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 …
+}
+@article{SysVABI,
+    keywords    =  {System V ABI},
+    contributer =  {a3moss@uwaterloo.ca},
+    title       = {System {V} application binary interface},
+    author      = {Matz, Michael and Hubicka, Jan and Jaeger, Andreas and Mitchell, Mark},
+    journal     = {AMD64 Architecture Processor Supplement, Draft v0},
+    volume      = {99},
+    year        = {2013}
+}
 % T
 …
     contributer = {pabuhr@plg},
     key         = {TIOBE Index},
     title       = {{TIOBE} Index},
+    author      = {{TIOBE Index}},
     howpublished= {\href{http://www.tiobe.com/tiobe_index}{http://\-www.tiobe.com/\-tiobe\_index}},
+    optnote     = {Accessed: 2018-09},
+}
+@misc{ThreadModel,
+    contributer = {pabuhr@plg},
+    key         = {ThreadModel},
+    title       = {Thread (computing)},
+    author      = {{Threading Model}},
+    howpublished= {\href{https://en.wikipedia.org/wiki/Thread_(computing)}{https://\-en.wikipedia.org/\-wiki/\-Thread\_(computing)}},
+}
 …
     year        = 1980
+}
+@misc{TraceCompass,
+    contributer = {pabuhr@plg},
+    key         = {Trace Compass},
+    author      = {{T}race {C}ompass},
+    howpublished= {\href{https://projects.eclipse.org/proposals/trace-compass}{https://\-projects.eclipse.org/\-proposals/\-trace-compass}},
+}
 @article{Leroy00,
 …
         Argues against declaring exceptions on routine definitions.
     },
+}
+@techreport{Black90,
+    title       = {Typechecking polymorphism in {Emerald}},
+    author      = {Black, Andrew P and Hutchinson, Norman C},
+    year        = {1990},
+    institution = {Cambridge Research Laboratory, Digital Equipment Corporation}
+}
 …
     title       = {Usability Challenges in Exception Handling},
     booktitle   = {5th International Workshop on Exception Handling (WEH)},
     organization= {16th International Symposium on the Foundations of Software Engineering (FSE 16)},
+    optorganization= {16th International Symposium on the Foundations of Software Engineering (FSE 16)},
     address     = {Zurich, Switzerland},
     month       = jun,
 …
     year        = 2017,
     howpublished= {\url{https://wiki.gnome.org/Projects/Vala/Manual}},
-    optnote     = {Accessed: 2017-04}
+}
 …
+}
+@inproceedings{vonBehren03,
+    keywords    = {threads, events, web server},
+    contributer = {pabuhr@plg},
+    author      = {Rob von Behren and Jeremy Condit and Eric Brewer},
+    title       = {Why Events Are a Bad Idea (for high-concurrency servers)},
+    booktitle   = {HotOS IX: The 9th Workshop on Hot Topics in Operating Systems},
+    publisher   = {USENIX Association},
+    address     = {Lihue, Hawaii, U.S.A.},
+    month       = may,
+    year        = 2003,
+    pages       = {19-24},
+}
 @techreport{Moss90,
     keywords    = {Swizzling, database},
 …
+}
+@article{Tarjan84,
+    keywords    = {union-find},
+    contributer = {a3moss@uwaterloo.ca},
+    author      = {Tarjan, Robert E. and van Leeuwen, Jan},
+    title       = {Worst-case Analysis of Set Union Algorithms},
+    journal     = {J. ACM},
+    issue_date  = {April 1984},
+    volume      = 31,
+    number      = 2,
+    month       = mar,
+    year        = 1984,
+    issn        = {0004-5411},
+    pages       = {245--281},
+    numpages    = {37},
+    url         = {http://doi.acm.org/10.1145/62.2160},
+    doi         = {10.1145/62.2160},
+    acmid       = {2160},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 % X
 % Y
+@article{Boehm12,
+    keywords    = {memory model, race condition},
+    contributer = {pabuhr@plg},
+    author      = {Boehm, Hans-J. and Adve, Sarita V.},
+    title       = {You Don'T Know Jack About Shared Variables or Memory Models},
+    journal     = cacm,
+    volume      = 55,
+    number      = 2,
+    month       = feb,
+    year        = 2012,
+    pages       = {48--54},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
 % Z
 …
     year        = 1986,
     editor      = {Norman Meyrowitz},
     publisher   = sigplan # " 21(11)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {Portland, Oregon},
     month       = sep # { 29}
+    month       = sep,
+}
 …
     year        = 1987,
     editor      = {Norman Meyrowitz},
     publisher   = sigplan # " 22(12)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {Orlando, Florida},
     month       = oct # { 4--8}
+    month       = oct,
+}
 …
     year        = 1988,
     editor      = {Norman Meyrowitz},
     publisher   = sigplan # " 23(11)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {San Diego, California},
     month       = sep # { 25--30}
+    month       = sep,
+}
 …
     year        = 1989,
     editor      = {Norman Meyrowitz},
     publisher   = sigplan # " 24(10)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {New Orleans, Louisiana},
     month       = oct # { 1--6}
+    month       = oct,
+}
 …
     year        = 1990,
     editor      = {Norman Meyrowitz},
     publisher   = sigplan # " 25(10)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {Ottawa, Canada},
     month       = oct # { 21--25}
+    month       = oct,
+}
 …
     year        = 1991,
     editor      = {Andreas Paepcke},
     publisher   = sigplan # " 26(11)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {Phoenix, Arizona},
     month       = oct # { 6--11}
+}
+    month       = oct,
+}

doc/papers/AMA/AMA-stix/ama/WileyNJD-v2.cls

-              r7951100
+              rb067d9b
     \vspace*{8.5\p@}%
     \rightskip0pt\raggedright\hspace*{7\p@}\hbox{\reset@font\abstractfont{\absheadfont#1}}\par\vskip3pt% LN20feb2016
     {\abstractfont\baselineskip15pt\ifFWabstract\hsize\textwidth\fi#2\par\vspace*{0\p@}}%
+    {\abstractfont\baselineskip15pt\ifFWabstract\hsize\textwidth\fi\hsize0.68\textwidth#2\par\vspace*{0\p@}}%
     \addcontentsline{toc}{section}{\abstractname}%
 }}%\abstract{}%
 …
 }%
+%
 \def\fundinginfohead#1{\gdef\@fundinginfo@head{#1}}\fundinginfohead{Funding Information}%
+\def\fundinginfohead#1{\gdef\@fundinginfo@head{#1}}\fundinginfohead{Funding information}%
 \def\fundinginfoheadtext#1{\gdef\@fundinginfo@head@text{#1}}\fundinginfoheadtext{}%
 \gdef\@fundinginfo{{%
 …
 %% Keywords %%
 \def\keywords#1{\def\@keywords{{\keywordsheadfont\textbf{KEYWORDS:}\par\removelastskip\nointerlineskip\vskip6pt \keywordsfont#1\par}}}\def\@keywords{}%
+\def\keywords#1{\def\@keywords{{\keywordsheadfont\textbf{KEYWORDS}\par\removelastskip\nointerlineskip\vskip6pt \keywordsfont#1\par}}}\def\@keywords{}%
 \def\@fnsymbol#1{\ifcase#1\or \dagger\or \ddagger\or
 …
      \@afterheading}
 \renewcommand\section{\@startsection{section}{1}{\z@}{-27pt \@plus -2pt \@minus -2pt}{12\p@}{\sectionfont}}%
 \renewcommand\subsection{\@startsection{subsection}{2}{\z@}{-23pt \@plus -2pt \@minus -2pt}{5\p@}{\subsectionfont}}%
+\renewcommand\section{\@startsection{section}{1}{\z@}{-25pt \@plus -2pt \@minus -2pt}{12\p@}{\sectionfont}}%
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}{-22pt \@plus -2pt \@minus -2pt}{5\p@}{\subsectionfont}}%
 \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}{-20pt \@plus -2pt \@minus -2pt}{2\p@}{\subsubsectionfont}}%
+%
 …
 \hskip-\parindentvalue\fbox{\vbox{\noindent\@jnlcitation}}}%
 \AtEndDocument{\ifappendixsec\else\printjnlcitation\fi}%
+%\AtEndDocument{\ifappendixsec\else\printjnlcitation\fi}%
 %% Misc math macros %%

doc/papers/OOPSLA17/Makefile

-              r7951100
+              rb067d9b
 DOCUMENT = generic_types.pdf
+BASE = ${basename ${DOCUMENT}}
 # Directives #
 …
 clean :
         @rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
+        @rm -frv ${DOCUMENT} ${BASE}.ps ${Build}
 # File Dependencies #
 ${DOCUMENT} : ${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${BASE}.ps
         ps2pdf $<
 ${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
+${BASE}.ps : ${BASE}.dvi
         dvips ${Build}/$< -o $@
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ../../bibliography/pl.bib
+${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ../../bibliography/pl.bib | ${Build}
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
 …
 ## Define the default recipes.
 ${Build}:
+${Build} :
         mkdir -p ${Build}
 …
         gnuplot -e Build="'${Build}/'" evaluation/timing.gp
 %.tex : %.fig
+%.tex : %.fig | ${Build}
         fig2dev -L eepic $< > ${Build}/$@
 %.ps : %.fig
+%.ps : %.fig | ${Build}
         fig2dev -L ps $< > ${Build}/$@
 %.pstex : %.fig
+%.pstex : %.fig | ${Build}
         fig2dev -L pstex $< > ${Build}/$@
         fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t

doc/papers/concurrency/Makefile

-              r7951100
+              rb067d9b
 Figures = figures
 Macros = ../AMA/AMA-stix/ama
 TeXLIB = .:annex:../../LaTeXmacros:${Macros}:${Build}:../../bibliography:
+TeXLIB = .:../../LaTeXmacros:${Macros}:${Build}:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+BibTeX = BIBINPUTS=annex:../../bibliography: && export BIBINPUTS && bibtex
 MAKEFLAGS = --no-print-directory # --silent
 …
 SOURCES = ${addsuffix .tex, \
 Paper \
-style/style \
-style/cfa-format \
+}
 FIGURES = ${addsuffix .tex, \
-monitor \
-ext_monitor \
 int_monitor \
 dependency \
+RunTimeStructure \
+}
 PICTURES = ${addsuffix .pstex, \
+FullProdConsStack \
+FullCoroutinePhases \
+corlayout \
+CondSigWait \
+monitor \
+ext_monitor \
 system \
 monitor_structs \
 …
         dvips ${Build}/$< -o $@
 ${BASE}.dvi : Makefile ${Build} ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
                 annex/local.bib ../../bibliography/pl.bib
+${BASE}.dvi : Makefile ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                annex/local.bib ../../bibliography/pl.bib | ${Build}
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
         ${BibTeX} ${Build}/${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Some citations reference others so run again to resolve these citations
         ${LaTeX} ${basename $@}.tex
         ${BibTeX} ${Build}/${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Run again to finish citations
         ${LaTeX} ${basename $@}.tex
 …
 ## Define the default recipes.
 ${Build}:
+${Build} :
         mkdir -p ${Build}
 ${BASE}.out.ps: ${Build}
+${BASE}.out.ps : | ${Build}
         ln -fs ${Build}/Paper.out.ps .
 WileyNJD-AMA.bst:
+WileyNJD-AMA.bst :
         ln -fs ../AMA/AMA-stix/ama/WileyNJD-AMA.bst .
 %.tex : %.fig ${Build}
+%.tex : %.fig | ${Build}
         fig2dev -L eepic $< > ${Build}/$@
 %.ps : %.fig ${Build}
+%.ps : %.fig | ${Build}
         fig2dev -L ps $< > ${Build}/$@
 %.pstex : %.fig ${Build}
+%.pstex : %.fig | ${Build}
         fig2dev -L pstex $< > ${Build}/$@
         fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t

doc/papers/concurrency/Paper.tex

-              r7951100
+              rb067d9b
 \articletype{RESEARCH ARTICLE}%
+\received{26 April 2016}
+\revised{6 June 2016}
+\accepted{6 June 2016}
+% Referees
+% Doug Lea, dl@cs.oswego.edu, SUNY Oswego
+% Herb Sutter, hsutter@microsoft.com, Microsoft Corp
+% Gor Nishanov, gorn@microsoft.com, Microsoft Corp
+% James Noble, kjx@ecs.vuw.ac.nz, Victoria University of Wellington, School of Engineering and Computer Science
+\received{XXXXX}
+\revised{XXXXX}
+\accepted{XXXXX}
 \raggedbottom
 …
 \usepackage{epic,eepic}
 \usepackage{xspace}
+\usepackage{enumitem}
 \usepackage{comment}
 \usepackage{upquote}                                            % switch curled `'" to straight
 …
 \renewcommand{\thesubfigure}{(\Alph{subfigure})}
 \captionsetup{justification=raggedright,singlelinecheck=false}
+\usepackage{siunitx}
+\sisetup{binary-units=true}
+\usepackage{dcolumn}                                            % align decimal points in tables
+\usepackage{capt-of}
+\setlength{\multicolsep}{6.0pt plus 2.0pt minus 1.5pt}
 \hypersetup{breaklinks=true}
 …
 \renewcommand{\linenumberfont}{\scriptsize\sffamily}
+\renewcommand{\topfraction}{0.8}                        % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\bottomfraction}{0.8}                     % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\floatpagefraction}{0.8}          % float must be greater than X of the page before it is forced onto its own page
 \renewcommand{\textfraction}{0.0}                       % the entire page maybe devoted to floats with no text on the page at all
 …
 \makeatother
+\newenvironment{cquote}{%
+        \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=3pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}%
+        \item\relax
+}{%
+        \endlist
+}% cquote
+\newenvironment{cquote}
+               {\list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=3pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}%
+                \item\relax}
+               {\endlist}
+%\newenvironment{cquote}{%
+%\list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=3pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}%
+%\item\relax%
+%}{%
+%\endlist%
+%}% cquote
 % CFA programming language, based on ANSI C (with some gcc additions)
 …
                 auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__,
                 coroutine, disable, dtype, enable, exception, __extension__, fallthrough, fallthru, finally,
                 __float80, float80, __float128, float128, forall, ftype, _Generic, _Imaginary, __imag, __imag__,
+                __float80, float80, __float128, float128, forall, ftype, generator, _Generic, _Imaginary, __imag, __imag__,
                 inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or,
                 otype, restrict, __restrict, __restrict__, __signed, __signed__, _Static_assert, thread,
                 _Thread_local, throw, throwResume, timeout, trait, try, ttype, typeof, __typeof, __typeof__,
                 virtual, __volatile, __volatile__, waitfor, when, with, zero_t},
+        moredirectives={defined,include_next}%
+        moredirectives={defined,include_next},
+        % replace/adjust listing characters that look bad in sanserif
+        literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1
+                {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 % {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
+                {<}{\textrm{\textless}}1 {>}{\textrm{\textgreater}}1
+                {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.5ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex{\textrm{\textgreater}}}2,
+}
 …
 aboveskip=4pt,                                                                                  % spacing above/below code block
 belowskip=3pt,
-% replace/adjust listing characters that look bad in sanserif
-literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1
-        {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 % {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
-        {<}{\textrm{\textless}}1 {>}{\textrm{\textgreater}}1
-        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.5ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex{\textrm{\textgreater}}}2,
 moredelim=**[is][\color{red}]{`}{`},
 }% lstset
 …
+}
+% Go programming language: https://github.com/julienc91/listings-golang/blob/master/listings-golang.sty
+\lstdefinelanguage{Golang}{
+        morekeywords=[1]{package,import,func,type,struct,return,defer,panic,recover,select,var,const,iota,},
+        morekeywords=[2]{string,uint,uint8,uint16,uint32,uint64,int,int8,int16,int32,int64,
+                bool,float32,float64,complex64,complex128,byte,rune,uintptr, error,interface},
+        morekeywords=[3]{map,slice,make,new,nil,len,cap,copy,close,true,false,delete,append,real,imag,complex,chan,},
+        morekeywords=[4]{for,break,continue,range,goto,switch,case,fallthrough,if,else,default,},
+        morekeywords=[5]{Println,Printf,Error,},
+        sensitive=true,
+        morecomment=[l]{//},
+        morecomment=[s]{/*}{*/},
+        morestring=[b]',
+        morestring=[b]",
+        morestring=[s]{`}{`},
+        % replace/adjust listing characters that look bad in sanserif
+        literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1
+                {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 % {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
+                {<}{\textrm{\textless}}1 {>}{\textrm{\textgreater}}1
+                {<-}{\makebox[2ex][c]{\textrm{\textless}\raisebox{0.5ex}{\rule{0.8ex}{0.075ex}}}}2,
+}
 \lstnewenvironment{cfa}[1][]
 {\lstset{#1}}
 …
 {}
 \lstnewenvironment{Go}[1][]
+{\lstset{#1}}
+{\lstset{language=Golang,moredelim=**[is][\protect\color{red}]{`}{`},#1}\lstset{#1}}
+{}
+\lstnewenvironment{python}[1][]
+{\lstset{language=python,moredelim=**[is][\protect\color{red}]{`}{`},#1}\lstset{#1}}
 {}
 …
+}
+\title{\texorpdfstring{Concurrency in \protect\CFA}{Concurrency in Cforall}}
+\newbox\myboxA
+\newbox\myboxB
+\newbox\myboxC
+\newbox\myboxD
+\title{\texorpdfstring{Advanced Control-flow and Concurrency in \protect\CFA}{Advanced Control-flow in Cforall}}
 \author[1]{Thierry Delisle}
 …
 \corres{*Peter A. Buhr, Cheriton School of Computer Science, University of Waterloo, 200 University Avenue West, Waterloo, ON, N2L 3G1, Canada. \email{pabuhr{\char`\@}uwaterloo.ca}}
 \fundingInfo{Natural Sciences and Engineering Research Council of Canada}
+% \fundingInfo{Natural Sciences and Engineering Research Council of Canada}
 \abstract[Summary]{
+\CFA is a modern, polymorphic, \emph{non-object-oriented} extension of the C programming language.
+This paper discusses the design of the concurrency and parallelism features in \CFA, and the concurrent runtime-system.
+These features are created from scratch as ISO C lacks concurrency, relying largely on the pthreads library.
+Coroutines and lightweight (user) threads are introduced into the language.
+In addition, monitors are added as a high-level mechanism for mutual exclusion and synchronization.
+A unique contribution is allowing multiple monitors to be safely acquired simultaneously.
+All features respect the expectations of C programmers, while being fully integrate with the \CFA polymorphic type-system and other language features.
+Finally, experimental results are presented to compare the performance of the new features with similar mechanisms in other concurrent programming-languages.
+\CFA is a polymorphic, non-object-oriented, concurrent, backwards-compatible extension of the C programming language.
+This paper discusses the design philosophy and implementation of its advanced control-flow and concurrent/parallel features, along with the supporting runtime written in \CFA.
+These features are created from scratch as ISO C has only low-level and/or unimplemented concurrency, so C programmers continue to rely on library features like pthreads.
+\CFA introduces modern language-level control-flow mechanisms, like generators, coroutines, user-level threading, and monitors for mutual exclusion and synchronization.
+% Library extension for executors, futures, and actors are built on these basic mechanisms.
+The runtime provides significant programmer simplification and safety by eliminating spurious wakeup and monitor barging.
+The runtime also ensures multiple monitors can be safely acquired \emph{simultaneously} (deadlock free), and this feature is fully integrated with all monitor synchronization mechanisms.
+All control-flow features integrate with the \CFA polymorphic type-system and exception handling, while respecting the expectations and style of C programmers.
+Experimental results show comparable performance of the new features with similar mechanisms in other concurrent programming languages.
 }%
 \keywords{concurrency, parallelism, coroutines, threads, monitors, runtime, C, Cforall}
+\keywords{generator, coroutine, concurrency, parallelism, thread, monitor, runtime, C, \CFA (Cforall)}
 …
 \section{Introduction}
+This paper provides a minimal concurrency \newterm{Application Program Interface} (API) that is simple, efficient and can be used to build other concurrency features.
+While the simplest concurrency system is a thread and a lock, this low-level approach is hard to master.
+An easier approach for programmers is to support higher-level constructs as the basis of concurrency.
+Indeed, for highly productive concurrent programming, high-level approaches are much more popular~\cite{Hochstein05}.
+Examples of high-level approaches are task (work) based~\cite{TBB}, implicit threading~\cite{OpenMP}, monitors~\cite{Java}, channels~\cite{CSP,Go}, and message passing~\cite{Erlang,MPI}.
+The following terminology is used.
+A \newterm{thread} is a fundamental unit of execution that runs a sequence of code and requires a stack to maintain state.
+Multiple simultaneous threads give rise to \newterm{concurrency}, which requires locking to ensure safe communication and access to shared data.
+% Correspondingly, concurrency is defined as the concepts and challenges that occur when multiple independent (sharing memory, timing dependencies, \etc) concurrent threads are introduced.
+\newterm{Locking}, and by extension \newterm{locks}, are defined as a mechanism to prevent progress of threads to provide safety.
+\newterm{Parallelism} is running multiple threads simultaneously.
+Parallelism implies \emph{actual} simultaneous execution, where concurrency only requires \emph{apparent} simultaneous execution.
+As such, parallelism only affects performance, which is observed through differences in space and/or time at runtime.
+Hence, there are two problems to be solved: concurrency and parallelism.
+While these two concepts are often combined, they are distinct, requiring different tools~\cite[\S~2]{Buhr05a}.
+Concurrency tools handle synchronization and mutual exclusion, while parallelism tools handle performance, cost and resource utilization.
+The proposed concurrency API is implemented in a dialect of C, called \CFA.
+The paper discusses how the language features are added to the \CFA translator with respect to parsing, semantic, and type checking, and the corresponding high-performance runtime-library to implement the concurrency features.
+\section{\CFA Overview}
+The following is a quick introduction to the \CFA language, specifically tailored to the features needed to support concurrency.
+Extended versions and explanation of the following code examples are available at the \CFA website~\cite{Cforall} or in Moss~\etal~\cite{Moss18}.
+\CFA is an extension of ISO-C, and hence, supports all C paradigms.
+%It is a non-object-oriented system-language, meaning most of the major abstractions have either no runtime overhead or can be opted out easily.
+Like C, the basics of \CFA revolve around structures and routines.
+Virtually all of the code generated by the \CFA translator respects C memory layouts and calling conventions.
+While \CFA is not an object-oriented language, lacking the concept of a receiver (\eg @this@) and nominal inheritance-relationships, C does have a notion of objects: ``region of data storage in the execution environment, the contents of which can represent values''~\cite[3.15]{C11}.
+While some \CFA features are common in object-oriented programming-languages, they are an independent capability allowing \CFA to adopt them while retaining a procedural paradigm.
+\subsection{References}
+\CFA provides multi-level rebindable references, as an alternative to pointers, which significantly reduces syntactic noise.
+\begin{cfa}
+int x = 1, y = 2, z = 3;
+int * p1 = &x, ** p2 = &p1,  *** p3 = &p2,      $\C{// pointers to x}$
+        `&` r1 = x,  `&&` r2 = r1,  `&&&` r3 = r2;      $\C{// references to x}$
+int * p4 = &z, `&` r4 = z;
+*p1 = 3; **p2 = 3; ***p3 = 3;       // change x
+r1 =  3;     r2 = 3;      r3 = 3;        // change x: implicit dereferences *r1, **r2, ***r3
+**p3 = &y; *p3 = &p4;                // change p1, p2
+`&`r3 = &y; `&&`r3 = &`&`r4;             // change r1, r2: cancel implicit dereferences (&*)**r3, (&(&*)*)*r3, &(&*)r4
+\end{cfa}
+A reference is a handle to an object, like a pointer, but is automatically dereferenced by the specified number of levels.
+Referencing (address-of @&@) a reference variable cancels one of the implicit dereferences, until there are no more implicit references, after which normal expression behaviour applies.
+\subsection{\texorpdfstring{\protect\lstinline{with} Statement}{with Statement}}
+\label{s:WithStatement}
+Heterogeneous data is aggregated into a structure/union.
+To reduce syntactic noise, \CFA provides a @with@ statement (see Pascal~\cite[\S~4.F]{Pascal}) to elide aggregate field-qualification by opening a scope containing the field identifiers.
+\begin{cquote}
+\vspace*{-\baselineskip}%???
+\lstDeleteShortInline@%
+\begin{cfa}
+struct S { char c; int i; double d; };
+struct T { double m, n; };
+// multiple aggregate parameters
+\end{cfa}
+\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}|@{\hspace{2\parindentlnth}}l@{}}
+\begin{cfa}
+void f( S & s, T & t ) {
+        `s.`c; `s.`i; `s.`d;
+        `t.`m; `t.`n;
+}
+\end{cfa}
+&
+\begin{cfa}
+void f( S & s, T & t ) `with ( s, t )` {
+        c; i; d;                // no qualification
+        m; n;
+}
+\end{cfa}
+\end{tabular}
+\lstMakeShortInline@%
+\end{cquote}
+Object-oriented programming languages only provide implicit qualification for the receiver.
+In detail, the @with@ statement has the form:
+\begin{cfa}
+$\emph{with-statement}$:
+        'with' '(' $\emph{expression-list}$ ')' $\emph{compound-statement}$
+\end{cfa}
+and may appear as the body of a routine or nested within a routine body.
+Each expression in the expression-list provides a type and object.
+The type must be an aggregate type.
+(Enumerations are already opened.)
+The object is the implicit qualifier for the open structure-fields.
+All expressions in the expression list are open in parallel within the compound statement, which is different from Pascal, which nests the openings from left to right.
+\subsection{Overloading}
+\CFA maximizes the ability to reuse names via overloading to aggressively address the naming problem.
+Both variables and routines may be overloaded, where selection is based on types, and number of returns (as in Ada~\cite{Ada}) and arguments.
+\begin{cquote}
+\vspace*{-\baselineskip}%???
+\lstDeleteShortInline@%
+\begin{cfa}
+// selection based on type
+\end{cfa}
+\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}|@{\hspace{2\parindentlnth}}l@{}}
+\begin{cfa}
+const short int `MIN` = -32768;
+const int `MIN` = -2147483648;
+const long int `MIN` = -9223372036854775808L;
+\end{cfa}
+&
+\begin{cfa}
+short int si = `MIN`;
+int i = `MIN`;
+long int li = `MIN`;
+\end{cfa}
+\end{tabular}
+\begin{cfa}
+// selection based on type and number of parameters
+\end{cfa}
+\begin{tabular}{@{}l@{\hspace{2.7\parindentlnth}}|@{\hspace{2\parindentlnth}}l@{}}
+\begin{cfa}
+void `f`( void );
+void `f`( char );
+void `f`( int, double );
+\end{cfa}
+&
+\begin{cfa}
+`f`();
+`f`( 'a' );
+`f`( 3, 5.2 );
+\end{cfa}
+\end{tabular}
+\begin{cfa}
+// selection based on type and number of returns
+\end{cfa}
+\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}|@{\hspace{2\parindentlnth}}l@{}}
+\begin{cfa}
+char `f`( int );
+double `f`( int );
+[char, double] `f`( int );
+\end{cfa}
+&
+\begin{cfa}
+char c = `f`( 3 );
+double d = `f`( 3 );
+[d, c] = `f`( 3 );
+\end{cfa}
+\end{tabular}
+\lstMakeShortInline@%
+\end{cquote}
+Overloading is important for \CFA concurrency since the runtime system relies on creating different types to represent concurrency objects.
+Therefore, overloading is necessary to prevent the need for long prefixes and other naming conventions to prevent name clashes.
+As seen in Section~\ref{basics}, routine @main@ is heavily overloaded.
+Variable overloading is useful in the parallel semantics of the @with@ statement for fields with the same name:
+\begin{cfa}
+struct S { int `i`; int j; double m; } s;
+struct T { int `i`; int k; int m; } t;
+with ( s, t ) {
+        j + k;                                                                  $\C{// unambiguous, s.j + t.k}$
+        m = 5.0;                                                                $\C{// unambiguous, s.m = 5.0}$
+        m = 1;                                                                  $\C{// unambiguous, t.m = 1}$
+        int a = m;                                                              $\C{// unambiguous, a = t.m }$
+        double b = m;                                                   $\C{// unambiguous, b = s.m}$
+        int c = `s.i` + `t.i`;                                  $\C{// unambiguous, qualification}$
+        (double)m;                                                              $\C{// unambiguous, cast s.m}$
+}
+\end{cfa}
+For parallel semantics, both @s.i@ and @t.i@ are visible the same type, so only @i@ is ambiguous without qualification.
+\subsection{Operators}
+Overloading also extends to operators.
+Operator-overloading syntax creates a routine name with an operator symbol and question marks for the operands:
+\begin{cquote}
+\lstDeleteShortInline@%
+\begin{tabular}{@{}ll@{\hspace{\parindentlnth}}|@{\hspace{\parindentlnth}}l@{}}
+\begin{cfa}
+int ++? (int op);
+int ?++ (int op);
+int `?+?` (int op1, int op2);
+int ?<=?(int op1, int op2);
+int ?=? (int & op1, int op2);
+int ?+=?(int & op1, int op2);
+\end{cfa}
+&
+\begin{cfa}
+// unary prefix increment
+// unary postfix increment
+// binary plus
+// binary less than
+// binary assignment
+// binary plus-assignment
+\end{cfa}
+&
+\begin{cfa}
+struct S { int i, j; };
+S `?+?`( S op1, S op2) { // add two structures
+        return (S){op1.i + op2.i, op1.j + op2.j};
+}
+S s1 = {1, 2}, s2 = {2, 3}, s3;
+s3 = s1 `+` s2;         // compute sum: s3 == {2, 5}
+\end{cfa}
+\end{tabular}
+\lstMakeShortInline@%
+\end{cquote}
+While concurrency does not use operator overloading directly, it provides an introduction for the syntax of constructors.
+\subsection{Parametric Polymorphism}
+\label{s:ParametricPolymorphism}
+The signature feature of \CFA is parametric-polymorphic routines~\cite{} with routines generalized using a @forall@ clause (giving the language its name), which allow separately compiled routines to support generic usage over multiple types.
+For example, the following sum routine works for any type that supports construction from 0 and addition \commenttd{constructors have not been introduced yet.}:
+\begin{cfa}
+forall( otype T | { void `?{}`( T *, zero_t ); T `?+?`( T, T ); } ) // constraint type, 0 and +
+T sum( T a[$\,$], size_t size ) {
+        `T` total = { `0` };                                    $\C{// initialize by 0 constructor}$
+        for ( size_t i = 0; i < size; i += 1 )
+                total = total `+` a[i];                         $\C{// select appropriate +}$
+        return total;
+}
+S sa[5];
+int i = sum( sa, 5 );                                           $\C{// use S's 0 construction and +}$
+\end{cfa}
+\CFA provides \newterm{traits} to name a group of type assertions, where the trait name allows specifying the same set of assertions in multiple locations, preventing repetition mistakes at each routine declaration:
+\begin{cfa}
+trait `sumable`( otype T ) {
+        void `?{}`( T &, zero_t );                              $\C{// 0 literal constructor}$
+        T `?+?`( T, T );                                                $\C{// assortment of additions}$
+        T ?+=?( T &, T );
+        T ++?( T & );
+        T ?++( T & );
+};
+forall( otype T `| sumable( T )` )                      $\C{// use trait}$
+T sum( T a[$\,$], size_t size );
+\end{cfa}
+Assertions can be @otype@ or @dtype@.
+@otype@ refers to a ``complete'' object, \ie an object has a size, default constructor, copy constructor, destructor and an assignment operator.
+@dtype@ only guarantees an object has a size and alignment.
+Using the return type for discrimination, it is possible to write a type-safe @alloc@ based on the C @malloc@:
+\begin{cfa}
+forall( dtype T | sized(T) ) T * alloc( void ) { return (T *)malloc( sizeof(T) ); }
+int * ip = alloc();                                                     $\C{// select type and size from left-hand side}$
+double * dp = alloc();
+struct S {...} * sp = alloc();
+\end{cfa}
+where the return type supplies the type/size of the allocation, which is impossible in most type systems.
+\subsection{Constructors / Destructors}
+Object lifetime is a challenge in non-managed programming languages.
+\CFA responds with \CC-like constructors and destructors:
+\begin{cfa}
+struct VLA { int len, * data; };                        $\C{// variable length array of integers}$
+void ?{}( VLA & vla ) with ( vla ) { len = 10;  data = alloc( len ); }  $\C{// default constructor}$
+void ?{}( VLA & vla, int size, char fill ) with ( vla ) { len = size;  data = alloc( len, fill ); } // initialization
+void ?{}( VLA & vla, VLA other ) { vla.len = other.len;  vla.data = other.data; } $\C{// copy, shallow}$
+void ^?{}( VLA & vla ) with ( vla ) { free( data ); } $\C{// destructor}$
+{
+        VLA  x,            y = { 20, 0x01 },     z = y; $\C{// z points to y}$
+        //    x{};         y{ 20, 0x01 };          z{ z, y };
+        ^x{};                                                                   $\C{// deallocate x}$
+        x{};                                                                    $\C{// reallocate x}$
+        z{ 5, 0xff };                                                   $\C{// reallocate z, not pointing to y}$
+        ^y{};                                                                   $\C{// deallocate y}$
+        y{ x };                                                                 $\C{// reallocate y, points to x}$
+        x{};                                                                    $\C{// reallocate x, not pointing to y}$
+        //  ^z{};  ^y{};  ^x{};
+}
+\end{cfa}
+Like \CC, construction is implicit on allocation (stack/heap) and destruction is implicit on deallocation.
+The object and all their fields are constructed/destructed.
+\CFA also provides @new@ and @delete@, which behave like @malloc@ and @free@, in addition to constructing and destructing objects:
+\begin{cfa}
+{       struct S s = {10};                                              $\C{// allocation, call constructor}$
+        ...
+}                                                                                       $\C{// deallocation, call destructor}$
+struct S * s = new();                                           $\C{// allocation, call constructor}$
+...
+delete( s );                                                            $\C{// deallocation, call destructor}$
+\end{cfa}
+\CFA concurrency uses object lifetime as a means of synchronization and/or mutual exclusion.
+\section{Concurrency Basics}\label{basics}
+At its core, concurrency is based on multiple call-stacks and scheduling threads executing on these stacks.
+Multiple call stacks (or contexts) and a single thread of execution, called \newterm{coroutining}~\cite{Conway63,Marlin80}, does \emph{not} imply concurrency~\cite[\S~2]{Buhr05a}.
+In coroutining, the single thread is self-scheduling across the stacks, so execution is deterministic, \ie given fixed inputs, the execution path to the outputs is fixed and predictable.
+A \newterm{stackless} coroutine executes on the caller's stack~\cite{Python} but this approach is restrictive, \eg preventing modularization and supporting only iterator/generator-style programming;
+a \newterm{stackfull} coroutine executes on its own stack, allowing full generality.
+Only stackfull coroutines are a stepping-stone to concurrency.
+The transition to concurrency, even for execution with a single thread and multiple stacks, occurs when coroutines also context switch to a scheduling oracle, introducing non-determinism from the coroutine perspective~\cite[\S~3]{Buhr05a}.
+Therefore, a minimal concurrency system is possible using coroutines (see Section \ref{coroutine}) in conjunction with a scheduler to decide where to context switch next.
+The resulting execution system now follows a cooperative threading-model, called \newterm{non-preemptive scheduling}.
+Because the scheduler is special, it can either be a stackless or stackfull coroutine. \commenttd{I dislike this sentence, it seems imply 1-step vs 2-step but also seems to say that some kind of coroutine is required, which is not the case.}
+For stackless, the scheduler performs scheduling on the stack of the current coroutine and switches directly to the next coroutine, so there is one context switch.
+For stackfull, the current coroutine switches to the scheduler, which performs scheduling, and it then switches to the next coroutine, so there are two context switches.
+A stackfull scheduler is often used for simplicity and security, even through there is a slightly higher runtime-cost. \commenttd{I'm not a fan of the fact that we don't quantify this but yet imply it is negligeable.}
+Regardless of the approach used, a subset of concurrency related challenges start to appear.
+For the complete set of concurrency challenges to occur, the missing feature is \newterm{preemption}, where context switching occurs randomly between any two instructions, often based on a timer interrupt, called \newterm{preemptive scheduling}.
+While a scheduler introduces uncertainty in the order of execution, preemption introduces uncertainty where context switches occur.
+Interestingly, uncertainty is necessary for the runtime (operating) system to give the illusion of parallelism on a single processor and increase performance on multiple processors.
+The reason is that only the runtime has complete knowledge about resources and how to best utilized them.
+However, the introduction of unrestricted non-determinism results in the need for \newterm{mutual exclusion} and \newterm{synchronization} to restrict non-determinism for correctness;
+otherwise, it is impossible to write meaningful programs.
+Optimal performance in concurrent applications is often obtained by having as much non-determinism as correctness allows.
+\subsection{\protect\CFA's Thread Building Blocks}
+An important missing feature in C is threading\footnote{While the C11 standard defines a ``threads.h'' header, it is minimal and defined as optional.
+As such, library support for threading is far from widespread.
+At the time of writing the paper, neither \protect\lstinline|gcc| nor \protect\lstinline|clang| support ``threads.h'' in their standard libraries.}.
+In modern programming languages, a lack of threading is unacceptable~\cite{Sutter05, Sutter05b}, and therefore existing and new programming languages must have tools for writing efficient concurrent programs to take advantage of parallelism.
+As an extension of C, \CFA needs to express these concepts in a way that is as natural as possible to programmers familiar with imperative languages.
+Furthermore, because C is a system-level language, programmers expect to choose precisely which features they need and which cost they are willing to pay.
+Hence, concurrent programs should be written using high-level mechanisms, and only step down to lower-level mechanisms when performance bottlenecks are encountered.
+\subsection{Coroutines: A Stepping Stone}\label{coroutine}
+While the focus of this discussion is concurrency and parallelism, it is important to address coroutines, which are a significant building block of a concurrency system.
+Coroutines are generalized routines allowing execution to be temporarily suspend and later resumed.
+Hence, unlike a normal routine, a coroutine may not terminate when it returns to its caller, allowing it to be restarted with the values and execution location present at the point of suspension.
+This capability is accomplish via the coroutine's stack, where suspend/resume context switch among stacks.
+Because threading design-challenges are present in coroutines, their design effort is relevant, and this effort can be easily exposed to programmers giving them a useful new programming paradigm because a coroutine handles the class of problems that need to retain state between calls, \eg plugins, device drivers, and finite-state machines.
+Therefore, the core \CFA coroutine-API for has two fundamental features: independent call-stacks and @suspend@/@resume@ operations.
+For example, a problem made easier with coroutines is unbounded generators, \eg generating an infinite sequence of Fibonacci numbers, where Figure~\ref{f:C-fibonacci} shows conventional approaches for writing a Fibonacci generator in C.
+\begin{displaymath}
+\mathsf{fib}(n) = \left \{
+\begin{array}{ll}
+                                       & n = 0         \\
+                                       & n = 1         \\
+\mathsf{fib}(n-1) + \mathsf{fib}(n-2)   & n \ge 2       \\
+\end{array}
+\right.
+\end{displaymath}
+Figure~\ref{f:GlobalVariables} illustrates the following problems:
+unique unencapsulated global variables necessary to retain state between calls;
+only one Fibonacci generator;
+execution state must be explicitly retained via explicit state variables.
+Figure~\ref{f:ExternalState} addresses these issues:
+unencapsulated program global variables become encapsulated structure variables;
+unique global variables are replaced by multiple Fibonacci objects;
+explicit execution state is removed by precomputing the first two Fibonacci numbers and returning $\mathsf{fib}(n-2)$.
+This paper discusses the design philosophy and implementation of advanced language-level control-flow and concurrent/parallel features in \CFA~\cite{Moss18,Cforall} and its runtime, which is written entirely in \CFA.
+\CFA is a modern, polymorphic, non-object-oriented\footnote{
+\CFA has features often associated with object-oriented programming languages, such as constructors, destructors, virtuals and simple inheritance.
+However, functions \emph{cannot} be nested in structures, so there is no lexical binding between a structure and set of functions (member/method) implemented by an implicit \lstinline@this@ (receiver) parameter.},
+backwards-compatible extension of the C programming language.
+In many ways, \CFA is to C as Scala~\cite{Scala} is to Java, providing a \emph{research vehicle} for new typing and control-flow capabilities on top of a highly popular programming language allowing immediate dissemination.
+Within the \CFA framework, new control-flow features are created from scratch because ISO \Celeven defines only a subset of the \CFA extensions, where the overlapping features are concurrency~\cite[\S~7.26]{C11}.
+However, \Celeven concurrency is largely wrappers for a subset of the pthreads library~\cite{Butenhof97,Pthreads}, and \Celeven and pthreads concurrency is simple, based on thread fork/join in a function and mutex/condition locks, which is low-level and error-prone;
+no high-level language concurrency features are defined.
+Interestingly, almost a decade after publication of the \Celeven standard, neither gcc-8, clang-9 nor msvc-19 (most recent versions) support the \Celeven include @threads.h@, indicating little interest in the C11 concurrency approach (possibly because the effort to add concurrency to \CC).
+Finally, while the \Celeven standard does not state a threading model, the historical association with pthreads suggests implementations would adopt kernel-level threading (1:1)~\cite{ThreadModel}.
+In contrast, there has been a renewed interest during the past decade in user-level (M:N, green) threading in old and new programming languages.
+As multi-core hardware became available in the 1980/90s, both user and kernel threading were examined.
+Kernel threading was chosen, largely because of its simplicity and fit with the simpler operating systems and hardware architectures at the time, which gave it a performance advantage~\cite{Drepper03}.
+Libraries like pthreads were developed for C, and the Solaris operating-system switched from user (JDK 1.1~\cite{JDK1.1}) to kernel threads.
+As a result, languages like Java, Scala, Objective-C~\cite{obj-c-book}, \CCeleven~\cite{C11}, and C\#~\cite{Csharp} adopt the 1:1 kernel-threading model, with a variety of presentation mechanisms.
+From 2000 onwards, languages like Go~\cite{Go}, Erlang~\cite{Erlang}, Haskell~\cite{Haskell}, D~\cite{D}, and \uC~\cite{uC++,uC++book} have championed the M:N user-threading model, and many user-threading libraries have appeared~\cite{Qthreads,MPC,Marcel}, including putting green threads back into Java~\cite{Quasar}.
+The main argument for user-level threading is that it is lighter weight than kernel threading (locking and context switching do not cross the kernel boundary), so there is less restriction on programming styles that encourage large numbers of threads performing medium work units to facilitate load balancing by the runtime~\cite{Verch12}.
+As well, user-threading facilitates a simpler concurrency approach using thread objects that leverage sequential patterns versus events with call-backs~\cite{Adya02,vonBehren03}.
+Finally, performant user-threading implementations (both time and space) meet or exceed direct kernel-threading implementations, while achieving the programming advantages of high concurrency levels and safety.
+A further effort over the past two decades is the development of language memory models to deal with the conflict between language features and compiler/hardware optimizations, \ie some language features are unsafe in the presence of aggressive sequential optimizations~\cite{Buhr95a,Boehm05}.
+The consequence is that a language must provide sufficient tools to program around safety issues, as inline and library code is all sequential to the compiler.
+One solution is low-level qualifiers and functions (\eg @volatile@ and atomics) allowing \emph{programmers} to explicitly write safe (race-free~\cite{Boehm12}) programs.
+A safer solution is high-level language constructs so the \emph{compiler} knows the optimization boundaries, and hence, provides implicit safety.
+This problem is best known with respect to concurrency, but applies to other complex control-flow, like exceptions\footnote{
+\CFA exception handling will be presented in a separate paper.
+The key feature that dovetails with this paper is nonlocal exceptions allowing exceptions to be raised across stacks, with synchronous exceptions raised among coroutines and asynchronous exceptions raised among threads, similar to that in \uC~\cite[\S~5]{uC++}
+} and coroutines.
+Finally, language solutions allow matching constructs with language paradigm, \ie imperative and functional languages often have different presentations of the same concept to fit their programming model.
+Finally, it is important for a language to provide safety over performance \emph{as the default}, allowing careful reduction of safety for performance when necessary.
+Two concurrency violations of this philosophy are \emph{spurious wakeup} (random wakeup~\cite[\S~8]{Buhr05a}) and \emph{barging}\footnote{
+The notion of competitive succession instead of direct handoff, \ie a lock owner releases the lock and an arriving thread acquires it ahead of preexisting waiter threads.
+} (signals-as-hints~\cite[\S~8]{Buhr05a}), where one is a consequence of the other, \ie once there is spurious wakeup, signals-as-hints follow.
+However, spurious wakeup is \emph{not} a foundational concurrency property~\cite[\S~8]{Buhr05a}, it is a performance design choice.
+Similarly, signals-as-hints are often a performance decision.
+We argue removing spurious wakeup and signals-as-hints make concurrent programming significantly safer because it removes local non-determinism and matches with programmer expectation.
+(Author experience teaching concurrency is that students are highly confused by these semantics.)
+Clawing back performance, when local non-determinism is unimportant, should be an option not the default.
+\begin{comment}
+Most augmented traditional (Fortran 18~\cite{Fortran18}, Cobol 14~\cite{Cobol14}, Ada 12~\cite{Ada12}, Java 11~\cite{Java11}) and new languages (Go~\cite{Go}, Rust~\cite{Rust}, and D~\cite{D}), except \CC, diverge from C with different syntax and semantics, only interoperate indirectly with C, and are not systems languages, for those with managed memory.
+As a result, there is a significant learning curve to move to these languages, and C legacy-code must be rewritten.
+While \CC, like \CFA, takes an evolutionary approach to extend C, \CC's constantly growing complex and interdependent features-set (\eg objects, inheritance, templates, etc.) mean idiomatic \CC code is difficult to use from C, and C programmers must expend significant effort learning \CC.
+Hence, rewriting and retraining costs for these languages, even \CC, are prohibitive for companies with a large C software-base.
+\CFA with its orthogonal feature-set, its high-performance runtime, and direct access to all existing C libraries circumvents these problems.
+\end{comment}
+\CFA embraces user-level threading, language extensions for advanced control-flow, and safety as the default.
+We present comparative examples so the reader can judge if the \CFA control-flow extensions are better and safer than those in other concurrent, imperative programming languages, and perform experiments to show the \CFA runtime is competitive with other similar mechanisms.
+The main contributions of this work are:
+\begin{itemize}[topsep=3pt,itemsep=1pt]
+\item
+language-level generators, coroutines and user-level threading, which respect the expectations of C programmers.
+\item
+monitor synchronization without barging, and the ability to safely acquiring multiple monitors \emph{simultaneously} (deadlock free), while seamlessly integrating these capabilities with all monitor synchronization mechanisms.
+\item
+providing statically type-safe interfaces that integrate with the \CFA polymorphic type-system and other language features.
+% \item
+% library extensions for executors, futures, and actors built on the basic mechanisms.
+\item
+a runtime system with no spurious wakeup.
+\item
+a dynamic partitioning mechanism to segregate the execution environment for specialized requirements.
+% \item
+% a non-blocking I/O library
+\item
+experimental results showing comparable performance of the new features with similar mechanisms in other programming languages.
+\end{itemize}
+Section~\ref{s:StatefulFunction} begins advanced control by introducing sequential functions that retain data and execution state between calls, which produces constructs @generator@ and @coroutine@.
+Section~\ref{s:Concurrency} begins concurrency, or how to create (fork) and destroy (join) a thread, which produces the @thread@ construct.
+Section~\ref{s:MutualExclusionSynchronization} discusses the two mechanisms to restricted nondeterminism when controlling shared access to resources (mutual exclusion) and timing relationships among threads (synchronization).
+Section~\ref{s:Monitor} shows how both mutual exclusion and synchronization are safely embedded in the @monitor@ and @thread@ constructs.
+Section~\ref{s:CFARuntimeStructure} describes the large-scale mechanism to structure (cluster) threads and virtual processors (kernel threads).
+Section~\ref{s:Performance} uses a series of microbenchmarks to compare \CFA threading with pthreads, Java OpenJDK-9, Go 1.12.6 and \uC 7.0.0.
+\section{Stateful Function}
+\label{s:StatefulFunction}
+The stateful function is an old idea~\cite{Conway63,Marlin80} that is new again~\cite{C++20Coroutine19}, where execution is temporarily suspended and later resumed, \eg plugin, device driver, finite-state machine.
+Hence, a stateful function may not end when it returns to its caller, allowing it to be restarted with the data and execution location present at the point of suspension.
+This capability is accomplished by retaining a data/execution \emph{closure} between invocations.
+If the closure is fixed size, we call it a \emph{generator} (or \emph{stackless}), and its control flow is restricted, \eg suspending outside the generator is prohibited.
+If the closure is variable size, we call it a \emph{coroutine} (or \emph{stackful}), and as the names implies, often implemented with a separate stack with no programming restrictions.
+Hence, refactoring a stackless coroutine may require changing it to stackful.
+A foundational property of all \emph{stateful functions} is that resume/suspend \emph{do not} cause incremental stack growth, \ie resume/suspend operations are remembered through the closure not the stack.
+As well, activating a stateful function is \emph{asymmetric} or \emph{symmetric}, identified by resume/suspend (no cycles) and resume/resume (cycles).
+A fixed closure activated by modified call/return is faster than a variable closure activated by context switching.
+Additionally, any storage management for the closure (especially in unmanaged languages, \ie no garbage collection) must also be factored into design and performance.
+Therefore, selecting between stackless and stackful semantics is a tradeoff between programming requirements and performance, where stackless is faster and stackful is more general.
+Note, creation cost is amortized across usage, so activation cost is usually the dominant factor.
 \begin{figure}
 \centering
-\newbox\myboxA
 \begin{lrbox}{\myboxA}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+`int f1, f2, state = 1;`   // single global variables
+int fib() {
+        int fn;
+        `switch ( state )` {  // explicit execution state
+          case 1: fn = 0;  f1 = fn;  state = 2;  break;
+          case 2: fn = 1;  f2 = f1;  f1 = fn;  state = 3;  break;
+          case 3: fn = f1 + f2;  f2 = f1;  f1 = fn;  break;
+        }
+typedef struct {
+        int fn1, fn;
+} Fib;
+#define FibCtor { 1, 0 }
+int fib( Fib * f ) {
+        int fn = f->fn; f->fn = f->fn1;
+                f->fn1 = f->fn + fn;
         return fn;
+}
 int main() {
         for ( int i = 0; i < 10; i += 1 ) {
                 printf( "%d\n", fib() );
+        }
+        Fib f1 = FibCtor, f2 = FibCtor;
+        for ( int i = 0; i < 10; i += 1 )
+                printf( "%d %d\n",
+                           fib( &f1 ), fib( &f2 ) );
+}
 \end{cfa}
 \end{lrbox}
-\newbox\myboxB
 \begin{lrbox}{\myboxB}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+#define FIB_INIT `{ 0, 1 }`
+typedef struct { int f2, f1; } Fib;
+int fib( Fib * f ) {
+        int ret = f->f2;
+        int fn = f->f1 + f->f2;
+        f->f2 = f->f1; f->f1 = fn;
+        return ret;
+`generator` Fib {
+        int fn1, fn;
+};
+void `main(Fib & fib)` with(fib) {
+        [fn1, fn] = [1, 0];
+        for () {
+                `suspend;`
+                [fn1, fn] = [fn, fn + fn1];
+        }
+}
 int main() {
+        Fib f1 = FIB_INIT, f2 = FIB_INIT;
+        for ( int i = 0; i < 10; i += 1 ) {
+                printf( "%d %d\n", fib( &f1 ), fib( &f2 ) );
+        Fib f1, f2;
+        for ( 10 )
+                sout | `resume( f1 )`.fn
+                         | `resume( f2 )`.fn;
+}
+\end{cfa}
+\end{lrbox}
+\begin{lrbox}{\myboxC}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+typedef struct {
+        int fn1, fn;  void * `next`;
+} Fib;
+#define FibCtor { 1, 0, NULL }
+Fib * comain( Fib * f ) {
+        if ( f->next ) goto *f->next;
+        f->next = &&s1;
+        for ( ;; ) {
+                return f;
+          s1:; int fn = f->fn + f->fn1;
+                        f->fn1 = f->fn; f->fn = fn;
+        }
+}
+int main() {
+        Fib f1 = FibCtor, f2 = FibCtor;
+        for ( int i = 0; i < 10; i += 1 )
+                printf("%d %d\n",comain(&f1)->fn,
+                                 comain(&f2)->fn);
+}
 \end{cfa}
 \end{lrbox}
+\subfloat[3 States: global variables]{\label{f:GlobalVariables}\usebox\myboxA}
+\qquad
+\subfloat[1 State: external variables]{\label{f:ExternalState}\usebox\myboxB}
+\caption{C Fibonacci Implementations}
+\label{f:C-fibonacci}
+\subfloat[C asymmetric generator]{\label{f:CFibonacci}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[\CFA asymmetric generator]{\label{f:CFAFibonacciGen}\usebox\myboxB}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[C generator implementation]{\label{f:CFibonacciSim}\usebox\myboxC}
+\caption{Fibonacci (output) asymmetric generator}
+\label{f:FibonacciAsymmetricGenerator}
 \bigskip
-\newbox\myboxA
 \begin{lrbox}{\myboxA}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+`coroutine` Fib { int fn; };
+void main( Fib & fib ) with( fib ) {
+        int f1, f2;
+        fn = 0;  f1 = fn;  `suspend()`;
+        fn = 1;  f2 = f1;  f1 = fn;  `suspend()`;
+        for ( ;; ) {
+                fn = f1 + f2;  f2 = f1;  f1 = fn;  `suspend()`;
+`generator Fmt` {
+        char ch;
+        int g, b;
+};
+void ?{}( Fmt & fmt ) { `resume(fmt);` } // constructor
+void ^?{}( Fmt & f ) with(f) { $\C[1.75in]{// destructor}$
+        if ( g != 0 || b != 0 ) sout | nl; }
+void `main( Fmt & f )` with(f) {
+        for () { $\C{// until destructor call}$
+                for ( ; g < 5; g += 1 ) { $\C{// groups}$
+                        for ( ; b < 4; b += 1 ) { $\C{// blocks}$
+                                `suspend;` $\C{// wait for character}$
+                                while ( ch == '\n' ) `suspend;` // ignore
+                                sout | ch;                                              // newline
+                        } sout | " ";  // block spacer
+                } sout | nl; // group newline
+        }
+}
-int next( Fib & fib ) with( fib ) {
-        `resume( fib );`
-        return fn;
+}
 int main() {
+        Fib f1, f2;
+        for ( int i = 1; i <= 10; i += 1 ) {
+                sout | next( f1 ) | next( f2 ) | endl;
+        Fmt fmt; $\C{// fmt constructor called}$
+        for () {
+                sin | fmt.ch; $\C{// read into generator}$
+          if ( eof( sin ) ) break;
+                `resume( fmt );`
+        }
+}
+} $\C{// fmt destructor called}\CRT$
 \end{cfa}
 \end{lrbox}
+\newbox\myboxB
 \begin{lrbox}{\myboxB}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+`coroutine` Fib { int ret; };
+void main( Fib & f ) with( fib ) {
+        int fn, f1 = 1, f2 = 0;
+typedef struct {
+        void * next;
+        char ch;
+        int g, b;
+} Fmt;
+void comain( Fmt * f ) {
+        if ( f->next ) goto *f->next;
+        f->next = &&s1;
         for ( ;; ) {
+                ret = f2;
+                fn = f1 + f2;  f2 = f1;  f1 = fn; `suspend();`
+                for ( f->g = 0; f->g < 5; f->g += 1 ) {
+                        for ( f->b = 0; f->b < 4; f->b += 1 ) {
+                                return;
+                          s1:;  while ( f->ch == '\n' ) return;
+                                printf( "%c", f->ch );
+                        } printf( " " );
+                } printf( "\n" );
+        }
+}
+int next( Fib & fib ) with( fib ) {
+        `resume( fib );`
+        return ret;
+}
+int main() {
+        Fmt fmt = { NULL };  comain( &fmt ); // prime
+        for ( ;; ) {
+                scanf( "%c", &fmt.ch );
+          if ( feof( stdin ) ) break;
+                comain( &fmt );
+        }
+        if ( fmt.g != 0 || fmt.b != 0 ) printf( "\n" );
+}
 \end{cfa}
 \end{lrbox}
+\subfloat[3 States, internal variables]{\label{f:Coroutine3States}\usebox\myboxA}
+\qquad\qquad
+\subfloat[1 State, internal variables]{\label{f:Coroutine1State}\usebox\myboxB}
+\caption{\CFA Coroutine Fibonacci Implementations}
+\label{f:fibonacci-cfa}
+\subfloat[\CFA asymmetric generator]{\label{f:CFAFormatGen}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[C generator simulation]{\label{f:CFormatSim}\usebox\myboxB}
+\hspace{3pt}
+\caption{Formatter (input) asymmetric generator}
+\label{f:FormatterAsymmetricGenerator}
 \end{figure}
+Using a coroutine, it is possible to express the Fibonacci formula directly without any of the C problems.
+Figure~\ref{f:Coroutine3States} creates a @coroutine@ type:
+\begin{cfa}
+`coroutine` Fib { int fn; };
+\end{cfa}
+which provides communication, @fn@, for the \newterm{coroutine main}, @main@, which runs on the coroutine stack, and possibly multiple interface routines @next@.
+Like the structure in Figure~\ref{f:ExternalState}, the coroutine type allows multiple instances, where instances of this type are passed to the (overloaded) coroutine main.
+The coroutine main's stack holds the state for the next generation, @f1@ and @f2@, and the code has the three suspend points, representing the three states in the Fibonacci formula, to context switch back to the caller's resume.
+The interface routine @next@, takes a Fibonacci instance and context switches to it using @resume@;
+on restart, the Fibonacci field, @fn@, contains the next value in the sequence, which is returned.
+The first @resume@ is special because it cocalls the coroutine at its coroutine main and allocates the stack;
+when the coroutine main returns, its stack is deallocated.
+Hence, @Fib@ is an object at creation, transitions to a coroutine on its first resume, and transitions back to an object when the coroutine main finishes.
+Figure~\ref{f:Coroutine1State} shows the coroutine version of the C version in Figure~\ref{f:ExternalState}.
+Coroutine generators are called \newterm{output coroutines} because values are only returned.
+Figure~\ref{f:CFAFmt} shows an \newterm{input coroutine}, @Format@, for restructuring text into groups of characters of fixed-size blocks.
+For example, the input of the left is reformatted into the output on the right.
+\begin{quote}
+Stateful functions appear as generators, coroutines, and threads, where presentations are based on function objects or pointers~\cite{Butenhof97, C++14, MS:VisualC++, BoostCoroutines15}.
+For example, Python presents generators as a function object:
+\begin{python}
+def Gen():
+        ... `yield val` ...
+gen = Gen()
+for i in range( 10 ):
+        print( next( gen ) )
+\end{python}
+Boost presents coroutines in terms of four functor object-types:
+\begin{cfa}
+asymmetric_coroutine<>::pull_type
+asymmetric_coroutine<>::push_type
+symmetric_coroutine<>::call_type
+symmetric_coroutine<>::yield_type
+\end{cfa}
+and many languages present threading using function pointers, @pthreads@~\cite{Butenhof97}, \Csharp~\cite{Csharp}, Go~\cite{Go}, and Scala~\cite{Scala}, \eg pthreads:
+\begin{cfa}
+void * rtn( void * arg ) { ... }
+int i = 3, rc;
+pthread_t t; $\C{// thread id}$
+`rc = pthread_create( &t, rtn, (void *)i );` $\C{// create and initialized task, type-unsafe input parameter}$
+\end{cfa}
+% void mycor( pthread_t cid, void * arg ) {
+%       int * value = (int *)arg;                               $\C{// type unsafe, pointer-size only}$
+%       // thread body
+% }
+% int main() {
+%       int input = 0, output;
+%       coroutine_t cid = coroutine_create( &mycor, (void *)&input ); $\C{// type unsafe, pointer-size only}$
+%       coroutine_resume( cid, (void *)input, (void **)&output ); $\C{// type unsafe, pointer-size only}$
+% }
+\CFA's preferred presentation model for generators/coroutines/threads is a hybrid of objects and functions, with an object-oriented flavour.
+Essentially, the generator/coroutine/thread function is semantically coupled with a generator/coroutine/thread custom type.
+The custom type solves several issues, while accessing the underlying mechanisms used by the custom types is still allowed.
+\subsection{Generator}
+Stackless generators have the potential to be very small and fast, \ie as small and fast as function call/return for both creation and execution.
+The \CFA goal is to achieve this performance target, possibly at the cost of some semantic complexity.
+A series of different kinds of generators and their implementation demonstrate how this goal is accomplished.
+Figure~\ref{f:FibonacciAsymmetricGenerator} shows an unbounded asymmetric generator for an infinite sequence of Fibonacci numbers written in C and \CFA, with a simple C implementation for the \CFA version.
+This generator is an \emph{output generator}, producing a new result on each resumption.
+To compute Fibonacci, the previous two values in the sequence are retained to generate the next value, \ie @fn1@ and @fn@, plus the execution location where control restarts when the generator is resumed, \ie top or middle.
+An additional requirement is the ability to create an arbitrary number of generators (of any kind), \ie retaining one state in global variables is insufficient;
+hence, state is retained in a closure between calls.
+Figure~\ref{f:CFibonacci} shows the C approach of manually creating the closure in structure @Fib@, and multiple instances of this closure provide multiple Fibonacci generators.
+The C version only has the middle execution state because the top execution state is declaration initialization.
+Figure~\ref{f:CFAFibonacciGen} shows the \CFA approach, which also has a manual closure, but replaces the structure with a custom \CFA @generator@ type.
+This generator type is then connected to a function that \emph{must be named \lstinline|main|},\footnote{
+The name \lstinline|main| has special meaning in C, specifically the function where a program starts execution.
+Hence, overloading this name for other starting points (generator/coroutine/thread) is a logical extension.}
+called a \emph{generator main},which takes as its only parameter a reference to the generator type.
+The generator main contains @suspend@ statements that suspend execution without ending the generator versus @return@.
+For the Fibonacci generator-main,\footnote{
+The \CFA \lstinline|with| opens an aggregate scope making its fields directly accessible, like Pascal \lstinline|with|, but using parallel semantics.
+Multiple aggregates may be opened.}
+the top initialization state appears at the start and the middle execution state is denoted by statement @suspend@.
+Any local variables in @main@ \emph{are not retained} between calls;
+hence local variables are only for temporary computations \emph{between} suspends.
+All retained state \emph{must} appear in the generator's type.
+As well, generator code containing a @suspend@ cannot be refactored into a helper function called by the generator, because @suspend@ is implemented via @return@, so a return from the helper function goes back to the current generator not the resumer.
+The generator is started by calling function @resume@ with a generator instance, which begins execution at the top of the generator main, and subsequent @resume@ calls restart the generator at its point of last suspension.
+Resuming an ended (returned) generator is undefined.
+Function @resume@ returns its argument generator so it can be cascaded in an expression, in this case to print the next Fibonacci value @fn@ computed in the generator instance.
+Figure~\ref{f:CFibonacciSim} shows the C implementation of the \CFA generator only needs one additional field, @next@, to handle retention of execution state.
+The computed @goto@ at the start of the generator main, which branches after the previous suspend, adds very little cost to the resume call.
+Finally, an explicit generator type provides both design and performance benefits, such as multiple type-safe interface functions taking and returning arbitrary types.\footnote{
+The \CFA operator syntax uses \lstinline|?| to denote operands, which allows precise definitions for pre, post, and infix operators, \eg \lstinline|++?|, \lstinline|?++|, and \lstinline|?+?|, in addition \lstinline|?\{\}| denotes a constructor, as in \lstinline|foo `f` = `\{`...`\}`|, \lstinline|^?\{\}| denotes a destructor, and \lstinline|?()| is \CC function call \lstinline|operator()|.
+}%
+\begin{cfa}
+int ?()( Fib & fib ) { return `resume( fib )`.fn; } $\C[3.9in]{// function-call interface}$
+int ?()( Fib & fib, int N ) { for ( N - 1 ) `fib()`; return `fib()`; } $\C{// use function-call interface to skip N values}$
+double ?()( Fib & fib ) { return (int)`fib()` / 3.14159; } $\C{// different return type, cast prevents recursive call}\CRT$
+sout | (int)f1() | (double)f1() | f2( 2 ); // alternative interface, cast selects call based on return type, step 2 values
+\end{cfa}
+Now, the generator can be a separately compiled opaque-type only accessed through its interface functions.
+For contrast, Figure~\ref{f:PythonFibonacci} shows the equivalent Python Fibonacci generator, which does not use a generator type, and hence only has a single interface, but an implicit closure.
+Having to manually create the generator closure by moving local-state variables into the generator type is an additional programmer burden.
+(This restriction is removed by the coroutine in Section~\ref{s:Coroutine}.)
+This requirement follows from the generality of variable-size local-state, \eg local state with a variable-length array requires dynamic allocation because the array size is unknown at compile time.
+However, dynamic allocation significantly increases the cost of generator creation/destruction and is a showstopper for embedded real-time programming.
+But more importantly, the size of the generator type is tied to the local state in the generator main, which precludes separate compilation of the generator main, \ie a generator must be inlined or local state must be dynamically allocated.
+With respect to safety, we believe static analysis can discriminate local state from temporary variables in a generator, \ie variable usage spanning @suspend@, and generate a compile-time error.
+Finally, our current experience is that most generator problems have simple data state, including local state, but complex execution state, so the burden of creating the generator type is small.
+As well, C programmers are not afraid of this kind of semantic programming requirement, if it results in very small, fast generators.
+Figure~\ref{f:CFAFormatGen} shows an asymmetric \newterm{input generator}, @Fmt@, for restructuring text into groups of characters of fixed-size blocks, \ie the input on the left is reformatted into the output on the right, where newlines are ignored.
+\begin{center}
 \tt
 \begin{tabular}{@{}l|l@{}}
 \multicolumn{1}{c|}{\textbf{\textrm{input}}} & \multicolumn{1}{c}{\textbf{\textrm{output}}} \\
+abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
+\begin{tabular}[t]{@{}ll@{}}
+abcdefghijklmnopqrstuvwxyz \\
+abcdefghijklmnopqrstuvwxyz
+\end{tabular}
+&
 \begin{tabular}[t]{@{}lllll@{}}
 …
 \end{tabular}
 \end{tabular}
+\end{quote}
+The example takes advantage of resuming a coroutine in the constructor to prime the loops so the first character sent for formatting appears inside the nested loops.
+The destruction provides a newline if formatted text ends with a full line.
+Figure~\ref{f:CFmt} shows the C equivalent formatter, where the loops of the coroutine are flatten (linearized) and rechecked on each call because execution location is not retained between calls.
+\end{center}
+The example takes advantage of resuming a generator in the constructor to prime the loops so the first character sent for formatting appears inside the nested loops.
+The destructor provides a newline, if formatted text ends with a full line.
+Figure~\ref{f:CFormatSim} shows the C implementation of the \CFA input generator with one additional field and the computed @goto@.
+For contrast, Figure~\ref{f:PythonFormatter} shows the equivalent Python format generator with the same properties as the Fibonacci generator.
+Figure~\ref{f:DeviceDriverGen} shows a \emph{killer} asymmetric generator, a device-driver, because device drivers caused 70\%-85\% of failures in Windows/Linux~\cite{Swift05}.
+Device drives follow the pattern of simple data state but complex execution state, \ie finite state-machine (FSM) parsing a protocol.
+For example, the following protocol:
+\begin{center}
+\ldots\, STX \ldots\, message \ldots\, ESC ETX \ldots\, message \ldots\, ETX 2-byte crc \ldots
+\end{center}
+is a network message beginning with the control character STX, ending with an ETX, and followed by a 2-byte cyclic-redundancy check.
+Control characters may appear in a message if preceded by an ESC.
+When a message byte arrives, it triggers an interrupt, and the operating system services the interrupt by calling the device driver with the byte read from a hardware register.
+The device driver returns a status code of its current state, and when a complete message is obtained, the operating system knows the message is in the message buffer.
+Hence, the device driver is an input/output generator.
+Note, the cost of creating and resuming the device-driver generator, @Driver@, is virtually identical to call/return, so performance in an operating-system kernel is excellent.
+As well, the data state is small, where variables @byte@ and @msg@ are communication variables for passing in message bytes and returning the message, and variables @lnth@, @crc@, and @sum@ are local variable that must be retained between calls and are manually hoisted into the generator type.
+% Manually, detecting and hoisting local-state variables is easy when the number is small.
+In contrast, the execution state is large, with one @resume@ and seven @suspend@s.
+Hence, the key benefits of the generator are correctness, safety, and maintenance because the execution states are transcribed directly into the programming language rather than using a table-driven approach.
+Because FSMs can be complex and frequently occur in important domains, direct generator support is important in a system programming language.
 \begin{figure}
 …
 \newbox\myboxA
 \begin{lrbox}{\myboxA}
+\begin{python}[aboveskip=0pt,belowskip=0pt]
+def Fib():
+        fn1, fn = 0, 1
+        while True:
+                `yield fn1`
+                fn1, fn = fn, fn1 + fn
+f1 = Fib()
+f2 = Fib()
+for i in range( 10 ):
+        print( next( f1 ), next( f2 ) )
+\end{python}
+\end{lrbox}
+\newbox\myboxB
+\begin{lrbox}{\myboxB}
+\begin{python}[aboveskip=0pt,belowskip=0pt]
+def Fmt():
+        try:
+                while True:
+                        for g in range( 5 ):
+                                for b in range( 4 ):
+                                        print( `(yield)`, end='' )
+                                print( '  ', end='' )
+                        print()
+        except GeneratorExit:
+                if g != 0 | b != 0:
+                        print()
+fmt = Fmt()
+`next( fmt )`                    # prime, next prewritten
+for i in range( 41 ):
+        `fmt.send( 'a' );`      # send to yield
+\end{python}
+\end{lrbox}
+\subfloat[Fibonacci]{\label{f:PythonFibonacci}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[Formatter]{\label{f:PythonFormatter}\usebox\myboxB}
+\caption{Python generator}
+\label{f:PythonGenerator}
+\bigskip
+\begin{tabular}{@{}l|l@{}}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+`coroutine` Format {
+        char ch;   // used for communication
+        int g, b;  // global because used in destructor
+enum Status { CONT, MSG, ESTX,
+                                ELNTH, ECRC };
+`generator` Driver {
+        Status status;
+        unsigned char byte, * msg; // communication
+        unsigned int lnth, sum;      // local state
+        unsigned short int crc;
 };
+void main( Format & fmt ) with( fmt ) {
+        for ( ;; ) {
+                for ( g = 0; g < 5; g += 1 ) {      // group
+                        for ( b = 0; b < 4; b += 1 ) { // block
+                                `suspend();`
+                                sout | ch;              // separator
+void ?{}( Driver & d, char * m ) { d.msg = m; }
+Status next( Driver & d, char b ) with( d ) {
+        byte = b; `resume( d );` return status;
+}
+void main( Driver & d ) with( d ) {
+        enum { STX = '\002', ESC = '\033',
+                        ETX = '\003', MaxMsg = 64 };
+  msg: for () { // parse message
+                status = CONT;
+                lnth = 0; sum = 0;
+                while ( byte != STX ) `suspend;`
+          emsg: for () {
+                        `suspend;` // process byte
+\end{cfa}
+&
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+                        choose ( byte ) { // switch with implicit break
+                          case STX:
+                                status = ESTX; `suspend;` continue msg;
+                          case ETX:
+                                break emsg;
+                          case ESC:
+                                `suspend;`
+                        }
+                        sout | "  ";               // separator
+                        if ( lnth >= MaxMsg ) { // buffer full ?
+                                status = ELNTH; `suspend;` continue msg; }
+                        msg[lnth++] = byte;
+                        sum += byte;
+                }
+                sout | endl;
+                msg[lnth] = '\0'; // terminate string
+                `suspend;`
+                crc = byte << 8;
+                `suspend;`
+                status = (crc | byte) == sum ? MSG : ECRC;
+                `suspend;`
+        }
+}
+void ?{}( Format & fmt ) { `resume( fmt );` }
+void ^?{}( Format & fmt ) with( fmt ) {
+        if ( g != 0 || b != 0 ) sout | endl;
+}
+void format( Format & fmt ) {
+        `resume( fmt );`
+\end{cfa}
+\end{tabular}
+\caption{Device-driver generator for communication protocol}
+\label{f:DeviceDriverGen}
+\end{figure}
+Figure~\ref{f:CFAPingPongGen} shows a symmetric generator, where the generator resumes another generator, forming a resume/resume cycle.
+(The trivial cycle is a generator resuming itself.)
+This control flow is similar to recursion for functions but without stack growth.
+The steps for symmetric control-flow are creating, executing, and terminating the cycle.
+Constructing the cycle must deal with definition-before-use to close the cycle, \ie, the first generator must know about the last generator, which is not within scope.
+(This issue occurs for any cyclic data structure.)
+% The example creates all the generators and then assigns the partners that form the cycle.
+% Alternatively, the constructor can assign the partners as they are declared, except the first, and the first-generator partner is set after the last generator declaration to close the cycle.
+Once the cycle is formed, the program main resumes one of the generators, and the generators can then traverse an arbitrary cycle using @resume@ to activate partner generator(s).
+Terminating the cycle is accomplished by @suspend@ or @return@, both of which go back to the stack frame that started the cycle (program main in the example).
+The starting stack-frame is below the last active generator because the resume/resume cycle does not grow the stack.
+Also, since local variables are not retained in the generator function, it does not contain any objects with destructors that must be called, so the  cost is the same as a function return.
+Destructor cost occurs when the generator instance is deallocated, which is easily controlled by the programmer.
+Figure~\ref{f:CPingPongSim} shows the implementation of the symmetric generator, where the complexity is the @resume@, which needs an extension to the calling convention to perform a forward rather than backward jump.
+This jump-starts at the top of the next generator main to re-execute the normal calling convention to make space on the stack for its local variables.
+However, before the jump, the caller must reset its stack (and any registers) equivalent to a @return@, but subsequently jump forward.
+This semantics is basically a tail-call optimization, which compilers already perform.
+The example shows the assembly code to undo the generator's entry code before the direct jump.
+This assembly code depends on what entry code is generated, specifically if there are local variables and the level of optimization.
+To provide this new calling convention requires a mechanism built into the compiler, which is beyond the scope of \CFA at this time.
+Nevertheless, it is possible to hand generate any symmetric generators for proof of concept and performance testing.
+A compiler could also eliminate other artifacts in the generator simulation to further increase performance, \eg LLVM has various coroutine support~\cite{CoroutineTS}, and \CFA can leverage this support should it fork @clang@.
+\begin{figure}
+\centering
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+`generator PingPong` {
+        const char * name;
+        int N;
+        int i;                          // local state
+        PingPong & partner; // rebindable reference
+};
+void `main( PingPong & pp )` with(pp) {
+        for ( ; i < N; i += 1 ) {
+                sout | name | i;
+                `resume( partner );`
+        }
+}
 int main() {
+        Format fmt;
+        eof: for ( ;; ) {
+                sin | fmt.ch;
+          if ( eof( sin ) ) break eof;
+                format( fmt );
+        enum { N = 5 };
+        PingPong ping = {"ping",N,0}, pong = {"pong",N,0};
+        &ping.partner = &pong;  &pong.partner = &ping;
+        `resume( ping );`
+}
+\end{cfa}
+\end{lrbox}
+\begin{lrbox}{\myboxB}
+\begin{cfa}[escapechar={},aboveskip=0pt,belowskip=0pt]
+typedef struct PingPong {
+        const char * name;
+        int N, i;
+        struct PingPong * partner;
+        void * next;
+} PingPong;
+#define PPCtor(name, N) {name,N,0,NULL,NULL}
+void comain( PingPong * pp ) {
+        if ( pp->next ) goto *pp->next;
+        pp->next = &&cycle;
+        for ( ; pp->i < pp->N; pp->i += 1 ) {
+                printf( "%s %d\n", pp->name, pp->i );
+                asm( "mov  %0,%%rdi" : "=m" (pp->partner) );
+                asm( "mov  %rdi,%rax" );
+                asm( "popq %rbx" );
+                asm( "jmp  comain" );
+          cycle: ;
+        }
+}
+\end{cfa}
+\end{lrbox}
+\subfloat[\CFA symmetric generator]{\label{f:CFAPingPongGen}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[C generator simulation]{\label{f:CPingPongSim}\usebox\myboxB}
+\hspace{3pt}
+\caption{Ping-Pong symmetric generator}
+\label{f:PingPongSymmetricGenerator}
+\end{figure}
+Finally, part of this generator work was inspired by the recent \CCtwenty generator proposal~\cite{C++20Coroutine19} (which they call coroutines).
+Our work provides the same high-performance asymmetric generators as \CCtwenty, and extends their work with symmetric generators.
+An additional \CCtwenty generator feature allows @suspend@ and @resume@ to be followed by a restricted compound statement that is executed after the current generator has reset its stack but before calling the next generator, specified with \CFA syntax:
+\begin{cfa}
+... suspend`{ ... }`;
+... resume( C )`{ ... }` ...
+\end{cfa}
+Since the current generator's stack is released before calling the compound statement, the compound statement can only reference variables in the generator's type.
+This feature is useful when a generator is used in a concurrent context to ensure it is stopped before releasing a lock in the compound statement, which might immediately allow another thread to resume the generator.
+Hence, this mechanism provides a general and safe handoff of the generator among competing threads.
+\subsection{Coroutine}
+\label{s:Coroutine}
+Stackful coroutines extend generator semantics, \ie there is an implicit closure and @suspend@ may appear in a helper function called from the coroutine main.
+A coroutine is specified by replacing @generator@ with @coroutine@ for the type.
+Coroutine generality results in higher cost for creation, due to dynamic stack allocation, execution, due to context switching among stacks, and terminating, due to possible stack unwinding and dynamic stack deallocation.
+A series of different kinds of coroutines and their implementations demonstrate how coroutines extend generators.
+First, the previous generator examples are converted to their coroutine counterparts, allowing local-state variables to be moved from the generator type into the coroutine main.
+\begin{description}
+\item[Fibonacci]
+Move the declaration of @fn1@ to the start of coroutine main.
+\begin{cfa}[xleftmargin=0pt]
+void main( Fib & fib ) with(fib) {
+        `int fn1;`
+\end{cfa}
+\item[Formatter]
+Move the declaration of @g@ and @b@ to the for loops in the coroutine main.
+\begin{cfa}[xleftmargin=0pt]
+for ( `g`; 5 ) {
+        for ( `b`; 4 ) {
+\end{cfa}
+\item[Device Driver]
+Move the declaration of @lnth@ and @sum@ to their points of initialization.
+\begin{cfa}[xleftmargin=0pt]
+        status = CONT;
+        `unsigned int lnth = 0, sum = 0;`
+        ...
+        `unsigned short int crc = byte << 8;`
+\end{cfa}
+\item[PingPong]
+Move the declaration of @i@ to the for loop in the coroutine main.
+\begin{cfa}[xleftmargin=0pt]
+void main( PingPong & pp ) with(pp) {
+        for ( `i`; N ) {
+\end{cfa}
+\end{description}
+It is also possible to refactor code containing local-state and @suspend@ statements into a helper function, like the computation of the CRC for the device driver.
+\begin{cfa}
+unsigned int Crc() {
+        `suspend;`
+        unsigned short int crc = byte << 8;
+        `suspend;`
+        status = (crc | byte) == sum ? MSG : ECRC;
+        return crc;
+}
+\end{cfa}
+A call to this function is placed at the end of the driver's coroutine-main.
+For complex finite-state machines, refactoring is part of normal program abstraction, especially when code is used in multiple places.
+Again, this complexity is usually associated with execution state rather than data state.
+\begin{comment}
+Figure~\ref{f:Coroutine3States} creates a @coroutine@ type, @`coroutine` Fib { int fn; }@, which provides communication, @fn@, for the \newterm{coroutine main}, @main@, which runs on the coroutine stack, and possibly multiple interface functions, \eg @next@.
+Like the structure in Figure~\ref{f:ExternalState}, the coroutine type allows multiple instances, where instances of this type are passed to the (overloaded) coroutine main.
+The coroutine main's stack holds the state for the next generation, @f1@ and @f2@, and the code represents the three states in the Fibonacci formula via the three suspend points, to context switch back to the caller's @resume@.
+The interface function @next@, takes a Fibonacci instance and context switches to it using @resume@;
+on restart, the Fibonacci field, @fn@, contains the next value in the sequence, which is returned.
+The first @resume@ is special because it allocates the coroutine stack and cocalls its coroutine main on that stack;
+when the coroutine main returns, its stack is deallocated.
+Hence, @Fib@ is an object at creation, transitions to a coroutine on its first resume, and transitions back to an object when the coroutine main finishes.
+Figure~\ref{f:Coroutine1State} shows the coroutine version of the C version in Figure~\ref{f:ExternalState}.
+Coroutine generators are called \newterm{output coroutines} because values are only returned.
+\begin{figure}
+\centering
+\newbox\myboxA
+% \begin{lrbox}{\myboxA}
+% \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+% `int fn1, fn2, state = 1;`   // single global variables
+% int fib() {
+%       int fn;
+%       `switch ( state )` {  // explicit execution state
+%         case 1: fn = 0;  fn1 = fn;  state = 2;  break;
+%         case 2: fn = 1;  fn2 = fn1;  fn1 = fn;  state = 3;  break;
+%         case 3: fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;  break;
+%       }
+%       return fn;
+% }
+% int main() {
+%
+%       for ( int i = 0; i < 10; i += 1 ) {
+%               printf( "%d\n", fib() );
+%       }
+% }
+% \end{cfa}
+% \end{lrbox}
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+#define FibCtor { 0, 1 }
+typedef struct { int fn1, fn; } Fib;
+int fib( Fib * f ) {
+        int ret = f->fn1;
+        f->fn1 = f->fn;
+        f->fn = ret + f->fn;
+        return ret;
+}
+int main() {
+        Fib f1 = FibCtor, f2 = FibCtor;
+        for ( int i = 0; i < 10; i += 1 ) {
+                printf( "%d %d\n",
+                                fib( &f1 ), fib( &f2 ) );
+        }
+}
 …
 \begin{lrbox}{\myboxB}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+struct Format {
+        char ch;
+        int g, b;
+};
+void format( struct Format * fmt ) {
+        if ( fmt->ch != -1 ) {      // not EOF ?
+                printf( "%c", fmt->ch );
+                fmt->b += 1;
+                if ( fmt->b == 4 ) {  // block
+                        printf( "  " );      // separator
+                        fmt->b = 0;
+                        fmt->g += 1;
+                }
+                if ( fmt->g == 5 ) {  // group
+                        printf( "\n" );     // separator
+                        fmt->g = 0;
+                }
+        } else {
+                if ( fmt->g != 0 || fmt->b != 0 ) printf( "\n" );
+`coroutine` Fib { int fn1; };
+void main( Fib & fib ) with( fib ) {
+        int fn;
+        [fn1, fn] = [0, 1];
+        for () {
+                `suspend;`
+                [fn1, fn] = [fn, fn1 + fn];
+        }
+}
+int ?()( Fib & fib ) with( fib ) {
+        return `resume( fib )`.fn1;
+}
 int main() {
+        struct Format fmt = { 0, 0, 0 };
+        for ( ;; ) {
+                scanf( "%c", &fmt.ch );
+          if ( feof( stdin ) ) break;
+                format( &fmt );
+        }
+        fmt.ch = -1;
+        format( &fmt );
+}
+        Fib f1, f2;
+        for ( 10 ) {
+                sout | f1() | f2();
+}
 \end{cfa}
 \end{lrbox}
+\subfloat[\CFA Coroutine]{\label{f:CFAFmt}\usebox\myboxA}
+\newbox\myboxC
+\begin{lrbox}{\myboxC}
+\begin{python}[aboveskip=0pt,belowskip=0pt]
+def Fib():
+        fn1, fn = 0, 1
+        while True:
+                `yield fn1`
+                fn1, fn = fn, fn1 + fn
+// next prewritten
+f1 = Fib()
+f2 = Fib()
+for i in range( 10 ):
+        print( next( f1 ), next( f2 ) )
+\end{python}
+\end{lrbox}
+\subfloat[C]{\label{f:GlobalVariables}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[\CFA]{\label{f:ExternalState}\usebox\myboxB}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[Python]{\label{f:ExternalState}\usebox\myboxC}
+\caption{Fibonacci generator}
+\label{f:C-fibonacci}
+\end{figure}
+\bigskip
+\newbox\myboxA
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+`coroutine` Fib { int fn; };
+void main( Fib & fib ) with( fib ) {
+        fn = 0;  int fn1 = fn; `suspend`;
+        fn = 1;  int fn2 = fn1;  fn1 = fn; `suspend`;
+        for () {
+                fn = fn1 + fn2; fn2 = fn1; fn1 = fn; `suspend`; }
+}
+int next( Fib & fib ) with( fib ) { `resume( fib );` return fn; }
+int main() {
+        Fib f1, f2;
+        for ( 10 )
+                sout | next( f1 ) | next( f2 );
+}
+\end{cfa}
+\end{lrbox}
+\newbox\myboxB
+\begin{lrbox}{\myboxB}
+\begin{python}[aboveskip=0pt,belowskip=0pt]
+def Fibonacci():
+        fn = 0; fn1 = fn; `yield fn`  # suspend
+        fn = 1; fn2 = fn1; fn1 = fn; `yield fn`
+        while True:
+                fn = fn1 + fn2; fn2 = fn1; fn1 = fn; `yield fn`
+f1 = Fibonacci()
+f2 = Fibonacci()
+for i in range( 10 ):
+        print( `next( f1 )`, `next( f2 )` ) # resume
+\end{python}
+\end{lrbox}
+\subfloat[\CFA]{\label{f:Coroutine3States}\usebox\myboxA}
 \qquad
 \subfloat[C Linearized]{\label{f:CFmt}\usebox\myboxB}
 \caption{Formatting text into lines of 5 blocks of 4 characters.}
 \label{f:fmt-line}
+\subfloat[Python]{\label{f:Coroutine1State}\usebox\myboxB}
+\caption{Fibonacci input coroutine, 3 states, internal variables}
+\label{f:cfa-fibonacci}
 \end{figure}
+The previous examples are \newterm{asymmetric (semi) coroutine}s because one coroutine always calls a resuming routine for another coroutine, and the resumed coroutine always suspends back to its last resumer, similar to call/return for normal routines
+However, there is no stack growth because @resume@/@suspend@ context switch to existing stack-frames rather than create new ones.
+\newterm{Symmetric (full) coroutine}s have a coroutine call a resuming routine for another coroutine, which eventually forms a resuming-call cycle.
+(The trivial cycle is a coroutine resuming itself.)
+This control flow is similar to recursion for normal routines, but again there is no stack growth from the context switch.
+\end{comment}
 \begin{figure}
 …
 \begin{cfa}
 `coroutine` Prod {
         Cons & c;
+        Cons & c;                       // communication
         int N, money, receipt;
 };
 void main( Prod & prod ) with( prod ) {
         // 1st resume starts here
         for ( int i = 0; i < N; i += 1 ) {
+        for ( i; N ) {
                 int p1 = random( 100 ), p2 = random( 100 );
                 sout | p1 | " " | p2 | endl;
+                sout | p1 | " " | p2;
                 int status = delivery( c, p1, p2 );
                 sout | " $" | money | endl | status | endl;
+                sout | " $" | money | nl | status;
                 receipt += 1;
+        }
         stop( c );
         sout | "prod stops" | endl;
+        sout | "prod stops";
+}
 int payment( Prod & prod, int money ) {
 …
 \begin{cfa}
 `coroutine` Cons {
         Prod & p;
+        Prod & p;                       // communication
         int p1, p2, status;
         _Bool done;
+        bool done;
 };
 void ?{}( Cons & cons, Prod & p ) {
         &cons.p = &p;
+        &cons.p = &p; // reassignable reference
         cons.[status, done ] = [0, false];
+}
-void ^?{}( Cons & cons ) {}
 void main( Cons & cons ) with( cons ) {
         // 1st resume starts here
         int money = 1, receipt;
         for ( ; ! done; ) {
                 sout | p1 | " " | p2 | endl | " $" | money | endl;
+                sout | p1 | " " | p2 | nl | " $" | money;
                 status += 1;
                 receipt = payment( p, money );
                 sout | " #" | receipt | endl;
+                sout | " #" | receipt;
                 money += 1;
+        }
         sout | "cons stops" | endl;
+        sout | "cons stops";
+}
 int delivery( Cons & cons, int p1, int p2 ) {
 …
         `resume( cons );`
+}
 \end{cfa}
 \end{tabular}
 \caption{Producer / consumer: resume-resume cycle, bi-directional communication}
+\caption{Producer / consumer: resume-resume cycle, bidirectional communication}
 \label{f:ProdCons}
 \end{figure}
 Figure~\ref{f:ProdCons} shows a producer/consumer symmetric-coroutine performing bi-directional communication.
 Since the solution involves a full-coroutining cycle, the program main creates one coroutine in isolation, passes this coroutine to its partner, and closes the cycle at the call to @start@.
 The @start@ routine communicates both the number of elements to be produced and the consumer into the producer's coroutine structure.
 Then the @resume@ to @prod@ creates @prod@'s stack with a frame for @prod@'s coroutine main at the top, and context switches to it.
 @prod@'s coroutine main starts, creates local variables that are retained between coroutine activations, and executes $N$ iterations, each generating two random values, calling the consumer to deliver the values, and printing the status returned from the consumer.
+Figure~\ref{f:ProdCons} shows the ping-pong example in Figure~\ref{f:CFAPingPongGen} extended into a producer/consumer symmetric-coroutine performing bidirectional communication.
+This example is illustrative because both producer/consumer have two interface functions with @resume@s that suspend execution in these interface (helper) functions.
+The program main creates the producer coroutine, passes it to the consumer coroutine in its initialization, and closes the cycle at the call to @start@ along with the number of items to be produced.
+The first @resume@ of @prod@ creates @prod@'s stack with a frame for @prod@'s coroutine main at the top, and context switches to it.
+@prod@'s coroutine main starts, creates local-state variables that are retained between coroutine activations, and executes $N$ iterations, each generating two random values, calling the consumer to deliver the values, and printing the status returned from the consumer.
 The producer call to @delivery@ transfers values into the consumer's communication variables, resumes the consumer, and returns the consumer status.
 For the first resume, @cons@'s stack is initialized, creating local variables retained between subsequent activations of the coroutine.
 The consumer iterates until the @done@ flag is set, prints, increments status, and calls back to the producer via @payment@, and on return from @payment@, prints the receipt from the producer and increments @money@ (inflation).
 The call from the consumer to the @payment@ introduces the cycle between producer and consumer.
+On the first resume, @cons@'s stack is created and initialized, holding local-state variables retained between subsequent activations of the coroutine.
+The consumer iterates until the @done@ flag is set, prints the values delivered by the producer, increments status, and calls back to the producer via @payment@, and on return from @payment@, prints the receipt from the producer and increments @money@ (inflation).
+The call from the consumer to @payment@ introduces the cycle between producer and consumer.
 When @payment@ is called, the consumer copies values into the producer's communication variable and a resume is executed.
+The context switch restarts the producer at the point where it was last context switched, so it continues in @delivery@ after the resume.
+The context switch restarts the producer at the point where it last context switched, so it continues in @delivery@ after the resume.
 @delivery@ returns the status value in @prod@'s coroutine main, where the status is printed.
 The loop then repeats calling @delivery@, where each call resumes the consumer coroutine.
 …
 The consumer increments and returns the receipt to the call in @cons@'s coroutine main.
 The loop then repeats calling @payment@, where each call resumes the producer coroutine.
+After iterating $N$ times, the producer calls @stop@.
+The @done@ flag is set to stop the consumer's execution and a resume is executed.
+The context switch restarts @cons@ in @payment@ and it returns with the last receipt.
+The consumer terminates its loops because @done@ is true, its @main@ terminates, so @cons@ transitions from a coroutine back to an object, and @prod@ reactivates after the resume in @stop@.
+@stop@ returns and @prod@'s coroutine main terminates.
+The program main restarts after the resume in @start@.
+@start@ returns and the program main terminates.
+\subsection{Coroutine Implementation}
+A significant implementation challenge for coroutines (and threads, see section \ref{threads}) is adding extra fields and executing code after/before the coroutine constructor/destructor and coroutine main to create/initialize/de-initialize/destroy extra fields and the stack.
+There are several solutions to this problem and the chosen option forced the \CFA coroutine design.
+Object-oriented inheritance provides extra fields and code in a restricted context, but it requires programmers to explicitly perform the inheritance:
+\begin{cfa}
+struct mycoroutine $\textbf{\textsf{inherits}}$ baseCoroutine { ... }
+\end{cfa}
+and the programming language (and possibly its tool set, \eg debugger) may need to understand @baseCoroutine@ because of the stack.
+Furthermore, the execution of constructs/destructors is in the wrong order for certain operations, \eg for threads;
+\eg, if the thread is implicitly started, it must start \emph{after} all constructors, because the thread relies on a completely initialized object, but the inherited constructor runs \emph{before} the derived.
+An alternatively is composition:
+\begin{cfa}
+struct mycoroutine {
+        ... // declarations
+Figure~\ref{f:ProdConsRuntimeStacks} shows the runtime stacks of the program main, and the coroutine mains for @prod@ and @cons@ during the cycling.
+\begin{figure}
+\begin{center}
+\input{FullProdConsStack.pstex_t}
+\end{center}
+\vspace*{-10pt}
+\caption{Producer / consumer runtime stacks}
+\label{f:ProdConsRuntimeStacks}
+\medskip
+\begin{center}
+\input{FullCoroutinePhases.pstex_t}
+\end{center}
+\vspace*{-10pt}
+\caption{Ping / Pong coroutine steps}
+\label{f:PingPongFullCoroutineSteps}
+\end{figure}
+Terminating a coroutine cycle is more complex than a generator cycle, because it requires context switching to the program main's \emph{stack} to shutdown the program, whereas generators started by the program main run on its stack.
+Furthermore, each deallocated coroutine must guarantee all destructors are run for object allocated in the coroutine type \emph{and} allocated on the coroutine's stack at the point of suspension, which can be arbitrarily deep.
+When a coroutine's main ends, its stack is already unwound so any stack allocated objects with destructors have been finalized.
+The na\"{i}ve semantics for coroutine-cycle termination is to context switch to the last resumer, like executing a @suspend@/@return@ in a generator.
+However, for coroutines, the last resumer is \emph{not} implicitly below the current stack frame, as for generators, because each coroutine's stack is independent.
+Unfortunately, it is impossible to determine statically if a coroutine is in a cycle and unrealistic to check dynamically (graph-cycle problem).
+Hence, a compromise solution is necessary that works for asymmetric (acyclic) and symmetric (cyclic) coroutines.
+Our solution is to context switch back to the first resumer (starter) once the coroutine ends.
+This semantics works well for the most common asymmetric and symmetric coroutine usage patterns.
+For asymmetric coroutines, it is common for the first resumer (starter) coroutine to be the only resumer.
+All previous generators converted to coroutines have this property.
+For symmetric coroutines, it is common for the cycle creator to persist for the lifetime of the cycle.
+Hence, the starter coroutine is remembered on the first resume and ending the coroutine resumes the starter.
+Figure~\ref{f:ProdConsRuntimeStacks} shows this semantic by the dashed lines from the end of the coroutine mains: @prod@ starts @cons@ so @cons@ resumes @prod@ at the end, and the program main starts @prod@ so @prod@ resumes the program main at the end.
+For other scenarios, it is always possible to devise a solution with additional programming effort, such as forcing the cycle forward (backward) to a safe point before starting termination.
+The producer/consumer example does not illustrate the full power of the starter semantics because @cons@ always ends first.
+Assume generator @PingPong@ is converted to a coroutine.
+Figure~\ref{f:PingPongFullCoroutineSteps} shows the creation, starter, and cyclic execution steps of the coroutine version.
+The program main creates (declares) coroutine instances @ping@ and @pong@.
+Next, program main resumes @ping@, making it @ping@'s starter, and @ping@'s main resumes @pong@'s main, making it @pong@'s starter.
+Execution forms a cycle when @pong@ resumes @ping@, and cycles $N$ times.
+By adjusting $N$ for either @ping@/@pong@, it is possible to have either one finish first, instead of @pong@ always ending first.
+If @pong@ ends first, it resumes its starter @ping@ in its coroutine main, then @ping@ ends and resumes its starter the program main in function @start@.
+If @ping@ ends first, it resumes its starter the program main in function @start@.
+Regardless of the cycle complexity, the starter stack always leads back to the program main, but the stack can be entered at an arbitrary point.
+Once back at the program main, coroutines @ping@ and @pong@ are deallocated.
+For generators, deallocation runs the destructors for all objects in the generator type.
+For coroutines, deallocation deals with objects in the coroutine type and must also run the destructors for any objects pending on the coroutine's stack for any unterminated coroutine.
+Hence, if a coroutine's destructor detects the coroutine is not ended, it implicitly raises a cancellation exception (uncatchable exception) at the coroutine and resumes it so the cancellation exception can propagate to the root of the coroutine's stack destroying all local variable on the stack.
+So the \CFA semantics for the generator and coroutine, ensure both can be safely deallocated at any time, regardless of their current state, like any other aggregate object.
+Explicitly raising normal exceptions at another coroutine can replace flag variables, like @stop@, \eg @prod@ raises a @stop@ exception at @cons@ after it finishes generating values and resumes @cons@, which catches the @stop@ exception to terminate its loop.
+Finally, there is an interesting effect for @suspend@ with symmetric coroutines.
+A coroutine must retain its last resumer to suspend back because the resumer is on a different stack.
+These reverse pointers allow @suspend@ to cycle \emph{backwards}, which may be useful in certain cases.
+However, there is an anomaly if a coroutine resumes itself, because it overwrites its last resumer with itself, losing the ability to resume the last external resumer.
+To prevent losing this information, a self-resume does not overwrite the last resumer.
+\subsection{Generator / Coroutine Implementation}
+A significant implementation challenge for generators/coroutines (and threads in Section~\ref{s:threads}) is adding extra fields to the custom types and related functions, \eg inserting code after/before the coroutine constructor/destructor and @main@ to create/initialize/de-initialize/destroy any extra fields, \eg stack.
+There are several solutions to these problem, which follow from the object-oriented flavour of adopting custom types.
+For object-oriented languages, inheritance is used to provide extra fields and code via explicit inheritance:
+\begin{cfa}[morekeywords={class,inherits}]
+class myCoroutine inherits baseCoroutine { ... }
+\end{cfa}
+% The problem is that the programming language and its tool chain, \eg debugger, @valgrind@, need to understand @baseCoroutine@ because it infers special property, so type @baseCoroutine@ becomes a de facto keyword and all types inheriting from it are implicitly custom types.
+The problem is that some special properties are not handled by existing language semantics, \eg the execution of constructors/destructors is in the wrong order to implicitly start threads because the thread must start \emph{after} all constructors as it relies on a completely initialized object, but the inherited constructor runs \emph{before} the derived.
+Alternatives, such as explicitly starting threads as in Java, are repetitive and forgetting to call start is a common source of errors.
+An alternative is composition:
+\begin{cfa}
+struct myCoroutine {
+        ... // declaration/communication variables
         baseCoroutine dummy; // composition, last declaration
+}
 \end{cfa}
 which also requires an explicit declaration that must be the last one to ensure correct initialization order.
+which also requires an explicit declaration that must be last to ensure correct initialization order.
 However, there is nothing preventing wrong placement or multiple declarations.
+For coroutines as for threads, many implementations are based on routine pointers or routine objects~\cite{Butenhof97, C++14, MS:VisualC++, BoostCoroutines15}.
+For example, Boost implements coroutines in terms of four functor object-types:
+\begin{cfa}
+asymmetric_coroutine<>::pull_type
+asymmetric_coroutine<>::push_type
+symmetric_coroutine<>::call_type
+symmetric_coroutine<>::yield_type
+\end{cfa}
+Similarly, the canonical threading paradigm is often based on routine pointers, \eg @pthread@~\cite{pthreads}, \Csharp~\cite{Csharp}, Go~\cite{Go}, and Scala~\cite{Scala}.
+However, the generic thread-handle (identifier) is limited (few operations), unless it is wrapped in a custom type.
+\begin{cfa}
+void mycor( coroutine_t cid, void * arg ) {
+        int * value = (int *)arg;                               $\C{// type unsafe, pointer-size only}$
+        // Coroutine body
+}
+int main() {
+        int input = 0, output;
+        coroutine_t cid = coroutine_create( &mycor, (void *)&input ); $\C{// type unsafe, pointer-size only}$
+        coroutine_resume( cid, (void *)input, (void **)&output ); $\C{// type unsafe, pointer-size only}$
+}
+\end{cfa}
+Since the custom type is simple to write in \CFA and solves several issues, added support for routine/lambda-based coroutines adds very little.
+Note, the type @coroutine_t@ must be an abstract handle to the coroutine, because the coroutine descriptor and its stack are non-copyable.
+Copying the coroutine descriptor results in copies being out of date with the current state of the stack.
+Correspondingly, copying the stack results is copies being out of date with coroutine descriptor, and pointers in the stack being out of date to data on the stack.
+(There is no mechanism in C to find all stack-specific pointers and update them as part of a copy.)
+The selected approach is to use language support by introducing a new kind of aggregate (structure):
+\begin{cfa}
+coroutine Fibonacci {
+        int fn; // communication variables
+};
+\end{cfa}
+The @coroutine@ keyword means the compiler (and tool set) can find and inject code where needed.
+The downside of this approach is that it makes coroutine a special case in the language.
+Users wanting to extend coroutines or build their own for various reasons can only do so in ways offered by the language.
+Furthermore, implementing coroutines without language supports also displays the power of a programming language.
+While this is ultimately the option used for idiomatic \CFA code, coroutines and threads can still be constructed without using the language support.
+The reserved keyword eases use for the common cases.
+Part of the mechanism to generalize coroutines is using a \CFA trait, which defines a coroutine as anything satisfying the trait @is_coroutine@, and this trait is used to restrict coroutine-manipulation routines:
+\CFA custom types make any special properties explicit to the language and its tool chain, \eg the language code-generator knows where to inject code
+% and when it is unsafe to perform certain optimizations,
+and IDEs using simple parsing can find and manipulate types with special properties.
+The downside of this approach is that it makes custom types a special case in the language.
+Users wanting to extend custom types or build their own can only do so in ways offered by the language.
+Furthermore, implementing custom types without language support may display the power of a programming language.
+\CFA blends the two approaches, providing custom type for idiomatic \CFA code, while extending and building new custom types is still possible, similar to Java concurrency with builtin and library.
+Part of the mechanism to generalize custom types is the \CFA trait~\cite[\S~2.3]{Moss18}, \eg the definition for custom-type @coroutine@ is anything satisfying the trait @is_coroutine@, and this trait both enforces and restricts the coroutine-interface functions.
 \begin{cfa}
 trait is_coroutine( `dtype` T ) {
 …
         coroutine_desc * get_coroutine( T & );
 };
+forall( `dtype` T | is_coroutine(T) ) void suspend( T & );
+forall( `dtype` T | is_coroutine(T) ) void resume( T & );
+\end{cfa}
+The @dtype@ property of the trait ensures the coroutine descriptor is non-copyable, so all coroutines must be passed by reference (pointer).
+The routine definitions ensures there is a statically-typed @main@ routine that is the starting point (first stack frame) of a coroutine, and a mechanism to get (read) the currently executing coroutine handle.
+The @main@ routine has no return value or additional parameters because the coroutine type allows an arbitrary number of interface routines with corresponding arbitrary typed input/output values versus fixed ones.
+The generic routines @suspend@ and @resume@ can be redefined, but any object passed to them is a coroutine since it must satisfy the @is_coroutine@ trait to compile.
+The advantage of this approach is that users can easily create different types of coroutines, for example, changing the memory layout of a coroutine is trivial when implementing the @get_coroutine@ routine, and possibly redefining @suspend@ and @resume@.
+The \CFA keyword @coroutine@ implicitly implements the getter and forward declarations required for implementing the coroutine main:
+forall( `dtype` T | is_coroutine(T) ) void $suspend$( T & ), resume( T & );
+\end{cfa}
+Note, copying generators/coroutines/threads is not meaningful.
+For example, both the resumer and suspender descriptors can have bidirectional pointers;
+copying these coroutines does not update the internal pointers so behaviour of both copies would be difficult to understand.
+Furthermore, two coroutines cannot logically execute on the same stack.
+A deep coroutine copy, which copies the stack, is also meaningless in an unmanaged language (no garbage collection), like C, because the stack may contain pointers to object within it that require updating for the copy.
+The \CFA @dtype@ property provides no \emph{implicit} copying operations and the @is_coroutine@ trait provides no \emph{explicit} copying operations, so all coroutines must be passed by reference (pointer).
+The function definitions ensure there is a statically typed @main@ function that is the starting point (first stack frame) of a coroutine, and a mechanism to get (read) the coroutine descriptor from its handle.
+The @main@ function has no return value or additional parameters because the coroutine type allows an arbitrary number of interface functions with corresponding arbitrary typed input/output values versus fixed ones.
+The advantage of this approach is that users can easily create different types of coroutines, \eg changing the memory layout of a coroutine is trivial when implementing the @get_coroutine@ function, and possibly redefining \textsf{suspend} and @resume@.
+The \CFA custom-type @coroutine@ implicitly implements the getter and forward declarations for the coroutine main.
 \begin{cquote}
 \begin{tabular}{@{}ccc@{}}
 …
 \end{tabular}
 \end{cquote}
+The combination of these two approaches allows an easy and concise specification to coroutining (and concurrency) for normal users, while more advanced users have tighter control on memory layout and initialization.
+\subsection{Thread Interface}
+\label{threads}
+Both user and kernel threads are supported, where user threads provide concurrency and kernel threads provide parallelism.
+Like coroutines and for the same design reasons, the selected approach for user threads is to use language support by introducing a new kind of aggregate (structure) and a \CFA trait:
+The combination of custom types and fundamental @trait@ description of these types allows a concise specification for programmers and tools, while more advanced programmers can have tighter control over memory layout and initialization.
+Figure~\ref{f:CoroutineMemoryLayout} shows different memory-layout options for a coroutine (where a task is similar).
+The coroutine handle is the @coroutine@ instance containing programmer specified type global/communication variables across interface functions.
+The coroutine descriptor contains all implicit declarations needed by the runtime, \eg @suspend@/@resume@, and can be part of the coroutine handle or separate.
+The coroutine stack can appear in a number of locations and be fixed or variable sized.
+Hence, the coroutine's stack could be a VLS\footnote{
+We are examining variable-sized structures (VLS), where fields can be variable-sized structures or arrays.
+Once allocated, a VLS is fixed sized.}
+on the allocating stack, provided the allocating stack is large enough.
+For a VLS stack allocation/deallocation is an inexpensive adjustment of the stack pointer, modulo any stack constructor costs (\eg initial frame setup).
+For heap stack allocation, allocation/deallocation is an expensive heap allocation (where the heap can be a shared resource), modulo any stack constructor costs.
+With heap stack allocation, it is also possible to use a split (segmented) stack calling convention, available with gcc and clang, so the stack is variable sized.
+Currently, \CFA supports stack/heap allocated descriptors but only fixed-sized heap allocated stacks.
+In \CFA debug-mode, the fixed-sized stack is terminated with a write-only page, which catches most stack overflows.
+Experience teaching concurrency with \uC~\cite{CS343} shows fixed-sized stacks are rarely an issue for students.
+Split-stack allocation is under development but requires recompilation of legacy code, which may be impossible.
+\begin{figure}
+\centering
+\input{corlayout.pstex_t}
+\caption{Coroutine memory layout}
+\label{f:CoroutineMemoryLayout}
+\end{figure}
+\section{Concurrency}
+\label{s:Concurrency}
+Concurrency is nondeterministic scheduling of independent sequential execution paths (threads), where each thread has its own stack.
+A single thread with multiple call stacks, \newterm{coroutining}~\cite{Conway63,Marlin80}, does \emph{not} imply concurrency~\cite[\S~2]{Buhr05a}.
+In coroutining, coroutines self-schedule the thread across stacks so execution is deterministic.
+(It is \emph{impossible} to generate a concurrency error when coroutining.)
+However, coroutines are a stepping stone towards concurrency.
+The transition to concurrency, even for a single thread with multiple stacks, occurs when coroutines context switch to a \newterm{scheduling coroutine}, introducing non-determinism from the coroutine perspective~\cite[\S~3,]{Buhr05a}.
+Therefore, a minimal concurrency system requires coroutines \emph{in conjunction with a nondeterministic scheduler}.
+The resulting execution system now follows a cooperative threading model~\cite{Adya02,libdill}, called \newterm{non-preemptive scheduling}.
+Adding \newterm{preemption} introduces non-cooperative scheduling, where context switching occurs randomly between any two instructions often based on a timer interrupt, called \newterm{preemptive scheduling}.
+While a scheduler introduces uncertain execution among explicit context switches, preemption introduces uncertainty by introducing implicit context switches.
+Uncertainty gives the illusion of parallelism on a single processor and provides a mechanism to access and increase performance on multiple processors.
+The reason is that the scheduler/runtime have complete knowledge about resources and how to best utilized them.
+However, the introduction of unrestricted nondeterminism results in the need for \newterm{mutual exclusion} and \newterm{synchronization}, which restrict nondeterminism for correctness;
+otherwise, it is impossible to write meaningful concurrent programs.
+Optimal concurrent performance is often obtained by having as much nondeterminism as mutual exclusion and synchronization correctness allow.
+A scheduler can either be a stackless or stackful.
+For stackless, the scheduler performs scheduling on the stack of the current coroutine and switches directly to the next coroutine, so there is one context switch.
+For stackful, the current coroutine switches to the scheduler, which performs scheduling, and it then switches to the next coroutine, so there are two context switches.
+The \CFA runtime uses a stackful scheduler for uniformity and security.
+\subsection{Thread}
+\label{s:threads}
+Threading needs the ability to start a thread and wait for its completion.
+A common API for this ability is @fork@ and @join@.
+\begin{cquote}
+\begin{tabular}{@{}lll@{}}
+\multicolumn{1}{c}{\textbf{Java}} & \multicolumn{1}{c}{\textbf{\Celeven}} & \multicolumn{1}{c}{\textbf{pthreads}} \\
+\begin{cfa}
+class MyTask extends Thread {...}
+mytask t = new MyTask(...);
+`t.start();` // start
+// concurrency
+`t.join();` // wait
+\end{cfa}
+&
+\begin{cfa}
+class MyTask { ... } // functor
+MyTask mytask;
+`thread t( mytask, ... );` // start
+// concurrency
+`t.join();` // wait
+\end{cfa}
+&
+\begin{cfa}
+void * rtn( void * arg ) {...}
+pthread_t t;  int i = 3;
+`pthread_create( &t, rtn, (void *)i );` // start
+// concurrency
+`pthread_join( t, NULL );` // wait
+\end{cfa}
+\end{tabular}
+\end{cquote}
+\CFA has a simpler approach using a custom @thread@ type and leveraging declaration semantics (allocation/deallocation), where threads implicitly @fork@ after construction and @join@ before destruction.
+\begin{cfa}
+thread MyTask {};
+void main( MyTask & this ) { ... }
+int main() {
+        MyTask team`[10]`; $\C[2.5in]{// allocate stack-based threads, implicit start after construction}$
+        // concurrency
+} $\C{// deallocate stack-based threads, implicit joins before destruction}$
+\end{cfa}
+This semantic ensures a thread is started and stopped exactly once, eliminating some programming error, and scales to multiple threads for basic (termination) synchronization.
+For block allocation to arbitrary depth, including recursion, threads are created/destroyed in a lattice structure (tree with top and bottom).
+Arbitrary topologies are possible using dynamic allocation, allowing threads to outlive their declaration scope, identical to normal dynamic allocation.
+\begin{cfa}
+MyTask * factory( int N ) { ... return `anew( N )`; } $\C{// allocate heap-based threads, implicit start after construction}$
+int main() {
+        MyTask * team = factory( 10 );
+        // concurrency
+        `delete( team );` $\C{// deallocate heap-based threads, implicit joins before destruction}\CRT$
+}
+\end{cfa}
+Figure~\ref{s:ConcurrentMatrixSummation} shows concurrently adding the rows of a matrix and then totalling the subtotals sequentially, after all the row threads have terminated.
+The program uses heap-based threads because each thread needs different constructor values.
+(Python provides a simple iteration mechanism to initialize array elements to different values allowing stack allocation.)
+The allocation/deallocation pattern appears unusual because allocated objects are immediately deallocated without any intervening code.
+However, for threads, the deletion provides implicit synchronization, which is the intervening code.
+% While the subtotals are added in linear order rather than completion order, which slightly inhibits concurrency, the computation is restricted by the critical-path thread (\ie the thread that takes the longest), and so any inhibited concurrency is very small as totalling the subtotals is trivial.
+\begin{figure}
+\begin{cfa}
+`thread` Adder { int * row, cols, & subtotal; } $\C{// communication variables}$
+void ?{}( Adder & adder, int row[], int cols, int & subtotal ) {
+        adder.[ row, cols, &subtotal ] = [ row, cols, &subtotal ];
+}
+void main( Adder & adder ) with( adder ) {
+        subtotal = 0;
+        for ( c; cols ) { subtotal += row[c]; }
+}
+int main() {
+        const int rows = 10, cols = 1000;
+        int matrix[rows][cols], subtotals[rows], total = 0;
+        // read matrix
+        Adder * adders[rows];
+        for ( r; rows; ) { $\C{// start threads to sum rows}$
+                adders[r] = `new( matrix[r], cols, &subtotals[r] );`
+        }
+        for ( r; rows ) { $\C{// wait for threads to finish}$
+                `delete( adders[r] );` $\C{// termination join}$
+                total += subtotals[r]; $\C{// total subtotal}$
+        }
+        sout | total;
+}
+\end{cfa}
+\caption{Concurrent matrix summation}
+\label{s:ConcurrentMatrixSummation}
+\end{figure}
+\subsection{Thread Implementation}
+Threads in \CFA are user level run by runtime kernel threads (see Section~\ref{s:CFARuntimeStructure}), where user threads provide concurrency and kernel threads provide parallelism.
+Like coroutines, and for the same design reasons, \CFA provides a custom @thread@ type and a @trait@ to enforce and restrict the task-interface functions.
 \begin{cquote}
 \begin{tabular}{@{}c@{\hspace{3\parindentlnth}}c@{}}
 \begin{cfa}
 thread myThread {
         // communication variables
+        ... // declaration/communication variables
 };
 …
 \begin{cfa}
 trait is_thread( `dtype` T ) {
       void main( T & );
       thread_desc * get_thread( T & );
       void ^?{}( T & `mutex` );
+        void main( T & );
+        thread_desc * get_thread( T & );
+        void ^?{}( T & `mutex` );
 };
 \end{cfa}
 \end{tabular}
 \end{cquote}
+(The qualifier @mutex@ for the destructor parameter is discussed in Section~\ref{s:Monitors}.)
+Like a coroutine, the statically-typed @main@ routine is the starting point (first stack frame) of a user thread.
+The difference is that a coroutine borrows a thread from its caller, so the first thread resuming a coroutine creates an instance of @main@;
+whereas, a user thread receives its own thread from the runtime system, which starts in @main@ as some point after the thread constructor is run.\footnote{
+The \lstinline@main@ routine is already a special routine in C (where the program begins), so it is a natural extension of the semantics to use overloading to declare mains for different coroutines/threads (the normal main being the main of the initial thread).}
+No return value or additional parameters are necessary for this routine because the task type allows an arbitrary number of interface routines with corresponding arbitrary typed input/output values.
+\begin{comment} % put in appendix with coroutine version ???
+As such the @main@ routine of a thread can be defined as
+\begin{cfa}
+thread foo {};
+void main(foo & this) {
+        sout | "Hello World!" | endl;
+}
+\end{cfa}
+In this example, threads of type @foo@ start execution in the @void main(foo &)@ routine, which prints @"Hello World!".@ While this paper encourages this approach to enforce strongly typed programming, users may prefer to use the routine-based thread semantics for the sake of simplicity.
+With the static semantics it is trivial to write a thread type that takes a routine pointer as a parameter and executes it on its stack asynchronously.
+\begin{cfa}
+typedef void (*voidRtn)(int);
+thread RtnRunner {
+        voidRtn func;
+        int arg;
+};
+void ?{}(RtnRunner & this, voidRtn inRtn, int arg) {
+        this.func = inRtn;
+        this.arg  = arg;
+}
+void main(RtnRunner & this) {
+        // thread starts here and runs the routine
+        this.func( this.arg );
+}
+void hello(/*unused*/ int) {
+        sout | "Hello World!" | endl;
+}
+int main() {
+        RtnRunner f = {hello, 42};
+        return 0?
+}
+\end{cfa}
+A consequence of the strongly typed approach to main is that memory layout of parameters and return values to/from a thread are now explicitly specified in the \textbf{api}.
+\end{comment}
+For user threads to be useful, it must be possible to start and stop the underlying thread, and wait for it to complete execution.
+While using an API such as @fork@ and @join@ is relatively common, such an interface is awkward and unnecessary.
+A simple approach is to use allocation/deallocation principles, and have threads implicitly @fork@ after construction and @join@ before destruction.
+\begin{cfa}
+thread World {};
+void main( World & this ) {
+        sout | "World!" | endl;
+}
+int main() {
+        World w`[10]`;                                                  $\C{// implicit forks after creation}$
+        sout | "Hello " | endl;                                 $\C{// "Hello " and 10 "World!" printed concurrently}$
+}                                                                                       $\C{// implicit joins before destruction}$
+\end{cfa}
+This semantics ensures a thread is started and stopped exactly once, eliminating some programming error, and scales to multiple threads for basic (termination) synchronization.
+This tree-structure (lattice) create/delete from C block-structure is generalized by using dynamic allocation, so threads can outlive the scope in which they are created, much like dynamically allocating memory lets objects outlive the scope in which they are created.
+\begin{cfa}
+int main() {
+        MyThread * heapLived;
+        {
+                MyThread blockLived;                            $\C{// fork block-based thread}$
+                heapLived = `new`( MyThread );          $\C{// fork heap-based thread}$
+                ...
+        }                                                                               $\C{// join block-based thread}$
+        ...
+        `delete`( heapLived );                                  $\C{// join heap-based thread}$
+}
+\end{cfa}
+The heap-based approach allows arbitrary thread-creation topologies, with respect to fork/join-style concurrency.
+Figure~\ref{s:ConcurrentMatrixSummation} shows concurrently adding the rows of a matrix and then totalling the subtotals sequential, after all the row threads have terminated.
+The program uses heap-based threads because each thread needs different constructor values.
+(Python provides a simple iteration mechanism to initialize array elements to different values allowing stack allocation.)
+The allocation/deallocation pattern appears unusual because allocated objects are immediately deleted without any intervening code.
+However, for threads, the deletion provides implicit synchronization, which is the intervening code.
+While the subtotals are added in linear order rather than completion order, which slight inhibits concurrency, the computation is restricted by the critical-path thread (\ie the thread that takes the longest), and so any inhibited concurrency is very small as totalling the subtotals is trivial.
+\begin{figure}
+\begin{cfa}
+thread Adder {
+    int * row, cols, & subtotal;                        $\C{// communication}$
+};
+void ?{}( Adder & adder, int row[], int cols, int & subtotal ) {
+    adder.[ row, cols, &subtotal ] = [ row, cols, &subtotal ];
+}
+void main( Adder & adder ) with( adder ) {
+    subtotal = 0;
+    for ( int c = 0; c < cols; c += 1 ) {
+                subtotal += row[c];
+    }
+}
+int main() {
+    const int rows = 10, cols = 1000;
+    int matrix[rows][cols], subtotals[rows], total = 0;
+    // read matrix
+    Adder * adders[rows];
+    for ( int r = 0; r < rows; r += 1 ) {       $\C{// start threads to sum rows}$
+                adders[r] = new( matrix[r], cols, &subtotals[r] );
+    }
+    for ( int r = 0; r < rows; r += 1 ) {       $\C{// wait for threads to finish}$
+                delete( adders[r] );                            $\C{// termination join}$
+                total += subtotals[r];                          $\C{// total subtotal}$
+    }
+    sout | total | endl;
+}
+\end{cfa}
+\caption{Concurrent Matrix Summation}
+\label{s:ConcurrentMatrixSummation}
+\end{figure}
+Like coroutines, the @dtype@ property prevents \emph{implicit} copy operations and the @is_thread@ trait provides no \emph{explicit} copy operations, so threads must be passed by reference (pointer).
+Similarly, the function definitions ensure there is a statically typed @main@ function that is the thread starting point (first stack frame), a mechanism to get (read) the thread descriptor from its handle, and a special destructor to prevent deallocation while the thread is executing.
+(The qualifier @mutex@ for the destructor parameter is discussed in Section~\ref{s:Monitor}.)
+The difference between the coroutine and thread is that a coroutine borrows a thread from its caller, so the first thread resuming a coroutine creates the coroutine's stack and starts running the coroutine main on the stack;
+whereas, a thread is scheduling for execution in @main@ immediately after its constructor is run.
+No return value or additional parameters are necessary for this function because the @thread@ type allows an arbitrary number of interface functions with corresponding arbitrary typed input/output values.
 \section{Mutual Exclusion / Synchronization}
+Uncontrolled non-deterministic execution is meaningless.
 To reestablish meaningful execution requires mechanisms to reintroduce determinism (\ie restrict non-determinism), called mutual exclusion and synchronization, where mutual exclusion is an access-control mechanism on data shared by threads, and synchronization is a timing relationship among threads~\cite[\S~4]{Buhr05a}.
 Since many deterministic challenges appear with the use of mutable shared state, some languages/libraries disallow it, \eg Erlang~\cite{Erlang}, Haskell~\cite{Haskell}, Akka~\cite{Akka} (Scala).
 In these paradigms, interaction among concurrent objects is performed by stateless message-passing~\cite{Thoth,Harmony,V-Kernel} or other paradigms closely relate to networking concepts (\eg channels~\cite{CSP,Go}).
 However, in call/return-based languages, these approaches force a clear distinction (\ie introduce a new programming paradigm) between regular and concurrent computation (\ie routine call versus message passing).
 Hence, a programmer must learn and manipulate two sets of design patterns.
+\label{s:MutualExclusionSynchronization}
+Unrestricted nondeterminism is meaningless as there is no way to know when the result is completed without synchronization.
+To produce meaningful execution requires clawing back some determinism using mutual exclusion and synchronization, where mutual exclusion provides access control for threads using shared data, and synchronization is a timing relationship among threads~\cite[\S~4]{Buhr05a}.
+Some concurrent systems eliminate mutable shared-state by switching to stateless communication like message passing~\cite{Thoth,Harmony,V-Kernel,MPI} (Erlang, MPI), channels~\cite{CSP} (CSP,Go), actors~\cite{Akka} (Akka, Scala), or functional techniques (Haskell).
+However, these approaches introduce a new communication mechanism for concurrency different from the standard communication using function call/return.
+Hence, a programmer must learn and manipulate two sets of design/programming patterns.
 While this distinction can be hidden away in library code, effective use of the library still has to take both paradigms into account.
 In contrast, approaches based on statefull models more closely resemble the standard call/return programming-model, resulting in a single programming paradigm.
 At the lowest level, concurrent control is implemented by atomic operations, upon which different kinds of locks mechanism are constructed, \eg semaphores~\cite{Dijkstra68b}, barriers, and path expressions~\cite{Campbell74}.
+In contrast, approaches based on stateful models more closely resemble the standard call/return programming model, resulting in a single programming paradigm.
+At the lowest level, concurrent control is implemented by atomic operations, upon which different kinds of locking mechanisms are constructed, \eg semaphores~\cite{Dijkstra68b}, barriers, and path expressions~\cite{Campbell74}.
 However, for productivity it is always desirable to use the highest-level construct that provides the necessary efficiency~\cite{Hochstein05}.
 A newer approach for restricting non-determinism is transactional memory~\cite{Herlihy93}.
 While this approach is pursued in hardware~\cite{Nakaike15} and system languages, like \CC~\cite{Cpp-Transactions}, the performance and feature set is still too restrictive to be the main concurrency paradigm for system languages, which is why it was rejected as the core paradigm for concurrency in \CFA.
+While this approach is pursued in hardware~\cite{Nakaike15} and system languages, like \CC~\cite{Cpp-Transactions}, the performance and feature set is still too restrictive to be the main concurrency paradigm for system languages, which is why it is rejected as the core paradigm for concurrency in \CFA.
 One of the most natural, elegant, and efficient mechanisms for mutual exclusion and synchronization for shared-memory systems is the \emph{monitor}.
 First proposed by Brinch Hansen~\cite{Hansen73} and later described and extended by C.A.R.~Hoare~\cite{Hoare74}, many concurrent programming-languages provide monitors as an explicit language construct: \eg Concurrent Pascal~\cite{ConcurrentPascal}, Mesa~\cite{Mesa}, Modula~\cite{Modula-2}, Turing~\cite{Turing:old}, Modula-3~\cite{Modula-3}, NeWS~\cite{NeWS}, Emerald~\cite{Emerald}, \uC~\cite{Buhr92a} and Java~\cite{Java}.
+First proposed by Brinch Hansen~\cite{Hansen73} and later described and extended by C.A.R.~Hoare~\cite{Hoare74}, many concurrent programming languages provide monitors as an explicit language construct: \eg Concurrent Pascal~\cite{ConcurrentPascal}, Mesa~\cite{Mesa}, Modula~\cite{Modula-2}, Turing~\cite{Turing:old}, Modula-3~\cite{Modula-3}, NeWS~\cite{NeWS}, Emerald~\cite{Emerald}, \uC~\cite{Buhr92a} and Java~\cite{Java}.
 In addition, operating-system kernels and device drivers have a monitor-like structure, although they often use lower-level primitives such as mutex locks or semaphores to simulate monitors.
 For these reasons, \CFA selected monitors as the core high-level concurrency-construct, upon which higher-level approaches can be easily constructed.
+For these reasons, \CFA selected monitors as the core high-level concurrency construct, upon which higher-level approaches can be easily constructed.
 \subsection{Mutual Exclusion}
+A group of instructions manipulating a specific instance of shared data that must be performed atomically is called an (individual) \newterm{critical-section}~\cite{Dijkstra65}.
+The generalization is called a \newterm{group critical-section}~\cite{Joung00}, where multiple tasks with the same session may use the resource simultaneously, but different sessions may not use the resource simultaneously.
+The readers/writer problem~\cite{Courtois71} is an instance of a group critical-section, where readers have the same session and all writers have a unique session.
+\newterm{Mutual exclusion} enforces that the correct kind and number of threads are using a critical section.
+A group of instructions manipulating a specific instance of shared data that must be performed atomically is called a \newterm{critical section}~\cite{Dijkstra65}, which is enforced by \newterm{simple mutual-exclusion}.
+The generalization is called a \newterm{group critical-section}~\cite{Joung00}, where multiple tasks with the same session use the resource simultaneously and different sessions are segregated, which is enforced by \newterm{complex mutual-exclusion} providing the correct kind and number of threads using a group critical-section.
+The readers/writer problem~\cite{Courtois71} is an instance of a group critical-section, where readers share a session but writers have a unique session.
 However, many solutions exist for mutual exclusion, which vary in terms of performance, flexibility and ease of use.
 Methods range from low-level locks, which are fast and flexible but require significant attention for correctness, to higher-level concurrency techniques, which sacrifice some performance to improve ease of use.
 Ease of use comes by either guaranteeing some problems cannot occur (\eg deadlock free), or by offering a more explicit coupling between shared data and critical section.
 For example, the \CC @std::atomic<T>@ offers an easy way to express mutual-exclusion on a restricted set of operations (\eg reading/writing) for numerical types.
+Ease of use comes by either guaranteeing some problems cannot occur, \eg deadlock free, or by offering a more explicit coupling between shared data and critical section.
+For example, the \CC @std::atomic<T>@ offers an easy way to express mutual-exclusion on a restricted set of operations, \eg reading/writing, for numerical types.
 However, a significant challenge with locks is composability because it takes careful organization for multiple locks to be used while preventing deadlock.
 Easing composability is another feature higher-level mutual-exclusion mechanisms can offer.
 …
 Synchronization enforces relative ordering of execution, and synchronization tools provide numerous mechanisms to establish these timing relationships.
 Low-level synchronization primitives offer good performance and flexibility at the cost of ease of use;
 higher-level mechanisms often simplify usage by adding better coupling between synchronization and data (\eg message passing), or offering a simpler solution to otherwise involved challenges, \eg barrier lock.
 Often synchronization is used to order access to a critical section, \eg ensuring a reader thread is the next kind of thread to enter a critical section.
 If a writer thread is scheduled for next access, but another reader thread acquires the critical section first, that reader has \newterm{barged}.
+higher-level mechanisms often simplify usage by adding better coupling between synchronization and data, \eg receive-specific versus receive-any thread in message passing or offering specialized solutions, \eg barrier lock.
+Often synchronization is used to order access to a critical section, \eg ensuring a waiting writer thread enters the critical section before a calling reader thread.
+If the calling reader is scheduled before the waiting writer, the reader has barged.
 Barging can result in staleness/freshness problems, where a reader barges ahead of a writer and reads temporally stale data, or a writer barges ahead of another writer overwriting data with a fresh value preventing the previous value from ever being read (lost computation).
+Preventing or detecting barging is an involved challenge with low-level locks, which can be made much easier by higher-level constructs.
+This challenge is often split into two different approaches: barging avoidance and barging prevention.
+Algorithms that allow a barger, but divert it until later using current synchronization state (flags), are avoiding the barger;
+algorithms that preclude a barger from entering during synchronization in the critical section prevent barging completely.
+Techniques like baton-pass locks~\cite{Andrews89} between threads instead of unconditionally releasing locks is an example of barging prevention.
+\section{Monitors}
+\label{s:Monitors}
+A \textbf{monitor} is a set of routines that ensure mutual exclusion when accessing shared state.
+More precisely, a monitor is a programming technique that binds mutual exclusion to routine scope, as opposed to locks, where mutual-exclusion is defined by acquire/release calls, independent of lexical context (analogous to block and heap storage allocation).
+The strong association with the call/return paradigm eases programmability, readability and maintainability, at a slight cost in flexibility and efficiency.
+Note, like coroutines/threads, both locks and monitors require an abstract handle to reference them, because at their core, both mechanisms are manipulating non-copyable shared state.
+Copying a lock is insecure because it is possible to copy an open lock and then use the open copy when the original lock is closed to simultaneously access the shared data.
+Copying a monitor is secure because both the lock and shared data are copies, but copying the shared data is meaningless because it no longer represents a unique entity.
+As for coroutines/tasks, a non-copyable (@dtype@) trait is used to capture this requirement, so all locks/monitors must be passed by reference (pointer).
+Preventing or detecting barging is an involved challenge with low-level locks, which is made easier through higher-level constructs.
+This challenge is often split into two different approaches: barging avoidance and prevention.
+Algorithms that unconditionally releasing a lock for competing threads to acquire use barging avoidance during synchronization to force a barging thread to wait;
+algorithms that conditionally hold locks during synchronization, \eg baton-passing~\cite{Andrews89}, prevent barging completely.
+\section{Monitor}
+\label{s:Monitor}
+A \textbf{monitor} is a set of functions that ensure mutual exclusion when accessing shared state.
+More precisely, a monitor is a programming technique that implicitly binds mutual exclusion to static function scope, as opposed to locks, where mutual-exclusion is defined by acquire/release calls, independent of lexical context (analogous to block and heap storage allocation).
+Restricting acquire/release points eases programming, comprehension, and maintenance, at a slight cost in flexibility and efficiency.
+\CFA uses a custom @monitor@ type and leverages declaration semantics (deallocation) to protect active or waiting threads in a monitor.
+The following is a \CFA monitor implementation of an atomic counter.
+\begin{cfa}[morekeywords=nomutex]
+`monitor` Aint { int cnt; }; $\C[4.25in]{// atomic integer counter}$
+int ++?( Aint & `mutex`$\(_{opt}\)$ this ) with( this ) { return ++cnt; } $\C{// increment}$
+int ?=?( Aint & `mutex`$\(_{opt}\)$ lhs, int rhs ) with( lhs ) { cnt = rhs; } $\C{// conversions with int}\CRT$
+int ?=?( int & lhs, Aint & `mutex`$\(_{opt}\)$ rhs ) with( rhs ) { lhs = cnt; }
+\end{cfa}
+% The @Aint@ constructor, @?{}@, uses the \lstinline[morekeywords=nomutex]@nomutex@ qualifier indicating mutual exclusion is unnecessary during construction because an object is inaccessible (private) until after it is initialized.
+% (While a constructor may publish its address into a global variable, doing so generates a race-condition.)
+The prefix increment operation, @++?@, is normally @mutex@, indicating mutual exclusion is necessary during function execution, to protect the incrementing from race conditions, unless there is an atomic increment instruction for the implementation type.
+The assignment operators provide bidirectional conversion between an atomic and normal integer without accessing field @cnt@;
+these operations only need @mutex@, if reading/writing the implementation type is not atomic.
+The atomic counter is used without any explicit mutual-exclusion and provides thread-safe semantics, which is similar to the \CC template @std::atomic@.
+\begin{cfa}
+int i = 0, j = 0, k = 5;
+Aint x = { 0 }, y = { 0 }, z = { 5 }; $\C{// no mutex required}$
+++x; ++y; ++z; $\C{// safe increment by multiple threads}$
+x = 2; y = i; z = k; $\C{// conversions}$
+i = x; j = y; k = z;
+\end{cfa}
+\CFA monitors have \newterm{multi-acquire} semantics so the thread in the monitor may acquire it multiple times without deadlock, allowing recursion and calling other interface functions.
+\begin{cfa}
+monitor M { ... } m;
+void foo( M & mutex m ) { ... } $\C{// acquire mutual exclusion}$
+void bar( M & mutex m ) { $\C{// acquire mutual exclusion}$
+        ... `bar( m );` ... `foo( m );` ... $\C{// reacquire mutual exclusion}$
+}
+\end{cfa}
+\CFA monitors also ensure the monitor lock is released regardless of how an acquiring function ends (normal or exceptional), and returning a shared variable is safe via copying before the lock is released.
+Similar safety is offered by \emph{explicit} mechanisms like \CC RAII;
+monitor \emph{implicit} safety ensures no programmer usage errors.
+Furthermore, RAII mechanisms cannot handle complex synchronization within a monitor, where the monitor lock may not be released on function exit because it is passed to an unblocking thread;
+RAII is purely a mutual-exclusion mechanism (see Section~\ref{s:Scheduling}).
+\subsection{Monitor Implementation}
+For the same design reasons, \CFA provides a custom @monitor@ type and a @trait@ to enforce and restrict the monitor-interface functions.
+\begin{cquote}
+\begin{tabular}{@{}c@{\hspace{3\parindentlnth}}c@{}}
+\begin{cfa}
+monitor M {
+        ... // shared data
+};
+\end{cfa}
+&
 \begin{cfa}
 trait is_monitor( `dtype` T ) {
 …
 };
 \end{cfa}
+\end{tabular}
+\end{cquote}
+The @dtype@ property prevents \emph{implicit} copy operations and the @is_monitor@ trait provides no \emph{explicit} copy operations, so monitors must be passed by reference (pointer).
+% Copying a lock is insecure because it is possible to copy an open lock and then use the open copy when the original lock is closed to simultaneously access the shared data.
+% Copying a monitor is secure because both the lock and shared data are copies, but copying the shared data is meaningless because it no longer represents a unique entity.
+Similarly, the function definitions ensures there is a mechanism to get (read) the monitor descriptor from its handle, and a special destructor to prevent deallocation if a thread using the shared data.
+The custom monitor type also inserts any locks needed to implement the mutual exclusion semantics.
 …
 \label{s:MutexAcquisition}
 While correctness implicitly implies a monitor's mutual exclusion is acquired and released, there are implementation options about when and where the locking/unlocking occurs.
+While the monitor lock provides mutual exclusion for shared data, there are implementation options for when and where the locking/unlocking occurs.
 (Much of this discussion also applies to basic locks.)
+For example, a monitor may need to be passed through multiple helper routines before it becomes necessary to acquire the monitor mutual-exclusion.
+\begin{cfa}[morekeywords=nomutex]
+monitor Aint { int cnt; };                                      $\C{// atomic integer counter}$
+void ?{}( Aint & `nomutex` this ) with( this ) { cnt = 0; } $\C{// constructor}$
+int ?=?( Aint & `mutex`$\(_{opt}\)$ lhs, int rhs ) with( lhs ) { cnt = rhs; } $\C{// conversions}$
+void ?{}( int & this, Aint & `mutex`$\(_{opt}\)$ v ) { this = v.cnt; }
+int ?=?( int & lhs, Aint & `mutex`$\(_{opt}\)$ rhs ) with( rhs ) { lhs = cnt; }
+int ++?( Aint & `mutex`$\(_{opt}\)$ this ) with( this ) { return ++cnt; } $\C{// increment}$
+\end{cfa}
+The @Aint@ constructor, @?{}@, uses the \lstinline[morekeywords=nomutex]@nomutex@ qualifier indicating mutual exclusion is unnecessary during construction because an object is inaccessible (private) until after it is initialized.
+(While a constructor may publish its address into a global variable, doing so generates a race-condition.)
+The conversion operators for initializing and assigning with a normal integer only need @mutex@, if reading/writing the implementation type is not atomic.
+Finally, the prefix increment operato, @++?@, is normally @mutex@ to protect the incrementing from race conditions, unless there is an atomic increment instruction for the implementation type.
+The atomic counter is used without any explicit mutual-exclusion and provides thread-safe semantics, which is similar to the \CC template @std::atomic@.
+\begin{cfa}
+Aint x, y, z;
+++x; ++y; ++z;                                                          $\C{// safe increment by multiple threads}$
+x = 2; y = 2; z = 2;                                            $\C{// conversions}$
+int i = x, j = y, k = z;
+i = x; j = y; k = z;
+\end{cfa}
+For maximum usability, monitors have \newterm{multi-acquire} semantics allowing a thread to acquire it multiple times without deadlock.
+For example, atomically printing the contents of a binary tree:
+\begin{cfa}
+monitor Tree {
+        Tree * left, right;
+        // value
+};
+void print( Tree & mutex tree ) {                       $\C{// prefix traversal}$
+        // write value
+        print( tree->left );                                    $\C{// multiply acquire monitor lock on each recursion}$
+        print( tree->right );
+}
+\end{cfa}
+Mandatory monitor qualifiers have the benefit of being self-documented, but requiring both @mutex@ and \lstinline[morekeywords=nomutex]@nomutex@ for all monitor parameter is redundant.
+Instead, one of qualifier semantics can be the default, and the other required.
+For example, assume the safe @mutex@ option for a monitor parameter because assuming \lstinline[morekeywords=nomutex]@nomutex@ may cause subtle errors.
+On the other hand, assuming \lstinline[morekeywords=nomutex]@nomutex@ is the \emph{normal} parameter behaviour, stating explicitly ``this parameter is not special''.
+For example, a monitor may be passed through multiple helper functions before it is necessary to acquire the monitor's mutual exclusion.
+The benefit of mandatory monitor qualifiers is self-documentation, but requiring both @mutex@ and \lstinline[morekeywords=nomutex]@nomutex@ for all monitor parameters is redundant.
+Instead, the semantics has one qualifier as the default and the other required.
+For example, make the safe @mutex@ qualifier the default because assuming \lstinline[morekeywords=nomutex]@nomutex@ may cause subtle errors.
+Alternatively, make the unsafe \lstinline[morekeywords=nomutex]@nomutex@ qualifier the default because it is the \emph{normal} parameter semantics while @mutex@ parameters are rare.
 Providing a default qualifier implies knowing whether a parameter is a monitor.
 Since \CFA relies heavily on traits as an abstraction mechanism, the distinction between a type that is a monitor and a type that looks like a monitor can become blurred.
+Since \CFA relies heavily on traits as an abstraction mechanism, types can coincidentally match the monitor trait but not be a monitor, similar to inheritance where a shape and playing card can both be drawable.
 For this reason, \CFA requires programmers to identify the kind of parameter with the @mutex@ keyword and uses no keyword to mean \lstinline[morekeywords=nomutex]@nomutex@.
 The next semantic decision is establishing which parameter \emph{types} may be qualified with @mutex@.
+Given:
+The following has monitor parameter types that are composed of multiple objects.
 \begin{cfa}
 monitor M { ... }
+int f1( M & mutex m );
+int f2( M * mutex m );
+int f3( M * mutex m[] );
+int f4( stack( M * ) & mutex m );
+\end{cfa}
+the issue is that some of these parameter types are composed of multiple objects.
+For @f1@, there is only a single parameter object.
+Adding indirection in @f2@ still identifies a single object.
+However, the matrix in @f3@ introduces multiple objects.
+While shown shortly, multiple acquisition is possible;
+however array lengths are often unknown in C.
+This issue is exacerbated in @f4@, where the data structure must be safely traversed to acquire all of its elements.
+To make the issue tractable, \CFA only acquires one monitor per parameter with at most one level of indirection.
+However, the C type-system has an ambiguity with respects to arrays.
+Is the argument for @f2@ a single object or an array of objects?
+If it is an array, only the first element of the array is acquired, which seems unsafe;
+hence, @mutex@ is disallowed for array parameters.
+\begin{cfa}
+int f1( M & mutex m );                                          $\C{// allowed: recommended case}$
+int f2( M * mutex m );                                          $\C{// disallowed: could be an array}$
+int f3( M mutex m[$\,$] );                                      $\C{// disallowed: array length unknown}$
+int f4( M ** mutex m );                                         $\C{// disallowed: could be an array}$
+int f5( M * mutex m[$\,$] );                            $\C{// disallowed: array length unknown}$
+\end{cfa}
+% Note, not all array routines have distinct types: @f2@ and @f3@ have the same type, as do @f4@ and @f5@.
+% However, even if the code generation could tell the difference, the extra information is still not sufficient to extend meaningfully the monitor call semantic.
+For object-oriented monitors, calling a mutex member \emph{implicitly} acquires mutual exclusion of the receiver object, @`rec`.foo(...)@.
+\CFA has no receiver, and hence, must use an explicit mechanism to specify which object has mutual exclusion acquired.
+A positive consequence of this design decision is the ability to support multi-monitor routines.
+\begin{cfa}
+int f( M & mutex x, M & mutex y );              $\C{// multiple monitor parameter of any type}$
+M m1, m2;
+f( m1, m2 );
+\end{cfa}
+(While object-oriented monitors can be extended with a mutex qualifier for multiple-monitor members, no prior example of this feature could be found.)
+In practice, writing multi-locking routines that do not deadlocks is tricky.
+Having language support for such a feature is therefore a significant asset for \CFA.
+The capability to acquire multiple locks before entering a critical section is called \newterm{bulk acquire}.
+In previous example, \CFA guarantees the order of acquisition is consistent across calls to different routines using the same monitors as arguments.
+This consistent ordering means acquiring multiple monitors is safe from deadlock.
+However, users can force the acquiring order.
+For example, notice the use of @mutex@/\lstinline[morekeywords=nomutex]@nomutex@ and how this affects the acquiring order:
+\begin{cfa}
+void foo( M & mutex m1, M & mutex m2 );         $\C{// acquire m1 and m2}$
+int f1( M & mutex m ); $\C{// single parameter object}$
+int f2( M * mutex m ); $\C{// single or multiple parameter object}$
+int f3( M * mutex m[$\,$] ); $\C{// multiple parameter object}$
+int f4( stack( M * ) & mutex m ); $\C{// multiple parameters object}$
+\end{cfa}
+Function @f1@ has a single parameter object, while @f2@'s indirection could be a single or multi-element array, where static array size is often unknown in C.
+Function @f3@ has a multiple object matrix, and @f4@ a multiple object data structure.
+While shown shortly, multiple object acquisition is possible, but the number of objects must be statically known.
+Therefore, \CFA only acquires one monitor per parameter with at most one level of indirection, excluding pointers as it is impossible to statically determine the size.
+For object-oriented monitors, \eg Java, calling a mutex member \emph{implicitly} acquires mutual exclusion of the receiver object, @`rec`.foo(...)@.
+\CFA has no receiver, and hence, the explicit @mutex@ qualifier is used to specify which objects acquire mutual exclusion.
+A positive consequence of this design decision is the ability to support multi-monitor functions,\footnote{
+While object-oriented monitors can be extended with a mutex qualifier for multiple-monitor members, no prior example of this feature could be found.}
+called \newterm{bulk acquire}.
+\CFA guarantees acquisition order is consistent across calls to @mutex@ functions using the same monitors as arguments, so acquiring multiple monitors is safe from deadlock.
+Figure~\ref{f:BankTransfer} shows a trivial solution to the bank transfer problem~\cite{BankTransfer}, where two resources must be locked simultaneously, using \CFA monitors with implicit locking and \CC with explicit locking.
+A \CFA programmer only has to manage when to acquire mutual exclusion;
+a \CC programmer must select the correct lock and acquisition mechanism from a panoply of locking options.
+Making good choices for common cases in \CFA simplifies the programming experience and enhances safety.
+\begin{figure}
+\centering
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+monitor BankAccount {
+        int balance;
+} b1 = { 0 }, b2 = { 0 };
+void deposit( BankAccount & `mutex` b,
+                        int deposit ) with(b) {
+        balance += deposit;
+}
+void transfer( BankAccount & `mutex` my,
+        BankAccount & `mutex` your, int me2you ) {
+        deposit( my, -me2you ); // debit
+        deposit( your, me2you ); // credit
+}
+`thread` Person { BankAccount & b1, & b2; };
+void main( Person & person ) with(person) {
+        for ( 10_000_000 ) {
+                if ( random() % 3 ) deposit( b1, 3 );
+                if ( random() % 3 ) transfer( b1, b2, 7 );
+        }
+}
+int main() {
+        `Person p1 = { b1, b2 }, p2 = { b2, b1 };`
+} // wait for threads to complete
+\end{cfa}
+\end{lrbox}
+\begin{lrbox}{\myboxB}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+struct BankAccount {
+        `recursive_mutex m;`
+        int balance = 0;
+} b1, b2;
+void deposit( BankAccount & b, int deposit ) {
+        `scoped_lock lock( b.m );`
+        b.balance += deposit;
+}
+void transfer( BankAccount & my,
+                        BankAccount & your, int me2you ) {
+        `scoped_lock lock( my.m, your.m );`
+        deposit( my, -me2you ); // debit
+        deposit( your, me2you ); // credit
+}
+void person( BankAccount & b1, BankAccount & b2 ) {
+        for ( int i = 0; i < 10$'$000$'$000; i += 1 ) {
+                if ( random() % 3 ) deposit( b1, 3 );
+                if ( random() % 3 ) transfer( b1, b2, 7 );
+        }
+}
+int main() {
+        `thread p1(person, ref(b1), ref(b2)), p2(person, ref(b2), ref(b1));`
+        `p1.join(); p2.join();`
+}
+\end{cfa}
+\end{lrbox}
+\subfloat[\CFA]{\label{f:CFABank}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[\CC]{\label{f:C++Bank}\usebox\myboxB}
+\hspace{3pt}
+\caption{Bank transfer problem}
+\label{f:BankTransfer}
+\end{figure}
+Users can still force the acquiring order by using @mutex@/\lstinline[morekeywords=nomutex]@nomutex@.
+\begin{cfa}
+void foo( M & mutex m1, M & mutex m2 ); $\C{// acquire m1 and m2}$
 void bar( M & mutex m1, M & /* nomutex */ m2 ) { $\C{// acquire m1}$
         ... foo( m1, m2 ); ...                                  $\C{// acquire m2}$
+        ... foo( m1, m2 ); ... $\C{// acquire m2}$
+}
 void baz( M & /* nomutex */ m1, M & mutex m2 ) { $\C{// acquire m2}$
+        ... foo( m1, m2 ); ...                                  $\C{// acquire m1}$
+}
+\end{cfa}
+The multi-acquire semantics allows @bar@ or @baz@ to acquire a monitor lock and reacquire it in @foo@.
+In the calls to @bar@ and @baz@, the monitors are acquired in opposite order.
+However, such use leads to lock acquiring order problems resulting in deadlock~\cite{Lister77}, where detecting it requires dynamically tracking of monitor calls, and dealing with it requires implement rollback semantics~\cite{Dice10}.
+In \CFA, safety is guaranteed by using bulk acquire of all monitors to shared objects, whereas other monitor systems provide no aid.
+While \CFA provides only a partial solution, the \CFA partial solution handles many useful cases.
+\begin{cfa}
+monitor Bank { ... };
+void deposit( Bank & `mutex` b, int deposit );
+void transfer( Bank & `mutex` mybank, Bank & `mutex` yourbank, int me2you) {
+        deposit( mybank, `-`me2you );                   $\C{// debit}$
+        deposit( yourbank, me2you );                    $\C{// credit}$
+}
+\end{cfa}
+This example shows a trivial solution to the bank-account transfer problem~\cite{BankTransfer}.
+Without multi- and bulk acquire, the solution to this problem requires careful engineering.
+\subsection{\protect\lstinline|mutex| statement} \label{mutex-stmt}
+The monitor call-semantics associate all locking semantics to routines.
+Like Java, \CFA offers an alternative @mutex@ statement to reduce refactoring and naming.
+        ... foo( m1, m2 ); ... $\C{// acquire m1}$
+}
+\end{cfa}
+The bulk-acquire semantics allow @bar@ or @baz@ to acquire a monitor lock and reacquire it in @foo@.
+The calls to @bar@ and @baz@ acquired the monitors in opposite order, possibly resulting in deadlock.
+However, this case is the simplest instance of the \emph{nested-monitor problem}~\cite{Lister77}, where monitors are acquired in sequence versus bulk.
+Detecting the nested-monitor problem requires dynamic tracking of monitor calls, and dealing with it requires rollback semantics~\cite{Dice10}.
+\CFA does not deal with this fundamental problem.
+Finally, like Java, \CFA offers an alternative @mutex@ statement to reduce refactoring and naming.
 \begin{cquote}
+\begin{tabular}{@{}c|@{\hspace{\parindentlnth}}c@{}}
+routine call & @mutex@ statement \\
+\begin{cfa}
+monitor M {};
+\renewcommand{\arraystretch}{0.0}
+\begin{tabular}{@{}l@{\hspace{3\parindentlnth}}l@{}}
+\multicolumn{1}{c}{\textbf{\lstinline@mutex@ call}} & \multicolumn{1}{c}{\lstinline@mutex@ \textbf{statement}} \\
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+monitor M { ... };
 void foo( M & mutex m1, M & mutex m2 ) {
         // critical section
 …
 \end{cfa}
+&
 \begin{cfa}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
 void bar( M & m1, M & m2 ) {
 …
+\section{Internal Scheduling}
+\label{s:InternalScheduling}
+While monitor mutual-exclusion provides safe access to shared data, the monitor data may indicate that a thread accessing it cannot proceed, \eg a bounded buffer, Figure~\ref{f:GenericBoundedBuffer}, may be full/empty so produce/consumer threads must block.
+\subsection{Scheduling}
+\label{s:Scheduling}
+% There are many aspects of scheduling in a concurrency system, all related to resource utilization by waiting threads, \ie which thread gets the resource next.
+% Different forms of scheduling include access to processors by threads (see Section~\ref{s:RuntimeStructureCluster}), another is access to a shared resource by a lock or monitor.
+This section discusses monitor scheduling for waiting threads eligible for entry, \ie which thread gets the shared resource next. (See Section~\ref{s:RuntimeStructureCluster} for scheduling threads on virtual processors.)
+While monitor mutual-exclusion provides safe access to shared data, the monitor data may indicate that a thread accessing it cannot proceed, \eg a bounded buffer may be full/empty so produce/consumer threads must block.
 Leaving the monitor and trying again (busy waiting) is impractical for high-level programming.
 Monitors eliminate busy waiting by providing internal synchronization to schedule threads needing access to the shared data, where the synchronization is blocking (threads are parked) versus spinning.
 The synchronization is generally achieved with internal~\cite{Hoare74} or external~\cite[\S~2.9.2]{uC++} scheduling, where \newterm{scheduling} is defined as indicating which thread acquires the critical section next.
+Monitors eliminate busy waiting by providing synchronization to schedule threads needing access to the shared data, where threads block versus spinning.
+Synchronization is generally achieved with internal~\cite{Hoare74} or external~\cite[\S~2.9.2]{uC++} scheduling.
 \newterm{Internal scheduling} is characterized by each thread entering the monitor and making an individual decision about proceeding or blocking, while \newterm{external scheduling} is characterized by an entering thread making a decision about proceeding for itself and on behalf of other threads attempting entry.
+Figure~\ref{f:BBInt} shows a \CFA bounded-buffer with internal scheduling, where producers/consumers enter the monitor, see the buffer is full/empty, and block on an appropriate condition lock, @full@/@empty@.
+The @wait@ routine atomically blocks the calling thread and implicitly releases the monitor lock(s) for all monitors in the routine's parameter list.
+The appropriate condition lock is signalled to unblock an opposite kind of thread after an element is inserted/removed from the buffer.
+Signalling is unconditional, because signalling an empty condition lock does nothing.
+Signalling semantics cannot have the signaller and signalled thread in the monitor simultaneously, which means:
+\begin{enumerate}
+\item
+The signalling thread returns immediately, and the signalled thread continues.
+\item
+The signalling thread continues and the signalled thread is marked for urgent unblocking at the next scheduling point (exit/wait).
+\item
+The signalling thread blocks but is marked for urgrent unblocking at the next scheduling point and the signalled thread continues.
+\end{enumerate}
+The first approach is too restrictive, as it precludes solving a reasonable class of problems (\eg dating service).
+\CFA supports the next two semantics as both are useful.
+Finally, while it is common to store a @condition@ as a field of the monitor, in \CFA, a @condition@ variable can be created/stored independently.
+Furthermore, a condition variable is tied to a \emph{group} of monitors on first use (called \newterm{branding}), which means that using internal scheduling with distinct sets of monitors requires one condition variable per set of monitors.
+Finally, \CFA monitors do not allow calling threads to barge ahead of signalled threads, which simplifies synchronization among threads in the monitor and increases correctness.
+If barging is allowed, synchronization between a signaller and signallee is difficult, often requiring additional flags and multiple unblock/block cycles.
+In fact, signals-as-hints is completely opposite from that proposed by Hoare in the seminal paper on monitors~\cite[p.~550]{Hoare74}.
+% \begin{cquote}
+% However, we decree that a signal operation be followed immediately by resumption of a waiting program, without possibility of an intervening procedure call from yet a third program.
+% It is only in this way that a waiting program has an absolute guarantee that it can acquire the resource just released by the signalling program without any danger that a third program will interpose a monitor entry and seize the resource instead.~\cite[p.~550]{Hoare74}
+% \end{cquote}
+Furthermore, \CFA concurrency has no spurious wakeup~\cite[\S~9]{Buhr05a}, which eliminates an implicit form of self barging.
+Hence, a \CFA @wait@ statement is not enclosed in a @while@ loop retesting a blocking predicate, which can cause thread starvation due to barging.
+Figure~\ref{f:MonitorScheduling} shows general internal/external scheduling (for the bounded-buffer example in Figure~\ref{f:InternalExternalScheduling}).
+External calling threads block on the calling queue, if the monitor is occupied, otherwise they enter in FIFO order.
+Internal threads block on condition queues via @wait@ and reenter from the condition in FIFO order.
+Alternatively, internal threads block on urgent from the @signal_block@ or @waitfor@, and reenter implicitly when the monitor becomes empty, \ie, the thread in the monitor exits or waits.
+There are three signalling mechanisms to unblock waiting threads to enter the monitor.
+Note, signalling cannot have the signaller and signalled thread in the monitor simultaneously because of the mutual exclusion, so either the signaller or signallee can proceed.
+For internal scheduling, threads are unblocked from condition queues using @signal@, where the signallee is moved to urgent and the signaller continues (solid line).
+Multiple signals move multiple signallees to urgent until the condition is empty.
+When the signaller exits or waits, a thread blocked on urgent is processed before calling threads to prevent barging.
+(Java conceptually moves the signalled thread to the calling queue, and hence, allows barging.)
+The alternative unblock is in the opposite order using @signal_block@, where the signaller is moved to urgent and the signallee continues (dashed line), and is implicitly unblocked from urgent when the signallee exits or waits.
+For external scheduling, the condition queues are not used;
+instead threads are unblocked directly from the calling queue using @waitfor@ based on function names requesting mutual exclusion.
+(The linear search through the calling queue to locate a particular call can be reduced to $O(1)$.)
+The @waitfor@ has the same semantics as @signal_block@, where the signalled thread executes before the signallee, which waits on urgent.
+Executing multiple @waitfor@s from different signalled functions causes the calling threads to move to urgent.
+External scheduling requires urgent to be a stack, because the signaller expects to execute immediately after the specified monitor call has exited or waited.
+Internal scheduling behaves the same for an urgent stack or queue, except for multiple signalling, where the threads unblock from urgent in reverse order from signalling.
+If the restart order is important, multiple signalling by a signal thread can be transformed into daisy-chain signalling among threads, where each thread signals the next thread.
+We tried both a stack for @waitfor@ and queue for signalling, but that resulted in complex semantics about which thread enters next.
+Hence, \CFA uses a single urgent stack to correctly handle @waitfor@ and adequately support both forms of signalling.
+\begin{figure}
+\centering
+% \subfloat[Scheduling Statements] {
+% \label{fig:SchedulingStatements}
+% {\resizebox{0.45\textwidth}{!}{\input{CondSigWait.pstex_t}}}
+\input{CondSigWait.pstex_t}
+% }% subfloat
+% \quad
+% \subfloat[Bulk acquire monitor] {
+% \label{fig:BulkMonitor}
+% {\resizebox{0.45\textwidth}{!}{\input{ext_monitor.pstex_t}}}
+% }% subfloat
+\caption{Monitor Scheduling}
+\label{f:MonitorScheduling}
+\end{figure}
+Figure~\ref{f:BBInt} shows a \CFA generic bounded-buffer with internal scheduling, where producers/consumers enter the monitor, detect the buffer is full/empty, and block on an appropriate condition variable, @full@/@empty@.
+The @wait@ function atomically blocks the calling thread and implicitly releases the monitor lock(s) for all monitors in the function's parameter list.
+The appropriate condition variable is signalled to unblock an opposite kind of thread after an element is inserted/removed from the buffer.
+Signalling is unconditional, because signalling an empty condition variable does nothing.
+It is common to declare condition variables as monitor fields to prevent shared access, hence no locking is required for access as the conditions are protected by the monitor lock.
+In \CFA, a condition variable can be created/stored independently.
+% To still prevent expensive locking on access, a condition variable is tied to a \emph{group} of monitors on first use, called \newterm{branding}, resulting in a low-cost boolean test to detect sharing from other monitors.
+% Signalling semantics cannot have the signaller and signalled thread in the monitor simultaneously, which means:
+% \begin{enumerate}
+% \item
+% The signalling thread returns immediately and the signalled thread continues.
+% \item
+% The signalling thread continues and the signalled thread is marked for urgent unblocking at the next scheduling point (exit/wait).
+% \item
+% The signalling thread blocks but is marked for urgent unblocking at the next scheduling point and the signalled thread continues.
+% \end{enumerate}
+% The first approach is too restrictive, as it precludes solving a reasonable class of problems, \eg dating service (see Figure~\ref{f:DatingService}).
+% \CFA supports the next two semantics as both are useful.
 \begin{figure}
 …
         };
         void ?{}( Buffer(T) & buffer ) with(buffer) {
                 [front, back, count] = 0;
+                front = back = count = 0;
+        }
         void insert( Buffer(T) & mutex buffer, T elem )
                                 with(buffer) {
 …
 \end{lrbox}
+% \newbox\myboxB
+% \begin{lrbox}{\myboxB}
+% \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+% forall( otype T ) { // distribute forall
+%       monitor Buffer {
+%
+%               int front, back, count;
+%               T elements[10];
+%       };
+%       void ?{}( Buffer(T) & buffer ) with(buffer) {
+%               [front, back, count] = 0;
+%       }
+%       T remove( Buffer(T) & mutex buffer ); // forward
+%       void insert( Buffer(T) & mutex buffer, T elem )
+%                               with(buffer) {
+%               if ( count == 10 ) `waitfor( remove, buffer )`;
+%               // insert elem into buffer
+%
+%       }
+%       T remove( Buffer(T) & mutex buffer ) with(buffer) {
+%               if ( count == 0 ) `waitfor( insert, buffer )`;
+%               // remove elem from buffer
+%
+%               return elem;
+%       }
+% }
+% \end{cfa}
+% \end{lrbox}
 \newbox\myboxB
 \begin{lrbox}{\myboxB}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+forall( otype T ) { // distribute forall
+        monitor Buffer {
+                int front, back, count;
+                T elements[10];
+        };
+        void ?{}( Buffer(T) & buffer ) with(buffer) {
+                [front, back, count] = 0;
+        }
+        T remove( Buffer(T) & mutex buffer ); // forward
+        void insert( Buffer(T) & mutex buffer, T elem )
+                                with(buffer) {
+                if ( count == 10 ) `waitfor( remove, buffer )`;
+                // insert elem into buffer
+        }
+        T remove( Buffer(T) & mutex buffer ) with(buffer) {
+                if ( count == 0 ) `waitfor( insert, buffer )`;
+                // remove elem from buffer
+                return elem;
+        }
+}
+monitor ReadersWriter {
+        int rcnt, wcnt; // readers/writer using resource
+};
+void ?{}( ReadersWriter & rw ) with(rw) {
+        rcnt = wcnt = 0;
+}
+void EndRead( ReadersWriter & mutex rw ) with(rw) {
+        rcnt -= 1;
+}
+void EndWrite( ReadersWriter & mutex rw ) with(rw) {
+        wcnt = 0;
+}
+void StartRead( ReadersWriter & mutex rw ) with(rw) {
+        if ( wcnt > 0 ) `waitfor( EndWrite, rw );`
+        rcnt += 1;
+}
+void StartWrite( ReadersWriter & mutex rw ) with(rw) {
+        if ( wcnt > 0 ) `waitfor( EndWrite, rw );`
+        else while ( rcnt > 0 ) `waitfor( EndRead, rw );`
+        wcnt = 1;
+}
 \end{cfa}
 \end{lrbox}
+\subfloat[Internal Scheduling]{\label{f:BBInt}\usebox\myboxA}
+%\qquad
+\subfloat[External Scheduling]{\label{f:BBExt}\usebox\myboxB}
+\caption{Generic Bounded-Buffer}
+\label{f:GenericBoundedBuffer}
+\subfloat[Generic bounded buffer, internal scheduling]{\label{f:BBInt}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[Readers / writer lock, external scheduling]{\label{f:RWExt}\usebox\myboxB}
+\caption{Internal / external scheduling}
+\label{f:InternalExternalScheduling}
 \end{figure}
+Figure~\ref{f:BBExt} shows a \CFA bounded-buffer with external scheduling, where producers/consumers detecting a full/empty buffer block and prevent more producers/consumers from entering the monitor until the buffer has a free/empty slot.
+External scheduling is controlled by the @waitfor@ statement, which atomically blocks the calling thread, releases the monitor lock, and restricts the routine calls that can next acquire mutual exclusion.
+Figure~\ref{f:BBInt} can be transformed into external scheduling by removing the condition variables and signals/waits, and adding the following lines at the locations of the current @wait@s in @insert@/@remove@, respectively.
+\begin{cfa}[aboveskip=2pt,belowskip=1pt]
+if ( count == 10 ) `waitfor( remove, buffer )`;       |      if ( count == 0 ) `waitfor( insert, buffer )`;
+\end{cfa}
+Here, the producers/consumers detects a full/\-empty buffer and prevents more producers/consumers from entering the monitor until there is a free/empty slot in the buffer.
+External scheduling is controlled by the @waitfor@ statement, which atomically blocks the calling thread, releases the monitor lock, and restricts the function calls that can next acquire mutual exclusion.
 If the buffer is full, only calls to @remove@ can acquire the buffer, and if the buffer is empty, only calls to @insert@ can acquire the buffer.
+Threads making calls to routines that are currently excluded block outside (externally) of the monitor on a calling queue, versus blocking on condition queues inside the monitor.
+Both internal and external scheduling extend to multiple monitors in a natural way.
+\begin{cfa}
+monitor M { `condition e`; ... };
+void foo( M & mutex m1, M & mutex m2 ) {
+        ... wait( `e` ); ...                                    $\C{// wait( e, m1, m2 )}$
+        ... wait( `e, m1` ); ...
+        ... wait( `e, m2` ); ...
+}
+void rtn$\(_1\)$( M & mutex m1, M & mutex m2 );
+void rtn$\(_2\)$( M & mutex m1 );
+void bar( M & mutex m1, M & mutex m2 ) {
+        ... waitfor( `rtn` ); ...                               $\C{// waitfor( rtn\(_1\), m1, m2 )}$
+        ... waitfor( `rtn, m1` ); ...                   $\C{// waitfor( rtn\(_2\), m1 )}$
+}
+\end{cfa}
+For @wait( e )@, the default semantics is to atomically block the signaller and release all acquired mutex types in the parameter list, \ie @wait( e, m1, m2 )@.
+To override the implicit multi-monitor wait, specific mutex parameter(s) can be specified, \eg @wait( e, m1 )@.
+Wait statically verifies the released monitors are the acquired mutex-parameters so unconditional release is safe.
+Similarly, for @waitfor( rtn, ... )@, the default semantics is to atomically block the acceptor and release all acquired mutex types in the parameter list, \ie @waitfor( rtn, m1, m2 )@.
+To override the implicit multi-monitor wait, specific mutex parameter(s) can be specified, \eg @waitfor( rtn, m1 )@.
+Waitfor statically verifies the released monitors are the same as the acquired mutex-parameters of the given routine or routine pointer.
+To statically verify the released monitors match with the accepted routine's mutex parameters, the routine (pointer) prototype must be accessible.
+Given the ability to release a subset of acquired monitors can result in a \newterm{nested monitor}~\cite{Lister77} deadlock.
+\begin{cfa}
+void foo( M & mutex m1, M & mutex m2 ) {
+        ... wait( `e, m1` ); ...                                $\C{// release m1, keeping m2 acquired )}$
+void baz( M & mutex m1, M & mutex m2 ) {        $\C{// must acquire m1 and m2 )}$
+        ... signal( `e` ); ...
+\end{cfa}
+The @wait@ only releases @m1@ so the signalling thread cannot acquire both @m1@ and @m2@ to  enter @baz@ to get to the @signal@.
+While deadlock issues can occur with multiple/nesting acquisition, this issue results from the fact that locks, and by extension monitors, are not perfectly composable.
+Finally, an important aspect of monitor implementation is barging, \ie can calling threads barge ahead of signalled threads?
+If barging is allowed, synchronization between a singller and signallee is difficult, often requiring multiple unblock/block cycles (looping around a wait rechecking if a condition is met).
+\begin{quote}
+However, we decree that a signal operation be followed immediately by resumption of a waiting program, without possibility of an intervening procedure call from yet a third program.
+It is only in this way that a waiting program has an absolute guarantee that it can acquire the resource just released by the signalling program without any danger that a third program will interpose a monitor entry and seize the resource instead.~\cite[p.~550]{Hoare74}
+\end{quote}
+\CFA scheduling \emph{precludes} barging, which simplifies synchronization among threads in the monitor and increases correctness.
+For example, there are no loops in either bounded buffer solution in Figure~\ref{f:GenericBoundedBuffer}.
+Supporting barging prevention as well as extending internal scheduling to multiple monitors is the main source of complexity in the design and implementation of \CFA concurrency.
+\subsection{Barging Prevention}
+Figure~\ref{f:BargingPrevention} shows \CFA code where bulk acquire adds complexity to the internal-signalling semantics.
+The complexity begins at the end of the inner @mutex@ statement, where the semantics of internal scheduling need to be extended for multiple monitors.
+The problem is that bulk acquire is used in the inner @mutex@ statement where one of the monitors is already acquired.
+When the signalling thread reaches the end of the inner @mutex@ statement, it should transfer ownership of @m1@ and @m2@ to the waiting thread to prevent barging into the outer @mutex@ statement by another thread.
+However, both the signalling and signalled threads still need monitor @m1@.
+\begin{figure}
+\newbox\myboxA
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+monitor M m1, m2;
+condition c;
+mutex( m1 ) {
+        ...
+        mutex( m1, m2 ) {
+                ... `wait( c )`; // block and release m1, m2
+                // m1, m2 acquired
+        } // $\LstCommentStyle{\color{red}release m2}$
+        // m1 acquired
+} // release m1
+\end{cfa}
+\end{lrbox}
+\newbox\myboxB
+\begin{lrbox}{\myboxB}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+mutex( m1 ) {
+        ...
+        mutex( m1, m2 ) {
+                ... `signal( c )`; ...
+                // m1, m2 acquired
+        } // $\LstCommentStyle{\color{red}release m2}$
+        // m1 acquired
+} // release m1
+\end{cfa}
+\end{lrbox}
+\newbox\myboxC
+\begin{lrbox}{\myboxC}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+mutex( m1 ) {
+        ... `wait( c )`; ...
+        // m1 acquired
+} // $\LstCommentStyle{\color{red}release m1}$
+\end{cfa}
+\end{lrbox}
+\begin{cquote}
+\subfloat[Waiting Thread]{\label{f:WaitingThread}\usebox\myboxA}
+\hspace{2\parindentlnth}
+\subfloat[Signalling Thread]{\label{f:SignallingThread}\usebox\myboxB}
+\hspace{2\parindentlnth}
+\subfloat[Other Waiting Thread]{\label{f:SignallingThread}\usebox\myboxC}
+\end{cquote}
+\caption{Barging Prevention}
+\label{f:BargingPrevention}
+\end{figure}
+The obvious solution to the problem of multi-monitor scheduling is to keep ownership of all locks until the last lock is ready to be transferred.
+It can be argued that that moment is when the last lock is no longer needed, because this semantics fits most closely to the behaviour of single-monitor scheduling.
+This solution has the main benefit of transferring ownership of groups of monitors, which simplifies the semantics from multiple objects to a single group of objects, effectively making the existing single-monitor semantic viable by simply changing monitors to monitor groups.
+This solution releases the monitors once every monitor in a group can be released.
+However, since some monitors are never released (\eg the monitor of a thread), this interpretation means a group might never be released.
+A more interesting interpretation is to transfer the group until all its monitors are released, which means the group is not passed further and a thread can retain its locks.
+However, listing \ref{f:int-secret} shows this solution can become much more complicated depending on what is executed while secretly holding B at line \ref{line:secret}, while avoiding the need to transfer ownership of a subset of the condition monitors.
+Figure~\ref{f:dependency} shows a slightly different example where a third thread is waiting on monitor @A@, using a different condition variable.
+Because the third thread is signalled when secretly holding @B@, the goal  becomes unreachable.
+Depending on the order of signals (listing \ref{f:dependency} line \ref{line:signal-ab} and \ref{line:signal-a}) two cases can happen:
+\begin{comment}
+\paragraph{Case 1: thread $\alpha$ goes first.} In this case, the problem is that monitor @A@ needs to be passed to thread $\beta$ when thread $\alpha$ is done with it.
+\paragraph{Case 2: thread $\beta$ goes first.} In this case, the problem is that monitor @B@ needs to be retained and passed to thread $\alpha$ along with monitor @A@, which can be done directly or possibly using thread $\beta$ as an intermediate.
+\\
+Note that ordering is not determined by a race condition but by whether signalled threads are enqueued in FIFO or FILO order.
+However, regardless of the answer, users can move line \ref{line:signal-a} before line \ref{line:signal-ab} and get the reverse effect for listing \ref{f:dependency}.
+In both cases, the threads need to be able to distinguish, on a per monitor basis, which ones need to be released and which ones need to be transferred, which means knowing when to release a group becomes complex and inefficient (see next section) and therefore effectively precludes this approach.
+\subsubsection{Dependency graphs}
+\begin{figure}
+\begin{multicols}{3}
+Thread $\alpha$
+\begin{cfa}[numbers=left, firstnumber=1]
+acquire A
+        acquire A & B
+                wait A & B
+        release A & B
+release A
+\end{cfa}
+\columnbreak
+Thread $\gamma$
+\begin{cfa}[numbers=left, firstnumber=6, escapechar=|]
+acquire A
+        acquire A & B
+                |\label{line:signal-ab}|signal A & B
+        |\label{line:release-ab}|release A & B
+        |\label{line:signal-a}|signal A
+|\label{line:release-a}|release A
+\end{cfa}
+\columnbreak
+Thread $\beta$
+\begin{cfa}[numbers=left, firstnumber=12, escapechar=|]
+acquire A
+        wait A
+|\label{line:release-aa}|release A
+\end{cfa}
+\end{multicols}
+\begin{cfa}[caption={Pseudo-code for the three thread example.},label={f:dependency}]
+\end{cfa}
+\begin{center}
+\input{dependency}
+\end{center}
+\caption{Dependency graph of the statements in listing \ref{f:dependency}}
+\label{fig:dependency}
+\end{figure}
+In listing \ref{f:int-bulk-cfa}, there is a solution that satisfies both barging prevention and mutual exclusion.
+If ownership of both monitors is transferred to the waiter when the signaller releases @A & B@ and then the waiter transfers back ownership of @A@ back to the signaller when it releases it, then the problem is solved (@B@ is no longer in use at this point).
+Dynamically finding the correct order is therefore the second possible solution.
+The problem is effectively resolving a dependency graph of ownership requirements.
+Here even the simplest of code snippets requires two transfers and has a super-linear complexity.
+This complexity can be seen in listing \ref{f:explosion}, which is just a direct extension to three monitors, requires at least three ownership transfer and has multiple solutions.
+Furthermore, the presence of multiple solutions for ownership transfer can cause deadlock problems if a specific solution is not consistently picked; In the same way that multiple lock acquiring order can cause deadlocks.
+\begin{figure}
+\begin{multicols}{2}
+\begin{cfa}
+acquire A
+        acquire B
+                acquire C
+                        wait A & B & C
+                release C
+        release B
+release A
+\end{cfa}
+\columnbreak
+\begin{cfa}
+acquire A
+        acquire B
+                acquire C
+                        signal A & B & C
+                release C
+        release B
+release A
+\end{cfa}
+\end{multicols}
+\begin{cfa}[caption={Extension to three monitors of listing \ref{f:int-bulk-cfa}},label={f:explosion}]
+\end{cfa}
+\end{figure}
+Given the three threads example in listing \ref{f:dependency}, figure \ref{fig:dependency} shows the corresponding dependency graph that results, where every node is a statement of one of the three threads, and the arrows the dependency of that statement (\eg $\alpha1$ must happen before $\alpha2$).
+The extra challenge is that this dependency graph is effectively post-mortem, but the runtime system needs to be able to build and solve these graphs as the dependencies unfold.
+Resolving dependency graphs being a complex and expensive endeavour, this solution is not the preferred one.
+\subsubsection{Partial Signalling} \label{partial-sig}
+\end{comment}
+Finally, the solution that is chosen for \CFA is to use partial signalling.
+Again using listing \ref{f:int-bulk-cfa}, the partial signalling solution transfers ownership of monitor @B@ at lines \ref{line:signal1} to the waiter but does not wake the waiting thread since it is still using monitor @A@.
+Only when it reaches line \ref{line:lastRelease} does it actually wake up the waiting thread.
+This solution has the benefit that complexity is encapsulated into only two actions: passing monitors to the next owner when they should be released and conditionally waking threads if all conditions are met.
+This solution has a much simpler implementation than a dependency graph solving algorithms, which is why it was chosen.
+Furthermore, after being fully implemented, this solution does not appear to have any significant downsides.
+Using partial signalling, listing \ref{f:dependency} can be solved easily:
+\begin{itemize}
+        \item When thread $\gamma$ reaches line \ref{line:release-ab} it transfers monitor @B@ to thread $\alpha$ and continues to hold monitor @A@.
+        \item When thread $\gamma$ reaches line \ref{line:release-a}  it transfers monitor @A@ to thread $\beta$  and wakes it up.
+        \item When thread $\beta$  reaches line \ref{line:release-aa} it transfers monitor @A@ to thread $\alpha$ and wakes it up.
+\end{itemize}
+\subsection{Signalling: Now or Later}
+Threads calling excluded functions block outside of (external to) the monitor on the calling queue, versus blocking on condition queues inside of (internal to) the monitor.
+Figure~\ref{f:RWExt} shows a readers/writer lock written using external scheduling, where a waiting reader detects a writer using the resource and restricts further calls until the writer exits by calling @EndWrite@.
+The writer does a similar action for each reader or writer using the resource.
+Note, no new calls to @StarRead@/@StartWrite@ may occur when waiting for the call to @EndRead@/@EndWrite@.
+External scheduling allows waiting for events from other threads while restricting unrelated events, that would otherwise have to wait on conditions in the monitor.
+The mechnaism can be done in terms of control flow, \eg Ada @accept@ or \uC @_Accept@, or in terms of data, \eg Go @select@ on channels.
+While both mechanisms have strengths and weaknesses, this project uses the control-flow mechanism to be consistent with other language features.
+% Two challenges specific to \CFA for external scheduling are loose object-definitions (see Section~\ref{s:LooseObjectDefinitions}) and multiple-monitor functions (see Section~\ref{s:Multi-MonitorScheduling}).
+Figure~\ref{f:DatingService} shows a dating service demonstrating non-blocking and blocking signalling.
+The dating service matches girl and boy threads with matching compatibility codes so they can exchange phone numbers.
+A thread blocks until an appropriate partner arrives.
+The complexity is exchanging phone numbers in the monitor because of the mutual-exclusion property.
+For signal scheduling, the @exchange@ condition is necessary to block the thread finding the match, while the matcher unblocks to take the opposite number, post its phone number, and unblock the partner.
+For signal-block scheduling, the implicit urgent-queue replaces the explict @exchange@-condition and @signal_block@ puts the finding thread on the urgent condition and unblocks the matcher.
+The dating service is an example of a monitor that cannot be written using external scheduling because it requires knowledge of calling parameters to make scheduling decisions, and parameters of waiting threads are unavailable;
+as well, an arriving thread may not find a partner and must wait, which requires a condition variable, and condition variables imply internal scheduling.
+Furthermore, barging corrupts the dating service during an exchange because a barger may also match and change the phone numbers, invalidating the previous exchange phone number.
+Putting loops around the @wait@s does not correct the problem;
+the simple solution must be restructured to account for barging.
 \begin{figure}
 …
         int GirlPhNo, BoyPhNo;
         condition Girls[CCodes], Boys[CCodes];
         condition exchange;
+        `condition exchange;`
 };
 int girl( DS & mutex ds, int phNo, int ccode ) {
 …
                 wait( Girls[ccode] );
                 GirlPhNo = phNo;
                 exchange.signal();
+                `signal( exchange );`
         } else {
                 GirlPhNo = phNo;
                 signal( Boys[ccode] );
                 exchange.wait();
         } // if
+                `signal( Boys[ccode] );`
+                `wait( exchange );`
+        }
         return BoyPhNo;
+}
 …
         } else {
                 GirlPhNo = phNo; // make phone number available
                 signal_block( Boys[ccode] ); // restart boy
+                `signal_block( Boys[ccode] );` // restart boy
         } // if
 …
 \qquad
 \subfloat[\lstinline@signal_block@]{\label{f:DatingSignalBlock}\usebox\myboxB}
 \caption{Dating service. }
 \label{f:Dating service}
+\caption{Dating service}
+\label{f:DatingService}
 \end{figure}
+An important note is that, until now, signalling a monitor was a delayed operation.
+The ownership of the monitor is transferred only when the monitor would have otherwise been released, not at the point of the @signal@ statement.
+However, in some cases, it may be more convenient for users to immediately transfer ownership to the thread that is waiting for cooperation, which is achieved using the @signal_block@ routine.
+The example in table \ref{tbl:datingservice} highlights the difference in behaviour.
+As mentioned, @signal@ only transfers ownership once the current critical section exits; this behaviour requires additional synchronization when a two-way handshake is needed.
+To avoid this explicit synchronization, the @condition@ type offers the @signal_block@ routine, which handles the two-way handshake as shown in the example.
+This feature removes the need for a second condition variables and simplifies programming.
+Like every other monitor semantic, @signal_block@ uses barging prevention, which means mutual-exclusion is baton-passed both on the front end and the back end of the call to @signal_block@, meaning no other thread can acquire the monitor either before or after the call.
+% ======================================================================
+% ======================================================================
+\section{External scheduling} \label{extsched}
+% ======================================================================
+% ======================================================================
+An alternative to internal scheduling is external scheduling (see Table~\ref{tbl:sched}).
+\begin{comment}
+\begin{table}
+\begin{tabular}{|c|c|c|}
+Internal Scheduling & External Scheduling & Go\\
+\hline
+\begin{uC++}[tabsize=3]
+_Monitor Semaphore {
+        condition c;
+        bool inUse;
+public:
+        void P() {
+                if(inUse)
+                        wait(c);
+                inUse = true;
+        }
+        void V() {
+                inUse = false;
+                signal(c);
+        }
+}
+\end{uC++}&\begin{uC++}[tabsize=3]
+_Monitor Semaphore {
+        bool inUse;
+public:
+        void P() {
+                if(inUse)
+                        _Accept(V);
+                inUse = true;
+        }
+        void V() {
+                inUse = false;
+        }
+}
+\end{uC++}&\begin{Go}[tabsize=3]
+type MySem struct {
+        inUse bool
+        c     chan bool
+}
+// acquire
+func (s MySem) P() {
+        if s.inUse {
+                select {
+                case <-s.c:
+                }
+        }
+        s.inUse = true
+}
+// release
+func (s MySem) V() {
+        s.inUse = false
+        // This actually deadlocks
+        // when single thread
+        s.c <- false
+}
+\end{Go}
+In summation, for internal scheduling, non-blocking signalling (as in the producer/consumer example) is used when the signaller is providing the cooperation for a waiting thread;
+the signaller enters the monitor and changes state, detects a waiting threads that can use the state, performs a non-blocking signal on the condition queue for the waiting thread, and exits the monitor to run concurrently.
+The waiter unblocks next from the urgent queue, uses/takes the state, and exits the monitor.
+Blocking signal is the reverse, where the waiter is providing the cooperation for the signalling thread;
+the signaller enters the monitor, detects a waiting thread providing the necessary state, performs a blocking signal to place it on the urgent queue and unblock the waiter.
+The waiter changes state and exits the monitor, and the signaller unblocks next from the urgent queue to use/take the state.
+Both internal and external scheduling extend to multiple monitors in a natural way.
+\begin{cquote}
+\begin{tabular}{@{}l@{\hspace{3\parindentlnth}}l@{}}
+\begin{cfa}
+monitor M { `condition e`; ... };
+void foo( M & mutex m1, M & mutex m2 ) {
+        ... wait( `e` ); ...   // wait( e, m1, m2 )
+        ... wait( `e, m1` ); ...
+        ... wait( `e, m2` ); ...
+}
+\end{cfa}
+&
+\begin{cfa}
+void rtn$\(_1\)$( M & mutex m1, M & mutex m2 );
+void rtn$\(_2\)$( M & mutex m1 );
+void bar( M & mutex m1, M & mutex m2 ) {
+        ... waitfor( `rtn` ); ...       // $\LstCommentStyle{waitfor( rtn\(_1\), m1, m2 )}$
+        ... waitfor( `rtn, m1` ); ... // $\LstCommentStyle{waitfor( rtn\(_2\), m1 )}$
+}
+\end{cfa}
 \end{tabular}
+\caption{Different forms of scheduling.}
+\label{tbl:sched}
+\end{table}
+\end{comment}
+This method is more constrained and explicit, which helps users reduce the non-deterministic nature of concurrency.
+Indeed, as the following examples demonstrate, external scheduling allows users to wait for events from other threads without the concern of unrelated events occurring.
+External scheduling can generally be done either in terms of control flow (\eg Ada with @accept@, \uC with @_Accept@) or in terms of data (\eg Go with channels).
+Of course, both of these paradigms have their own strengths and weaknesses, but for this project, control-flow semantics was chosen to stay consistent with the rest of the languages semantics.
+Two challenges specific to \CFA arise when trying to add external scheduling with loose object definitions and multiple-monitor routines.
+The previous example shows a simple use @_Accept@ versus @wait@/@signal@ and its advantages.
+Note that while other languages often use @accept@/@select@ as the core external scheduling keyword, \CFA uses @waitfor@ to prevent name collisions with existing socket \textbf{api}s.
+For the @P@ member above using internal scheduling, the call to @wait@ only guarantees that @V@ is the last routine to access the monitor, allowing a third routine, say @isInUse()@, acquire mutual exclusion several times while routine @P@ is waiting.
+On the other hand, external scheduling guarantees that while routine @P@ is waiting, no other routine than @V@ can acquire the monitor.
+% ======================================================================
+% ======================================================================
+\subsection{Loose Object Definitions}
+% ======================================================================
+% ======================================================================
+In \uC, a monitor class declaration includes an exhaustive list of monitor operations.
+Since \CFA is not object oriented, monitors become both more difficult to implement and less clear for a user:
+\begin{cfa}
+monitor A {};
+void f(A & mutex a);
+void g(A & mutex a) {
+        waitfor(f); // Obvious which f() to wait for
+}
+void f(A & mutex a, int); // New different F added in scope
+void h(A & mutex a) {
+        waitfor(f); // Less obvious which f() to wait for
+}
+\end{cfa}
+Furthermore, external scheduling is an example where implementation constraints become visible from the interface.
+Here is the cfa-code for the entering phase of a monitor:
+\begin{center}
+\begin{tabular}{l}
+\begin{cfa}
+        if monitor is free
+                enter
+        elif already own the monitor
+                continue
+        elif monitor accepts me
+                enter
+        else
+                block
+\end{cfa}
+\end{tabular}
+\end{center}
+For the first two conditions, it is easy to implement a check that can evaluate the condition in a few instructions.
+However, a fast check for @monitor accepts me@ is much harder to implement depending on the constraints put on the monitors.
+Indeed, monitors are often expressed as an entry queue and some acceptor queue as in Figure~\ref{fig:ClassicalMonitor}.
+\end{cquote}
+For @wait( e )@, the default semantics is to atomically block the signaller and release all acquired mutex parameters, \ie @wait( e, m1, m2 )@.
+To override the implicit multi-monitor wait, specific mutex parameter(s) can be specified, \eg @wait( e, m1 )@.
+Wait cannot statically verifies the released monitors are the acquired mutex-parameters without disallowing separately compiled helper functions calling @wait@.
+While \CC supports bulk locking, @wait@ only accepts a single lock for a condition variable, so bulk locking with condition variables is asymmetric.
+Finally, a signaller,
+\begin{cfa}
+void baz( M & mutex m1, M & mutex m2 ) {
+        ... signal( e ); ...
+}
+\end{cfa}
+must have acquired at least the same locks as the waiting thread signalled from a condition queue to allow the locks to be passed, and hence, prevent barging.
+Similarly, for @waitfor( rtn )@, the default semantics is to atomically block the acceptor and release all acquired mutex parameters, \ie @waitfor( rtn, m1, m2 )@.
+To override the implicit multi-monitor wait, specific mutex parameter(s) can be specified, \eg @waitfor( rtn, m1 )@.
+@waitfor@ does statically verify the monitor types passed are the same as the acquired mutex-parameters of the given function or function pointer, hence the function (pointer) prototype must be accessible.
+% When an overloaded function appears in an @waitfor@ statement, calls to any function with that name are accepted.
+% The rationale is that members with the same name should perform a similar function, and therefore, all should be eligible to accept a call.
+Overloaded functions can be disambiguated using a cast
+\begin{cfa}
+void rtn( M & mutex m );
+`int` rtn( M & mutex m );
+waitfor( (`int` (*)( M & mutex ))rtn, m );
+\end{cfa}
+The ability to release a subset of acquired monitors can result in a \newterm{nested monitor}~\cite{Lister77} deadlock.
+\begin{cfa}
+void foo( M & mutex m1, M & mutex m2 ) {
+        ... wait( `e, m1` ); ...                                $\C{// release m1, keeping m2 acquired )}$
+void bar( M & mutex m1, M & mutex m2 ) {        $\C{// must acquire m1 and m2 )}$
+        ... signal( `e` ); ...
+\end{cfa}
+The @wait@ only releases @m1@ so the signalling thread cannot acquire @m1@ and @m2@ to enter @bar@ and @signal@ the condition.
+While deadlock can occur with multiple/nesting acquisition, this is a consequence of locks, and by extension monitors, not being perfectly composable.
+\subsection{\texorpdfstring{Extended \protect\lstinline@waitfor@}{Extended waitfor}}
+Figure~\ref{f:ExtendedWaitfor} shows the extended form of the @waitfor@ statement to conditionally accept one of a group of mutex functions, with an optional statement to be performed \emph{after} the mutex function finishes.
+For a @waitfor@ clause to be executed, its @when@ must be true and an outstanding call to its corresponding member(s) must exist.
+The \emph{conditional-expression} of a @when@ may call a function, but the function must not block or context switch.
+If there are multiple acceptable mutex calls, selection occurs top-to-bottom (prioritized) among the @waitfor@ clauses, whereas some programming languages with similar mechanisms accept nondeterministically for this case, \eg Go \lstinline[morekeywords=select]@select@.
+If some accept guards are true and there are no outstanding calls to these members, the acceptor is blocked until a call to one of these members is made.
+If there is a @timeout@ clause, it provides an upper bound on waiting.
+If all the accept guards are false, the statement does nothing, unless there is a terminating @else@ clause with a true guard, which is executed instead.
+Hence, the terminating @else@ clause allows a conditional attempt to accept a call without blocking.
+If both @timeout@ and @else@ clause are present, the @else@ must be conditional, or the @timeout@ is never triggered.
+There is also a traditional future wait queue (not shown) (\eg Microsoft (@WaitForMultipleObjects@)), to wait for a specified number of future elements in the queue.
 \begin{figure}
 \centering
+\subfloat[Classical Monitor] {
+\label{fig:ClassicalMonitor}
+{\resizebox{0.45\textwidth}{!}{\input{monitor}}}
+}% subfloat
+\qquad
+\subfloat[bulk acquire Monitor] {
+\label{fig:BulkMonitor}
+{\resizebox{0.45\textwidth}{!}{\input{ext_monitor}}}
+}% subfloat
+\caption{External Scheduling Monitor}
+\begin{cfa}
+`when` ( $\emph{conditional-expression}$ )      $\C{// optional guard}$
+        waitfor( $\emph{mutex-member-name}$ ) $\emph{statement}$ $\C{// action after call}$
+`or` `when` ( $\emph{conditional-expression}$ ) $\C{// any number of functions}$
+        waitfor( $\emph{mutex-member-name}$ ) $\emph{statement}$
+`or`    ...
+`when` ( $\emph{conditional-expression}$ ) $\C{// optional guard}$
+        `timeout` $\emph{statement}$ $\C{// optional terminating timeout clause}$
+`when` ( $\emph{conditional-expression}$ ) $\C{// optional guard}$
+        `else`  $\emph{statement}$ $\C{// optional terminating clause}$
+\end{cfa}
+\caption{Extended \protect\lstinline@waitfor@}
+\label{f:ExtendedWaitfor}
 \end{figure}
+There are other alternatives to these pictures, but in the case of the left picture, implementing a fast accept check is relatively easy.
+Restricted to a fixed number of mutex members, N, the accept check reduces to updating a bitmask when the acceptor queue changes, a check that executes in a single instruction even with a fairly large number (\eg 128) of mutex members.
+This approach requires a unique dense ordering of routines with an upper-bound and that ordering must be consistent across translation units.
+For OO languages these constraints are common, since objects only offer adding member routines consistently across translation units via inheritance.
+However, in \CFA users can extend objects with mutex routines that are only visible in certain translation unit.
+This means that establishing a program-wide dense-ordering among mutex routines can only be done in the program linking phase, and still could have issues when using dynamically shared objects.
+The alternative is to alter the implementation as in Figure~\ref{fig:BulkMonitor}.
+Here, the mutex routine called is associated with a thread on the entry queue while a list of acceptable routines is kept separate.
+Generating a mask dynamically means that the storage for the mask information can vary between calls to @waitfor@, allowing for more flexibility and extensions.
+Storing an array of accepted routine pointers replaces the single instruction bitmask comparison with dereferencing a pointer followed by a linear search.
+Furthermore, supporting nested external scheduling (\eg listing \ref{f:nest-ext}) may now require additional searches for the @waitfor@ statement to check if a routine is already queued.
+Note, a group of conditional @waitfor@ clauses is \emph{not} the same as a group of @if@ statements, \eg:
+\begin{cfa}
+if ( C1 ) waitfor( mem1 );                       when ( C1 ) waitfor( mem1 );
+else if ( C2 ) waitfor( mem2 );         or when ( C2 ) waitfor( mem2 );
+\end{cfa}
+The left example only accepts @mem1@ if @C1@ is true or only @mem2@ if @C2@ is true.
+The right example accepts either @mem1@ or @mem2@ if @C1@ and @C2@ are true.
+An interesting use of @waitfor@ is accepting the @mutex@ destructor to know when an object is deallocated, \eg assume the bounded buffer is restructred from a monitor to a thread with the following @main@.
+\begin{cfa}
+void main( Buffer(T) & buffer ) with(buffer) {
+        for () {
+                `waitfor( ^?{}, buffer )` break;
+                or when ( count != 20 ) waitfor( insert, buffer ) { ... }
+                or when ( count != 0 ) waitfor( remove, buffer ) { ... }
+        }
+        // clean up
+}
+\end{cfa}
+When the program main deallocates the buffer, it first calls the buffer's destructor, which is accepted, the destructor runs, and the buffer is deallocated.
+However, the buffer thread cannot continue after the destructor call because the object is gone;
+hence, clean up in @main@ cannot occur, which means destructors for local objects are not run.
+To make this useful capability work, the semantics for accepting the destructor is the same as @signal@, \ie the destructor call is placed on urgent and the acceptor continues execution, which ends the loop, cleans up, and the thread terminates.
+Then, the destructor caller unblocks from urgent to deallocate the object.
+Accepting the destructor is the idiomatic way in \CFA to terminate a thread performing direct communication.
+\subsection{Bulk Barging Prevention}
+Figure~\ref{f:BulkBargingPrevention} shows \CFA code where bulk acquire adds complexity to the internal-signalling semantics.
+The complexity begins at the end of the inner @mutex@ statement, where the semantics of internal scheduling need to be extended for multiple monitors.
+The problem is that bulk acquire is used in the inner @mutex@ statement where one of the monitors is already acquired.
+When the signalling thread reaches the end of the inner @mutex@ statement, it should transfer ownership of @m1@ and @m2@ to the waiting threads to prevent barging into the outer @mutex@ statement by another thread.
+However, both the signalling and waiting threads W1 and W2 need some subset of monitors @m1@ and @m2@.
+\begin{cquote}
+condition c: (order 1) W2(@m2@), W1(@m1@,@m2@)\ \ \ or\ \ \ (order 2) W1(@m1@,@m2@), W2(@m2@) \\
+S: acq. @m1@ $\rightarrow$ acq. @m1,m2@ $\rightarrow$ @signal(c)@ $\rightarrow$ rel. @m2@ $\rightarrow$ pass @m2@ unblock W2 (order 2) $\rightarrow$ rel. @m1@ $\rightarrow$ pass @m1,m2@ unblock W1 \\
+\hspace*{2.75in}$\rightarrow$ rel. @m1@ $\rightarrow$ pass @m1,m2@ unblock W1 (order 1)
+\end{cquote}
 \begin{figure}
+\begin{cfa}[caption={Example of nested external scheduling},label={f:nest-ext}]
+monitor M {};
+void foo( M & mutex a ) {}
+void bar( M & mutex b ) {
+        // Nested in the waitfor(bar, c) call
+        waitfor(foo, b);
+}
+void baz( M & mutex c ) {
+        waitfor(bar, c);
+}
+\end{cfa}
+\newbox\myboxA
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+monitor M m1, m2;
+condition c;
+mutex( m1 ) { // $\LstCommentStyle{\color{red}outer}$
+        ...
+        mutex( m1, m2 ) { // $\LstCommentStyle{\color{red}inner}$
+                ... `signal( c )`; ...
+                // m1, m2 still acquired
+        } // $\LstCommentStyle{\color{red}release m2}$
+        // m1 acquired
+} // release m1
+\end{cfa}
+\end{lrbox}
+\newbox\myboxB
+\begin{lrbox}{\myboxB}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+mutex( m1 ) {
+        ...
+        mutex( m1, m2 ) {
+                ... `wait( c )`; // release m1, m2
+                // m1, m2 reacquired
+        } // $\LstCommentStyle{\color{red}release m2}$
+        // m1 acquired
+} // release m1
+\end{cfa}
+\end{lrbox}
+\newbox\myboxC
+\begin{lrbox}{\myboxC}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+mutex( m2 ) {
+        ... `wait( c )`; // release m2
+        // m2 reacquired
+} // $\LstCommentStyle{\color{red}release m2}$
+\end{cfa}
+\end{lrbox}
+\begin{cquote}
+\subfloat[Signalling Thread (S)]{\label{f:SignallingThread}\usebox\myboxA}
+\hspace{3\parindentlnth}
+\subfloat[Waiting Thread (W1)]{\label{f:WaitingThread}\usebox\myboxB}
+\hspace{2\parindentlnth}
+\subfloat[Waiting Thread (W2)]{\label{f:OtherWaitingThread}\usebox\myboxC}
+\end{cquote}
+\caption{Bulk Barging Prevention}
+\label{f:BulkBargingPrevention}
 \end{figure}
+Note that in the right picture, tasks need to always keep track of the monitors associated with mutex routines, and the routine mask needs to have both a routine pointer and a set of monitors, as is discussed in the next section.
+These details are omitted from the picture for the sake of simplicity.
+At this point, a decision must be made between flexibility and performance.
+Many design decisions in \CFA achieve both flexibility and performance, for example polymorphic routines add significant flexibility but inlining them means the optimizer can easily remove any runtime cost.
+Here, however, the cost of flexibility cannot be trivially removed.
+In the end, the most flexible approach has been chosen since it allows users to write programs that would otherwise be  hard to write.
+This decision is based on the assumption that writing fast but inflexible locks is closer to a solved problem than writing locks that are as flexible as external scheduling in \CFA.
+% ======================================================================
+% ======================================================================
+One scheduling solution is for the signaller S to keep ownership of all locks until the last lock is ready to be transferred, because this semantics fits most closely to the behaviour of single-monitor scheduling.
+However, this solution is inefficient if W2 waited first and can be immediate passed @m2@ when released, while S retains @m1@ until completion of the outer mutex statement.
+If W1 waited first, the signaller must retain @m1@ amd @m2@ until completion of the outer mutex statement and then pass both to W1.
+% Furthermore, there is an execution sequence where the signaller always finds waiter W2, and hence, waiter W1 starves.
+To support this efficient semantics (and prevent barging), the implementation maintains a list of monitors acquired for each blocked thread.
+When a signaller exits or waits in a monitor function/statement, the front waiter on urgent is unblocked if all its monitors are released.
+Implementing a fast subset check for the necessary released monitors is important.
+% The benefit is encapsulating complexity into only two actions: passing monitors to the next owner when they should be released and conditionally waking threads if all conditions are met.
+\subsection{Loose Object Definitions}
+\label{s:LooseObjectDefinitions}
+In an object-oriented programming language, a class includes an exhaustive list of operations.
+A new class can add members via static inheritance but the subclass still has an exhaustive list of operations.
+(Dynamic member adding, \eg JavaScript~\cite{JavaScript}, is not considered.)
+In the object-oriented scenario, the type and all its operators are always present at compilation (even separate compilation), so it is possible to number the operations in a bit mask and use an $O(1)$ compare with a similar bit mask created for the operations specified in a @waitfor@.
+However, in \CFA, monitor functions can be statically added/removed in translation units, making a fast subset check difficult.
+\begin{cfa}
+        monitor M { ... }; // common type, included in .h file
+translation unit 1
+        void `f`( M & mutex m );
+        void g( M & mutex m ) { waitfor( `f`, m ); }
+translation unit 2
+        void `f`( M & mutex m ); $\C{// replacing f and g for type M in this translation unit}$
+        void `g`( M & mutex m );
+        void h( M & mutex m ) { waitfor( `f`, m ) or waitfor( `g`, m ); } $\C{// extending type M in this translation unit}$
+\end{cfa}
+The @waitfor@ statements in each translation unit cannot form a unique bit-mask because the monitor type does not carry that information.
+Hence, function pointers are used to identify the functions listed in the @waitfor@ statement, stored in a variable-sized array.
+Then, the same implementation approach used for the urgent stack is used for the calling queue.
+Each caller has a list of monitors acquired, and the @waitfor@ statement performs a (usually short) linear search matching functions in the @waitfor@ list with called functions, and then verifying the associated mutex locks can be transfers.
+(A possible way to construct a dense mapping is at link or load-time.)
 \subsection{Multi-Monitor Scheduling}
+% ======================================================================
+% ======================================================================
+External scheduling, like internal scheduling, becomes significantly more complex when introducing multi-monitor syntax.
+Even in the simplest possible case, some new semantics needs to be established:
+\begin{cfa}
+monitor M {};
+void f(M & mutex a);
+void g(M & mutex b, M & mutex c) {
+        waitfor(f); // two monitors M => unknown which to pass to f(M & mutex)
+}
+\end{cfa}
+The obvious solution is to specify the correct monitor as follows:
+\begin{cfa}
+monitor M {};
+void f(M & mutex a);
+void g(M & mutex a, M & mutex b) {
+        // wait for call to f with argument b
+        waitfor(f, b);
+}
+\end{cfa}
+This syntax is unambiguous.
+Both locks are acquired and kept by @g@.
+When routine @f@ is called, the lock for monitor @b@ is temporarily transferred from @g@ to @f@ (while @g@ still holds lock @a@).
+This behaviour can be extended to the multi-monitor @waitfor@ statement as follows.
+\begin{cfa}
+monitor M {};
+void f(M & mutex a, M & mutex b);
+void g(M & mutex a, M & mutex b) {
+        // wait for call to f with arguments a and b
+        waitfor(f, a, b);
+}
+\end{cfa}
+Note that the set of monitors passed to the @waitfor@ statement must be entirely contained in the set of monitors already acquired in the routine. @waitfor@ used in any other context is undefined behaviour.
+An important behaviour to note is when a set of monitors only match partially:
+\begin{cfa}
+mutex struct A {};
+mutex struct B {};
+void g(A & mutex a, B & mutex b) {
+        waitfor(f, a, b);
+}
+A a1, a2;
+B b;
+void foo() {
+        g(a1, b); // block on accept
+}
+void bar() {
+        f(a2, b); // fulfill cooperation
+}
+\end{cfa}
+While the equivalent can happen when using internal scheduling, the fact that conditions are specific to a set of monitors means that users have to use two different condition variables.
+In both cases, partially matching monitor sets does not wakeup the waiting thread.
+It is also important to note that in the case of external scheduling the order of parameters is irrelevant; @waitfor(f,a,b)@ and @waitfor(f,b,a)@ are indistinguishable waiting condition.
+% ======================================================================
+% ======================================================================
+\subsection{\protect\lstinline|waitfor| Semantics}
+% ======================================================================
+% ======================================================================
+Syntactically, the @waitfor@ statement takes a routine identifier and a set of monitors.
+While the set of monitors can be any list of expressions, the routine name is more restricted because the compiler validates at compile time the validity of the routine type and the parameters used with the @waitfor@ statement.
+It checks that the set of monitors passed in matches the requirements for a routine call.
+Figure~\ref{f:waitfor} shows various usages of the waitfor statement and which are acceptable.
+The choice of the routine type is made ignoring any non-@mutex@ parameter.
+One limitation of the current implementation is that it does not handle overloading, but overloading is possible.
+\label{s:Multi-MonitorScheduling}
+External scheduling, like internal scheduling, becomes significantly more complex for multi-monitor semantics.
+Even in the simplest case, new semantics need to be established.
+\begin{cfa}
+monitor M { ... };
+void f( M & mutex m1 );
+void g( M & mutex m1, M & mutex m2 ) { `waitfor( f );` } $\C{// pass m1 or m2 to f?}$
+\end{cfa}
+The solution is for the programmer to disambiguate:
+\begin{cfa}
+waitfor( f, `m2` ); $\C{// wait for call to f with argument m2}$
+\end{cfa}
+Both locks are acquired by function @g@, so when function @f@ is called, the lock for monitor @m2@ is passed from @g@ to @f@, while @g@ still holds lock @m1@.
+This behaviour can be extended to the multi-monitor @waitfor@ statement.
+\begin{cfa}
+monitor M { ... };
+void f( M & mutex m1, M & mutex m2 );
+void g( M & mutex m1, M & mutex m2 ) { waitfor( f, `m1, m2` ); $\C{// wait for call to f with arguments m1 and m2}$
+\end{cfa}
+Again, the set of monitors passed to the @waitfor@ statement must be entirely contained in the set of monitors already acquired by the accepting function.
+Also, the order of the monitors in a @waitfor@ statement is unimportant.
+Figure~\ref{f:UnmatchedMutexSets} shows an example where, for internal and external scheduling with multiple monitors, a signalling or accepting thread must match exactly, \ie partial matching results in waiting.
+For both examples, the set of monitors is disjoint so unblocking is impossible.
 \begin{figure}
+\begin{cfa}[caption={Various correct and incorrect uses of the waitfor statement},label={f:waitfor}]
+monitor A{};
+monitor B{};
+void f1( A & mutex );
+void f2( A & mutex, B & mutex );
+void f3( A & mutex, int );
+void f4( A & mutex, int );
+void f4( A & mutex, double );
+void foo( A & mutex a1, A & mutex a2, B & mutex b1, B & b2 ) {
+        A * ap = & a1;
+        void (*fp)( A & mutex ) = f1;
+        waitfor(f1, a1);     // Correct : 1 monitor case
+        waitfor(f2, a1, b1); // Correct : 2 monitor case
+        waitfor(f3, a1);     // Correct : non-mutex arguments are ignored
+        waitfor(f1, *ap);    // Correct : expression as argument
+        waitfor(f1, a1, b1); // Incorrect : Too many mutex arguments
+        waitfor(f2, a1);     // Incorrect : Too few mutex arguments
+        waitfor(f2, a1, a2); // Incorrect : Mutex arguments don't match
+        waitfor(f1, 1);      // Incorrect : 1 not a mutex argument
+        waitfor(f9, a1);     // Incorrect : f9 routine does not exist
+        waitfor(*fp, a1 );   // Incorrect : fp not an identifier
+        waitfor(f4, a1);     // Incorrect : f4 ambiguous
+        waitfor(f2, a1, b2); // Undefined behaviour : b2 not mutex
+}
+\end{cfa}
+\centering
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+monitor M1 {} m11, m12;
+monitor M2 {} m2;
+condition c;
+void f( M1 & mutex m1, M2 & mutex m2 ) {
+        signal( c );
+}
+void g( M1 & mutex m1, M2 & mutex m2 ) {
+        wait( c );
+}
+g( `m11`, m2 ); // block on wait
+f( `m12`, m2 ); // cannot fulfil
+\end{cfa}
+\end{lrbox}
+\begin{lrbox}{\myboxB}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+monitor M1 {} m11, m12;
+monitor M2 {} m2;
+void f( M1 & mutex m1, M2 & mutex m2 ) {
+}
+void g( M1 & mutex m1, M2 & mutex m2 ) {
+        waitfor( f, m1, m2 );
+}
+g( `m11`, m2 ); // block on accept
+f( `m12`, m2 ); // cannot fulfil
+\end{cfa}
+\end{lrbox}
+\subfloat[Internal scheduling]{\label{f:InternalScheduling}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[External scheduling]{\label{f:ExternalScheduling}\usebox\myboxB}
+\caption{Unmatched \protect\lstinline@mutex@ sets}
+\label{f:UnmatchedMutexSets}
 \end{figure}
+Finally, for added flexibility, \CFA supports constructing a complex @waitfor@ statement using the @or@, @timeout@ and @else@.
+Indeed, multiple @waitfor@ clauses can be chained together using @or@; this chain forms a single statement that uses baton pass to any routine that fits one of the routine+monitor set passed in.
+To enable users to tell which accepted routine executed, @waitfor@s are followed by a statement (including the null statement @;@) or a compound statement, which is executed after the clause is triggered.
+A @waitfor@ chain can also be followed by a @timeout@, to signify an upper bound on the wait, or an @else@, to signify that the call should be non-blocking, which checks for a matching routine call already arrived and otherwise continues.
+Any and all of these clauses can be preceded by a @when@ condition to dynamically toggle the accept clauses on or off based on some current state.
+Figure~\ref{f:waitfor2} demonstrates several complex masks and some incorrect ones.
+\subsection{\texorpdfstring{\protect\lstinline@mutex@ Threads}{mutex Threads}}
+Threads in \CFA can also be monitors to allow \emph{direct communication} among threads, \ie threads can have mutex functions that are called by other threads.
+Hence, all monitor features are available when using threads.
+Figure~\ref{f:DirectCommunication} shows a comparison of direct call communication in \CFA with direct channel communication in Go.
+(Ada provides a similar mechanism to the \CFA direct communication.)
+The program main in both programs communicates directly with the other thread versus indirect communication where two threads interact through a passive monitor.
+Both direct and indirection thread communication are valuable tools in structuring concurrent programs.
 \begin{figure}
+\lstset{language=CFA,deletedelim=**[is][]{`}{`}}
+\begin{cfa}
+monitor A{};
+void f1( A & mutex );
+void f2( A & mutex );
+void foo( A & mutex a, bool b, int t ) {
+        waitfor(f1, a);                                                 $\C{// Correct : blocking case}$
+        waitfor(f1, a) {                                                $\C{// Correct : block with statement}$
+                sout | "f1" | endl;
+\centering
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+struct Msg { int i, j; };
+thread GoRtn { int i;  float f;  Msg m; };
+void mem1( GoRtn & mutex gortn, int i ) { gortn.i = i; }
+void mem2( GoRtn & mutex gortn, float f ) { gortn.f = f; }
+void mem3( GoRtn & mutex gortn, Msg m ) { gortn.m = m; }
+void ^?{}( GoRtn & mutex ) {}
+void main( GoRtn & gortn ) with( gortn ) {  // thread starts
+        for () {
+                `waitfor( mem1, gortn )` sout | i;  // wait for calls
+                or `waitfor( mem2, gortn )` sout | f;
+                or `waitfor( mem3, gortn )` sout | m.i | m.j;
+                or `waitfor( ^?{}, gortn )` break;
+        }
+        waitfor(f1, a) {                                                $\C{// Correct : block waiting for f1 or f2}$
+                sout | "f1" | endl;
+        } or waitfor(f2, a) {
+                sout | "f2" | endl;
+}
+int main() {
+        GoRtn gortn; $\C[2.0in]{// start thread}$
+        `mem1( gortn, 0 );` $\C{// different calls}\CRT$
+        `mem2( gortn, 2.5 );`
+        `mem3( gortn, (Msg){1, 2} );`
+} // wait for completion
+\end{cfa}
+\end{lrbox}
+\begin{lrbox}{\myboxB}
+\begin{Go}[aboveskip=0pt,belowskip=0pt]
+func main() {
+        type Msg struct{ i, j int }
+        ch1 := make( chan int )
+        ch2 := make( chan float32 )
+        ch3 := make( chan Msg )
+        hand := make( chan string )
+        shake := make( chan string )
+        gortn := func() { $\C[1.5in]{// thread starts}$
+                var i int;  var f float32;  var m Msg
+                L: for {
+                        select { $\C{// wait for messages}$
+                          case `i = <- ch1`: fmt.Println( i )
+                          case `f = <- ch2`: fmt.Println( f )
+                          case `m = <- ch3`: fmt.Println( m )
+                          case `<- hand`: break L $\C{// sentinel}$
+                        }
+                }
+                `shake <- "SHAKE"` $\C{// completion}$
+        }
+        waitfor(f1, a); or else;                                $\C{// Correct : non-blocking case}$
+        waitfor(f1, a) {                                                $\C{// Correct : non-blocking case}$
+                sout | "blocked" | endl;
+        } or else {
+                sout | "didn't block" | endl;
+        go gortn() $\C{// start thread}$
+        `ch1 <- 0` $\C{// different messages}$
+        `ch2 <- 2.5`
+        `ch3 <- Msg{1, 2}`
+        `hand <- "HAND"` $\C{// sentinel value}$
+        `<- shake` $\C{// wait for completion}\CRT$
+}
+\end{Go}
+\end{lrbox}
+\subfloat[\CFA]{\label{f:CFAwaitfor}\usebox\myboxA}
+\hspace{3pt}
+\vrule
+\hspace{3pt}
+\subfloat[Go]{\label{f:Gochannel}\usebox\myboxB}
+\caption{Direct communication}
+\label{f:DirectCommunication}
+\end{figure}
+\begin{comment}
+The following shows an example of two threads directly calling each other and accepting calls from each other in a cycle.
+\begin{cfa}
+\end{cfa}
+\vspace{-0.8\baselineskip}
+\begin{cquote}
+\begin{tabular}{@{}l@{\hspace{3\parindentlnth}}l@{}}
+\begin{cfa}
+thread Ping {} pi;
+void ping( Ping & mutex ) {}
+void main( Ping & pi ) {
+        for ( 10 ) {
+                `waitfor( ping, pi );`
+                `pong( po );`
+        }
+        waitfor(f1, a) {                                                $\C{// Correct : block at most 10 seconds}$
+                sout | "blocked" | endl;
+        } or timeout( 10`s) {
+                sout | "didn't block" | endl;
+}
+int main() {}
+\end{cfa}
+&
+\begin{cfa}
+thread Pong {} po;
+void pong( Pong & mutex ) {}
+void main( Pong & po ) {
+        for ( 10 ) {
+                `ping( pi );`
+                `waitfor( pong, po );`
+        }
+        // Correct : block only if b == true if b == false, don't even make the call
+        when(b) waitfor(f1, a);
+        // Correct : block only if b == true if b == false, make non-blocking call
+        waitfor(f1, a); or when(!b) else;
+        // Correct : block only of t > 1
+        waitfor(f1, a); or when(t > 1) timeout(t); or else;
+        // Incorrect : timeout clause is dead code
+        waitfor(f1, a); or timeout(t); or else;
+        // Incorrect : order must be waitfor [or waitfor... [or timeout] [or else]]
+        timeout(t); or waitfor(f1, a); or else;
+}
+\end{cfa}
+\caption{Correct and incorrect uses of the or, else, and timeout clause around a waitfor statement}
+\label{f:waitfor2}
+\end{figure}
+% ======================================================================
+% ======================================================================
+\subsection{Waiting For The Destructor}
+% ======================================================================
+% ======================================================================
+An interesting use for the @waitfor@ statement is destructor semantics.
+Indeed, the @waitfor@ statement can accept any @mutex@ routine, which includes the destructor (see section \ref{data}).
+However, with the semantics discussed until now, waiting for the destructor does not make any sense, since using an object after its destructor is called is undefined behaviour.
+The simplest approach is to disallow @waitfor@ on a destructor.
+However, a more expressive approach is to flip ordering of execution when waiting for the destructor, meaning that waiting for the destructor allows the destructor to run after the current @mutex@ routine, similarly to how a condition is signalled.
+\begin{figure}
+\begin{cfa}[caption={Example of an executor which executes action in series until the destructor is called.},label={f:dtor-order}]
+monitor Executer {};
+struct  Action;
+void ^?{}   (Executer & mutex this);
+void execute(Executer & mutex this, const Action & );
+void run    (Executer & mutex this) {
+        while(true) {
+                   waitfor(execute, this);
+                or waitfor(^?{}   , this) {
+                        break;
+                }
+        }
+}
+\end{cfa}
+\end{figure}
+For example, listing \ref{f:dtor-order} shows an example of an executor with an infinite loop, which waits for the destructor to break out of this loop.
+Switching the semantic meaning introduces an idiomatic way to terminate a task and/or wait for its termination via destruction.
+% ######     #    ######     #    #       #       ####### #       ###  #####  #     #
+% #     #   # #   #     #   # #   #       #       #       #        #  #     # ##   ##
+% #     #  #   #  #     #  #   #  #       #       #       #        #  #       # # # #
+% ######  #     # ######  #     # #       #       #####   #        #   #####  #  #  #
+% #       ####### #   #   ####### #       #       #       #        #        # #     #
+% #       #     # #    #  #     # #       #       #       #        #  #     # #     #
+% #       #     # #     # #     # ####### ####### ####### ####### ###  #####  #     #
+\section{Parallelism}
+Historically, computer performance was about processor speeds and instruction counts.
+However, with heat dissipation being a direct consequence of speed increase, parallelism has become the new source for increased performance~\cite{Sutter05, Sutter05b}.
+In this decade, it is no longer reasonable to create a high-performance application without caring about parallelism.
+Indeed, parallelism is an important aspect of performance and more specifically throughput and hardware utilization.
+The lowest-level approach of parallelism is to use \textbf{kthread} in combination with semantics like @fork@, @join@, \etc.
+However, since these have significant costs and limitations, \textbf{kthread} are now mostly used as an implementation tool rather than a user oriented one.
+There are several alternatives to solve these issues that all have strengths and weaknesses.
+While there are many variations of the presented paradigms, most of these variations do not actually change the guarantees or the semantics, they simply move costs in order to achieve better performance for certain workloads.
+\section{Paradigms}
+\subsection{User-Level Threads}
+A direct improvement on the \textbf{kthread} approach is to use \textbf{uthread}.
+These threads offer most of the same features that the operating system already provides but can be used on a much larger scale.
+This approach is the most powerful solution as it allows all the features of multithreading, while removing several of the more expensive costs of kernel threads.
+The downside is that almost none of the low-level threading problems are hidden; users still have to think about data races, deadlocks and synchronization issues.
+These issues can be somewhat alleviated by a concurrency toolkit with strong guarantees, but the parallelism toolkit offers very little to reduce complexity in itself.
+Examples of languages that support \textbf{uthread} are Erlang~\cite{Erlang} and \uC~\cite{uC++book}.
+\subsection{Fibers : User-Level Threads Without Preemption} \label{fibers}
+A popular variant of \textbf{uthread} is what is often referred to as \textbf{fiber}.
+However, \textbf{fiber} do not present meaningful semantic differences with \textbf{uthread}.
+The significant difference between \textbf{uthread} and \textbf{fiber} is the lack of \textbf{preemption} in the latter.
+Advocates of \textbf{fiber} list their high performance and ease of implementation as major strengths, but the performance difference between \textbf{uthread} and \textbf{fiber} is controversial, and the ease of implementation, while true, is a weak argument in the context of language design.
+Therefore this proposal largely ignores fibers.
+An example of a language that uses fibers is Go~\cite{Go}
+\subsection{Jobs and Thread Pools}
+An approach on the opposite end of the spectrum is to base parallelism on \textbf{pool}.
+Indeed, \textbf{pool} offer limited flexibility but at the benefit of a simpler user interface.
+In \textbf{pool} based systems, users express parallelism as units of work, called jobs, and a dependency graph (either explicit or implicit) that ties them together.
+This approach means users need not worry about concurrency but significantly limit the interaction that can occur among jobs.
+Indeed, any \textbf{job} that blocks also block the underlying worker, which effectively means the CPU utilization, and therefore throughput, suffers noticeably.
+It can be argued that a solution to this problem is to use more workers than available cores.
+However, unless the number of jobs and the number of workers are comparable, having a significant number of blocked jobs always results in idles cores.
+The gold standard of this implementation is Intel's TBB library~\cite{TBB}.
+\subsection{Paradigm Performance}
+While the choice between the three paradigms listed above may have significant performance implications, it is difficult to pin down the performance implications of choosing a model at the language level.
+Indeed, in many situations one of these paradigms may show better performance but it all strongly depends on the workload.
+Having a large amount of mostly independent units of work to execute almost guarantees equivalent performance across paradigms and that the \textbf{pool}-based system has the best efficiency thanks to the lower memory overhead (\ie no thread stack per job).
+However, interactions among jobs can easily exacerbate contention.
+User-level threads allow fine-grain context switching, which results in better resource utilization, but a context switch is more expensive and the extra control means users need to tweak more variables to get the desired performance.
+Finally, if the units of uninterrupted work are large, enough the paradigm choice is largely amortized by the actual work done.
+\section{The \protect\CFA\ Kernel : Processors, Clusters and Threads}\label{kernel}
+A \textbf{cfacluster} is a group of \textbf{kthread} executed in isolation. \textbf{uthread} are scheduled on the \textbf{kthread} of a given \textbf{cfacluster}, allowing organization between \textbf{uthread} and \textbf{kthread}.
+It is important that \textbf{kthread} belonging to a same \textbf{cfacluster} have homogeneous settings, otherwise migrating a \textbf{uthread} from one \textbf{kthread} to the other can cause issues.
+A \textbf{cfacluster} also offers a pluggable scheduler that can optimize the workload generated by the \textbf{uthread}.
+\textbf{cfacluster} have not been fully implemented in the context of this paper.
+Currently \CFA only supports one \textbf{cfacluster}, the initial one.
+\subsection{Future Work: Machine Setup}\label{machine}
+While this was not done in the context of this paper, another important aspect of clusters is affinity.
+While many common desktop and laptop PCs have homogeneous CPUs, other devices often have more heterogeneous setups.
+For example, a system using \textbf{numa} configurations may benefit from users being able to tie clusters and/or kernel threads to certain CPU cores.
+OS support for CPU affinity is now common~\cite{affinityLinux, affinityWindows, affinityFreebsd, affinityNetbsd, affinityMacosx}, which means it is both possible and desirable for \CFA to offer an abstraction mechanism for portable CPU affinity.
+\subsection{Paradigms}\label{cfaparadigms}
+Given these building blocks, it is possible to reproduce all three of the popular paradigms.
+Indeed, \textbf{uthread} is the default paradigm in \CFA.
+However, disabling \textbf{preemption} on a cluster means threads effectively become fibers.
+Since several \textbf{cfacluster} with different scheduling policy can coexist in the same application, this allows \textbf{fiber} and \textbf{uthread} to coexist in the runtime of an application.
+Finally, it is possible to build executors for thread pools from \textbf{uthread} or \textbf{fiber}, which includes specialized jobs like actors~\cite{Actors}.
+\section{Behind the Scenes}
+There are several challenges specific to \CFA when implementing concurrency.
+These challenges are a direct result of bulk acquire and loose object definitions.
+These two constraints are the root cause of most design decisions in the implementation.
+Furthermore, to avoid contention from dynamically allocating memory in a concurrent environment, the internal-scheduling design is (almost) entirely free of mallocs.
+This approach avoids the chicken and egg problem~\cite{Chicken} of having a memory allocator that relies on the threading system and a threading system that relies on the runtime.
+This extra goal means that memory management is a constant concern in the design of the system.
+The main memory concern for concurrency is queues.
+All blocking operations are made by parking threads onto queues and all queues are designed with intrusive nodes, where each node has pre-allocated link fields for chaining, to avoid the need for memory allocation.
+Since several concurrency operations can use an unbound amount of memory (depending on bulk acquire), statically defining information in the intrusive fields of threads is insufficient.The only way to use a variable amount of memory without requiring memory allocation is to pre-allocate large buffers of memory eagerly and store the information in these buffers.
+Conveniently, the call stack fits that description and is easy to use, which is why it is used heavily in the implementation of internal scheduling, particularly variable-length arrays.
+Since stack allocation is based on scopes, the first step of the implementation is to identify the scopes that are available to store the information, and which of these can have a variable-length array.
+The threads and the condition both have a fixed amount of memory, while @mutex@ routines and blocking calls allow for an unbound amount, within the stack size.
+Note that since the major contributions of this paper are extending monitor semantics to bulk acquire and loose object definitions, any challenges that are not resulting of these characteristics of \CFA are considered as solved problems and therefore not discussed.
+% ======================================================================
+% ======================================================================
+\section{Mutex Routines}
+% ======================================================================
+% ======================================================================
+The first step towards the monitor implementation is simple @mutex@ routines.
+In the single monitor case, mutual-exclusion is done using the entry/exit procedure in listing \ref{f:entry1}.
+The entry/exit procedures do not have to be extended to support multiple monitors.
+Indeed it is sufficient to enter/leave monitors one-by-one as long as the order is correct to prevent deadlock~\cite{Havender68}.
+In \CFA, ordering of monitor acquisition relies on memory ordering.
+This approach is sufficient because all objects are guaranteed to have distinct non-overlapping memory layouts and mutual-exclusion for a monitor is only defined for its lifetime, meaning that destroying a monitor while it is acquired is undefined behaviour.
+When a mutex call is made, the concerned monitors are aggregated into a variable-length pointer array and sorted based on pointer values.
+This array persists for the entire duration of the mutual-exclusion and its ordering reused extensively.
+\begin{figure}
+\begin{multicols}{2}
+Entry
+\begin{cfa}
+if monitor is free
+        enter
+elif already own the monitor
+        continue
+else
+        block
+increment recursions
+\end{cfa}
+\columnbreak
+Exit
+\begin{cfa}
+decrement recursion
+if recursion == 0
+        if entry queue not empty
+                wake-up thread
+\end{cfa}
+\end{multicols}
+\begin{cfa}[caption={Initial entry and exit routine for monitors},label={f:entry1}]
+\end{cfa}
+\end{figure}
+\subsection{Details: Interaction with polymorphism}
+Depending on the choice of semantics for when monitor locks are acquired, interaction between monitors and \CFA's concept of polymorphism can be more complex to support.
+However, it is shown that entry-point locking solves most of the issues.
+First of all, interaction between @otype@ polymorphism (see Section~\ref{s:ParametricPolymorphism}) and monitors is impossible since monitors do not support copying.
+Therefore, the main question is how to support @dtype@ polymorphism.
+It is important to present the difference between the two acquiring options: \textbf{callsite-locking} and entry-point locking, \ie acquiring the monitors before making a mutex routine-call or as the first operation of the mutex routine-call.
+For example:
+}
+\end{cfa}
+\end{tabular}
+\end{cquote}
+% \lstMakeShortInline@%
+% \caption{Threads ping/pong using external scheduling}
+% \label{f:pingpong}
+% \end{figure}
+Note, the ping/pong threads are globally declared, @pi@/@po@, and hence, start (and possibly complete) before the program main starts.
+\end{comment}
+\subsection{Execution Properties}
+Table~\ref{t:ObjectPropertyComposition} shows how the \CFA high-level constructs cover 3 fundamental execution properties: thread, stateful function, and mutual exclusion.
+Case 1 is a basic object, with none of the new execution properties.
+Case 2 allows @mutex@ calls to Case 1 to protect shared data.
+Case 3 allows stateful functions to suspend/resume but restricts operations because the state is stackless.
+Case 4 allows @mutex@ calls to Case 3 to protect shared data.
+Cases 5 and 6 are the same as 3 and 4 without restriction because the state is stackful.
+Cases 7 and 8 are rejected because a thread cannot execute without a stackful state in a preemptive environment when context switching from the signal handler.
+Cases 9 and 10 have a stackful thread without and with @mutex@ calls.
+For situations where threads do not require direct communication, case 9 provides faster creation/destruction by eliminating @mutex@ setup.
 \begin{table}
+\begin{center}
+\begin{tabular}{|c|c|c|}
+Mutex & \textbf{callsite-locking} & \textbf{entry-point-locking} \\
+call & cfa-code & cfa-code \\
+\caption{Object property composition}
+\centering
+\label{t:ObjectPropertyComposition}
+\renewcommand{\arraystretch}{1.25}
+%\setlength{\tabcolsep}{5pt}
+\begin{tabular}{c|c||l|l}
+\multicolumn{2}{c||}{object properties} & \multicolumn{2}{c}{mutual exclusion} \\
 \hline
+\begin{cfa}[tabsize=3]
+void foo(monitor& mutex a){
+        // Do Work
+        //...
+}
+void main() {
+        monitor a;
+        foo(a);
+}
+\end{cfa} & \begin{cfa}[tabsize=3]
+foo(& a) {
+        // Do Work
+        //...
+}
+main() {
+        monitor a;
+        acquire(a);
+        foo(a);
+        release(a);
+}
+\end{cfa} & \begin{cfa}[tabsize=3]
+foo(& a) {
+        acquire(a);
+        // Do Work
+        //...
+        release(a);
+}
+main() {
+        monitor a;
+        foo(a);
+}
+\end{cfa}
+\end{tabular}
+\end{center}
+\caption{Call-site vs entry-point locking for mutex calls}
+\label{tbl:locking-site}
+\end{table}
+Note the @mutex@ keyword relies on the type system, which means that in cases where a generic monitor-routine is desired, writing the mutex routine is possible with the proper trait, \eg:
+\begin{cfa}
+// Incorrect: T may not be monitor
+forall(dtype T)
+void foo(T * mutex t);
+// Correct: this routine only works on monitors (any monitor)
+forall(dtype T | is_monitor(T))
+void bar(T * mutex t));
+\end{cfa}
+Both entry point and \textbf{callsite-locking} are feasible implementations.
+The current \CFA implementation uses entry-point locking because it requires less work when using \textbf{raii}, effectively transferring the burden of implementation to object construction/destruction.
+It is harder to use \textbf{raii} for call-site locking, as it does not necessarily have an existing scope that matches exactly the scope of the mutual exclusion, \ie the routine body.
+For example, the monitor call can appear in the middle of an expression.
+Furthermore, entry-point locking requires less code generation since any useful routine is called multiple times but there is only one entry point for many call sites.
+% ======================================================================
+% ======================================================================
+\section{Threading} \label{impl:thread}
+% ======================================================================
+% ======================================================================
+Figure \ref{fig:system1} shows a high-level picture if the \CFA runtime system in regards to concurrency.
+Each component of the picture is explained in detail in the flowing sections.
+\begin{figure}
+\begin{center}
+{\resizebox{\textwidth}{!}{\input{system.pstex_t}}}
+\end{center}
+\caption{Overview of the entire system}
+\label{fig:system1}
+\end{figure}
+\subsection{Processors}
+Parallelism in \CFA is built around using processors to specify how much parallelism is desired. \CFA processors are object wrappers around kernel threads, specifically @pthread@s in the current implementation of \CFA.
+Indeed, any parallelism must go through operating-system libraries.
+However, \textbf{uthread} are still the main source of concurrency, processors are simply the underlying source of parallelism.
+Indeed, processor \textbf{kthread} simply fetch a \textbf{uthread} from the scheduler and run it; they are effectively executers for user-threads.
+The main benefit of this approach is that it offers a well-defined boundary between kernel code and user code, for example, kernel thread quiescing, scheduling and interrupt handling.
+Processors internally use coroutines to take advantage of the existing context-switching semantics.
+\subsection{Stack Management}
+One of the challenges of this system is to reduce the footprint as much as possible.
+Specifically, all @pthread@s created also have a stack created with them, which should be used as much as possible.
+Normally, coroutines also create their own stack to run on, however, in the case of the coroutines used for processors, these coroutines run directly on the \textbf{kthread} stack, effectively stealing the processor stack.
+The exception to this rule is the Main Processor, \ie the initial \textbf{kthread} that is given to any program.
+In order to respect C user expectations, the stack of the initial kernel thread, the main stack of the program, is used by the main user thread rather than the main processor, which can grow very large.
+\subsection{Context Switching}
+As mentioned in section \ref{coroutine}, coroutines are a stepping stone for implementing threading, because they share the same mechanism for context-switching between different stacks.
+To improve performance and simplicity, context-switching is implemented using the following assumption: all context-switches happen inside a specific routine call.
+This assumption means that the context-switch only has to copy the callee-saved registers onto the stack and then switch the stack registers with the ones of the target coroutine/thread.
+Note that the instruction pointer can be left untouched since the context-switch is always inside the same routine
+Threads, however, do not context-switch between each other directly.
+They context-switch to the scheduler.
+This method is called a 2-step context-switch and has the advantage of having a clear distinction between user code and the kernel where scheduling and other system operations happen.
+Obviously, this doubles the context-switch cost because threads must context-switch to an intermediate stack.
+The alternative 1-step context-switch uses the stack of the ``from'' thread to schedule and then context-switches directly to the ``to'' thread.
+However, the performance of the 2-step context-switch is still superior to a @pthread_yield@ (see section \ref{results}).
+Additionally, for users in need for optimal performance, it is important to note that having a 2-step context-switch as the default does not prevent \CFA from offering a 1-step context-switch (akin to the Microsoft @SwitchToFiber@~\cite{switchToWindows} routine).
+This option is not currently present in \CFA, but the changes required to add it are strictly additive.
+\subsection{Preemption} \label{preemption}
+Finally, an important aspect for any complete threading system is preemption.
+As mentioned in section \ref{basics}, preemption introduces an extra degree of uncertainty, which enables users to have multiple threads interleave transparently, rather than having to cooperate among threads for proper scheduling and CPU distribution.
+Indeed, preemption is desirable because it adds a degree of isolation among threads.
+In a fully cooperative system, any thread that runs a long loop can starve other threads, while in a preemptive system, starvation can still occur but it does not rely on every thread having to yield or block on a regular basis, which reduces significantly a programmer burden.
+Obviously, preemption is not optimal for every workload.
+However any preemptive system can become a cooperative system by making the time slices extremely large.
+Therefore, \CFA uses a preemptive threading system.
+Preemption in \CFA\footnote{Note that the implementation of preemption is strongly tied with the underlying threading system.
+For this reason, only the Linux implementation is cover, \CFA does not run on Windows at the time of writting} is based on kernel timers, which are used to run a discrete-event simulation.
+Every processor keeps track of the current time and registers an expiration time with the preemption system.
+When the preemption system receives a change in preemption, it inserts the time in a sorted order and sets a kernel timer for the closest one, effectively stepping through preemption events on each signal sent by the timer.
+These timers use the Linux signal {\tt SIGALRM}, which is delivered to the process rather than the kernel-thread.
+This results in an implementation problem, because when delivering signals to a process, the kernel can deliver the signal to any kernel thread for which the signal is not blocked, \ie:
+\begin{quote}
+A process-directed signal may be delivered to any one of the threads that does not currently have the signal blocked.
+If more than one of the threads has the signal unblocked, then the kernel chooses an arbitrary thread to which to deliver the signal.
+SIGNAL(7) - Linux Programmer's Manual
+\end{quote}
+For the sake of simplicity, and in order to prevent the case of having two threads receiving alarms simultaneously, \CFA programs block the {\tt SIGALRM} signal on every kernel thread except one.
+Now because of how involuntary context-switches are handled, the kernel thread handling {\tt SIGALRM} cannot also be a processor thread.
+Hence, involuntary context-switching is done by sending signal {\tt SIGUSR1} to the corresponding proces\-sor and having the thread yield from inside the signal handler.
+This approach effectively context-switches away from the signal handler back to the kernel and the signal handler frame is eventually unwound when the thread is scheduled again.
+As a result, a signal handler can start on one kernel thread and terminate on a second kernel thread (but the same user thread).
+It is important to note that signal handlers save and restore signal masks because user-thread migration can cause a signal mask to migrate from one kernel thread to another.
+This behaviour is only a problem if all kernel threads, among which a user thread can migrate, differ in terms of signal masks\footnote{Sadly, official POSIX documentation is silent on what distinguishes ``async-signal-safe'' routines from other routines}.
+However, since the kernel thread handling preemption requires a different signal mask, executing user threads on the kernel-alarm thread can cause deadlocks.
+For this reason, the alarm thread is in a tight loop around a system call to @sigwaitinfo@, requiring very little CPU time for preemption.
+One final detail about the alarm thread is how to wake it when additional communication is required (\eg on thread termination).
+This unblocking is also done using {\tt SIGALRM}, but sent through the @pthread_sigqueue@.
+Indeed, @sigwait@ can differentiate signals sent from @pthread_sigqueue@ from signals sent from alarms or the kernel.
+\subsection{Scheduler}
+Finally, an aspect that was not mentioned yet is the scheduling algorithm.
+Currently, the \CFA scheduler uses a single ready queue for all processors, which is the simplest approach to scheduling.
+Further discussion on scheduling is present in section \ref{futur:sched}.
+% ======================================================================
+% ======================================================================
+\section{Internal Scheduling} \label{impl:intsched}
+% ======================================================================
+% ======================================================================
+The following figure is the traditional illustration of a monitor (repeated from page~\pageref{fig:ClassicalMonitor} for convenience):
+\begin{figure}
+\begin{center}
+{\resizebox{0.4\textwidth}{!}{\input{monitor}}}
+\end{center}
+\caption{Traditional illustration of a monitor}
+\end{figure}
+This picture has several components, the two most important being the entry queue and the AS-stack.
+The entry queue is an (almost) FIFO list where threads waiting to enter are parked, while the acceptor/signaller (AS) stack is a FILO list used for threads that have been signalled or otherwise marked as running next.
+For \CFA, this picture does not have support for blocking multiple monitors on a single condition.
+To support bulk acquire two changes to this picture are required.
+First, it is no longer helpful to attach the condition to \emph{a single} monitor.
+Secondly, the thread waiting on the condition has to be separated across multiple monitors, seen in figure \ref{fig:monitor_cfa}.
+\begin{figure}
+\begin{center}
+{\resizebox{0.8\textwidth}{!}{\input{int_monitor}}}
+\end{center}
+\caption{Illustration of \CFA Monitor}
+\label{fig:monitor_cfa}
+\end{figure}
+This picture and the proper entry and leave algorithms (see listing \ref{f:entry2}) is the fundamental implementation of internal scheduling.
+Note that when a thread is moved from the condition to the AS-stack, it is conceptually split into N pieces, where N is the number of monitors specified in the parameter list.
+The thread is woken up when all the pieces have popped from the AS-stacks and made active.
+In this picture, the threads are split into halves but this is only because there are two monitors.
+For a specific signalling operation every monitor needs a piece of thread on its AS-stack.
+\begin{figure}
+\begin{multicols}{2}
+Entry
+\begin{cfa}
+if monitor is free
+        enter
+elif already own the monitor
+        continue
+else
+        block
+increment recursion
+\end{cfa}
+\columnbreak
+Exit
+\begin{cfa}
+decrement recursion
+if recursion == 0
+        if signal_stack not empty
+                set_owner to thread
+                if all monitors ready
+                        wake-up thread
+        if entry queue not empty
+                wake-up thread
+\end{cfa}
+\end{multicols}
+\begin{cfa}[caption={Entry and exit routine for monitors with internal scheduling},label={f:entry2}]
+\end{cfa}
+\end{figure}
+The solution discussed in \ref{s:InternalScheduling} can be seen in the exit routine of listing \ref{f:entry2}.
+Basically, the solution boils down to having a separate data structure for the condition queue and the AS-stack, and unconditionally transferring ownership of the monitors but only unblocking the thread when the last monitor has transferred ownership.
+This solution is deadlock safe as well as preventing any potential barging.
+The data structures used for the AS-stack are reused extensively for external scheduling, but in the case of internal scheduling, the data is allocated using variable-length arrays on the call stack of the @wait@ and @signal_block@ routines.
+\begin{figure}
+\begin{center}
+{\resizebox{0.8\textwidth}{!}{\input{monitor_structs.pstex_t}}}
+\end{center}
+\caption{Data structures involved in internal/external scheduling}
+\label{fig:structs}
+\end{figure}
+Figure \ref{fig:structs} shows a high-level representation of these data structures.
+The main idea behind them is that, a thread cannot contain an arbitrary number of intrusive ``next'' pointers for linking onto monitors.
+The @condition node@ is the data structure that is queued onto a condition variable and, when signalled, the condition queue is popped and each @condition criterion@ is moved to the AS-stack.
+Once all the criteria have been popped from their respective AS-stacks, the thread is woken up, which is what is shown in listing \ref{f:entry2}.
+% ======================================================================
+% ======================================================================
+\section{External Scheduling}
+% ======================================================================
+% ======================================================================
+Similarly to internal scheduling, external scheduling for multiple monitors relies on the idea that waiting-thread queues are no longer specific to a single monitor, as mentioned in section \ref{extsched}.
+For internal scheduling, these queues are part of condition variables, which are still unique for a given scheduling operation (\ie no signal statement uses multiple conditions).
+However, in the case of external scheduling, there is no equivalent object which is associated with @waitfor@ statements.
+This absence means the queues holding the waiting threads must be stored inside at least one of the monitors that is acquired.
+These monitors being the only objects that have sufficient lifetime and are available on both sides of the @waitfor@ statement.
+This requires an algorithm to choose which monitor holds the relevant queue.
+It is also important that said algorithm be independent of the order in which users list parameters.
+The proposed algorithm is to fall back on monitor lock ordering (sorting by address) and specify that the monitor that is acquired first is the one with the relevant waiting queue.
+This assumes that the lock acquiring order is static for the lifetime of all concerned objects but that is a reasonable constraint.
+This algorithm choice has two consequences:
+\begin{itemize}
+        \item The queue of the monitor with the lowest address is no longer a true FIFO queue because threads can be moved to the front of the queue.
+These queues need to contain a set of monitors for each of the waiting threads.
+Therefore, another thread whose set contains the same lowest address monitor but different lower priority monitors may arrive first but enter the critical section after a thread with the correct pairing.
+        \item The queue of the lowest priority monitor is both required and potentially unused.
+Indeed, since it is not known at compile time which monitor is the monitor which has the lowest address, every monitor needs to have the correct queues even though it is possible that some queues go unused for the entire duration of the program, for example if a monitor is only used in a specific pair.
+\end{itemize}
+Therefore, the following modifications need to be made to support external scheduling:
+\begin{itemize}
+        \item The threads waiting on the entry queue need to keep track of which routine they are trying to enter, and using which set of monitors.
+The @mutex@ routine already has all the required information on its stack, so the thread only needs to keep a pointer to that information.
+        \item The monitors need to keep a mask of acceptable routines.
+This mask contains for each acceptable routine, a routine pointer and an array of monitors to go with it.
+It also needs storage to keep track of which routine was accepted.
+Since this information is not specific to any monitor, the monitors actually contain a pointer to an integer on the stack of the waiting thread.
+Note that if a thread has acquired two monitors but executes a @waitfor@ with only one monitor as a parameter, setting the mask of acceptable routines to both monitors will not cause any problems since the extra monitor will not change ownership regardless.
+This becomes relevant when @when@ clauses affect the number of monitors passed to a @waitfor@ statement.
+        \item The entry/exit routines need to be updated as shown in listing \ref{f:entry3}.
+\end{itemize}
+\subsection{External Scheduling - Destructors}
+Finally, to support the ordering inversion of destructors, the code generation needs to be modified to use a special entry routine.
+This routine is needed because of the storage requirements of the call order inversion.
+Indeed, when waiting for the destructors, storage is needed for the waiting context and the lifetime of said storage needs to outlive the waiting operation it is needed for.
+For regular @waitfor@ statements, the call stack of the routine itself matches this requirement but it is no longer the case when waiting for the destructor since it is pushed on to the AS-stack for later.
+The @waitfor@ semantics can then be adjusted correspondingly, as seen in listing \ref{f:entry-dtor}
+\begin{figure}
+\begin{multicols}{2}
+Entry
+\begin{cfa}
+if monitor is free
+        enter
+elif already own the monitor
+        continue
+elif matches waitfor mask
+        push criteria to AS-stack
+        continue
+else
+        block
+increment recursion
+\end{cfa}
+\columnbreak
+Exit
+\begin{cfa}
+decrement recursion
+if recursion == 0
+        if signal_stack not empty
+                set_owner to thread
+                if all monitors ready
+                        wake-up thread
+                endif
+        endif
+        if entry queue not empty
+                wake-up thread
+        endif
+\end{cfa}
+\end{multicols}
+\begin{cfa}[caption={Entry and exit routine for monitors with internal scheduling and external scheduling},label={f:entry3}]
+\end{cfa}
+\end{figure}
+\begin{figure}
+\begin{multicols}{2}
+Destructor Entry
+\begin{cfa}
+if monitor is free
+        enter
+elif already own the monitor
+        increment recursion
+        return
+create wait context
+if matches waitfor mask
+        reset mask
+        push self to AS-stack
+        baton pass
+else
+        wait
+increment recursion
+\end{cfa}
+\columnbreak
+Waitfor
+\begin{cfa}
+if matching thread is already there
+        if found destructor
+                push destructor to AS-stack
+                unlock all monitors
+        else
+                push self to AS-stack
+                baton pass
+        endif
+        return
+endif
+if non-blocking
+        Unlock all monitors
+        Return
+endif
+push self to AS-stack
+set waitfor mask
+block
+return
+\end{cfa}
+\end{multicols}
+\begin{cfa}[caption={Pseudo code for the \protect\lstinline|waitfor| routine and the \protect\lstinline|mutex| entry routine for destructors},label={f:entry-dtor}]
+\end{cfa}
+\end{figure}
+% ======================================================================
+% ======================================================================
+\section{Putting It All Together}
+% ======================================================================
+% ======================================================================
+\section{Threads As Monitors}
+As it was subtly alluded in section \ref{threads}, @thread@s in \CFA are in fact monitors, which means that all monitor features are available when using threads.
+For example, here is a very simple two thread pipeline that could be used for a simulator of a game engine:
+\begin{figure}
+\begin{cfa}[caption={Toy simulator using \protect\lstinline|thread|s and \protect\lstinline|monitor|s.},label={f:engine-v1}]
+// Visualization declaration
+thread Renderer {} renderer;
+Frame * simulate( Simulator & this );
+// Simulation declaration
+thread Simulator{} simulator;
+void render( Renderer & this );
+// Blocking call used as communication
+void draw( Renderer & mutex this, Frame * frame );
+// Simulation loop
+void main( Simulator & this ) {
+        while( true ) {
+                Frame * frame = simulate( this );
+                draw( renderer, frame );
+        }
+}
+// Rendering loop
+void main( Renderer & this ) {
+        while( true ) {
+                waitfor( draw, this );
+                render( this );
+        }
+}
+\end{cfa}
+\end{figure}
+One of the obvious complaints of the previous code snippet (other than its toy-like simplicity) is that it does not handle exit conditions and just goes on forever.
+Luckily, the monitor semantics can also be used to clearly enforce a shutdown order in a concise manner:
+\begin{figure}
+\begin{cfa}[caption={Same toy simulator with proper termination condition.},label={f:engine-v2}]
+// Visualization declaration
+thread Renderer {} renderer;
+Frame * simulate( Simulator & this );
+// Simulation declaration
+thread Simulator{} simulator;
+void render( Renderer & this );
+// Blocking call used as communication
+void draw( Renderer & mutex this, Frame * frame );
+// Simulation loop
+void main( Simulator & this ) {
+        while( true ) {
+                Frame * frame = simulate( this );
+                draw( renderer, frame );
+                // Exit main loop after the last frame
+                if( frame->is_last ) break;
+        }
+}
+// Rendering loop
+void main( Renderer & this ) {
+        while( true ) {
+                   waitfor( draw, this );
+                or waitfor( ^?{}, this ) {
+                        // Add an exit condition
+                        break;
+                }
+                render( this );
+        }
+}
+// Call destructor for simulator once simulator finishes
+// Call destructor for renderer to signify shutdown
+\end{cfa}
+\end{figure}
+\section{Fibers \& Threads}
+As mentioned in section \ref{preemption}, \CFA uses preemptive threads by default but can use fibers on demand.
+Currently, using fibers is done by adding the following line of code to the program~:
+\begin{cfa}
+unsigned int default_preemption() {
+        return 0;
+}
+\end{cfa}
+This routine is called by the kernel to fetch the default preemption rate, where 0 signifies an infinite time-slice, \ie no preemption.
+However, once clusters are fully implemented, it will be possible to create fibers and \textbf{uthread} in the same system, as in listing \ref{f:fiber-uthread}
+\begin{figure}
+\lstset{language=CFA,deletedelim=**[is][]{`}{`}}
+\begin{cfa}[caption={Using fibers and \textbf{uthread} side-by-side in \CFA},label={f:fiber-uthread}]
+// Cluster forward declaration
+struct cluster;
+// Processor forward declaration
+struct processor;
+// Construct clusters with a preemption rate
+void ?{}(cluster& this, unsigned int rate);
+// Construct processor and add it to cluster
+void ?{}(processor& this, cluster& cluster);
+// Construct thread and schedule it on cluster
+void ?{}(thread& this, cluster& cluster);
+// Declare two clusters
+cluster thread_cluster = { 10`ms };                     // Preempt every 10 ms
+cluster fibers_cluster = { 0 };                         // Never preempt
+// Construct 4 processors
+processor processors[4] = {
+        //2 for the thread cluster
+        thread_cluster;
+        thread_cluster;
+        //2 for the fibers cluster
+        fibers_cluster;
+        fibers_cluster;
+};
+// Declares thread
+thread UThread {};
+void ?{}(UThread& this) {
+        // Construct underlying thread to automatically
+        // be scheduled on the thread cluster
+        (this){ thread_cluster }
+}
+void main(UThread & this);
+// Declares fibers
+thread Fiber {};
+void ?{}(Fiber& this) {
+        // Construct underlying thread to automatically
+        // be scheduled on the fiber cluster
+        (this.__thread){ fibers_cluster }
+}
+void main(Fiber & this);
+\end{cfa}
+\end{figure}
+% ======================================================================
+% ======================================================================
+\section{Performance Results} \label{results}
+% ======================================================================
+% ======================================================================
+\section{Machine Setup}
+Table \ref{tab:machine} shows the characteristics of the machine used to run the benchmarks.
+All tests were made on this machine.
+\begin{table}
+\begin{center}
+\begin{tabular}{| l | r | l | r |}
+\hline
+Architecture            & x86\_64                       & NUMA node(s)  & 8 \\
+\hline
+CPU op-mode(s)          & 32-bit, 64-bit                & Model name    & AMD Opteron\texttrademark  Processor 6380 \\
+\hline
+Byte Order                      & Little Endian                 & CPU Freq              & 2.5\si{\giga\hertz} \\
+\hline
+CPU(s)                  & 64                            & L1d cache     & \SI{16}{\kibi\byte} \\
+\hline
+Thread(s) per core      & 2                             & L1i cache     & \SI{64}{\kibi\byte} \\
+\hline
+Core(s) per socket      & 8                             & L2 cache              & \SI{2048}{\kibi\byte} \\
+\hline
+Socket(s)                       & 4                             & L3 cache              & \SI{6144}{\kibi\byte} \\
+thread  & stateful                              & \multicolumn{1}{c|}{No} & \multicolumn{1}{c}{Yes} \\
 \hline
 \hline
 Operating system                & Ubuntu 16.04.3 LTS    & Kernel                & Linux 4.4-97-generic \\
+No              & No                                    & \textbf{1}\ \ \ aggregate type                & \textbf{2}\ \ \ @monitor@ aggregate type \\
 \hline
 Compiler                        & GCC 6.3               & Translator    & CFA 1 \\
+No              & Yes (stackless)               & \textbf{3}\ \ \ @generator@                   & \textbf{4}\ \ \ @monitor@ @generator@ \\
 \hline
 Java version            & OpenJDK-9             & Go version    & 1.9.2 \\
+No              & Yes (stackful)                & \textbf{5}\ \ \ @coroutine@                   & \textbf{6}\ \ \ @monitor@ @coroutine@ \\
 \hline
+Yes             & No / Yes (stackless)  & \textbf{7}\ \ \ {\color{red}rejected} & \textbf{8}\ \ \ {\color{red}rejected} \\
+\hline
+Yes             & Yes (stackful)                & \textbf{9}\ \ \ @thread@                              & \textbf{10}\ \ @monitor@ @thread@ \\
 \end{tabular}
-\end{center}
-\caption{Machine setup used for the tests}
-\label{tab:machine}
 \end{table}
+\section{Micro Benchmarks}
+All benchmarks are run using the same harness to produce the results, seen as the @BENCH()@ macro in the following examples.
+This macro uses the following logic to benchmark the code:
+\begin{cfa}
+#define BENCH(run, result) \
+        before = gettime(); \
+        run; \
+        after  = gettime(); \
+        result = (after - before) / N;
+\end{cfa}
+The method used to get time is @clock_gettime(CLOCK_THREAD_CPUTIME_ID);@.
+Each benchmark is using many iterations of a simple call to measure the cost of the call.
+The specific number of iterations depends on the specific benchmark.
+\subsection{Context-Switching}
+The first interesting benchmark is to measure how long context-switches take.
+The simplest approach to do this is to yield on a thread, which executes a 2-step context switch.
+Yielding causes the thread to context-switch to the scheduler and back, more precisely: from the \textbf{uthread} to the \textbf{kthread} then from the \textbf{kthread} back to the same \textbf{uthread} (or a different one in the general case).
+In order to make the comparison fair, coroutines also execute a 2-step context-switch by resuming another coroutine which does nothing but suspending in a tight loop, which is a resume/suspend cycle instead of a yield.
+Figure~\ref{f:ctx-switch} shows the code for coroutines and threads with the results in table \ref{tab:ctx-switch}.
+All omitted tests are functionally identical to one of these tests.
+The difference between coroutines and threads can be attributed to the cost of scheduling.
+\subsection{Low-level Locks}
+For completeness and efficiency, \CFA provides a standard set of low-level locks: recursive mutex, condition, semaphore, barrier, \etc, and atomic instructions: @fetchAssign@, @fetchAdd@, @testSet@, @compareSet@, \etc.
+Some of these low-level mechanism are used in the \CFA runtime, but we strongly advocate using high-level mechanisms whenever possible.
+% \section{Parallelism}
+% \label{s:Parallelism}
+%
+% Historically, computer performance was about processor speeds.
+% However, with heat dissipation being a direct consequence of speed increase, parallelism is the new source for increased performance~\cite{Sutter05, Sutter05b}.
+% Therefore, high-performance applications must care about parallelism, which requires concurrency.
+% The lowest-level approach of parallelism is to use \newterm{kernel threads} in combination with semantics like @fork@, @join@, \etc.
+% However, kernel threads are better as an implementation tool because of complexity and higher cost.
+% Therefore, different abstractions are often layered onto kernel threads to simplify them, \eg pthreads.
+%
+%
+% \subsection{User Threads}
+%
+% A direct improvement on kernel threads is user threads, \eg Erlang~\cite{Erlang} and \uC~\cite{uC++book}.
+% This approach provides an interface that matches the language paradigms, gives more control over concurrency by the language runtime, and an abstract (and portable) interface to the underlying kernel threads across operating systems.
+% In many cases, user threads can be used on a much larger scale (100,000 threads).
+% Like kernel threads, user threads support preemption, which maximizes nondeterminism, but increases the potential for concurrency errors: race, livelock, starvation, and deadlock.
+% \CFA adopts user-threads to provide more flexibility and a low-cost mechanism to build any other concurrency approach, \eg thread pools and actors~\cite{Actors}.
+%
+% A variant of user thread is \newterm{fibres}, which removes preemption, \eg Go~\cite{Go} @goroutine@s.
+% Like functional programming, which removes mutation and its associated problems, removing preemption from concurrency reduces nondeterminism, making race and deadlock errors more difficult to generate.
+% However, preemption is necessary for fairness and to reduce tail-latency.
+% For concurrency that relies on spinning, if all cores spin the system is livelocked, whereas preemption breaks the livelock.
+\begin{comment}
+\subsection{Thread Pools}
+In contrast to direct threading is indirect \newterm{thread pools}, \eg Java @executor@, where small jobs (work units) are inserted into a work pool for execution.
+If the jobs are dependent, \ie interact, there is an implicit/explicit dependency graph that ties them together.
+While removing direct concurrency, and hence the amount of context switching, thread pools significantly limit the interaction that can occur among jobs.
+Indeed, jobs should not block because that also blocks the underlying thread, which effectively means the CPU utilization, and therefore throughput, suffers.
+While it is possible to tune the thread pool with sufficient threads, it becomes difficult to obtain high throughput and good core utilization as job interaction increases.
+As well, concurrency errors return, which threads pools are suppose to mitigate.
 \begin{figure}
+\centering
+\begin{tabular}{@{}l|l@{}}
+\begin{cfa}
+struct Adder {
+    int * row, cols;
+};
+int operator()() {
+        subtotal = 0;
+        for ( int c = 0; c < cols; c += 1 )
+                subtotal += row[c];
+        return subtotal;
+}
+void ?{}( Adder * adder, int row[$\,$], int cols, int & subtotal ) {
+        adder.[rows, cols, subtotal] = [rows, cols, subtotal];
+}
+\end{cfa}
+&
+\begin{cfa}
+int main() {
+        const int rows = 10, cols = 10;
+        int matrix[rows][cols], subtotals[rows], total = 0;
+        // read matrix
+        Executor executor( 4 ); // kernel threads
+        Adder * adders[rows];
+        for ( r; rows ) { // send off work for executor
+                adders[r] = new( matrix[r], cols, &subtotal[r] );
+                executor.send( *adders[r] );
+        }
+        for ( r; rows ) {       // wait for results
+                delete( adders[r] );
+                total += subtotals[r];
+        }
+        sout | total;
+}
+\end{cfa}
+\end{tabular}
+\caption{Executor}
+\end{figure}
+\end{comment}
+\section{Runtime Structure}
+\label{s:CFARuntimeStructure}
+Figure~\ref{f:RunTimeStructure} illustrates the runtime structure of a \CFA program.
+In addition to the new kinds of objects introduced by \CFA, there are two more runtime entities used to control parallel execution: cluster and (virtual) processor.
+An executing thread is illustrated by its containment in a processor.
+\begin{figure}
+\centering
+\input{RunTimeStructure}
+\caption{\CFA Runtime structure}
+\label{f:RunTimeStructure}
+\end{figure}
+\subsection{Cluster}
+\label{s:RuntimeStructureCluster}
+A \newterm{cluster} is a collection of threads and virtual processors (abstract kernel-thread) that execute the (user) threads from its own ready queue (like an OS executing kernel threads).
+The purpose of a cluster is to control the amount of parallelism that is possible among threads, plus scheduling and other execution defaults.
+The default cluster-scheduler is single-queue multi-server, which provides automatic load-balancing of threads on processors.
+However, the design allows changing the scheduler, \eg multi-queue multi-server with work-stealing/sharing across the virtual processors.
+If several clusters exist, both threads and virtual processors, can be explicitly migrated from one cluster to another.
+No automatic load balancing among clusters is performed by \CFA.
+When a \CFA program begins execution, it creates a user cluster with a single processor and a special processor to handle preemption that does not execute user threads.
+The user cluster is created to contain the application user-threads.
+Having all threads execute on the one cluster often maximizes utilization of processors, which minimizes runtime.
+However, because of limitations of scheduling requirements (real-time), NUMA architecture, heterogeneous hardware, or issues with the underlying operating system, multiple clusters are sometimes necessary.
+\subsection{Virtual Processor}
+\label{s:RuntimeStructureProcessor}
+A virtual processor is implemented by a kernel thread (\eg UNIX process), which are scheduled for execution on a hardware processor by the underlying operating system.
+Programs may use more virtual processors than hardware processors.
+On a multiprocessor, kernel threads are distributed across the hardware processors resulting in virtual processors executing in parallel.
+(It is possible to use affinity to lock a virtual processor onto a particular hardware processor~\cite{affinityLinux, affinityWindows, affinityFreebsd, affinityNetbsd, affinityMacosx}, which is used when caching issues occur or for heterogeneous hardware processors.)
+The \CFA runtime attempts to block unused processors and unblock processors as the system load increases;
+balancing the workload with processors is difficult because it requires future knowledge, \ie what will the applicaton workload do next.
+Preemption occurs on virtual processors rather than user threads, via operating-system interrupts.
+Thus virtual processors execute user threads, where preemption frequency applies to a virtual processor, so preemption occurs randomly across the executed user threads.
+Turning off preemption transforms user threads into fibres.
+\begin{comment}
+\section{Implementation}
+\label{s:Implementation}
+A primary implementation challenge is avoiding contention from dynamically allocating memory because of bulk acquire, \eg the internal-scheduling design is (almost) free of allocations.
+All blocking operations are made by parking threads onto queues, therefore all queues are designed with intrusive nodes, where each node has preallocated link fields for chaining.
+Furthermore, several bulk-acquire operations need a variable amount of memory.
+This storage is allocated at the base of a thread's stack before blocking, which means programmers must add a small amount of extra space for stacks.
+In \CFA, ordering of monitor acquisition relies on memory ordering to prevent deadlock~\cite{Havender68}, because all objects have distinct non-overlapping memory layouts, and mutual-exclusion for a monitor is only defined for its lifetime.
+When a mutex call is made, pointers to the concerned monitors are aggregated into a variable-length array and sorted.
+This array persists for the entire duration of the mutual exclusion and is used extensively for synchronization operations.
+To improve performance and simplicity, context switching occurs inside a function call, so only callee-saved registers are copied onto the stack and then the stack register is switched;
+the corresponding registers are then restored for the other context.
+Note, the instruction pointer is untouched since the context switch is always inside the same function.
+Experimental results (not presented) for a stackless or stackful scheduler (1 versus 2 context switches) (see Section~\ref{s:Concurrency}) show the performance is virtually equivalent, because both approaches are dominated by locking to prevent a race condition.
+All kernel threads (@pthreads@) created a stack.
+Each \CFA virtual processor is implemented as a coroutine and these coroutines run directly on the kernel-thread stack, effectively stealing this stack.
+The exception to this rule is the program main, \ie the initial kernel thread that is given to any program.
+In order to respect C expectations, the stack of the initial kernel thread is used by program main rather than the main processor, allowing it to grow dynamically as in a normal C program.
+\end{comment}
+\subsection{Preemption}
+Nondeterministic preemption provides fairness from long-running threads, and forces concurrent programmers to write more robust programs, rather than relying on code between cooperative scheduling to be atomic.
+This atomic reliance can fail on multi-core machines, because execution across cores is nondeterministic.
+A different reason for not supporting preemption is that it significantly complicates the runtime system, \eg Microsoft runtime does not support interrupts and on Linux systems, interrupts are complex (see below).
+Preemption is normally handled by setting a countdown timer on each virtual processor.
+When the timer expires, an interrupt is delivered, and the interrupt handler resets the countdown timer, and if the virtual processor is executing in user code, the signal handler performs a user-level context-switch, or if executing in the language runtime kernel, the preemption is ignored or rolled forward to the point where the runtime kernel context switches back to user code.
+Multiple signal handlers may be pending.
+When control eventually switches back to the signal handler, it returns normally, and execution continues in the interrupted user thread, even though the return from the signal handler may be on a different kernel thread than the one where the signal is delivered.
+The only issue with this approach is that signal masks from one kernel thread may be restored on another as part of returning from the signal handler;
+therefore, the same signal mask is required for all virtual processors in a cluster.
+Because preemption frequency is usually long (1 millisecond) performance cost is negligible.
+Linux switched a decade ago from specific to arbitrary process signal-delivery for applications with multiple kernel threads.
+\begin{cquote}
+A process-directed signal may be delivered to any one of the threads that does not currently have the signal blocked.
+If more than one of the threads has the signal unblocked, then the kernel chooses an arbitrary thread to which it will deliver the signal.
+SIGNAL(7) - Linux Programmer's Manual
+\end{cquote}
+Hence, the timer-expiry signal, which is generated \emph{externally} by the Linux kernel to an application, is delivered to any of its Linux subprocesses (kernel threads).
+To ensure each virtual processor receives a preemption signal, a discrete-event simulation is run on a special virtual processor, and only it sets and receives timer events.
+Virtual processors register an expiration time with the discrete-event simulator, which is inserted in sorted order.
+The simulation sets the countdown timer to the value at the head of the event list, and when the timer expires, all events less than or equal to the current time are processed.
+Processing a preemption event sends an \emph{internal} @SIGUSR1@ signal to the registered virtual processor, which is always delivered to that processor.
+\subsection{Debug Kernel}
+There are two versions of the \CFA runtime kernel: debug and non-debug.
+The debugging version has many runtime checks and internal assertions, \eg stack (non-writable) guard page, and checks for stack overflow whenever context switches occur among coroutines and threads, which catches most stack overflows.
+After a program is debugged, the non-debugging version can be used to significantly decrease space and increase performance.
+\section{Performance}
+\label{s:Performance}
+To verify the implementation of the \CFA runtime, a series of microbenchmarks are performed comparing \CFA with pthreads, Java OpenJDK-9, Go 1.12.6 and \uC 7.0.0.
+For comparison, the package must be multi-processor (M:N), which excludes libdill/libmil~\cite{libdill} (M:1)), and use a shared-memory programming model, \eg not message passing.
+The benchmark computer is an AMD Opteron\texttrademark\ 6380 NUMA 64-core, 8 socket, 2.5 GHz processor, running Ubuntu 16.04.6 LTS, and \CFA/\uC are compiled with gcc 6.5.
+All benchmarks are run using the following harness. (The Java harness is augmented to circumvent JIT issues.)
+\begin{cfa}
+unsigned int N = 10_000_000;
+#define BENCH( `run` ) Time before = getTimeNsec();  `run;`  Duration result = (getTimeNsec() - before) / N;
+\end{cfa}
+The method used to get time is @clock_gettime( CLOCK_REALTIME )@.
+Each benchmark is performed @N@ times, where @N@ varies depending on the benchmark;
+the total time is divided by @N@ to obtain the average time for a benchmark.
+Each benchmark experiment is run 31 times.
+All omitted tests for other languages are functionally identical to the \CFA tests and available online~\cite{CforallBenchMarks}.
+% tar --exclude=.deps --exclude=Makefile --exclude=Makefile.in --exclude=c.c --exclude=cxx.cpp --exclude=fetch_add.c -cvhf benchmark.tar benchmark
+\paragraph{Object Creation}
+Object creation is measured by creating/deleting the specific kind of concurrent object.
+Figure~\ref{f:creation} shows the code for \CFA, with results in Table~\ref{tab:creation}.
+The only note here is that the call stacks of \CFA coroutines are lazily created, therefore without priming the coroutine to force stack creation, the creation cost is artificially low.
 \begin{multicols}{2}
+\CFA Coroutines
+\begin{cfa}
+coroutine GreatSuspender {};
+void main(GreatSuspender& this) {
+        while(true) { suspend(); }
+}
+\lstset{language=CFA,moredelim=**[is][\color{red}]{@}{@},deletedelim=**[is][]{`}{`}}
+\begin{cfa}
+@thread@ MyThread {};
+void @main@( MyThread & ) {}
 int main() {
+        GreatSuspender s;
+        resume(s);
+        BENCH( for ( N ) { @MyThread m;@ } )
+        sout | result`ns;
+}
+\end{cfa}
+\captionof{figure}{\CFA object-creation benchmark}
+\label{f:creation}
+\columnbreak
+\vspace*{-16pt}
+\captionof{table}{Object creation comparison (nanoseconds)}
+\label{tab:creation}
+\begin{tabular}[t]{@{}r*{3}{D{.}{.}{5.2}}@{}}
+\multicolumn{1}{@{}c}{} & \multicolumn{1}{c}{Median} & \multicolumn{1}{c}{Average} & \multicolumn{1}{c@{}}{Std Dev} \\
+\CFA Coroutine Lazy             & 13.2          & 13.1          & 0.44          \\
+\CFA Coroutine Eager    & 531.3         & 536.0         & 26.54         \\
+\CFA Thread                             & 2074.9        & 2066.5        & 170.76        \\
+\uC Coroutine                   & 89.6          & 90.5          & 1.83          \\
+\uC Thread                              & 528.2         & 528.5         & 4.94          \\
+Goroutine                               & 4068.0        & 4113.1        & 414.55        \\
+Java Thread                             & 103848.5      & 104295.4      & 2637.57       \\
+Pthreads                                & 33112.6       & 33127.1       & 165.90
+\end{tabular}
+\end{multicols}
+\paragraph{Context-Switching}
+In procedural programming, the cost of a function call is important as modularization (refactoring) increases.
+(In many cases, a compiler inlines function calls to eliminate this cost.)
+Similarly, when modularization extends to coroutines/tasks, the time for a context switch becomes a relevant factor.
+The coroutine test is from resumer to suspender and from suspender to resumer, which is two context switches.
+The thread test is using yield to enter and return from the runtime kernel, which is two context switches.
+The difference in performance between coroutine and thread context-switch is the cost of scheduling for threads, whereas coroutines are self-scheduling.
+Figure~\ref{f:ctx-switch} only shows the \CFA code for coroutines/threads (other systems are similar) with all results in Table~\ref{tab:ctx-switch}.
+\begin{multicols}{2}
+\lstset{language=CFA,moredelim=**[is][\color{red}]{@}{@},deletedelim=**[is][]{`}{`}}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+@coroutine@ C {} c;
+void main( C & ) { for ( ;; ) { @suspend;@ } }
+int main() { // coroutine test
+        BENCH( for ( N ) { @resume( c );@ } )
+        sout | result`ns;
+}
+int main() { // task test
+        BENCH( for ( N ) { @yield();@ } )
+        sout | result`ns;
+}
+\end{cfa}
+\captionof{figure}{\CFA context-switch benchmark}
+\label{f:ctx-switch}
+\columnbreak
+\vspace*{-16pt}
+\captionof{table}{Context switch comparison (nanoseconds)}
+\label{tab:ctx-switch}
+\begin{tabular}{@{}r*{3}{D{.}{.}{3.2}}@{}}
+\multicolumn{1}{@{}c}{} & \multicolumn{1}{c}{Median} &\multicolumn{1}{c}{Average} & \multicolumn{1}{c@{}}{Std Dev} \\
+C function              & 1.8   & 1.8   & 0.01  \\
+\CFA generator  & 2.4   & 2.2   & 0.25  \\
+\CFA Coroutine  & 36.2  & 36.2  & 0.25  \\
+\CFA Thread             & 93.2  & 93.5  & 2.09  \\
+\uC Coroutine   & 52.0  & 52.1  & 0.51  \\
+\uC Thread              & 96.2  & 96.3  & 0.58  \\
+Goroutine               & 141.0 & 141.3 & 3.39  \\
+Java Thread             & 374.0 & 375.8 & 10.38 \\
+Pthreads Thread & 361.0 & 365.3 & 13.19
+\end{tabular}
+\end{multicols}
+\paragraph{Mutual-Exclusion}
+Uncontented mutual exclusion, which frequently occurs, is measured by entering/leaving a critical section.
+For monitors, entering and leaving a monitor function is measured.
+To put the results in context, the cost of entering a non-inline function and the cost of acquiring and releasing a @pthread_mutex@ lock is also measured.
+Figure~\ref{f:mutex} shows the code for \CFA with all results in Table~\ref{tab:mutex}.
+Note, the incremental cost of bulk acquire for \CFA, which is largely a fixed cost for small numbers of mutex objects.
+\begin{multicols}{2}
+\lstset{language=CFA,moredelim=**[is][\color{red}]{@}{@},deletedelim=**[is][]{`}{`}}
+\begin{cfa}
+@monitor@ M {} m1/*, m2, m3, m4*/;
+void __attribute__((noinline))
+do_call( M & @mutex m/*, m2, m3, m4*/@ ) {}
+int main() {
         BENCH(
+                for(size_t i=0; i<n; i++) {
+                        resume(s);
+                },
+                result
+                for( N ) do_call( m1/*, m2, m3, m4*/ );
+        )
+        printf("%llu\n", result);
+}
+\end{cfa}
+        sout | result`ns;
+}
+\end{cfa}
+\captionof{figure}{\CFA acquire/release mutex benchmark}
+\label{f:mutex}
 \columnbreak
+\CFA Threads
+\begin{cfa}
+int main() {
+        BENCH(
+                for(size_t i=0; i<n; i++) {
+                        yield();
+                },
+                result
+        )
+        printf("%llu\n", result);
+}
+\end{cfa}
+\vspace*{-16pt}
+\captionof{table}{Mutex comparison (nanoseconds)}
+\label{tab:mutex}
+\begin{tabular}{@{}r*{3}{D{.}{.}{3.2}}@{}}
+\multicolumn{1}{@{}c}{} & \multicolumn{1}{c}{Median} &\multicolumn{1}{c}{Average} & \multicolumn{1}{c@{}}{Std Dev} \\
+test and test-and-test lock             & 19.1  & 18.9  & 0.40  \\
+\CFA @mutex@ function, 1 arg.   & 45.9  & 46.6  & 1.45  \\
+\CFA @mutex@ function, 2 arg.   & 105.0 & 104.7 & 3.08  \\
+\CFA @mutex@ function, 4 arg.   & 165.0 & 167.6 & 5.65  \\
+\uC @monitor@ member rtn.               & 54.0  & 53.7  & 0.82  \\
+Java synchronized method                & 31.0  & 31.1  & 0.50  \\
+Pthreads Mutex Lock                             & 33.6  & 32.6  & 1.14
+\end{tabular}
 \end{multicols}
+\begin{cfa}[caption={\CFA benchmark code used to measure context-switches for coroutines and threads.},label={f:ctx-switch}]
+\end{cfa}
+\end{figure}
+\begin{table}
+\begin{center}
+\begin{tabular}{| l | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] |}
+\cline{2-4}
+\multicolumn{1}{c |}{} & \multicolumn{1}{c |}{ Median } &\multicolumn{1}{c |}{ Average } & \multicolumn{1}{c |}{ Standard Deviation} \\
+\hline
+Kernel Thread   & 241.5 & 243.86        & 5.08 \\
+\CFA Coroutine  & 38            & 38            & 0    \\
+\CFA Thread             & 103           & 102.96        & 2.96 \\
+\uC Coroutine   & 46            & 45.86 & 0.35 \\
+\uC Thread              & 98            & 99.11 & 1.42 \\
+Goroutine               & 150           & 149.96        & 3.16 \\
+Java Thread             & 289           & 290.68        & 8.72 \\
+\hline
+\end{tabular}
+\end{center}
+\caption{Context Switch comparison.
+All numbers are in nanoseconds(\si{\nano\second})}
+\label{tab:ctx-switch}
+\end{table}
+\subsection{Mutual-Exclusion}
+The next interesting benchmark is to measure the overhead to enter/leave a critical-section.
+For monitors, the simplest approach is to measure how long it takes to enter and leave a monitor routine.
+Figure~\ref{f:mutex} shows the code for \CFA.
+To put the results in context, the cost of entering a non-inline routine and the cost of acquiring and releasing a @pthread_mutex@ lock is also measured.
+The results can be shown in table \ref{tab:mutex}.
+\begin{figure}
+\begin{cfa}[caption={\CFA benchmark code used to measure mutex routines.},label={f:mutex}]
+monitor M {};
+void __attribute__((noinline)) call( M & mutex m /*, m2, m3, m4*/ ) {}
+int main() {
+        M m/*, m2, m3, m4*/;
+        BENCH(
+                for(size_t i=0; i<n; i++) {
+                        call(m/*, m2, m3, m4*/);
+                },
+                result
+        )
+        printf("%llu\n", result);
+}
+\end{cfa}
+\end{figure}
+\begin{table}
+\begin{center}
+\begin{tabular}{| l | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] |}
+\cline{2-4}
+\multicolumn{1}{c |}{} & \multicolumn{1}{c |}{ Median } &\multicolumn{1}{c |}{ Average } & \multicolumn{1}{c |}{ Standard Deviation} \\
+\hline
+C routine                                               & 2             & 2             & 0    \\
+FetchAdd + FetchSub                             & 26            & 26            & 0    \\
+Pthreads Mutex Lock                             & 31            & 31.86 & 0.99 \\
+\uC @monitor@ member routine            & 30            & 30            & 0    \\
+\CFA @mutex@ routine, 1 argument        & 41            & 41.57 & 0.9  \\
+\CFA @mutex@ routine, 2 argument        & 76            & 76.96 & 1.57 \\
+\CFA @mutex@ routine, 4 argument        & 145           & 146.68        & 3.85 \\
+Java synchronized routine                       & 27            & 28.57 & 2.6  \\
+\hline
+\end{tabular}
+\end{center}
+\caption{Mutex routine comparison.
+All numbers are in nanoseconds(\si{\nano\second})}
+\label{tab:mutex}
+\end{table}
+\subsection{Internal Scheduling}
+The internal-scheduling benchmark measures the cost of waiting on and signalling a condition variable.
+Figure~\ref{f:int-sched} shows the code for \CFA, with results table \ref{tab:int-sched}.
+As with all other benchmarks, all omitted tests are functionally identical to one of these tests.
+\begin{figure}
+\begin{cfa}[caption={Benchmark code for internal scheduling},label={f:int-sched}]
+\paragraph{External Scheduling}
+External scheduling is measured using a cycle of two threads calling and accepting the call using the @waitfor@ statement.
+Figure~\ref{f:ext-sched} shows the code for \CFA, with results in Table~\ref{tab:ext-sched}.
+Note, the incremental cost of bulk acquire for \CFA, which is largely a fixed cost for small numbers of mutex objects.
+\begin{multicols}{2}
+\lstset{language=CFA,moredelim=**[is][\color{red}]{@}{@},deletedelim=**[is][]{`}{`}}
+\vspace*{-16pt}
+\begin{cfa}
 volatile int go = 0;
+condition c;
+monitor M {};
+M m1;
+void __attribute__((noinline)) do_call( M & mutex a1 ) { signal(c); }
+@monitor@ M {} m;
 thread T {};
+void ^?{}( T & mutex this ) {}
+void main( T & this ) {
+        while(go == 0) { yield(); }
+        while(go == 1) { do_call(m1); }
+}
+int  __attribute__((noinline)) do_wait( M & mutex a1 ) {
+        go = 1;
+        BENCH(
+                for(size_t i=0; i<n; i++) {
+                        wait(c);
+                },
+                result
+        )
+        printf("%llu\n", result);
+        go = 0;
+        return 0;
+void __attribute__((noinline))
+do_call( M & @mutex@ ) {}
+void main( T & ) {
+        while ( go == 0 ) { yield(); }
+        while ( go == 1 ) { do_call( m ); }
+}
+int __attribute__((noinline))
+do_wait( M & @mutex@ m ) {
+        go = 1; // continue other thread
+        BENCH( for ( N ) { @waitfor( do_call, m );@ } )
+        go = 0; // stop other thread
+        sout | result`ns;
+}
 int main() {
         T t;
+        return do_wait(m1);
+}
+\end{cfa}
+\end{figure}
+\begin{table}
+\begin{center}
+\begin{tabular}{| l | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] |}
+\cline{2-4}
+\multicolumn{1}{c |}{} & \multicolumn{1}{c |}{ Median } &\multicolumn{1}{c |}{ Average } & \multicolumn{1}{c |}{ Standard Deviation} \\
+\hline
+Pthreads Condition Variable                     & 5902.5        & 6093.29       & 714.78 \\
+\uC @signal@                                    & 322           & 323   & 3.36   \\
+\CFA @signal@, 1 @monitor@      & 352.5 & 353.11        & 3.66   \\
+\CFA @signal@, 2 @monitor@      & 430           & 430.29        & 8.97   \\
+\CFA @signal@, 4 @monitor@      & 594.5 & 606.57        & 18.33  \\
+Java @notify@                           & 13831.5       & 15698.21      & 4782.3 \\
+\hline
+        do_wait( m );
+}
+\end{cfa}
+\captionof{figure}{\CFA external-scheduling benchmark}
+\label{f:ext-sched}
+\columnbreak
+\vspace*{-16pt}
+\captionof{table}{External-scheduling comparison (nanoseconds)}
+\label{tab:ext-sched}
+\begin{tabular}{@{}r*{3}{D{.}{.}{3.2}}@{}}
+\multicolumn{1}{@{}c}{} & \multicolumn{1}{c}{Median} &\multicolumn{1}{c}{Average} & \multicolumn{1}{c@{}}{Std Dev} \\
+\CFA @waitfor@, 1 @monitor@     & 376.4 & 376.8 & 7.63  \\
+\CFA @waitfor@, 2 @monitor@     & 491.4 & 492.0 & 13.31 \\
+\CFA @waitfor@, 4 @monitor@     & 681.0 & 681.7 & 19.10 \\
+\uC @_Accept@                           & 331.1 & 331.4 & 2.66
 \end{tabular}
 \end{center}
+\caption{Internal scheduling comparison.
+All numbers are in nanoseconds(\si{\nano\second})}
 \label{tab:int-sched}
+\end{table}
+\subsection{External Scheduling}
 The Internal scheduling benchmark measures the cost of the @waitfor@ statement (@_Accept@ in \uC).
 Figure~\ref{f:ext-sched} shows the code for \CFA, with results in table \ref{tab:ext-sched}.
+As with all other benchmarks, all omitted tests are functionally identical to one of these tests.
 \begin{figure}
 \begin{cfa}[caption={Benchmark code for external scheduling},label={f:ext-sched}]
+\end{multicols}
+\paragraph{Internal Scheduling}
+Internal scheduling is measured using a cycle of two threads signalling and waiting.
+Figure~\ref{f:int-sched} shows the code for \CFA, with results in Table~\ref{tab:int-sched}.
+Note, the incremental cost of bulk acquire for \CFA, which is largely a fixed cost for small numbers of mutex objects.
+Java scheduling is significantly greater because the benchmark explicitly creates multiple thread in order to prevent the JIT from making the program sequential, \ie removing all locking.
+\begin{multicols}{2}
+\lstset{language=CFA,moredelim=**[is][\color{red}]{@}{@},deletedelim=**[is][]{`}{`}}
+\begin{cfa}
 volatile int go = 0;
+monitor M {};
+M m1;
+@monitor@ M { @condition c;@ } m;
+void __attribute__((noinline))
+do_call( M & @mutex@ a1 ) { @signal( c );@ }
 thread T {};
-void __attribute__((noinline)) do_call( M & mutex a1 ) {}
-void ^?{}( T & mutex this ) {}
 void main( T & this ) {
+        while(go == 0) { yield(); }
+        while(go == 1) { do_call(m1); }
+}
+int  __attribute__((noinline)) do_wait( M & mutex a1 ) {
+        go = 1;
+        BENCH(
+                for(size_t i=0; i<n; i++) {
+                        waitfor(call, a1);
+                },
+                result
+        )
+        printf("%llu\n", result);
+        go = 0;
+        return 0;
+        while ( go == 0 ) { yield(); }
+        while ( go == 1 ) { do_call( m ); }
+}
+int  __attribute__((noinline))
+do_wait( M & mutex m ) with(m) {
+        go = 1; // continue other thread
+        BENCH( for ( N ) { @wait( c );@ } );
+        go = 0; // stop other thread
+        sout | result`ns;
+}
 int main() {
         T t;
+        return do_wait(m1);
+}
+\end{cfa}
+\end{figure}
+\begin{table}
+\begin{center}
+\begin{tabular}{| l | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] |}
+\cline{2-4}
+\multicolumn{1}{c |}{} & \multicolumn{1}{c |}{ Median } &\multicolumn{1}{c |}{ Average } & \multicolumn{1}{c |}{ Standard Deviation} \\
+\hline
+\uC @Accept@                                    & 350           & 350.61        & 3.11  \\
+\CFA @waitfor@, 1 @monitor@     & 358.5 & 358.36        & 3.82  \\
+\CFA @waitfor@, 2 @monitor@     & 422           & 426.79        & 7.95  \\
+\CFA @waitfor@, 4 @monitor@     & 579.5 & 585.46        & 11.25 \\
+\hline
+        do_wait( m );
+}
+\end{cfa}
+\captionof{figure}{\CFA Internal-scheduling benchmark}
+\label{f:int-sched}
+\columnbreak
+\vspace*{-16pt}
+\captionof{table}{Internal-scheduling comparison (nanoseconds)}
+\label{tab:int-sched}
+\bigskip
+\begin{tabular}{@{}r*{3}{D{.}{.}{5.2}}@{}}
+\multicolumn{1}{@{}c}{} & \multicolumn{1}{c}{Median} & \multicolumn{1}{c}{Average} & \multicolumn{1}{c@{}}{Std Dev} \\
+\CFA @signal@, 1 @monitor@      & 372.6         & 374.3         & 14.17         \\
+\CFA @signal@, 2 @monitor@      & 492.7         & 494.1         & 12.99         \\
+\CFA @signal@, 4 @monitor@      & 749.4         & 750.4         & 24.74         \\
+\uC @signal@                            & 320.5         & 321.0         & 3.36          \\
+Java @notify@                           & 10160.5       & 10169.4       & 267.71        \\
+Pthreads Cond. Variable         & 4949.6        & 5065.2        & 363
 \end{tabular}
+\end{center}
+\caption{External scheduling comparison.
+All numbers are in nanoseconds(\si{\nano\second})}
+\label{tab:ext-sched}
+\end{table}
+\subsection{Object Creation}
+Finally, the last benchmark measures the cost of creation for concurrent objects.
+Figure~\ref{f:creation} shows the code for @pthread@s and \CFA threads, with results shown in table \ref{tab:creation}.
+As with all other benchmarks, all omitted tests are functionally identical to one of these tests.
+The only note here is that the call stacks of \CFA coroutines are lazily created, therefore without priming the coroutine, the creation cost is very low.
+\begin{figure}
+\begin{center}
+@pthread@
+\begin{cfa}
+int main() {
+        BENCH(
+                for(size_t i=0; i<n; i++) {
+                        pthread_t thread;
+                        if(pthread_create(&thread,NULL,foo,NULL)<0) {
+                                perror( "failure" );
+                                return 1;
+                        }
+                        if(pthread_join(thread, NULL)<0) {
+                                perror( "failure" );
+                                return 1;
+                        }
+                },
+                result
+        )
+        printf("%llu\n", result);
+}
+\end{cfa}
+\CFA Threads
+\begin{cfa}
+int main() {
+        BENCH(
+                for(size_t i=0; i<n; i++) {
+                        MyThread m;
+                },
+                result
+        )
+        printf("%llu\n", result);
+}
+\end{cfa}
+\end{center}
+\caption{Benchmark code for \protect\lstinline|pthread|s and \CFA to measure object creation}
+\label{f:creation}
+\end{figure}
+\begin{table}
+\begin{center}
+\begin{tabular}{| l | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] | S[table-format=5.2,table-number-alignment=right] |}
+\cline{2-4}
+\multicolumn{1}{c |}{} & \multicolumn{1}{c |}{ Median } &\multicolumn{1}{c |}{ Average } & \multicolumn{1}{c |}{ Standard Deviation} \\
+\hline
+Pthreads                        & 26996 & 26984.71      & 156.6  \\
+\CFA Coroutine Lazy     & 6             & 5.71  & 0.45   \\
+\CFA Coroutine Eager    & 708           & 706.68        & 4.82   \\
+\CFA Thread                     & 1173.5        & 1176.18       & 15.18  \\
+\uC Coroutine           & 109           & 107.46        & 1.74   \\
+\uC Thread                      & 526           & 530.89        & 9.73   \\
+Goroutine                       & 2520.5        & 2530.93       & 61,56  \\
+Java Thread                     & 91114.5       & 92272.79      & 961.58 \\
+\hline
+\end{tabular}
+\end{center}
+\caption{Creation comparison.
+All numbers are in nanoseconds(\si{\nano\second}).}
+\label{tab:creation}
+\end{table}
+\end{multicols}
 \section{Conclusion}
+This paper has achieved a minimal concurrency \textbf{api} that is simple, efficient and usable as the basis for higher-level features.
+The approach presented is based on a lightweight thread-system for parallelism, which sits on top of clusters of processors.
+This M:N model is judged to be both more efficient and allow more flexibility for users.
+Furthermore, this document introduces monitors as the main concurrency tool for users.
+This paper also offers a novel approach allowing multiple monitors to be accessed simultaneously without running into the Nested Monitor Problem~\cite{Lister77}.
+It also offers a full implementation of the concurrency runtime written entirely in \CFA, effectively the largest \CFA code base to date.
+% ======================================================================
+% ======================================================================
+Advanced control-flow will always be difficult, especially when there is temporal ordering and nondeterminism.
+However, many systems exacerbate the difficulty through their presentation mechanisms.
+This paper shows it is possible to present a hierarchy of control-flow features, generator, coroutine, thread, and monitor, providing an integrated set of high-level, efficient, and maintainable control-flow features.
+Eliminated from \CFA are spurious wakeup and barging, which are nonintuitive and lead to errors, and having to work with a bewildering set of low-level locks and acquisition techniques.
+\CFA high-level race-free monitors and tasks provide the core mechanisms for mutual exclusion and synchronization, without having to resort to magic qualifiers like @volatile@/@atomic@.
+Extending these mechanisms to handle high-level deadlock-free bulk acquire across both mutual exclusion and synchronization is a unique contribution.
+The \CFA runtime provides concurrency based on a preemptive M:N user-level threading-system, executing in clusters, which encapsulate scheduling of work on multiple kernel threads providing parallelism.
+The M:N model is judged to be efficient and provide greater flexibility than a 1:1 threading model.
+These concepts and the \CFA runtime-system are written in the \CFA language, extensively leveraging the \CFA type-system, which demonstrates the expressiveness of the \CFA language.
+Performance comparisons with other concurrent systems/languages show the \CFA approach is competitive across all low-level operations, which translates directly into good performance in well-written concurrent applications.
+C programmers should feel comfortable using these mechanisms for developing complex control-flow in applications, with the ability to obtain maximum available performance by selecting mechanisms at the appropriate level of need.
 \section{Future Work}
+% ======================================================================
+% ======================================================================
+\subsection{Performance} \label{futur:perf}
+This paper presents a first implementation of the \CFA concurrency runtime.
+Therefore, there is still significant work to improve performance.
+Many of the data structures and algorithms may change in the future to more efficient versions.
+For example, the number of monitors in a single bulk acquire is only bound by the stack size, this is probably unnecessarily generous.
+It may be possible that limiting the number helps increase performance.
+However, it is not obvious that the benefit would be significant.
+\subsection{Flexible Scheduling} \label{futur:sched}
+While control flow in \CFA has a strong start, development is still underway to complete a number of missing features.
+\paragraph{Flexible Scheduling}
+\label{futur:sched}
 An important part of concurrency is scheduling.
 Different scheduling algorithms can affect performance (both in terms of average and variation).
 However, no single scheduler is optimal for all workloads and therefore there is value in being able to change the scheduler for given programs.
+One solution is to offer various tweaking options to users, allowing the scheduler to be adjusted to the requirements of the workload.
+However, in order to be truly flexible, it would be interesting to allow users to add arbitrary data and arbitrary scheduling algorithms.
+For example, a web server could attach Type-of-Service information to threads and have a ``ToS aware'' scheduling algorithm tailored to this specific web server.
+This path of flexible schedulers will be explored for \CFA.
+\subsection{Non-Blocking I/O} \label{futur:nbio}
+While most of the parallelism tools are aimed at data parallelism and control-flow parallelism, many modern workloads are not bound on computation but on IO operations, a common case being web servers and XaaS (anything as a service).
+These types of workloads often require significant engineering around amortizing costs of blocking IO operations.
+At its core, non-blocking I/O is an operating system level feature that allows queuing IO operations (\eg network operations) and registering for notifications instead of waiting for requests to complete.
+In this context, the role of the language makes Non-Blocking IO easily available and with low overhead.
+The current trend is to use asynchronous programming using tools like callbacks and/or futures and promises, which can be seen in frameworks like Node.js~\cite{NodeJs} for JavaScript, Spring MVC~\cite{SpringMVC} for Java and Django~\cite{Django} for Python.
+However, while these are valid solutions, they lead to code that is harder to read and maintain because it is much less linear.
+\subsection{Other Concurrency Tools} \label{futur:tools}
+While monitors offer a flexible and powerful concurrent core for \CFA, other concurrency tools are also necessary for a complete multi-paradigm concurrency package.
+Examples of such tools can include simple locks and condition variables, futures and promises~\cite{promises}, executors and actors.
+These additional features are useful when monitors offer a level of abstraction that is inadequate for certain tasks.
+\subsection{Implicit Threading} \label{futur:implcit}
+Simpler applications can benefit greatly from having implicit parallelism.
+That is, parallelism that does not rely on the user to write concurrency.
+This type of parallelism can be achieved both at the language level and at the library level.
+The canonical example of implicit parallelism is parallel for loops, which are the simplest example of a divide and conquer algorithms~\cite{uC++book}.
+Table \ref{f:parfor} shows three different code examples that accomplish point-wise sums of large arrays.
+Note that none of these examples explicitly declare any concurrency or parallelism objects.
+\begin{table}
+\begin{center}
+\begin{tabular}[t]{|c|c|c|}
+Sequential & Library Parallel & Language Parallel \\
+\begin{cfa}[tabsize=3]
+void big_sum(
+        int* a, int* b,
+        int* o,
+        size_t len)
+{
+        for(
+                int i = 0;
+                i < len;
+                ++i )
+        {
+                o[i]=a[i]+b[i];
+        }
+}
+int* a[10000];
+int* b[10000];
+int* c[10000];
+//... fill in a & b
+big_sum(a,b,c,10000);
+\end{cfa} &\begin{cfa}[tabsize=3]
+void big_sum(
+        int* a, int* b,
+        int* o,
+        size_t len)
+{
+        range ar(a, a+len);
+        range br(b, b+len);
+        range or(o, o+len);
+        parfor( ai, bi, oi,
+        [](     int* ai,
+                int* bi,
+                int* oi)
+        {
+                oi=ai+bi;
+        });
+}
+int* a[10000];
+int* b[10000];
+int* c[10000];
+//... fill in a & b
+big_sum(a,b,c,10000);
+\end{cfa}&\begin{cfa}[tabsize=3]
+void big_sum(
+        int* a, int* b,
+        int* o,
+        size_t len)
+{
+        parfor (ai,bi,oi)
+            in (a, b, o )
+        {
+                oi = ai + bi;
+        }
+}
+int* a[10000];
+int* b[10000];
+int* c[10000];
+//... fill in a & b
+big_sum(a,b,c,10000);
+\end{cfa}
+\end{tabular}
+\end{center}
+\caption{For loop to sum numbers: Sequential, using library parallelism and language parallelism.}
+\label{f:parfor}
+\end{table}
+Implicit parallelism is a restrictive solution and therefore has its limitations.
+However, it is a quick and simple approach to parallelism, which may very well be sufficient for smaller applications and reduces the amount of boilerplate needed to start benefiting from parallelism in modern CPUs.
+% A C K N O W L E D G E M E N T S
+% -------------------------------
+One solution is to offer various tuning options, allowing the scheduler to be adjusted to the requirements of the workload.
+However, to be truly flexible, a pluggable scheduler is necessary.
+Currently, the \CFA pluggable scheduler is too simple to handle complex scheduling, \eg quality of service and real-time, where the scheduler must interact with mutex objects to deal with issues like priority inversion~\cite{Buhr00b}.
+\paragraph{Non-Blocking I/O}
+\label{futur:nbio}
+Many modern workloads are not bound by computation but IO operations, a common case being web servers and XaaS~\cite{XaaS} (anything as a service).
+These types of workloads require significant engineering to amortizing costs of blocking IO-operations.
+At its core, non-blocking I/O is an operating-system level feature queuing IO operations, \eg network operations, and registering for notifications instead of waiting for requests to complete.
+Current trends use asynchronous programming like callbacks, futures, and/or promises, \eg Node.js~\cite{NodeJs} for JavaScript, Spring MVC~\cite{SpringMVC} for Java, and Django~\cite{Django} for Python.
+However, these solutions lead to code that is hard to create, read and maintain.
+A better approach is to tie non-blocking I/O into the concurrency system to provide ease of use with low overhead, \eg thread-per-connection web-services.
+A non-blocking I/O library is currently under development for \CFA.
+\paragraph{Other Concurrency Tools}
+\label{futur:tools}
+While monitors offer flexible and powerful concurrency for \CFA, other concurrency tools are also necessary for a complete multi-paradigm concurrency package.
+Examples of such tools can include futures and promises~\cite{promises}, executors and actors.
+These additional features are useful for applications that can be constructed without shared data and direct blocking.
+As well, new \CFA extensions should make it possible to create a uniform interface for virtually all mutual exclusion, including monitors and low-level locks.
+\paragraph{Implicit Threading}
+\label{futur:implcit}
+Basic concurrent (embarrassingly parallel) applications can benefit greatly from implicit concurrency, where sequential programs are converted to concurrent, possibly with some help from pragmas to guide the conversion.
+This type of concurrency can be achieved both at the language level and at the library level.
+The canonical example of implicit concurrency is concurrent nested @for@ loops, which are amenable to divide and conquer algorithms~\cite{uC++book}.
+The \CFA language features should make it possible to develop a reasonable number of implicit concurrency mechanism to solve basic HPC data-concurrency problems.
+However, implicit concurrency is a restrictive solution with significant limitations, so it can never replace explicit concurrent programming.
 \section{Acknowledgements}
+Thanks to Aaron Moss, Rob Schluntz and Andrew Beach for their work on the \CFA project as well as all the discussions which helped concretize the ideas in this paper.
+Partial funding was supplied by the Natural Sciences and Engineering Research Council of Canada and a corporate partnership with Huawei Ltd.
+% B I B L I O G R A P H Y
+% -----------------------------
+%\bibliographystyle{plain}
+The authors would like to recognize the design assistance of Aaron Moss, Rob Schluntz, Andrew Beach and Michael Brooks on the features described in this paper.
+Funding for this project has been provided by Huawei Ltd.\ (\url{http://www.huawei.com}). %, and Peter Buhr is partially funded by the Natural Sciences and Engineering Research Council of Canada.
+{%
+\fontsize{9bp}{12bp}\selectfont%
 \bibliography{pl,local}
+}%
 \end{document}

doc/papers/concurrency/annex/local.bib

-              r7951100
+              rb067d9b
     title       = {Thread Building Blocks},
     howpublished= {Intel, \url{https://www.threadingbuildingblocks.org}},
     note        = {Accessed: 2018-3},
+    optnote     = {Accessed: 2018-3},
+}
 …
+}
 @article{BankTransfer,
+@misc{BankTransfer,
         key     = {Bank Transfer},
         keywords        = {Bank Transfer},
         title   = {Bank Account Transfer Problem},
+        publisher       = {Wiki Wiki Web},
+        address = {http://wiki.c2.com},
+        howpublished    = {Wiki Wiki Web, \url{http://wiki.c2.com/?BankAccountTransferProblem}},
         year            = 2010
+}

doc/papers/concurrency/figures/ext_monitor.fig

-              r7951100
+              rb067d9b
 -2
 2
 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 3150.000 3450.000 3150 3150 2850 3450 3150 3750
 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 3150.000 4350.000 3150 4050 2850 4350 3150 4650
 5850 1950 6150 2250
 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 2100 105 105 6000 2100 6105 2205
 1 -1 0 0 0 10 0.0000 2 105 90 6000 2160 d\001
+1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1500.000 3600.000 1500 3300 1200 3600 1500 3900
+1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1500.000 4500.000 1500 4200 1200 4500 1500 4800
+4200 2100 4500 2400
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 2250 105 105 4350 2250 4455 2355
+1 -1 0 0 0 10 0.0000 2 105 90 4350 2310 d\001
 -6
 5100 2100 5400 2400
 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 5250 2250 105 105 5250 2250 5355 2250
 1 -1 0 0 0 10 0.0000 2 105 120 5250 2295 X\001
+4200 1800 4500 2100
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 1950 105 105 4350 1950 4455 2055
+1 -1 0 0 0 10 0.0000 2 105 90 4350 2010 b\001
 -6
+5100 1800 5400 2100
+3 0 1 -1 -1 1 0 4 0.000 1 0.0000 5250 1950 105 105 5250 1950 5355 1950
+1 -1 0 0 0 10 0.0000 2 105 120 5250 2010 Y\001
+1420 5595 5625 5805
+3 0 1 -1 -1 0 0 20 0.000 1 0.0000 1500 5700 80 80 1500 5700 1580 5780
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 2850 5700 105 105 2850 5700 2955 5805
+3 0 1 -1 -1 0 0 4 0.000 1 0.0000 4350 5700 105 105 4350 5700 4455 5805
+0 -1 0 0 0 12 0.0000 2 135 1035 3075 5775 blocked task\001
+0 -1 0 0 0 12 0.0000 2 135 870 1650 5775 active task\001
+0 -1 0 0 0 12 0.0000 2 135 1050 4575 5775 routine mask\001
 -6
+5850 1650 6150 1950
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 1800 105 105 6000 1800 6105 1905
+1 -1 0 0 0 10 0.0000 2 105 90 6000 1860 b\001
+3450 1950 3750 2550
+3 0 1 -1 -1 1 0 4 0.000 1 0.0000 3600 2100 105 105 3600 2100 3705 2100
+2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+1950 3750 1950 3750 2550 3450 2550 3450 1950
+1 4 0 0 0 10 0.0000 2 105 120 3600 2160 Y\001
 -6
+3070 5445 7275 5655
+3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3150 5550 80 80 3150 5550 3230 5630
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4500 5550 105 105 4500 5550 4605 5655
+3 0 1 -1 -1 0 0 4 0.000 1 0.0000 6000 5550 105 105 6000 5550 6105 5655
+0 -1 0 0 0 12 0.0000 2 135 1035 4725 5625 blocked task\001
+0 -1 0 0 0 12 0.0000 2 135 870 3300 5625 active task\001
+0 -1 0 0 0 12 0.0000 2 135 1050 6225 5625 routine mask\001
+3450 2250 3750 2550
+3 0 1 -1 -1 1 0 4 0.000 1 0.0000 3600 2400 105 105 3600 2400 3705 2400
+1 4 0 0 0 10 0.0000 2 105 120 3600 2445 X\001
 -6
 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 3300 3600 105 105 3300 3600 3405 3705
 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 3600 3600 105 105 3600 3600 3705 3705
 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6600 3900 105 105 6600 3900 6705 4005
 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6900 3900 105 105 6900 3900 7005 4005
 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 2700 105 105 6000 2700 6105 2805
 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 2400 105 105 6000 2400 6105 2505
 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 5100 4575 80 80 5100 4575 5180 4655
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 1650 3750 105 105 1650 3750 1755 3855
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 1950 3750 105 105 1950 3750 2055 3855
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4950 4050 105 105 4950 4050 5055 4155
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 5250 4050 105 105 5250 4050 5355 4155
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 2850 105 105 4350 2850 4455 2955
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 2550 105 105 4350 2550 4455 2655
+3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3450 4725 80 80 3450 4725 3530 4805
 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
 2925 5475 2925 5475 3225 4050 3225 4050 2925
+3075 3825 3075 3825 3375 2400 3375 2400 3075
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
 3750 3750 3750 3750 4050 3150 4050
+3900 2100 3900 2100 4200 1500 4200
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 3
 3450 3750 3450 3900 3675
+3600 2100 3600 2250 3825
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
 3150 3600 3375
+3300 1950 3525
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 3
 4350 3750 4350 3900 4575
+4500 2100 4500 2250 4725
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
 4050 3600 4275
+4200 1950 4425
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
 4650 3750 4650 3750 4950 4950 4950
+4800 2100 4800 2100 5100 3300 5100
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
 3750 6300 3975
+3900 4650 4125
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
 4950 5175 5100
+5100 3525 5250
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 9
 4950 6450 4950 6450 4050 7050 4050 7050 3750 6450 3750
 2850 6150 2850 6150 1650
+5100 4800 5100 4800 4200 5400 4200 5400 3900 4800 3900
+3000 4500 3000 4500 1800
 2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
 4200 5850 3300 4350 3300 4350 4200 5850 4200
 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 1 2
+4350 4200 3450 2700 3450 2700 4350 4200 4350
+1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 1 1.00 60.00 120.00
+1 1.00 60.00 120.00
+3150 5250 2400
+3225 3600 2550
+1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+3000 4500 3150
 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+3150 3750 3150 3750 2850 5700 2850 5700 1650
+1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+2850 6150 3000
+2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+1800 5400 1800 5400 2400 5100 2400 5100 1800
+1 -1 0 0 0 10 0.0000 2 75 75 6000 2745 a\001
+1 -1 0 0 0 10 0.0000 2 75 75 6000 2445 c\001
+1 -1 0 0 0 12 0.0000 2 135 315 5100 5325 exit\001
+1 -1 0 0 0 12 0.0000 2 135 135 3300 3075 A\001
+1 -1 0 0 0 12 0.0000 2 135 795 3300 4875 condition\001
+1 -1 0 0 0 12 0.0000 2 135 135 3300 5100 B\001
+0 -1 0 0 0 12 0.0000 2 135 420 6600 3675 stack\001
+0 -1 0 0 0 12 0.0000 2 180 750 6600 3225 acceptor/\001
+0 -1 0 0 0 12 0.0000 2 180 750 6600 3450 signalled\001
+1 -1 0 0 0 12 0.0000 2 135 795 3300 2850 condition\001
+1 -1 0 0 0 12 0.0000 2 165 420 6000 1350 entry\001
+1 -1 0 0 0 12 0.0000 2 135 495 6000 1575 queue\001
+0 -1 0 0 0 12 0.0000 2 135 525 6300 2400 arrival\001
+0 -1 0 0 0 12 0.0000 2 135 630 6300 2175 order of\001
+1 -1 0 0 0 12 0.0000 2 135 525 5100 3675 shared\001
+1 -1 0 0 0 12 0.0000 2 135 735 5100 3975 variables\001
+0 0 50 -1 0 11 0.0000 2 165 855 4275 3150 Acceptables\001
+0 0 50 -1 0 11 0.0000 2 120 165 5775 2700 W\001
+0 0 50 -1 0 11 0.0000 2 120 135 5775 2400 X\001
+0 0 50 -1 0 11 0.0000 2 120 105 5775 2100 Z\001
+0 0 50 -1 0 11 0.0000 2 120 135 5775 1800 Y\001
+3300 2100 3300 2100 3000 4050 3000 4050 1800
+1 -1 0 0 0 10 0.0000 2 75 75 4350 2895 a\001
+1 -1 0 0 0 10 0.0000 2 75 75 4350 2595 c\001
+1 -1 0 0 0 12 0.0000 2 135 315 3450 5475 exit\001
+1 -1 0 0 0 12 0.0000 2 135 135 1650 3225 A\001
+1 -1 0 0 0 12 0.0000 2 135 795 1650 5025 condition\001
+1 -1 0 0 0 12 0.0000 2 135 135 1650 5250 B\001
+0 -1 0 0 0 12 0.0000 2 135 420 4950 3825 stack\001
+0 -1 0 0 0 12 0.0000 2 180 750 4950 3375 acceptor/\001
+0 -1 0 0 0 12 0.0000 2 180 750 4950 3600 signalled\001
+1 -1 0 0 0 12 0.0000 2 135 795 1650 3000 condition\001
+0 -1 0 0 0 12 0.0000 2 135 525 4650 2550 arrival\001
+0 -1 0 0 0 12 0.0000 2 135 630 4650 2325 order of\001
+1 -1 0 0 0 12 0.0000 2 135 525 3450 3825 shared\001
+1 -1 0 0 0 12 0.0000 2 135 735 3450 4125 variables\001
+0 4 50 -1 0 11 0.0000 2 120 135 4075 2025 X\001
+0 4 50 -1 0 11 0.0000 2 120 135 4075 2325 Y\001
+0 4 50 -1 0 11 0.0000 2 120 135 4075 2625 Y\001
+0 4 50 -1 0 11 0.0000 2 120 135 4075 2925 X\001
+0 -1 0 0 3 12 0.0000 2 150 540 4950 4425 urgent\001
+1 0 50 -1 0 11 0.0000 2 165 600 3075 3300 accepted\001
+1 -1 0 0 0 12 0.0000 2 165 960 4275 1725 entry queue\001

doc/papers/concurrency/figures/monitor.fig

-              r7951100
+              rb067d9b
 -2
 2
+1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1500.000 2700.000 1500 2400 1200 2700 1500 3000
+1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1500.000 3600.000 1500 3300 1200 3600 1500 3900
+4200 1200 4500 1500
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 1350 105 105 4350 1350 4455 1455
+1 -1 0 0 0 10 0.0000 2 105 90 4350 1410 d\001
+1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1500.000 3300.000 1500 3000 1200 3300 1500 3600
+1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1500.000 4200.000 1500 3900 1200 4200 1500 4500
+1350 5250 5325 5550
+3 0 1 -1 -1 0 0 20 0.000 1 0.0000 1500 5400 80 80 1500 5400 1580 5480
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 2850 5400 105 105 2850 5400 2955 5505
+3 0 1 -1 -1 0 0 4 0.000 1 0.0000 4350 5400 105 105 4350 5400 4455 5505
+0 -1 0 0 0 12 0.0000 2 180 765 4575 5475 duplicate\001
+0 -1 0 0 0 12 0.0000 2 135 1035 3075 5475 blocked task\001
+0 -1 0 0 0 12 0.0000 2 135 870 1650 5475 active task\001
 -6
 4200 900 4500 1200
 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 1050 105 105 4350 1050 4455 1155
 1 -1 0 0 0 10 0.0000 2 105 90 4350 1110 b\001
+4200 1800 4500 2100
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 1950 105 105 4350 1950 4455 2055
+1 -1 0 0 0 10 0.0000 2 105 90 4350 2010 d\001
 -6
 2400 1500 2700 1800
 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 2550 1650 105 105 2550 1650 2655 1650
 1 -1 0 0 0 10 0.0000 2 105 90 2550 1710 b\001
+4200 1500 4500 1800
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 1650 105 105 4350 1650 4455 1755
+1 -1 0 0 0 10 0.0000 2 105 90 4350 1710 b\001
 -6
+2400 1800 2700 2100
+3 0 1 -1 -1 1 0 4 0.000 1 0.0000 2550 1950 105 105 2550 1950 2655 1950
+1 -1 0 0 0 10 0.0000 2 75 75 2550 1995 a\001
+-6
+3300 1500 3600 1800
+3 0 1 -1 -1 1 0 4 0.000 1 0.0000 3450 1650 105 105 3450 1650 3555 1650
+1 -1 0 0 0 10 0.0000 2 105 90 3450 1710 d\001
+-6
+1350 4650 5325 4950
+3 0 1 -1 -1 0 0 20 0.000 1 0.0000 1500 4800 80 80 1500 4800 1580 4880
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 2850 4800 105 105 2850 4800 2955 4905
+3 0 1 -1 -1 0 0 4 0.000 1 0.0000 4350 4800 105 105 4350 4800 4455 4905
+0 -1 0 0 0 12 0.0000 2 180 765 4575 4875 duplicate\001
+0 -1 0 0 0 12 0.0000 2 135 1035 3075 4875 blocked task\001
+0 -1 0 0 0 12 0.0000 2 135 870 1650 4875 active task\001
+-6
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 1650 2850 105 105 1650 2850 1755 2955
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 1950 2850 105 105 1950 2850 2055 2955
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4950 3150 105 105 4950 3150 5055 3255
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 5250 3150 105 105 5250 3150 5355 3255
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 1950 105 105 4350 1950 4455 2055
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 1650 105 105 4350 1650 4455 1755
+3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3450 3825 80 80 3450 3825 3530 3905
+3 0 1 -1 -1 1 0 4 0.000 1 0.0000 3450 1950 105 105 3450 1950 3555 1950
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 1650 3450 105 105 1650 3450 1755 3555
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 1950 3450 105 105 1950 3450 2055 3555
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4950 3750 105 105 4950 3750 5055 3855
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 5250 3750 105 105 5250 3750 5355 3855
+3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3450 4425 80 80 3450 4425 3530 4505
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 2550 105 105 4350 2550 4455 2655
+3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4350 2250 105 105 4350 2250 4455 2355
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 5
+3000 2100 3000 2100 2700 2400 2700 2400 2100
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
+3600 2100 3600 2100 3900 1500 3900
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 3
+3300 2100 3300 2250 3525
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
+2100 2625 2250
+3000 1950 3225
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 3
+4200 2100 4200 2250 4425
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
+2100 3525 2250
+3900 1950 4125
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
+4500 2100 4500 2100 4800 3300 4800
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
+2100 4425 2250
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 5
+2400 2100 2400 2100 2100 2400 2100 2400 1500
+3600 4650 3825
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
+4800 3525 4950
+2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
+4050 4200 3150 2700 3150 2700 4050 4200 4050
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
+3000 2100 3000 2100 3300 1500 3300
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 3
+2700 2100 2700 2250 2925
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
+2400 1950 2625
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 3
+3600 2100 3600 2250 3825
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
+3300 1950 3525
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
+3900 2100 3900 2100 4200 3300 4200
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
+3000 4650 3225
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
+4200 3525 4350
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
+1500 3600 2100 4200 2100 4200 900
+1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
+1500 2700 2100 3300 2100 3300 1500
+2100 3600 2700 4050 2700 4050 1500
 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 9
+4200 4800 4200 4800 3300 5400 3300 5400 3000 4800 3000
+2100 4500 2100 4500 900
+2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
+3450 4200 2550 2700 2550 2700 3450 4200 3450
+1 -1 0 0 0 10 0.0000 2 75 75 4350 1995 a\001
+1 -1 0 0 0 10 0.0000 2 75 75 4350 1695 c\001
+1 -1 0 0 0 12 0.0000 2 135 315 3450 4575 exit\001
+1 -1 0 0 0 12 0.0000 2 135 135 1650 2325 A\001
+1 -1 0 0 0 12 0.0000 2 135 795 1650 4125 condition\001
+1 -1 0 0 0 12 0.0000 2 135 135 1650 4350 B\001
+0 -1 0 0 0 12 0.0000 2 135 420 4950 2925 stack\001
+0 -1 0 0 0 12 0.0000 2 180 750 4950 2475 acceptor/\001
+0 -1 0 0 0 12 0.0000 2 180 750 4950 2700 signalled\001
+1 -1 0 0 0 12 0.0000 2 135 795 1650 2100 condition\001
+1 -1 0 0 0 12 0.0000 2 135 135 2550 1425 X\001
+1 -1 0 0 0 12 0.0000 2 135 135 3450 1425 Y\001
+1 -1 0 0 0 12 0.0000 2 165 420 4350 600 entry\001
+1 -1 0 0 0 12 0.0000 2 135 495 4350 825 queue\001
+0 -1 0 0 0 12 0.0000 2 135 525 4650 1650 arrival\001
+0 -1 0 0 0 12 0.0000 2 135 630 4650 1425 order of\001
+1 -1 0 0 0 12 0.0000 2 135 525 3450 2925 shared\001
+1 -1 0 0 0 12 0.0000 2 135 735 3450 3225 variables\001
+1 -1 0 0 0 12 0.0000 2 120 510 3000 975 mutex\001
+1 -1 0 0 0 10 0.0000 2 75 75 3450 1995 c\001
+1 -1 0 0 0 12 0.0000 2 135 570 3000 1200 queues\001
+4800 4800 4800 4800 3900 5400 3900 5400 3600 4800 3600
+2700 4500 2700 4500 1500
+1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+2700 4500 2850
+1 -1 0 0 0 12 0.0000 2 135 315 3450 5175 exit\001
+1 -1 0 0 0 12 0.0000 2 135 795 1650 4725 condition\001
+1 -1 0 0 0 12 0.0000 2 135 135 1650 4950 B\001
+0 -1 0 0 0 12 0.0000 2 135 420 4950 3525 stack\001
+0 -1 0 0 0 12 0.0000 2 180 750 4950 3075 acceptor/\001
+0 -1 0 0 0 12 0.0000 2 180 750 4950 3300 signalled\001
+1 -1 0 0 0 12 0.0000 2 135 525 3450 3525 shared\001
+1 -1 0 0 0 12 0.0000 2 135 735 3450 3825 variables\001
+0 -1 0 0 3 12 0.0000 2 150 540 4950 4125 urgent\001
+1 -1 0 0 0 10 0.0000 2 75 75 4350 2595 a\001
+1 -1 0 0 0 10 0.0000 2 75 75 4350 2295 c\001
+0 -1 0 0 0 12 0.0000 2 135 525 4650 2250 arrival\001
+0 -1 0 0 0 12 0.0000 2 135 630 4650 2025 order of\001
+0 4 50 -1 0 11 0.0000 2 120 135 4075 1725 X\001
+0 4 50 -1 0 11 0.0000 2 120 135 4075 2025 Y\001
+0 4 50 -1 0 11 0.0000 2 120 135 4075 2325 Y\001
+0 4 50 -1 0 11 0.0000 2 120 135 4075 2625 X\001
+1 -1 0 0 0 12 0.0000 2 165 960 4275 1425 entry queue\001

doc/papers/general/.gitignore

r7951100	rb067d9b
4	4	*.ps
5	5
6		~~Paper.tex.plain~~
7	6	mail
8	7	Paper.out.ps

doc/papers/general/Makefile

-              r7951100
+              rb067d9b
 Figures = figures
 Macros = ../AMA/AMA-stix/ama
 TeXLIB = .:${Macros}:${Build}:../../bibliography:
+TeXLIB = .:${Macros}:${Build}:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+BibTeX = BIBINPUTS=../../bibliography: && export BIBINPUTS && bibtex
 MAKEFLAGS = --no-print-directory # --silent
 …
 Paper.zip :
+        zip -x general/.gitignore -x general/"*AMA*" -x general/Paper.out.ps -x general/Paper.tex.plain -x general/evaluation.zip -x general/mail -x general/response -x general/test.c -x general/evaluation.zip -x general/Paper.tex.plain -x general/Paper.ps -x general/Paper.pdf -x general/"*build*" -x general/evaluation/.gitignore -x general/evaluation/timing.xlsx -r Paper.zip general
+        zip -x general/.gitignore -x general/Paper.out.ps -x general/Paper.tex.plain -x -x general/WileyNJD-AMA.bst general/"*evaluation*" -x general/evaluation.zip \
+                -x general/mail -x general/response -x general/test.c -x general/Paper.ps -x general/"*build*" -r Paper.zip general pl.bib
 evaluation.zip :
         zip -x evaluation/.gitignore  -x evaluation/timing.xlsx -x evaluation/timing.dat -r evaluation.zip evaluation
+        zip -x evaluation/.gitignore -x evaluation/timing.xlsx -x evaluation/timing.dat -r evaluation.zip evaluation
 # File Dependencies #
 …
         dvips ${Build}/$< -o $@
 ${BASE}.dvi : Makefile ${Build} ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
                 ../../bibliography/pl.bib
+${BASE}.dvi : Makefile ${BASE}.out.ps ${Macros}/WileyNJD-v2.cls WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ../../bibliography/pl.bib | ${Build}
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
 …
         mkdir -p ${Build}
 ${BASE}.out.ps : ${Build}
+${BASE}.out.ps : | ${Build}
         ln -fs ${Build}/Paper.out.ps .
 …
         gnuplot -e Build="'${Build}/'" evaluation/timing.gp
 %.tex : %.fig ${Build}
+%.tex : %.fig | ${Build}
         fig2dev -L eepic $< > ${Build}/$@
 %.ps : %.fig ${Build}
+%.ps : %.fig | ${Build}
         fig2dev -L ps $< > ${Build}/$@
 %.pstex : %.fig ${Build}
+%.pstex : %.fig | ${Build}
         fig2dev -L pstex $< > ${Build}/$@
         fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t

doc/papers/general/Paper.tex

-              r7951100
+              rb067d9b
 \documentclass[AMA,STIX1COL]{WileyNJD-v2}
+\setlength\typewidth{170mm}
+\setlength\textwidth{170mm}
 \articletype{RESEARCH ARTICLE}%
+\received{26 April 2016}
+\revised{6 June 2016}
+\accepted{6 June 2016}
+\received{12 March 2018}
+\revised{8 May 2018}
+\accepted{28 June 2018}
+\setlength\typewidth{168mm}
+\setlength\textwidth{168mm}
 \raggedbottom
 …
+}
 \title{\texorpdfstring{\protect\CFA : Adding Modern Programming Language Features to C}{Cforall : Adding Modern Programming Language Features to C}}
+\title{\texorpdfstring{\protect\CFA : Adding modern programming language features to C}{Cforall : Adding modern programming language features to C}}
 \author[1]{Aaron Moss}
 \author[1]{Robert Schluntz}
 \author[1]{Peter A. Buhr*}
+\author[1]{Peter A. Buhr}
 \authormark{MOSS \textsc{et al}}
 \address[1]{\orgdiv{Cheriton School of Computer Science}, \orgname{University of Waterloo}, \orgaddress{\state{Waterloo, ON}, \country{Canada}}}
 \corres{*Peter A. Buhr, Cheriton School of Computer Science, University of Waterloo, 200 University Avenue West, Waterloo, ON, N2L 3G1, Canada. \email{pabuhr{\char`\@}uwaterloo.ca}}
+\address[1]{\orgdiv{Cheriton School of Computer Science}, \orgname{University of Waterloo}, \orgaddress{\state{Waterloo, Ontario}, \country{Canada}}}
+\corres{Peter A. Buhr, Cheriton School of Computer Science, University of Waterloo, 200 University Avenue West, Waterloo, ON N2L 3G1, Canada. \email{pabuhr{\char`\@}uwaterloo.ca}}
 \fundingInfo{Natural Sciences and Engineering Research Council of Canada}
 \abstract[Summary]{
+The C programming language is a foundational technology for modern computing with millions of lines of code implementing everything from hobby projects to commercial operating-systems.
+This installation base and the programmers producing it represent a massive software-engineering investment spanning decades and likely to continue for decades more.
+Nevertheless, C, first standardized almost forty years ago, lacks many features that make programming in more modern languages safer and more productive.
+The goal of the \CFA project (pronounced ``C-for-all'') is to create an extension of C that provides modern safety and productivity features while still ensuring strong backwards compatibility with C and its programmers.
+Prior projects have attempted similar goals but failed to honour C programming-style;
+for instance, adding object-oriented or functional programming with garbage collection is a non-starter for many C developers.
+Specifically, \CFA is designed to have an orthogonal feature-set based closely on the C programming paradigm, so that \CFA features can be added \emph{incrementally} to existing C code-bases, and C programmers can learn \CFA extensions on an as-needed basis, preserving investment in existing code and programmers.
+This paper presents a quick tour of \CFA features showing how their design avoids shortcomings of similar features in C and other C-like languages.
+Finally, experimental results are presented to validate several of the new features.
+The C programming language is a foundational technology for modern computing with millions of lines of code implementing everything from hobby projects to commercial operating systems.
+This installation base and the programmers producing it represent a massive software engineering investment spanning decades and likely to continue for decades more.
+Nevertheless, C, which was first standardized almost 30 years ago, lacks many features that make programming in more modern languages safer and more productive.
+The goal of the \CFA project (pronounced ``C for all'') is to create an extension of C that provides modern safety and productivity features while still ensuring strong backward compatibility with C and its programmers.
+Prior projects have attempted similar goals but failed to honor the C programming style;
+for instance, adding object-oriented or functional programming with garbage collection is a nonstarter for many C developers.
+Specifically, \CFA is designed to have an orthogonal feature set based closely on the C programming paradigm, so that \CFA features can be added \emph{incrementally} to existing C code bases, and C programmers can learn \CFA extensions on an as-needed basis, preserving investment in existing code and programmers.
+This paper presents a quick tour of \CFA features, showing how their design avoids shortcomings of similar features in C and other C-like languages.
+Experimental results are presented to validate several of the new features.
 }%
 \keywords{generic types, tuple types, variadic types, polymorphic functions, C, Cforall}
+\keywords{C, Cforall, generic types, polymorphic functions, tuple types, variadic types}
 \begin{document}
 \linenumbers                                            % comment out to turn off line numbering
+%\linenumbers                                            % comment out to turn off line numbering
 \maketitle
+\vspace*{-10pt}
 \section{Introduction}
 The C programming language is a foundational technology for modern computing with millions of lines of code implementing everything from hobby projects to commercial operating-systems.
 This installation base and the programmers producing it represent a massive software-engineering investment spanning decades and likely to continue for decades more.
 The TIOBE~\cite{TIOBE} ranks the top 5 most \emph{popular} programming languages as: Java 15\%, \Textbf{C 12\%}, \Textbf{\CC 5.5\%}, Python 5\%, \Csharp 4.5\% = 42\%, where the next 50 languages are less than 4\% each with a long tail.
 The top 3 rankings over the past 30 years are:
+The C programming language is a foundational technology for modern computing with millions of lines of code implementing everything from hobby projects to commercial operating systems.
+This installation base and the programmers producing it represent a massive software engineering investment spanning decades and likely to continue for decades more.
+The TIOBE index~\cite{TIOBE} ranks the top five most \emph{popular} programming languages as Java 15\%, \Textbf{C 12\%}, \Textbf{\CC 5.5\%}, and Python 5\%, \Csharp 4.5\% = 42\%, where the next 50 languages are less than 4\% each with a long tail.
+The top three rankings over the past 30 years are as follows.
 \begin{center}
 \setlength{\tabcolsep}{10pt}
+\lstDeleteShortInline@%
+\begin{tabular}{@{}rccccccc@{}}
+                & 2018  & 2013  & 2008  & 2003  & 1998  & 1993  & 1988  \\ \hline
+Java    & 1             & 2             & 1             & 1             & 18    & -             & -             \\
+\fontsize{9bp}{11bp}\selectfont
+\lstDeleteShortInline@%
+\begin{tabular}{@{}cccccccc@{}}
+                & 2018  & 2013  & 2008  & 2003  & 1998  & 1993  & 1988  \\
+Java    & 1             & 2             & 1             & 1             & 18    & --    & --    \\
 \Textbf{C}& \Textbf{2} & \Textbf{1} & \Textbf{2} & \Textbf{2} & \Textbf{1} & \Textbf{1} & \Textbf{1} \\
 \CC             & 3             & 4             & 3             & 3             & 2             & 2             & 5             \\
 …
 Love it or hate it, C is extremely popular, highly used, and one of the few systems languages.
 In many cases, \CC is often used solely as a better C.
 Nevertheless, C, first standardized almost forty years ago~\cite{ANSI89:C}, lacks many features that make programming in more modern languages safer and more productive.
 \CFA (pronounced ``C-for-all'', and written \CFA or Cforall) is an evolutionary extension of the C programming language that adds modern language-features to C, while maintaining source and runtime compatibility in the familiar C programming model.
 The four key design goals for \CFA~\cite{Bilson03} are:
 (1) The behaviour of standard C code must remain the same when translated by a \CFA compiler as when translated by a C compiler;
 (2) Standard C code must be as fast and as small when translated by a \CFA compiler as when translated by a C compiler;
 (3) \CFA code must be at least as portable as standard C code;
 (4) Extensions introduced by \CFA must be translated in the most efficient way possible.
 These goals ensure existing C code-bases can be converted to \CFA incrementally with minimal effort, and C programmers can productively generate \CFA code without training beyond the features being used.
 \CC is used similarly, but has the disadvantages of multiple legacy design-choices that cannot be updated and active divergence of the language model from C, requiring significant effort and training to incrementally add \CC to a C-based project.
 All languages features discussed in this paper are working, except some advanced exception-handling features.
 Not discussed in this paper are the integrated concurrency-constructs and user-level threading-library~\cite{Delisle18}.
+Nevertheless, C, which was first standardized almost 30 years ago~\cite{ANSI89:C}, lacks many features that make programming in more modern languages safer and more productive.
+\CFA (pronounced ``C for all'' and written \CFA or Cforall) is an evolutionary extension of the C programming language that adds modern language features to C, while maintaining source and runtime compatibility in the familiar C programming model.
+The four key design goals for \CFA~\cite{Bilson03} are as follows:
+(1) the behavior of standard C code must remain the same when translated by a \CFA compiler as when translated by a C compiler;
+(2) the standard C code must be as fast and as small when translated by a \CFA compiler as when translated by a C compiler;
+(3) the \CFA code must be at least as portable as standard C code;
+(4) extensions introduced by \CFA must be translated in the most efficient way possible.
+These goals ensure that the existing C code bases can be converted into \CFA incrementally with minimal effort, and C programmers can productively generate \CFA code without training beyond the features being used.
+\CC is used similarly but has the disadvantages of multiple legacy design choices that cannot be updated and active divergence of the language model from C, requiring significant effort and training to incrementally add \CC to a C-based project.
+All language features discussed in this paper are working, except some advanced exception-handling features.
+Not discussed in this paper are the integrated concurrency constructs and user-level threading library~\cite{Delisle18}.
 \CFA is an \emph{open-source} project implemented as a source-to-source translator from \CFA to the gcc-dialect of C~\cite{GCCExtensions}, allowing it to leverage the portability and code optimizations provided by gcc, meeting goals (1)--(3).
-Ultimately, a compiler is necessary for advanced features and optimal performance.
 % @plg2[9]% cd cfa-cc/src; cloc ArgTweak CodeGen CodeTools Common Concurrency ControlStruct Designators GenPoly InitTweak MakeLibCfa.cc MakeLibCfa.h Parser ResolvExpr SymTab SynTree Tuples driver prelude main.cc
 % -------------------------------------------------------------------------------
 …
 % SUM:                           223           8203           8263          46479
 % -------------------------------------------------------------------------------
+The \CFA translator is 200+ files and 46,000+ lines of code written in C/\CC.
+Starting with a translator versus a compiler makes it easier and faster to generate and debug C object-code rather than intermediate, assembler or machine code.
+The translator design is based on the \emph{visitor pattern}, allowing multiple passes over the abstract code-tree, which works well for incrementally adding new feature through additional visitor passes.
+At the heart of the translator is the type resolver, which handles the polymorphic function/type overload-resolution.
+The \CFA translator is 200+ files and 46\,000+ lines of code written in C/\CC.
+A translator versus a compiler makes it easier and faster to generate and debug the C object code rather than the intermediate, assembler, or machine code;
+ultimately, a compiler is necessary for advanced features and optimal performance.
+% The translator design is based on the \emph{visitor pattern}, allowing multiple passes over the abstract code-tree, which works well for incrementally adding new feature through additional visitor passes.
+Two key translator components are expression analysis, determining expression validity and what operations are required for its implementation, and code generation, dealing with multiple forms of overloading, polymorphism, and multiple return values by converting them into the C code for a C compiler that supports none of these features.
+Details of these components are available in chapters 2 and 3 in the work of Bilson~\cite{Bilson03} and form the base for the current \CFA translator.
 % @plg2[8]% cd cfa-cc/src; cloc libcfa
 % -------------------------------------------------------------------------------
 …
 % SUM:                           100           1895           2785          11763
 % -------------------------------------------------------------------------------
 The \CFA runtime system is 100+ files and 11,000+ lines of code, written in \CFA.
+The \CFA runtime system is 100+ files and 11\,000+ lines of code, written in \CFA.
 Currently, the \CFA runtime is the largest \emph{user} of \CFA providing a vehicle to test the language features and implementation.
 % @plg2[6]% cd cfa-cc/src; cloc tests examples benchmark
 …
 % SUM:                           290          13175           3400          27776
 % -------------------------------------------------------------------------------
+The \CFA tests are 290+ files and 27,000+ lines of code.
+The tests illustrate syntactic and semantic features in \CFA, plus a growing number of runtime benchmarks.
+The tests check for correctness and are used for daily regression testing of 3800+ commits.
+Finally, it is impossible to describe a programming language without usages before definitions.
+Therefore, syntax and semantics appear before explanations, and related work (Section~\ref{s:RelatedWork}) is deferred until \CFA is presented;
+hence, patience is necessary until details are discussed.
+% The \CFA tests are 290+ files and 27,000+ lines of code.
+% The tests illustrate syntactic and semantic features in \CFA, plus a growing number of runtime benchmarks.
+% The tests check for correctness and are used for daily regression testing of 3800+ commits.
+Finally, it is impossible to describe a programming language without usage before definition.
+Therefore, syntax and semantics appear before explanations;
+hence, patience is necessary until sufficient details are presented and discussed.
+Similarly, a detailed comparison with other programming languages is postponed until Section~\ref{s:RelatedWork}.
+\vspace*{-6pt}
 \section{Polymorphic Functions}
 \CFA introduces both ad-hoc and parametric polymorphism to C, with a design originally formalized by Ditchfield~\cite{Ditchfield92}, and first implemented by Bilson~\cite{Bilson03}.
 Shortcomings are identified in existing approaches to generic and variadic data types in C-like languages and how these shortcomings are avoided in \CFA.
 Specifically, the solution is both reusable and type-checked, as well as conforming to the design goals of \CFA with ergonomic use of existing C abstractions.
+\CFA introduces both ad hoc and parametric polymorphism to C, with a design originally formalized by Ditchfield~\cite{Ditchfield92} and first implemented by Bilson~\cite{Bilson03}.
+Shortcomings are identified in the existing approaches to generic and variadic data types in C-like languages and how these shortcomings are avoided in \CFA.
+Specifically, the solution is both reusable and type checked, as well as conforming to the design goals of \CFA with ergonomic use of existing C abstractions.
 The new constructs are empirically compared with C and \CC approaches via performance experiments in Section~\ref{sec:eval}.
+\subsection{Name Overloading}
+\vspace*{-6pt}
+\subsection{Name overloading}
 \label{s:NameOverloading}
 \begin{quote}
 There are only two hard things in Computer Science: cache invalidation and \emph{naming things} -- Phil Karlton
+``There are only two hard things in Computer Science: cache invalidation and \emph{naming things}.''---Phil Karlton
 \end{quote}
 \vspace{-9pt}
 C already has a limited form of ad-hoc polymorphism in its basic arithmetic operators, which apply to a variety of different types using identical syntax.
+C already has a limited form of ad hoc polymorphism in its basic arithmetic operators, which apply to a variety of different types using identical syntax.
 \CFA extends the built-in operator overloading by allowing users to define overloads for any function, not just operators, and even any variable;
 Section~\ref{sec:libraries} includes a number of examples of how this overloading simplifies \CFA programming relative to C.
 Code generation for these overloaded functions and variables is implemented by the usual approach of mangling the identifier names to include a representation of their type, while \CFA decides which overload to apply based on the same ``usual arithmetic conversions'' used in C to disambiguate operator overloads.
+As an example:
+\newpage
 \begin{cfa}
 int max = 2147483647;                                           $\C[4in]{// (1)}$
 …
 int max( int a, int b ) { return a < b ? b : a; }  $\C{// (3)}$
 double max( double a, double b ) { return a < b ? b : a; }  $\C{// (4)}\CRT$
 max( 7, -max );                                         $\C{// uses (3) and (1), by matching int from constant 7}$
+max( 7, -max );                                         $\C[3in]{// uses (3) and (1), by matching int from constant 7}$
 max( max, 3.14 );                                       $\C{// uses (4) and (2), by matching double from constant 3.14}$
 max( max, -max );                                       $\C{// ERROR, ambiguous}$
 int m = max( max, -max );                       $\C{// uses (3) and (1) twice, by matching return type}$
+int m = max( max, -max );                       $\C{// uses (3) and (1) twice, by matching return type}\CRT$
 \end{cfa}
 …
 In some cases, hundreds of names can be reduced to tens, resulting in a significant cognitive reduction.
 In the above, the name @max@ has a consistent meaning, and a programmer only needs to remember the single concept: maximum.
 To prevent significant ambiguities, \CFA uses the return type in selecting overloads, \eg in the assignment to @m@, the compiler use @m@'s type to unambiguously select the most appropriate call to function @max@ (as does Ada).
+To prevent significant ambiguities, \CFA uses the return type in selecting overloads, \eg in the assignment to @m@, the compiler uses @m@'s type to unambiguously select the most appropriate call to function @max@ (as does Ada).
 As is shown later, there are a number of situations where \CFA takes advantage of available type information to disambiguate, where other programming languages generate ambiguities.
 \Celeven added @_Generic@ expressions~\cite[\S~6.5.1.1]{C11}, which is used with preprocessor macros to provide ad-hoc polymorphism;
+\Celeven added @_Generic@ expressions (see section~6.5.1.1 of the ISO/IEC 9899~\cite{C11}), which is used with preprocessor macros to provide ad hoc polymorphism;
 however, this polymorphism is both functionally and ergonomically inferior to \CFA name overloading.
+The macro wrapping the generic expression imposes some limitations;
+\eg, it cannot implement the example above, because the variables @max@ are ambiguous with the functions @max@.
+The macro wrapping the generic expression imposes some limitations, for instance, it cannot implement the example above, because the variables @max@ are ambiguous with the functions @max@.
 Ergonomic limitations of @_Generic@ include the necessity to put a fixed list of supported types in a single place and manually dispatch to appropriate overloads, as well as possible namespace pollution from the dispatch functions, which must all have distinct names.
 \CFA supports @_Generic@ expressions for backwards compatibility, but it is an unnecessary mechanism. \TODO{actually implement that}
+\CFA supports @_Generic@ expressions for backward compatibility, but it is an unnecessary mechanism.
 % http://fanf.livejournal.com/144696.html
 …
+\subsection{\texorpdfstring{\protect\lstinline{forall} Functions}{forall Functions}}
+\vspace*{-10pt}
+\subsection{\texorpdfstring{\protect\lstinline{forall} functions}{forall functions}}
 \label{sec:poly-fns}
 The signature feature of \CFA is parametric-polymorphic functions~\cite{forceone:impl,Cormack90,Duggan96} with functions generalized using a @forall@ clause (giving the language its name):
+The signature feature of \CFA is parametric-polymorphic functions~\cite{forceone:impl,Cormack90,Duggan96} with functions generalized using a @forall@ clause (giving the language its name).
 \begin{cfa}
 `forall( otype T )` T identity( T val ) { return val; }
 …
 This @identity@ function can be applied to any complete \newterm{object type} (or @otype@).
 The type variable @T@ is transformed into a set of additional implicit parameters encoding sufficient information about @T@ to create and return a variable of that type.
 The \CFA implementation passes the size and alignment of the type represented by an @otype@ parameter, as well as an assignment operator, constructor, copy constructor and destructor.
 If this extra information is not needed, \eg for a pointer, the type parameter can be declared as a \newterm{data type} (or @dtype@).
 In \CFA, the polymorphic runtime-cost is spread over each polymorphic call, because more arguments are passed to polymorphic functions;
 the experiments in Section~\ref{sec:eval} show this overhead is similar to \CC virtual-function calls.
 A design advantage is that, unlike \CC template-functions, \CFA polymorphic-functions are compatible with C \emph{separate compilation}, preventing compilation and code bloat.
 Since bare polymorphic-types provide a restricted set of available operations, \CFA provides a \newterm{type assertion}~\cite[pp.~37-44]{Alphard} mechanism to provide further type information, where type assertions may be variable or function declarations that depend on a polymorphic type-variable.
 For example, the function @twice@ can be defined using the \CFA syntax for operator overloading:
+The \CFA implementation passes the size and alignment of the type represented by an @otype@ parameter, as well as an assignment operator, constructor, copy constructor, and destructor.
+If this extra information is not needed, for instance, for a pointer, the type parameter can be declared as a \newterm{data type} (or @dtype@).
+In \CFA, the polymorphic runtime cost is spread over each polymorphic call, because more arguments are passed to polymorphic functions;
+the experiments in Section~\ref{sec:eval} show this overhead is similar to \CC virtual function calls.
+A design advantage is that, unlike \CC template functions, \CFA polymorphic functions are compatible with C \emph{separate compilation}, preventing compilation and code bloat.
+Since bare polymorphic types provide a restricted set of available operations, \CFA provides a \newterm{type assertion}~\cite[pp.~37-44]{Alphard} mechanism to provide further type information, where type assertions may be variable or function declarations that depend on a polymorphic type variable.
+For example, the function @twice@ can be defined using the \CFA syntax for operator overloading.
 \begin{cfa}
 forall( otype T `| { T ?+?(T, T); }` ) T twice( T x ) { return x `+` x; }  $\C{// ? denotes operands}$
 int val = twice( twice( 3.7 ) );  $\C{// val == 14}$
 \end{cfa}
+which works for any type @T@ with a matching addition operator.
+The polymorphism is achieved by creating a wrapper function for calling @+@ with @T@ bound to @double@, then passing this function to the first call of @twice@.
+There is now the option of using the same @twice@ and converting the result to @int@ on assignment, or creating another @twice@ with type parameter @T@ bound to @int@ because \CFA uses the return type~\cite{Cormack81,Baker82,Ada} in its type analysis.
+The first approach has a late conversion from @double@ to @int@ on the final assignment, while the second has an early conversion to @int@.
+\CFA minimizes the number of conversions and their potential to lose information, so it selects the first approach, which corresponds with C-programmer intuition.
+This works for any type @T@ with a matching addition operator.
+The polymorphism is achieved by creating a wrapper function for calling @+@ with the @T@ bound to @double@ and then passing this function to the first call of @twice@.
+There is now the option of using the same @twice@ and converting the result into @int@ on assignment or creating another @twice@ with the type parameter @T@ bound to @int@ because \CFA uses the return type~\cite{Cormack81,Baker82,Ada} in its type analysis.
+The first approach has a late conversion from @double@ to @int@ on the final assignment, whereas the second has an early conversion to @int@.
+\CFA minimizes the number of conversions and their potential to lose information;
+hence, it selects the first approach, which corresponds with C programmer intuition.
 Crucial to the design of a new programming language are the libraries to access thousands of external software features.
 Like \CC, \CFA inherits a massive compatible library-base, where other programming languages must rewrite or provide fragile inter-language communication with C.
 A simple example is leveraging the existing type-unsafe (@void *@) C @bsearch@ to binary search a sorted float array:
+Like \CC, \CFA inherits a massive compatible library base, where other programming languages must rewrite or provide fragile interlanguage communication with C.
+A simple example is leveraging the existing type-unsafe (@void *@) C @bsearch@ to binary search a sorted float array.
 \begin{cfa}
 void * bsearch( const void * key, const void * base, size_t nmemb, size_t size,
 …
 double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp ); $\C{// search sorted array}$
 \end{cfa}
+which can be augmented simply with generalized, type-safe, \CFA-overloaded wrappers:
+This can be augmented simply with generalized, type-safe, \CFA-overloaded wrappers.
 \begin{cfa}
 forall( otype T | { int ?<?( T, T ); } ) T * bsearch( T key, const T * arr, size_t size ) {
 …
 \end{cfa}
 The nested function @comp@ provides the hidden interface from typed \CFA to untyped (@void *@) C, plus the cast of the result.
+Providing a hidden @comp@ function in \CC is awkward as lambdas do not use C calling-conventions and template declarations cannot appear at block scope.
+As well, an alternate kind of return is made available: position versus pointer to found element.
+\CC's type-system cannot disambiguate between the two versions of @bsearch@ because it does not use the return type in overload resolution, nor can \CC separately compile a template @bsearch@.
+% FIX
+Providing a hidden @comp@ function in \CC is awkward as lambdas do not use C calling conventions and template declarations cannot appear in block scope.
+In addition, an alternate kind of return is made available: position versus pointer to found element.
+\CC's type system cannot disambiguate between the two versions of @bsearch@ because it does not use the return type in overload resolution, nor can \CC separately compile a template @bsearch@.
 \CFA has replacement libraries condensing hundreds of existing C functions into tens of \CFA overloaded functions, all without rewriting the actual computations (see Section~\ref{sec:libraries}).
 …
 \end{cfa}
 Call-site inferencing and nested functions provide a localized form of inheritance.
+Call site inferencing and nested functions provide a localized form of inheritance.
 For example, the \CFA @qsort@ only sorts in ascending order using @<@.
 However, it is trivial to locally change this behaviour:
+However, it is trivial to locally change this behavior.
 \begin{cfa}
 forall( otype T | { int ?<?( T, T ); } ) void qsort( const T * arr, size_t size ) { /* use C qsort */ }
 int main() {
         int ?<?( double x, double y ) { return x `>` y; } $\C{// locally override behaviour}$
+        int ?<?( double x, double y ) { return x `>` y; } $\C{// locally override behavior}$
         qsort( vals, 10 );                                                      $\C{// descending sort}$
+}
 \end{cfa}
 The local version of @?<?@ performs @?>?@ overriding the built-in @?<?@ so it is passed to @qsort@.
 Hence, programmers can easily form local environments, adding and modifying appropriate functions, to maximize reuse of other existing functions and types.
 To reduce duplication, it is possible to distribute a group of @forall@ (and storage-class qualifiers) over functions/types, so each block declaration is prefixed by the group (see example in Appendix~\ref{s:CforallStack}).
+Therefore, programmers can easily form local environments, adding and modifying appropriate functions, to maximize the reuse of other existing functions and types.
+To reduce duplication, it is possible to distribute a group of @forall@ (and storage-class qualifiers) over functions/types, such that each block declaration is prefixed by the group (see the example in Appendix~\ref{s:CforallStack}).
 \begin{cfa}
 forall( otype `T` ) {                                                   $\C{// distribution block, add forall qualifier to declarations}$
 …
-\vspace*{-2pt}
 \subsection{Traits}
+\CFA provides \newterm{traits} to name a group of type assertions, where the trait name allows specifying the same set of assertions in multiple locations, preventing repetition mistakes at each function declaration:
+\CFA provides \newterm{traits} to name a group of type assertions, where the trait name allows specifying the same set of assertions in multiple locations, preventing repetition mistakes at each function declaration.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \end{cquote}
 Note, the @sumable@ trait does not include a copy constructor needed for the right side of @?+=?@ and return;
 it is provided by @otype@, which is syntactic sugar for the following trait:
+Note that the @sumable@ trait does not include a copy constructor needed for the right side of @?+=?@ and return;
+it is provided by @otype@, which is syntactic sugar for the following trait.
 \begin{cfa}
 trait otype( dtype T | sized(T) ) {  // sized is a pseudo-trait for types with known size and alignment
 …
 };
 \end{cfa}
 Given the information provided for an @otype@, variables of polymorphic type can be treated as if they were a complete type: stack-allocatable, default or copy-initialized, assigned, and deleted.
 In summation, the \CFA type-system uses \newterm{nominal typing} for concrete types, matching with the C type-system, and \newterm{structural typing} for polymorphic types.
+Given the information provided for an @otype@, variables of polymorphic type can be treated as if they were a complete type: stack allocatable, default or copy initialized, assigned, and deleted.
+In summation, the \CFA type system uses \newterm{nominal typing} for concrete types, matching with the C type system, and \newterm{structural typing} for polymorphic types.
 Hence, trait names play no part in type equivalence;
 the names are simply macros for a list of polymorphic assertions, which are expanded at usage sites.
 Nevertheless, trait names form a logical subtype-hierarchy with @dtype@ at the top, where traits often contain overlapping assertions, \eg operator @+@.
 Traits are used like interfaces in Java or abstract base-classes in \CC, but without the nominal inheritance-relationships.
 Instead, each polymorphic function (or generic type) defines the structural type needed for its execution (polymorphic type-key), and this key is fulfilled at each call site from the lexical environment, which is similar to Go~\cite{Go} interfaces.
 Hence, new lexical scopes and nested functions are used extensively to create local subtypes, as in the @qsort@ example, without having to manage a nominal-inheritance hierarchy.
+Nevertheless, trait names form a logical subtype hierarchy with @dtype@ at the top, where traits often contain overlapping assertions, \eg operator @+@.
+Traits are used like interfaces in Java or abstract base classes in \CC, but without the nominal inheritance relationships.
+Instead, each polymorphic function (or generic type) defines the structural type needed for its execution (polymorphic type key), and this key is fulfilled at each call site from the lexical environment, which is similar to the Go~\cite{Go} interfaces.
+Hence, new lexical scopes and nested functions are used extensively to create local subtypes, as in the @qsort@ example, without having to manage a nominal inheritance hierarchy.
 % (Nominal inheritance can be approximated with traits using marker variables or functions, as is done in Go.)
 …
 A significant shortcoming of standard C is the lack of reusable type-safe abstractions for generic data structures and algorithms.
 Broadly speaking, there are three approaches to implement abstract data-structures in C.
 One approach is to write bespoke data-structures for each context in which they are needed.
 While this approach is flexible and supports integration with the C type-checker and tooling, it is also tedious and error-prone, especially for more complex data structures.
 A second approach is to use @void *@-based polymorphism, \eg the C standard-library functions @bsearch@ and @qsort@, which allow reuse of code with common functionality.
 However, basing all polymorphism on @void *@ eliminates the type-checker's ability to ensure that argument types are properly matched, often requiring a number of extra function parameters, pointer indirection, and dynamic allocation that is not otherwise needed.
 A third approach to generic code is to use preprocessor macros, which does allow the generated code to be both generic and type-checked, but errors may be difficult to interpret.
+Broadly speaking, there are three approaches to implement abstract data structures in C.
+One approach is to write bespoke data structures for each context in which they are needed.
+While this approach is flexible and supports integration with the C type checker and tooling, it is also tedious and error prone, especially for more complex data structures.
+A second approach is to use @void *@-based polymorphism, \eg the C standard library functions @bsearch@ and @qsort@, which allow for the reuse of code with common functionality.
+However, basing all polymorphism on @void *@ eliminates the type checker's ability to ensure that argument types are properly matched, often requiring a number of extra function parameters, pointer indirection, and dynamic allocation that is otherwise not needed.
+A third approach to generic code is to use preprocessor macros, which does allow the generated code to be both generic and type checked, but errors may be difficult to interpret.
 Furthermore, writing and using preprocessor macros is unnatural and inflexible.
 \CC, Java, and other languages use \newterm{generic types} to produce type-safe abstract data-types.
 \CFA generic types integrate efficiently and naturally with the existing polymorphic functions, while retaining backwards compatibility with C and providing separate compilation.
+\CC, Java, and other languages use \newterm{generic types} to produce type-safe abstract data types.
+\CFA generic types integrate efficiently and naturally with the existing polymorphic functions, while retaining backward compatibility with C and providing separate compilation.
 However, for known concrete parameters, the generic-type definition can be inlined, like \CC templates.
 A generic type can be declared by placing a @forall@ specifier on a @struct@ or @union@ declaration, and instantiated using a parenthesized list of types after the type name:
+A generic type can be declared by placing a @forall@ specifier on a @struct@ or @union@ declaration and instantiated using a parenthesized list of types after the type name.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \CFA classifies generic types as either \newterm{concrete} or \newterm{dynamic}.
 Concrete types have a fixed memory layout regardless of type parameters, while dynamic types vary in memory layout depending on their type parameters.
+Concrete types have a fixed memory layout regardless of type parameters, whereas dynamic types vary in memory layout depending on their type parameters.
 A \newterm{dtype-static} type has polymorphic parameters but is still concrete.
 Polymorphic pointers are an example of dtype-static types;
 given some type variable @T@, @T@ is a polymorphic type, as is @T *@, but @T *@ has a fixed size and can therefore be represented by @void *@ in code generation.
 \CFA generic types also allow checked argument-constraints.
 For example, the following declaration of a sorted set-type ensures the set key supports equality and relational comparison:
+given some type variable @T@, @T@ is a polymorphic type, as is @T *@, but @T *@ has a fixed size and can, therefore, be represented by @void *@ in code generation.
+\CFA generic types also allow checked argument constraints.
+For example, the following declaration of a sorted set type ensures the set key supports equality and relational comparison.
 \begin{cfa}
 forall( otype Key | { _Bool ?==?(Key, Key); _Bool ?<?(Key, Key); } ) struct sorted_set;
 …
 \subsection{Concrete Generic-Types}
 The \CFA translator template-expands concrete generic-types into new structure types, affording maximal inlining.
 To enable inter-operation among equivalent instantiations of a generic type, the translator saves the set of instantiations currently in scope and reuses the generated structure declarations where appropriate.
 A function declaration that accepts or returns a concrete generic-type produces a declaration for the instantiated structure in the same scope, which all callers may reuse.
 For example, the concrete instantiation for @pair( const char *, int )@ is:
+\subsection{Concrete generic types}
+The \CFA translator template expands concrete generic types into new structure types, affording maximal inlining.
+To enable interoperation among equivalent instantiations of a generic type, the translator saves the set of instantiations currently in scope and reuses the generated structure declarations where appropriate.
+A function declaration that accepts or returns a concrete generic type produces a declaration for the instantiated structure in the same scope, which all callers may reuse.
+For example, the concrete instantiation for @pair( const char *, int )@ is
 \begin{cfa}
 struct _pair_conc0 {
 …
 \end{cfa}
 A concrete generic-type with dtype-static parameters is also expanded to a structure type, but this type is used for all matching instantiations.
 In the above example, the @pair( F *, T * )@ parameter to @value@ is such a type; its expansion is below and it is used as the type of the variables @q@ and @r@ as well, with casts for member access where appropriate:
+A concrete generic type with dtype-static parameters is also expanded to a structure type, but this type is used for all matching instantiations.
+In the above example, the @pair( F *, T * )@ parameter to @value@ is such a type; its expansion is below, and it is used as the type of the variables @q@ and @r@ as well, with casts for member access where appropriate.
 \begin{cfa}
 struct _pair_conc1 {
 …
+\subsection{Dynamic Generic-Types}
+Though \CFA implements concrete generic-types efficiently, it also has a fully general system for dynamic generic types.
+As mentioned in Section~\ref{sec:poly-fns}, @otype@ function parameters (in fact all @sized@ polymorphic parameters) come with implicit size and alignment parameters provided by the caller.
+Dynamic generic-types also have an \newterm{offset array} containing structure-member offsets.
+A dynamic generic-@union@ needs no such offset array, as all members are at offset 0, but size and alignment are still necessary.
+Access to members of a dynamic structure is provided at runtime via base-displacement addressing with the structure pointer and the member offset (similar to the @offsetof@ macro), moving a compile-time offset calculation to runtime.
+\subsection{Dynamic generic types}
+Though \CFA implements concrete generic types efficiently, it also has a fully general system for dynamic generic types.
+As mentioned in Section~\ref{sec:poly-fns}, @otype@ function parameters (in fact, all @sized@ polymorphic parameters) come with implicit size and alignment parameters provided by the caller.
+Dynamic generic types also have an \newterm{offset array} containing structure-member offsets.
+A dynamic generic @union@ needs no such offset array, as all members are at offset 0, but size and alignment are still necessary.
+Access to members of a dynamic structure is provided at runtime via base displacement addressing
+% FIX
+using the structure pointer and the member offset (similar to the @offsetof@ macro), moving a compile-time offset calculation to runtime.
 The offset arrays are statically generated where possible.
 If a dynamic generic-type is declared to be passed or returned by value from a polymorphic function, the translator can safely assume the generic type is complete (\ie has a known layout) at any call-site, and the offset array is passed from the caller;
+If a dynamic generic type is declared to be passed or returned by value from a polymorphic function, the translator can safely assume that the generic type is complete (\ie has a known layout) at any call site, and the offset array is passed from the caller;
 if the generic type is concrete at the call site, the elements of this offset array can even be statically generated using the C @offsetof@ macro.
 As an example, the body of the second @value@ function is implemented as:
+As an example, the body of the second @value@ function is implemented as
 \begin{cfa}
 _assign_T( _retval, p + _offsetof_pair[1] ); $\C{// return *p.second}$
 \end{cfa}
+@_assign_T@ is passed in as an implicit parameter from @otype T@, and takes two @T *@ (@void *@ in the generated code), a destination and a source; @_retval@ is the pointer to a caller-allocated buffer for the return value, the usual \CFA method to handle dynamically-sized return types.
+@_offsetof_pair@ is the offset array passed into @value@; this array is generated at the call site as:
+\newpage
+\noindent
+Here, @_assign_T@ is passed in as an implicit parameter from @otype T@, and takes two @T *@ (@void *@ in the generated code), a destination and a source, and @_retval@ is the pointer to a caller-allocated buffer for the return value, the usual \CFA method to handle dynamically sized return types.
+@_offsetof_pair@ is the offset array passed into @value@;
+this array is generated at the call site as
 \begin{cfa}
 size_t _offsetof_pair[] = { offsetof( _pair_conc0, first ), offsetof( _pair_conc0, second ) }
 \end{cfa}
 In some cases the offset arrays cannot be statically generated.
 For instance, modularity is generally provided in C by including an opaque forward-declaration of a structure and associated accessor and mutator functions in a header file, with the actual implementations in a separately-compiled @.c@ file.
 \CFA supports this pattern for generic types, but the caller does not know the actual layout or size of the dynamic generic-type, and only holds it by a pointer.
+In some cases, the offset arrays cannot be statically generated.
+For instance, modularity is generally provided in C by including an opaque forward declaration of a structure and associated accessor and mutator functions in a header file, with the actual implementations in a separately compiled @.c@ file.
+\CFA supports this pattern for generic types, but the caller does not know the actual layout or size of the dynamic generic type and only holds it by a pointer.
 The \CFA translator automatically generates \newterm{layout functions} for cases where the size, alignment, and offset array of a generic struct cannot be passed into a function from that function's caller.
 These layout functions take as arguments pointers to size and alignment variables and a caller-allocated array of member offsets, as well as the size and alignment of all @sized@ parameters to the generic structure (un@sized@ parameters are forbidden from being used in a context that affects layout).
 …
 Whether a type is concrete, dtype-static, or dynamic is decided solely on the @forall@'s type parameters.
 This design allows opaque forward declarations of generic types, \eg @forall(otype T)@ @struct Box@ -- like in C, all uses of @Box(T)@ can be separately compiled, and callers from other translation units know the proper calling conventions to use.
+If the definition of a structure type is included in deciding whether a generic type is dynamic or concrete, some further types may be recognized as dtype-static (\eg @forall(otype T)@ @struct unique_ptr { T * p }@ does not depend on @T@ for its layout, but the existence of an @otype@ parameter means that it \emph{could}.), but preserving separate compilation (and the associated C compatibility) in the existing design is judged to be an appropriate trade-off.
+If the definition of a structure type is included in deciding whether a generic type is dynamic or concrete, some further types may be recognized as dtype-static (\eg @forall(otype T)@ @struct unique_ptr { T * p }@ does not depend on @T@ for its layout, but the existence of an @otype@ parameter means that it \emph{could}.);
+however, preserving separate compilation (and the associated C compatibility) in the existing design is judged to be an appropriate trade-off.
 …
+}
 \end{cfa}
+Since @pair( T *, T * )@ is a concrete type, there are no implicit parameters passed to @lexcmp@, so the generated code is identical to a function written in standard C using @void *@, yet the \CFA version is type-checked to ensure the members of both pairs and the arguments to the comparison function match in type.
+Another useful pattern enabled by reused dtype-static type instantiations is zero-cost \newterm{tag-structures}.
+Sometimes information is only used for type-checking and can be omitted at runtime, \eg:
+Since @pair( T *, T * )@ is a concrete type, there are no implicit parameters passed to @lexcmp@;
+hence, the generated code is identical to a function written in standard C using @void *@, yet the \CFA version is type checked to ensure members of both pairs and arguments to the comparison function match in type.
+Another useful pattern enabled by reused dtype-static type instantiations is zero-cost \newterm{tag structures}.
+Sometimes, information is only used for type checking and can be omitted at runtime.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
                                                         half_marathon;
 scalar(litres) two_pools = pool + pool;
 `marathon + pool;`      // ERROR, mismatched types
+`marathon + pool;` // ERROR, mismatched types
 \end{cfa}
 \end{tabular}
 \lstMakeShortInline@%
 \end{cquote}
+@scalar@ is a dtype-static type, so all uses have a single structure definition, containing @unsigned long@, and can share the same implementations of common functions like @?+?@.
+Here, @scalar@ is a dtype-static type;
+hence, all uses have a single structure definition, containing @unsigned long@, and can share the same implementations of common functions like @?+?@.
 These implementations may even be separately compiled, unlike \CC template functions.
 However, the \CFA type-checker ensures matching types are used by all calls to @?+?@, preventing nonsensical computations like adding a length to a volume.
+However, the \CFA type checker ensures matching types are used by all calls to @?+?@, preventing nonsensical computations like adding a length to a volume.
 …
 \label{sec:tuples}
 In many languages, functions can return at most one value;
+In many languages, functions can return, at most, one value;
 however, many operations have multiple outcomes, some exceptional.
 Consider C's @div@ and @remquo@ functions, which return the quotient and remainder for a division of integer and float values, respectively.
 …
 double r = remquo( 13.5, 5.2, &q );                     $\C{// return remainder, alias quotient}$
 \end{cfa}
 @div@ aggregates the quotient/remainder in a structure, while @remquo@ aliases a parameter to an argument.
+Here, @div@ aggregates the quotient/remainder in a structure, whereas @remquo@ aliases a parameter to an argument.
 Both approaches are awkward.
+Alternatively, a programming language can directly support returning multiple values, \eg in \CFA:
+% FIX
+Alternatively, a programming language can directly support returning multiple values, \eg \CFA provides the following.
 \begin{cfa}
 [ int, int ] div( int num, int den );           $\C{// return two integers}$
 …
 This approach is straightforward to understand and use;
 therefore, why do few programming languages support this obvious feature or provide it awkwardly?
 To answer, there are complex consequences that cascade through multiple aspects of the language, especially the type-system.
 This section show these consequences and how \CFA handles them.
+To answer, there are complex consequences that cascade through multiple aspects of the language, especially the type system.
+This section shows these consequences and how \CFA handles them.
 \subsection{Tuple Expressions}
 The addition of multiple-return-value functions (MRVF) are \emph{useless} without a syntax for accepting multiple values at the call-site.
+The addition of multiple-return-value functions (MRVFs) is \emph{useless} without a syntax for accepting multiple values at the call site.
 The simplest mechanism for capturing the return values is variable assignment, allowing the values to be retrieved directly.
 As such, \CFA allows assigning multiple values from a function into multiple variables, using a square-bracketed list of lvalue expressions (as above), called a \newterm{tuple}.
 However, functions also use \newterm{composition} (nested calls), with the direct consequence that MRVFs must also support composition to be orthogonal with single-returning-value functions (SRVF), \eg:
+However, functions also use \newterm{composition} (nested calls), with the direct consequence that MRVFs must also support composition to be orthogonal with single-returning-value functions (SRVFs), \eg, \CFA provides the following.
 \begin{cfa}
 printf( "%d %d\n", div( 13, 5 ) );                      $\C{// return values seperated into arguments}$
 \end{cfa}
 Here, the values returned by @div@ are composed with the call to @printf@ by flattening the tuple into separate arguments.
 However, the \CFA type-system must support significantly more complex composition:
+However, the \CFA type-system must support significantly more complex composition.
 \begin{cfa}
 [ int, int ] foo$\(_1\)$( int );                        $\C{// overloaded foo functions}$
 …
 `bar`( foo( 3 ), foo( 3 ) );
 \end{cfa}
+The type-resolver only has the tuple return-types to resolve the call to @bar@ as the @foo@ parameters are identical, which involves unifying the possible @foo@ functions with @bar@'s parameter list.
+No combination of @foo@s are an exact match with @bar@'s parameters, so the resolver applies C conversions.
+The type resolver only has the tuple return types to resolve the call to @bar@ as the @foo@ parameters are identical, which involves unifying the possible @foo@ functions with @bar@'s parameter list.
+No combination of @foo@s is an exact match with @bar@'s parameters;
+thus, the resolver applies C conversions.
+% FIX
 The minimal cost is @bar( foo@$_1$@( 3 ), foo@$_2$@( 3 ) )@, giving (@int@, {\color{ForestGreen}@int@}, @double@) to (@int@, {\color{ForestGreen}@double@}, @double@) with one {\color{ForestGreen}safe} (widening) conversion from @int@ to @double@ versus ({\color{red}@double@}, {\color{ForestGreen}@int@}, {\color{ForestGreen}@int@}) to ({\color{red}@int@}, {\color{ForestGreen}@double@}, {\color{ForestGreen}@double@}) with one {\color{red}unsafe} (narrowing) conversion from @double@ to @int@ and two safe conversions.
 \subsection{Tuple Variables}
+\subsection{Tuple variables}
 An important observation from function composition is that new variable names are not required to initialize parameters from an MRVF.
+\CFA also allows declaration of tuple variables that can be initialized from an MRVF, since it can be awkward to declare multiple variables of different types, \eg:
+\CFA also allows declaration of tuple variables that can be initialized from an MRVF, since it can be awkward to declare multiple variables of different types.
+\newpage
 \begin{cfa}
 [ int, int ] qr = div( 13, 5 );                         $\C{// tuple-variable declaration and initialization}$
 [ double, double ] qr = div( 13.5, 5.2 );
 \end{cfa}
 where the tuple variable-name serves the same purpose as the parameter name(s).
+Here, the tuple variable name serves the same purpose as the parameter name(s).
 Tuple variables can be composed of any types, except for array types, since array sizes are generally unknown in C.
 One way to access the tuple-variable components is with assignment or composition:
+One way to access the tuple variable components is with assignment or composition.
 \begin{cfa}
 [ q, r ] = qr;                                                          $\C{// access tuple-variable components}$
 printf( "%d %d\n", qr );
 \end{cfa}
 \CFA also supports \newterm{tuple indexing} to access single components of a tuple expression:
+\CFA also supports \newterm{tuple indexing} to access single components of a tuple expression.
 \begin{cfa}
 [int, int] * p = &qr;                                           $\C{// tuple pointer}$
 …
 \subsection{Flattening and Restructuring}
+\subsection{Flattening and restructuring}
 In function call contexts, tuples support implicit flattening and restructuring conversions.
 Tuple flattening recursively expands a tuple into the list of its basic components.
 Tuple structuring packages a list of expressions into a value of tuple type, \eg:
+Tuple structuring packages a list of expressions into a value of tuple type.
 \begin{cfa}
 int f( int, int );
 …
 h( x, y );                                                                      $\C{// flatten and structure}$
 \end{cfa}
 In the call to @f@, @x@ is implicitly flattened so the components of @x@ are passed as the two arguments.
+In the call to @f@, @x@ is implicitly flattened so the components of @x@ are passed as two arguments.
 In the call to @g@, the values @y@ and @10@ are structured into a single argument of type @[int, int]@ to match the parameter type of @g@.
 Finally, in the call to @h@, @x@ is flattened to yield an argument list of length 3, of which the first component of @x@ is passed as the first parameter of @h@, and the second component of @x@ and @y@ are structured into the second argument of type @[int, int]@.
+The flexible structure of tuples permits a simple and expressive function call syntax to work seamlessly with both SRVF and MRVF, and with any number of arguments of arbitrarily complex structure.
+\subsection{Tuple Assignment}
+The flexible structure of tuples permits a simple and expressive function call syntax to work seamlessly with both SRVFs and MRVFs with any number of arguments of arbitrarily complex structure.
+\subsection{Tuple assignment}
+\enlargethispage{-10pt}
 An assignment where the left side is a tuple type is called \newterm{tuple assignment}.
 There are two kinds of tuple assignment depending on whether the right side of the assignment operator has a tuple type or a non-tuple type, called \newterm{multiple} and \newterm{mass assignment}, respectively.
+There are two kinds of tuple assignment depending on whether the right side of the assignment operator has a tuple type or a nontuple type, called \newterm{multiple} and \newterm{mass assignment}, respectively.
 \begin{cfa}
 int x = 10;
 …
 [y, x] = 3.14;                                                          $\C{// mass assignment}$
 \end{cfa}
 Both kinds of tuple assignment have parallel semantics, so that each value on the left and right side is evaluated before any assignments occur.
+Both kinds of tuple assignment have parallel semantics, so that each value on the left and right sides is evaluated before any assignments occur.
 As a result, it is possible to swap the values in two variables without explicitly creating any temporary variables or calling a function, \eg, @[x, y] = [y, x]@.
 This semantics means mass assignment differs from C cascading assignment (\eg @a = b = c@) in that conversions are applied in each individual assignment, which prevents data loss from the chain of conversions that can happen during a cascading assignment.
+For example, @[y, x] = 3.14@ performs the assignments @y = 3.14@ and @x = 3.14@, yielding @y == 3.14@ and @x == 3@;
+whereas, C cascading assignment @y = x = 3.14@ performs the assignments @x = 3.14@ and @y = x@, yielding @3@ in @y@ and @x@.
+For example, @[y, x] = 3.14@ performs the assignments @y = 3.14@ and @x = 3.14@, yielding @y == 3.14@ and @x == 3@, whereas C cascading assignment @y = x = 3.14@ performs the assignments @x = 3.14@ and @y = x@, yielding @3@ in @y@ and @x@.
 Finally, tuple assignment is an expression where the result type is the type of the left-hand side of the assignment, just like all other assignment expressions in C.
 This example shows mass, multiple, and cascading assignment used in one expression:
+This example shows mass, multiple, and cascading assignment used in one expression.
 \begin{cfa}
 [void] f( [int, int] );
 …
 \subsection{Member Access}
 It is also possible to access multiple members from a single expression using a \newterm{member-access}.
 The result is a single tuple-valued expression whose type is the tuple of the types of the members, \eg:
+\subsection{Member access}
+It is also possible to access multiple members from a single expression using a \newterm{member access}.
+The result is a single tuple-valued expression whose type is the tuple of the types of the members.
 \begin{cfa}
 struct S { int x; double y; char * z; } s;
 …
 [int, int, int] y = x.[2, 0, 2];                        $\C{// duplicate: [y.0, y.1, y.2] = [x.2, x.0.x.2]}$
 \end{cfa}
 It is also possible for a member access to contain other member accesses, \eg:
+It is also possible for a member access to contain other member accesses.
 \begin{cfa}
 struct A { double i; int j; };
 …
 Tuples also integrate with \CFA polymorphism as a kind of generic type.
 Due to the implicit flattening and structuring conversions involved in argument passing, @otype@ and @dtype@ parameters are restricted to matching only with non-tuple types, \eg:
+Due to the implicit flattening and structuring conversions involved in argument passing, @otype@ and @dtype@ parameters are restricted to matching only with nontuple types.
 \begin{cfa}
 forall( otype T, dtype U ) void f( T x, U * y );
 f( [5, "hello"] );
 \end{cfa}
 where @[5, "hello"]@ is flattened, giving argument list @5, "hello"@, and @T@ binds to @int@ and @U@ binds to @const char@.
+Here, @[5, "hello"]@ is flattened, giving argument list @5, "hello"@, and @T@ binds to @int@ and @U@ binds to @const char@.
 Tuples, however, may contain polymorphic components.
 For example, a plus operator can be written to sum two triples.
 …
 g( 5, 10.21 );
 \end{cfa}
+\newpage
 Hence, function parameter and return lists are flattened for the purposes of type unification allowing the example to pass expression resolution.
 This relaxation is possible by extending the thunk scheme described by Bilson~\cite{Bilson03}.
 …
 \subsection{Variadic Tuples}
+\subsection{Variadic tuples}
 \label{sec:variadic-tuples}
 To define variadic functions, \CFA adds a new kind of type parameter, @ttype@ (tuple type).
 Matching against a @ttype@ parameter consumes all remaining argument components and packages them into a tuple, binding to the resulting tuple of types.
 In a given parameter list, there must be at most one @ttype@ parameter that occurs last, which matches normal variadic semantics, with a strong feeling of similarity to \CCeleven variadic templates.
+To define variadic functions, \CFA adds a new kind of type parameter, \ie @ttype@ (tuple type).
+Matching against a @ttype@ parameter consumes all the remaining argument components and packages them into a tuple, binding to the resulting tuple of types.
+In a given parameter list, there must be, at most, one @ttype@ parameter that occurs last, which matches normal variadic semantics, with a strong feeling of similarity to \CCeleven variadic templates.
 As such, @ttype@ variables are also called \newterm{argument packs}.
 …
 Since nothing is known about a parameter pack by default, assertion parameters are key to doing anything meaningful.
 Unlike variadic templates, @ttype@ polymorphic functions can be separately compiled.
 For example, a generalized @sum@ function:
+For example, the following is a generalized @sum@ function.
 \begin{cfa}
 int sum$\(_0\)$() { return 0; }
 …
 \end{cfa}
 Since @sum@\(_0\) does not accept any arguments, it is not a valid candidate function for the call @sum(10, 20, 30)@.
 In order to call @sum@\(_1\), @10@ is matched with @x@, and the argument resolution moves on to the argument pack @rest@, which consumes the remainder of the argument list and @Params@ is bound to @[20, 30]@.
+In order to call @sum@\(_1\), @10@ is matched with @x@, and the argument resolution moves on to the argument pack @rest@, which consumes the remainder of the argument list, and @Params@ is bound to @[20, 30]@.
 The process continues until @Params@ is bound to @[]@, requiring an assertion @int sum()@, which matches @sum@\(_0\) and terminates the recursion.
 Effectively, this algorithm traces as @sum(10, 20, 30)@ $\rightarrow$ @10 + sum(20, 30)@ $\rightarrow$ @10 + (20 + sum(30))@ $\rightarrow$ @10 + (20 + (30 + sum()))@ $\rightarrow$ @10 + (20 + (30 + 0))@.
 It is reasonable to take the @sum@ function a step further to enforce a minimum number of arguments:
+It is reasonable to take the @sum@ function a step further to enforce a minimum number of arguments.
 \begin{cfa}
 int sum( int x, int y ) { return x + y; }
 …
+}
 \end{cfa}
 One more step permits the summation of any sumable type with all arguments of the same type:
+One more step permits the summation of any sumable type with all arguments of the same type.
 \begin{cfa}
 trait sumable( otype T ) {
 …
 This example showcases a variadic-template-like decomposition of the provided argument list.
 The individual @print@ functions allow printing a single element of a type.
 The polymorphic @print@ allows printing any list of types, where as each individual type has a @print@ function.
+The polymorphic @print@ allows printing any list of types, where each individual type has a @print@ function.
 The individual print functions can be used to build up more complicated @print@ functions, such as @S@, which cannot be done with @printf@ in C.
 This mechanism is used to seamlessly print tuples in the \CFA I/O library (see Section~\ref{s:IOLibrary}).
 Finally, it is possible to use @ttype@ polymorphism to provide arbitrary argument forwarding functions.
 For example, it is possible to write @new@ as a library function:
+For example, it is possible to write @new@ as a library function.
 \begin{cfa}
 forall( otype R, otype S ) void ?{}( pair(R, S) *, R, S );
 …
 \end{cfa}
 The @new@ function provides the combination of type-safe @malloc@ with a \CFA constructor call, making it impossible to forget constructing dynamically allocated objects.
 This function provides the type-safety of @new@ in \CC, without the need to specify the allocated type again, thanks to return-type inference.
+This function provides the type safety of @new@ in \CC, without the need to specify the allocated type again, due to return-type inference.
 …
 Tuples are implemented in the \CFA translator via a transformation into \newterm{generic types}.
+For each $N$, the first time an $N$-tuple is seen in a scope a generic type with $N$ type parameters is generated, \eg:
+For each $N$, the first time an $N$-tuple is seen in a scope, a generic type with $N$ type parameters is generated.
+For example, the following
 \begin{cfa}
 [int, int] f() {
 …
+}
 \end{cfa}
 is transformed into:
+is transformed into
 \begin{cfa}
 forall( dtype T0, dtype T1 | sized(T0) | sized(T1) ) struct _tuple2 {
 …
 The various kinds of tuple assignment, constructors, and destructors generate GNU C statement expressions.
 A variable is generated to store the value produced by a statement expression, since its members may need to be constructed with a non-trivial constructor and it may need to be referred to multiple time, \eg in a unique expression.
+A variable is generated to store the value produced by a statement expression, since its members may need to be constructed with a nontrivial constructor and it may need to be referred to multiple time, \eg in a unique expression.
 The use of statement expressions allows the translator to arbitrarily generate additional temporary variables as needed, but binds the implementation to a non-standard extension of the C language.
 However, there are other places where the \CFA translator makes use of GNU C extensions, such as its use of nested functions, so this restriction is not new.
 …
 \section{Control Structures}
 \CFA identifies inconsistent, problematic, and missing control structures in C, and extends, modifies, and adds control structures to increase functionality and safety.
 \subsection{\texorpdfstring{\protect\lstinline{if} Statement}{if Statement}}
 The @if@ expression allows declarations, similar to @for@ declaration expression:
+\CFA identifies inconsistent, problematic, and missing control structures in C, as well as extends, modifies, and adds control structures to increase functionality and safety.
+\subsection{\texorpdfstring{\protect\lstinline@if@ statement}{if statement}}
+The @if@ expression allows declarations, similar to the @for@ declaration expression.
 \begin{cfa}
 if ( int x = f() ) ...                                          $\C{// x != 0}$
 …
 \end{cfa}
 Unless a relational expression is specified, each variable is compared not equal to 0, which is the standard semantics for the @if@ expression, and the results are combined using the logical @&&@ operator.\footnote{\CC only provides a single declaration always compared not equal to 0.}
 The scope of the declaration(s) is local to the @if@ statement but exist within both the ``then'' and ``else'' clauses.
 \subsection{\texorpdfstring{\protect\lstinline{switch} Statement}{switch Statement}}
+The scope of the declaration(s) is local to the @if@ statement but exists within both the ``then'' and ``else'' clauses.
+\subsection{\texorpdfstring{\protect\lstinline@switch@ statement}{switch statement}}
 There are a number of deficiencies with the C @switch@ statements: enumerating @case@ lists, placement of @case@ clauses, scope of the switch body, and fall through between case clauses.
 C has no shorthand for specifying a list of case values, whether the list is non-contiguous or contiguous\footnote{C provides this mechanism via fall through.}.
 \CFA provides a shorthand for a non-contiguous list:
+C has no shorthand for specifying a list of case values, whether the list is noncontiguous or contiguous\footnote{C provides this mechanism via fall through.}.
+\CFA provides a shorthand for a noncontiguous list:
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \lstMakeShortInline@%
 \end{cquote}
+for a contiguous list:\footnote{gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, as a space is required after a number, otherwise the first period is a decimal point.}
+for a contiguous list:\footnote{gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, as a space is required after a number;
+otherwise, the first period is a decimal point.}
 \begin{cquote}
 \lstDeleteShortInline@%
 …
+}
 \end{cfa}
 \CFA precludes this form of transfer \emph{into} a control structure because it causes undefined behaviour, especially with respect to missed initialization, and provides very limited functionality.
 C allows placement of declaration within the @switch@ body and unreachable code at the start, resulting in undefined behaviour:
+\CFA precludes this form of transfer \emph{into} a control structure because it causes an undefined behavior, especially with respect to missed initialization, and provides very limited functionality.
+C allows placement of declaration within the @switch@ body and unreachable code at the start, resulting in an undefined behavior.
 \begin{cfa}
 switch ( x ) {
 …
 C @switch@ provides multiple entry points into the statement body, but once an entry point is selected, control continues across \emph{all} @case@ clauses until the end of the @switch@ body, called \newterm{fall through};
+@case@ clauses are made disjoint by the @break@ statement.
+@case@ clauses are made disjoint by the @break@
+\newpage
+\noindent
+statement.
 While fall through \emph{is} a useful form of control flow, it does not match well with programmer intuition, resulting in errors from missing @break@ statements.
 For backwards compatibility, \CFA provides a \emph{new} control structure, @choose@, which mimics @switch@, but reverses the meaning of fall through (see Figure~\ref{f:ChooseSwitchStatements}), similar to Go.
+For backward compatibility, \CFA provides a \emph{new} control structure, \ie @choose@, which mimics @switch@, but reverses the meaning of fall through (see Figure~\ref{f:ChooseSwitchStatements}), similar to Go.
 \begin{figure}
 \centering
+\fontsize{9bp}{11bp}\selectfont
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l|@{\hspace{\parindentlnth}}l@{}}
 …
 \end{tabular}
 \lstMakeShortInline@%
 \caption{\lstinline|choose| versus \lstinline|switch| Statements}
+\caption{\lstinline|choose| versus \lstinline|switch| statements}
 \label{f:ChooseSwitchStatements}
+\vspace*{-11pt}
 \end{figure}
 Finally, Figure~\ref{f:FallthroughStatement} shows @fallthrough@ may appear in contexts other than terminating a @case@ clause, and have an explicit transfer label allowing separate cases but common final-code for a set of cases.
+Finally, Figure~\ref{f:FallthroughStatement} shows @fallthrough@ may appear in contexts other than terminating a @case@ clause and have an explicit transfer label allowing separate cases but common final code for a set of cases.
 The target label must be below the @fallthrough@ and may not be nested in a control structure, \ie @fallthrough@ cannot form a loop, and the target label must be at the same or higher level as the containing @case@ clause and located at the same level as a @case@ clause;
 the target label may be case @default@, but only associated with the current @switch@/@choose@ statement.
 …
 \begin{figure}
 \centering
+\fontsize{9bp}{11bp}\selectfont
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l|@{\hspace{\parindentlnth}}l@{}}
 …
 \end{tabular}
 \lstMakeShortInline@%
 \caption{\lstinline|fallthrough| Statement}
+\caption{\lstinline|fallthrough| statement}
 \label{f:FallthroughStatement}
+\vspace*{-11pt}
 \end{figure}
+\subsection{\texorpdfstring{Labelled \protect\lstinline{continue} / \protect\lstinline{break}}{Labelled continue / break}}
+\vspace*{-8pt}
+\subsection{\texorpdfstring{Labeled \protect\lstinline@continue@ / \protect\lstinline@break@}{Labeled continue / break}}
 While C provides @continue@ and @break@ statements for altering control flow, both are restricted to one level of nesting for a particular control structure.
 Unfortunately, this restriction forces programmers to use @goto@ to achieve the equivalent control-flow for more than one level of nesting.
 To prevent having to switch to the @goto@, \CFA extends the @continue@ and @break@ with a target label to support static multi-level exit~\cite{Buhr85}, as in Java.
+Unfortunately, this restriction forces programmers to use @goto@ to achieve the equivalent control flow for more than one level of nesting.
+To prevent having to switch to the @goto@, \CFA extends @continue@ and @break@ with a target label to support static multilevel exit~\cite{Buhr85}, as in Java.
 For both @continue@ and @break@, the target label must be directly associated with a @for@, @while@ or @do@ statement;
 for @break@, the target label can also be associated with a @switch@, @if@ or compound (@{}@) statement.
 Figure~\ref{f:MultiLevelExit} shows @continue@ and @break@ indicating the specific control structure, and the corresponding C program using only @goto@ and labels.
 The innermost loop has 7 exit points, which cause continuation or termination of one or more of the 7 nested control-structures.
+Figure~\ref{f:MultiLevelExit} shows @continue@ and @break@ indicating the specific control structure and the corresponding C program using only @goto@ and labels.
+The innermost loop has seven exit points, which cause a continuation or termination of one or more of the seven nested control structures.
 \begin{figure}
+\fontsize{9bp}{11bp}\selectfont
 \lstDeleteShortInline@%
 \begin{tabular}{@{\hspace{\parindentlnth}}l|@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
 …
 \end{tabular}
 \lstMakeShortInline@%
 \caption{Multi-level Exit}
+\caption{Multilevel exit}
 \label{f:MultiLevelExit}
+\vspace*{-5pt}
 \end{figure}
 With respect to safety, both labelled @continue@ and @break@ are a @goto@ restricted in the following ways:
 \begin{itemize}
+With respect to safety, both labeled @continue@ and @break@ are @goto@ restricted in the following ways.
+\begin{list}{$\bullet$}{\topsep=4pt\itemsep=0pt\parsep=0pt}
 \item
 They cannot create a loop, which means only the looping constructs cause looping.
 …
 \item
 They cannot branch into a control structure.
+This restriction prevents missing declarations and/or initializations at the start of a control structure resulting in undefined behaviour.
+\end{itemize}
+The advantage of the labelled @continue@/@break@ is allowing static multi-level exits without having to use the @goto@ statement, and tying control flow to the target control structure rather than an arbitrary point in a program.
+Furthermore, the location of the label at the \emph{beginning} of the target control structure informs the reader (eye candy) that complex control-flow is occurring in the body of the control structure.
+This restriction prevents missing declarations and/or initializations at the start of a control structure resulting in an undefined behavior.
+\end{list}
+The advantage of the labeled @continue@/@break@ is allowing static multilevel exits without having to use the @goto@ statement and tying control flow to the target control structure rather than an arbitrary point in a program.
+Furthermore, the location of the label at the \emph{beginning} of the target control structure informs the reader (eye candy) that complex control flow is
+occurring in the body of the control structure.
 With @goto@, the label is at the end of the control structure, which fails to convey this important clue early enough to the reader.
 Finally, using an explicit target for the transfer instead of an implicit target allows new constructs to be added or removed without affecting existing constructs.
+Finally, using an explicit target for the transfer instead of an implicit target allows new constructs to be added or removed without affecting the existing constructs.
 Otherwise, the implicit targets of the current @continue@ and @break@, \ie the closest enclosing loop or @switch@, change as certain constructs are added or removed.
+\subsection{Exception Handling}
+The following framework for \CFA exception-handling is in place, excluding some runtime type-information and virtual functions.
+\vspace*{-5pt}
+\subsection{Exception handling}
+The following framework for \CFA exception handling is in place, excluding some runtime type information and virtual functions.
 \CFA provides two forms of exception handling: \newterm{fix-up} and \newterm{recovery} (see Figure~\ref{f:CFAExceptionHandling})~\cite{Buhr92b,Buhr00a}.
 Both mechanisms provide dynamic call to a handler using dynamic name-lookup, where fix-up has dynamic return and recovery has static return from the handler.
+Both mechanisms provide dynamic call to a handler using dynamic name lookup, where fix-up has dynamic return and recovery has static return from the handler.
 \CFA restricts exception types to those defined by aggregate type @exception@.
 The form of the raise dictates the set of handlers examined during propagation: \newterm{resumption propagation} (@resume@) only examines resumption handlers (@catchResume@); \newterm{terminating propagation} (@throw@) only examines termination handlers (@catch@).
 If @resume@ or @throw@ have no exception type, it is a reresume/rethrow, meaning the currently exception continues propagation.
+If @resume@ or @throw@ has no exception type, it is a reresume/rethrow, which means that the current exception continues propagation.
 If there is no current exception, the reresume/rethrow results in a runtime error.
 \begin{figure}
+\fontsize{9bp}{11bp}\selectfont
+\lstDeleteShortInline@%
 \begin{cquote}
-\lstDeleteShortInline@%
 \begin{tabular}{@{}l|@{\hspace{\parindentlnth}}l@{}}
 \multicolumn{1}{@{}c|@{\hspace{\parindentlnth}}}{\textbf{Resumption}}   & \multicolumn{1}{c@{}}{\textbf{Termination}}   \\
 …
 \end{cfa}
 \end{tabular}
-\lstMakeShortInline@%
 \end{cquote}
+\caption{\CFA Exception Handling}
+\lstMakeShortInline@%
+\caption{\CFA exception handling}
 \label{f:CFAExceptionHandling}
+\vspace*{-5pt}
 \end{figure}
 The set of exception types in a list of catch clause may include both a resumption and termination handler:
+The set of exception types in a list of catch clauses may include both a resumption and a termination handler.
 \begin{cfa}
 try {
 …
 The termination handler is available because the resumption propagation did not unwind the stack.
 An additional feature is conditional matching in a catch clause:
+An additional feature is conditional matching in a catch clause.
 \begin{cfa}
 try {
 …
    catch ( IOError err ) { ... }                        $\C{// handler error from other files}$
 \end{cfa}
 where the throw inserts the failing file-handle into the I/O exception.
 Conditional catch cannot be trivially mimicked by other mechanisms because once an exception is caught, handler clauses in that @try@ statement are no longer eligible..
 The resumption raise can specify an alternate stack on which to raise an exception, called a \newterm{nonlocal raise}:
+Here, the throw inserts the failing file handle into the I/O exception.
+Conditional catch cannot be trivially mimicked by other mechanisms because once an exception is caught, handler clauses in that @try@ statement are no longer eligible.
+The resumption raise can specify an alternate stack on which to raise an exception, called a \newterm{nonlocal raise}.
 \begin{cfa}
 resume( $\emph{exception-type}$, $\emph{alternate-stack}$ )
 …
 Nonlocal raise is restricted to resumption to provide the exception handler the greatest flexibility because processing the exception does not unwind its stack, allowing it to continue after the handler returns.
 To facilitate nonlocal raise, \CFA provides dynamic enabling and disabling of nonlocal exception-propagation.
 The constructs for controlling propagation of nonlocal exceptions are the @enable@ and the @disable@ blocks:
+To facilitate nonlocal raise, \CFA provides dynamic enabling and disabling of nonlocal exception propagation.
+The constructs for controlling propagation of nonlocal exceptions are the @enable@ and @disable@ blocks.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \begin{cfa}
 enable $\emph{exception-type-list}$ {
         // allow non-local raise
+        // allow nonlocal raise
+}
 \end{cfa}
 …
 \begin{cfa}
 disable $\emph{exception-type-list}$ {
         // disallow non-local raise
+        // disallow nonlocal raise
+}
 \end{cfa}
 …
 The arguments for @enable@/@disable@ specify the exception types allowed to be propagated or postponed, respectively.
 Specifying no exception type is shorthand for specifying all exception types.
+Both @enable@ and @disable@ blocks can be nested, turning propagation on/off on entry, and on exit, the specified exception types are restored to their prior state.
+Coroutines and tasks start with non-local exceptions disabled, allowing handlers to be put in place, before non-local exceptions are explicitly enabled.
+Both @enable@ and @disable@ blocks can be nested;
+turning propagation on/off on entry and on exit, the specified exception types are restored to their prior state.
+Coroutines and tasks start with nonlocal exceptions disabled, allowing handlers to be put in place, before nonlocal exceptions are explicitly enabled.
 \begin{cfa}
 void main( mytask & t ) {                                       $\C{// thread starts here}$
         // non-local exceptions disabled
         try {                                                                   $\C{// establish handles for non-local exceptions}$
                 enable {                                                        $\C{// allow non-local exception delivery}$
+        // nonlocal exceptions disabled
+        try {                                                                   $\C{// establish handles for nonlocal exceptions}$
+                enable {                                                        $\C{// allow nonlocal exception delivery}$
                         // task body
+                }
 …
 \end{cfa}
 Finally, \CFA provides a Java like  @finally@ clause after the catch clauses:
+Finally, \CFA provides a Java-like  @finally@ clause after the catch clauses.
 \begin{cfa}
 try {
 …
+}
 \end{cfa}
 The finally clause is always executed, i.e., if the try block ends normally or if an exception is raised.
+The finally clause is always executed, \ie, if the try block ends normally or if an exception is raised.
 If an exception is raised and caught, the handler is run before the finally clause.
 Like a destructor (see Section~\ref{s:ConstructorsDestructors}), a finally clause can raise an exception but not if there is an exception being propagated.
 Mimicking the @finally@ clause with mechanisms like RAII is non-trivial when there are multiple types and local accesses.
 \subsection{\texorpdfstring{\protect\lstinline{with} Statement}{with Statement}}
+Mimicking the @finally@ clause with mechanisms like Resource Aquisition Is Initialization (RAII) is nontrivial when there are multiple types and local accesses.
+\subsection{\texorpdfstring{\protect\lstinline{with} statement}{with statement}}
 \label{s:WithStatement}
 Heterogeneous data is often aggregated into a structure/union.
 To reduce syntactic noise, \CFA provides a @with@ statement (see Pascal~\cite[\S~4.F]{Pascal}) to elide aggregate member-qualification by opening a scope containing the member identifiers.
+Heterogeneous data are often aggregated into a structure/union.
+To reduce syntactic noise, \CFA provides a @with@ statement (see section~4.F in the Pascal User Manual and Report~\cite{Pascal}) to elide aggregate member qualification by opening a scope containing the member identifiers.
 \begin{cquote}
 \vspace*{-\baselineskip}%???
 …
 Object-oriented programming languages only provide implicit qualification for the receiver.
 In detail, the @with@ statement has the form:
+In detail, the @with@ statement has the form
 \begin{cfa}
 $\emph{with-statement}$:
 …
 \end{cfa}
 and may appear as the body of a function or nested within a function body.
 Each expression in the expression-list provides a type and object.
+Each expression in the expression list provides a type and object.
 The type must be an aggregate type.
 (Enumerations are already opened.)
 The object is the implicit qualifier for the open structure-members.
+The object is the implicit qualifier for the open structure members.
 All expressions in the expression list are open in parallel within the compound statement, which is different from Pascal, which nests the openings from left to right.
 The difference between parallel and nesting occurs for members with the same name and type:
+The difference between parallel and nesting occurs for members with the same name and type.
 \begin{cfa}
 struct S { int `i`; int j; double m; } s, w;    $\C{// member i has same type in structure types S and T}$
 …
+}
 \end{cfa}
 For parallel semantics, both @s.i@ and @t.i@ are visible, so @i@ is ambiguous without qualification;
 for nested semantics, @t.i@ hides @s.i@, so @i@ implies @t.i@.
+For parallel semantics, both @s.i@ and @t.i@ are visible and, therefore, @i@ is ambiguous without qualification;
+for nested semantics, @t.i@ hides @s.i@ and, therefore, @i@ implies @t.i@.
 \CFA's ability to overload variables means members with the same name but different types are automatically disambiguated, eliminating most qualification when opening multiple aggregates.
 Qualification or a cast is used to disambiguate.
 There is an interesting problem between parameters and the function-body @with@, \eg:
+There is an interesting problem between parameters and the function body @with@.
 \begin{cfa}
 void ?{}( S & s, int i ) with ( s ) {           $\C{// constructor}$
 …
+}
 \end{cfa}
 Here, the assignment @s.i = i@ means @s.i = s.i@, which is meaningless, and there is no mechanism to qualify the parameter @i@, making the assignment impossible using the function-body @with@.
 To solve this problem, parameters are treated like an initialized aggregate:
+Here, the assignment @s.i = i@ means @s.i = s.i@, which is meaningless, and there is no mechanism to qualify the parameter @i@, making the assignment impossible using the function body @with@.
+To solve this problem, parameters are treated like an initialized aggregate
 \begin{cfa}
 struct Params {
 …
 } params;
 \end{cfa}
+and implicitly opened \emph{after} a function-body open, to give them higher priority:
+\newpage
+and implicitly opened \emph{after} a function body open, to give them higher priority
 \begin{cfa}
 void ?{}( S & s, int `i` ) with ( s ) `{` `with( $\emph{\color{red}params}$ )` {
 …
 } `}`
 \end{cfa}
 Finally, a cast may be used to disambiguate among overload variables in a @with@ expression:
+Finally, a cast may be used to disambiguate among overload variables in a @with@ expression
 \begin{cfa}
 with ( w ) { ... }                                                      $\C{// ambiguous, same name and no context}$
 with ( (S)w ) { ... }                                           $\C{// unambiguous, cast}$
 \end{cfa}
 and @with@ expressions may be complex expressions with type reference (see Section~\ref{s:References}) to aggregate:
+and @with@ expressions may be complex expressions with type reference (see Section~\ref{s:References}) to aggregate
 \begin{cfa}
 struct S { int i, j; } sv;
 …
 \CFA attempts to correct and add to C declarations, while ensuring \CFA subjectively ``feels like'' C.
 An important part of this subjective feel is maintaining C's syntax and procedural paradigm, as opposed to functional and object-oriented approaches in other systems languages such as \CC and Rust.
 Maintaining the C approach means that C coding-patterns remain not only useable but idiomatic in \CFA, reducing the mental burden of retraining C programmers and switching between C and \CFA development.
+Maintaining the C approach means that C coding patterns remain not only useable but idiomatic in \CFA, reducing the mental burden of retraining C programmers and switching between C and \CFA development.
 Nevertheless, some features from other approaches are undeniably convenient;
 \CFA attempts to adapt these features to the C paradigm.
 \subsection{Alternative Declaration Syntax}
+\subsection{Alternative declaration syntax}
 C declaration syntax is notoriously confusing and error prone.
 For example, many C programmers are confused by a declaration as simple as:
+For example, many C programmers are confused by a declaration as simple as the following.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \lstMakeShortInline@%
 \end{cquote}
 Is this an array of 5 pointers to integers or a pointer to an array of 5 integers?
+Is this an array of five pointers to integers or a pointer to an array of five integers?
 If there is any doubt, it implies productivity and safety issues even for basic programs.
 Another example of confusion results from the fact that a function name and its parameters are embedded within the return type, mimicking the way the return value is used at the function's call site.
 For example, a function returning a pointer to an array of integers is defined and used in the following way:
+For example, a function returning a pointer to an array of integers is defined and used in the following way.
 \begin{cfa}
 int `(*`f`())[`5`]` {...};                                      $\C{// definition}$
 …
 While attempting to make the two contexts consistent is a laudable goal, it has not worked out in practice.
+\CFA provides its own type, variable and function declarations, using a different syntax~\cite[pp.~856--859]{Buhr94a}.
+The new declarations place qualifiers to the left of the base type, while C declarations place qualifiers to the right.
+\newpage
+\CFA provides its own type, variable, and function declarations, using a different syntax~\cite[pp.~856--859]{Buhr94a}.
+The new declarations place qualifiers to the left of the base type, whereas C declarations place qualifiers to the right.
 The qualifiers have the same meaning but are ordered left to right to specify a variable's type.
 \begin{cquote}
 …
 \lstMakeShortInline@%
 \end{cquote}
 The only exception is bit-field specification, which always appear to the right of the base type.
+The only exception is bit-field specification, which always appears to the right of the base type.
 % Specifically, the character @*@ is used to indicate a pointer, square brackets @[@\,@]@ are used to represent an array or function return value, and parentheses @()@ are used to indicate a function parameter.
 However, unlike C, \CFA type declaration tokens are distributed across all variables in the declaration list.
 For instance, variables @x@ and @y@ of type pointer to integer are defined in \CFA as follows:
+For instance, variables @x@ and @y@ of type pointer to integer are defined in \CFA as
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \end{comment}
 All specifiers (@extern@, @static@, \etc) and qualifiers (@const@, @volatile@, \etc) are used in the normal way with the new declarations and also appear left to right, \eg:
+All specifiers (@extern@, @static@, \etc) and qualifiers (@const@, @volatile@, \etc) are used in the normal way with the new declarations and also appear left to right.
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{@{}c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{C}}     \\
 \begin{cfa}
+\begin{cfa}[basicstyle=\linespread{0.9}\fontsize{9bp}{12bp}\selectfont\sf]
 extern const * const int x;
 static const * [5] const int y;
 \end{cfa}
+&
 \begin{cfa}
+\begin{cfa}[basicstyle=\linespread{0.9}\fontsize{9bp}{12bp}\selectfont\sf]
 int extern const * const x;
 static const int (* const y)[5]
 \end{cfa}
+&
 \begin{cfa}
+\begin{cfa}[basicstyle=\linespread{0.9}\fontsize{9bp}{12bp}\selectfont\sf]
 // external const pointer to const int
 // internal const pointer to array of 5 const int
 …
 \end{cquote}
 Specifiers must appear at the start of a \CFA function declaration\footnote{\label{StorageClassSpecifier}
 The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}}.
+The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature (see section~6.11.5(1) in ISO/IEC 9899~\cite{C11}).}.
 The new declaration syntax can be used in other contexts where types are required, \eg casts and the pseudo-function @sizeof@:
 …
 The syntax of the new function-prototype declaration follows directly from the new function-definition syntax;
 as well, parameter names are optional, \eg:
+also, parameter names are optional.
 \begin{cfa}
 [ int x ] f ( /* void */ );             $\C[2.5in]{// returning int with no parameters}$
 …
 [ * int, int ] j ( int );               $\C{// returning pointer to int and int with int parameter}$
 \end{cfa}
 This syntax allows a prototype declaration to be created by cutting and pasting source text from the function-definition header (or vice versa).
 Like C, it is possible to declare multiple function-prototypes in a single declaration, where the return type is distributed across \emph{all} function names in the declaration list, \eg:
+This syntax allows a prototype declaration to be created by cutting and pasting the source text from the function-definition header (or vice versa).
+Like C, it is possible to declare multiple function prototypes in a single declaration, where the return type is distributed across \emph{all} function names in the declaration list.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \lstMakeShortInline@%
 \end{cquote}
 where \CFA allows the last function in the list to define its body.
 The syntax for pointers to \CFA functions specifies the pointer name on the right, \eg:
+Here, \CFA allows the last function in the list to define its body.
+The syntax for pointers to \CFA functions specifies the pointer name on the right.
 \begin{cfa}
 * [ int x ] () fp;                              $\C{// pointer to function returning int with no parameters}$
 …
 * [ * int, int ] ( int ) jp;    $\C{// pointer to function returning pointer to int and int with int parameter}\CRT$
 \end{cfa}
+Note, the name of the function pointer is specified last, as for other variable declarations.
+Finally, new \CFA declarations may appear together with C declarations in the same program block, but cannot be mixed within a specific declaration.
+Therefore, a programmer has the option of either continuing to use traditional C declarations or take advantage of the new style.
+Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX-like systems.
+\newpage
+\noindent
+Note that the name of the function pointer is specified last, as for other variable declarations.
+Finally, new \CFA declarations may appear together with C declarations in the same program block but cannot be mixed within a specific declaration.
+Therefore, a programmer has the option of either continuing to use traditional C declarations or taking advantage of the new style.
+Clearly, both styles need to be supported for some time due to existing C-style header files, particularly for UNIX-like systems.
 …
 All variables in C have an \newterm{address}, a \newterm{value}, and a \newterm{type};
 at the position in the program's memory denoted by the address, there exists a sequence of bits (the value), with the length and semantic meaning of this bit sequence defined by the type.
 The C type-system does not always track the relationship between a value and its address;
 a value that does not have a corresponding address is called a \newterm{rvalue} (for ``right-hand value''), while a value that does have an address is called a \newterm{lvalue} (for ``left-hand value'').
 For example, in @int x; x = 42;@ the variable expression @x@ on the left-hand-side of the assignment is a lvalue, while the constant expression @42@ on the right-hand-side of the assignment is a rvalue.
 Despite the nomenclature of ``left-hand'' and ``right-hand'', an expression's classification as lvalue or rvalue is entirely dependent on whether it has an address or not; in imperative programming, the address of a value is used for both reading and writing (mutating) a value, and as such, lvalues can be converted to rvalues and read from, but rvalues cannot be mutated because they lack a location to store the updated value.
+The C type system does not always track the relationship between a value and its address;
+a value that does not have a corresponding address is called an \newterm{rvalue} (for ``right-hand value''), whereas a value that does have an address is called an \newterm{lvalue} (for ``left-hand value'').
+For example, in @int x; x = 42;@ the variable expression @x@ on the left-hand side of the assignment is an lvalue, whereas the constant expression @42@ on the right-hand side of the assignment is an rvalue.
+Despite the nomenclature of ``left-hand'' and ``right-hand'', an expression's classification as an lvalue or an rvalue is entirely dependent on whether it has an address or not; in imperative programming, the address of a value is used for both reading and writing (mutating) a value, and as such, lvalues can be converted into rvalues and read from, but rvalues cannot be mutated because they lack a location to store the updated value.
 Within a lexical scope, lvalue expressions have an \newterm{address interpretation} for writing a value or a \newterm{value interpretation} to read a value.
 For example, in @x = y@, @x@ has an address interpretation, while @y@ has a value interpretation.
+For example, in @x = y@, @x@ has an address interpretation, whereas @y@ has a value interpretation.
 While this duality of interpretation is useful, C lacks a direct mechanism to pass lvalues between contexts, instead relying on \newterm{pointer types} to serve a similar purpose.
 In C, for any type @T@ there is a pointer type @T *@, the value of which is the address of a value of type @T@.
+A pointer rvalue can be explicitly \newterm{dereferenced} to the pointed-to lvalue with the dereference operator @*?@, while the rvalue representing the address of a lvalue can be obtained with the address-of operator @&?@.
+A pointer rvalue can be explicitly \newterm{dereferenced} to the pointed-to lvalue with the dereference operator @*?@, whereas the rvalue representing the address of an lvalue can be obtained with the address-of operator @&?@.
 \begin{cfa}
 int x = 1, y = 2, * p1, * p2, ** p3;
 …
 *p2 = ((*p1 + *p2) * (**p3 - *p1)) / (**p3 - 15);
 \end{cfa}
 Unfortunately, the dereference and address-of operators introduce a great deal of syntactic noise when dealing with pointed-to values rather than pointers, as well as the potential for subtle bugs because of pointer arithmetic.
 For both brevity and clarity, it is desirable for the compiler to figure out how to elide the dereference operators in a complex expression such as the assignment to @*p2@ above.
 However, since C defines a number of forms of \newterm{pointer arithmetic}, two similar expressions involving pointers to arithmetic types (\eg @*p1 + x@ and @p1 + x@) may each have well-defined but distinct semantics, introducing the possibility that a programmer may write one when they mean the other, and precluding any simple algorithm for elision of dereference operators.
+However, since C defines a number of forms of \newterm{pointer arithmetic}, two similar expressions involving pointers to arithmetic types (\eg @*p1 + x@ and @p1 + x@) may each have well-defined but distinct semantics, introducing the possibility that a programmer may write one when they mean the other and precluding any simple algorithm for elision of dereference operators.
 To solve these problems, \CFA introduces reference types @T &@;
+a @T &@ has exactly the same value as a @T *@, but where the @T *@ takes the address interpretation by default, a @T &@ takes the value interpretation by default, as below:
+a @T &@ has exactly the same value as a @T *@, but where the @T *@ takes the address interpretation by default, a @T &@ takes the value interpretation by default, as below.
 \begin{cfa}
 int x = 1, y = 2, & r1, & r2, && r3;
 …
 r2 = ((r1 + r2) * (r3 - r1)) / (r3 - 15);       $\C{// implicit dereferencing}$
 \end{cfa}
 Except for auto-dereferencing by the compiler, this reference example is exactly the same as the previous pointer example.
 Hence, a reference behaves like a variable name -- an lvalue expression which is interpreted as a value -- but also has the type system track the address of that value.
 One way to conceptualize a reference is via a rewrite rule, where the compiler inserts a dereference operator before the reference variable for each reference qualifier in the reference variable declaration, so the previous example implicitly acts like:
+Hence, a reference behaves like a variable name---an lvalue expression that is interpreted as a value---but also has the type system track the address of that value.
+One way to conceptualize a reference is via a rewrite rule, where the compiler inserts a dereference operator before the reference variable for each reference qualifier in the reference variable declaration;
+thus, the previous example implicitly acts like the following.
 \begin{cfa}
 `*`r2 = ((`*`r1 + `*`r2) * (`**`r3 - `*`r1)) / (`**`r3 - 15);
 \end{cfa}
 References in \CFA are similar to those in \CC, with important improvements, which can be seen in the example above.
 Firstly, \CFA does not forbid references to references.
 This provides a much more orthogonal design for library implementors, obviating the need for workarounds such as @std::reference_wrapper@.
+This provides a much more orthogonal design for library \mbox{implementors}, obviating the need for workarounds such as @std::reference_wrapper@.
 Secondly, \CFA references are rebindable, whereas \CC references have a fixed address.
 Rebinding allows \CFA references to be default-initialized (\eg to a null pointer\footnote{
 While effort has been made into non-null reference checking in \CC and Java, the exercise seems moot for any non-managed languages (C/\CC), given that it only handles one of many different error situations, \eg using a pointer after its storage is deleted.}) and point to different addresses throughout their lifetime, like pointers.
+Rebinding allows \CFA references to be default initialized (\eg to a null pointer\footnote{
+While effort has been made into non-null reference checking in \CC and Java, the exercise seems moot for any nonmanaged languages (C/\CC), given that it only handles one of many different error situations, \eg using a pointer after its storage is deleted.}) and point to different addresses throughout their lifetime, like pointers.
 Rebinding is accomplished by extending the existing syntax and semantics of the address-of operator in C.
 In C, the address of a lvalue is always a rvalue, as in general that address is not stored anywhere in memory, and does not itself have an address.
 In \CFA, the address of a @T &@ is a lvalue @T *@, as the address of the underlying @T@ is stored in the reference, and can thus be mutated there.
+In C, the address of an lvalue is always an rvalue, as, in general, that address is not stored anywhere in memory and does not itself have an address.
+In \CFA, the address of a @T &@ is an lvalue @T *@, as the address of the underlying @T@ is stored in the reference and can thus be mutated there.
 The result of this rule is that any reference can be rebound using the existing pointer assignment semantics by assigning a compatible pointer into the address of the reference, \eg @&r1 = &x;@ above.
 This rebinding occurs to an arbitrary depth of reference nesting;
 loosely speaking, nested address-of operators produce a nested lvalue pointer up to the depth of the reference.
 These explicit address-of operators can be thought of as ``cancelling out'' the implicit dereference operators, \eg @(&`*`)r1 = &x@ or @(&(&`*`)`*`)r3 = &(&`*`)r1@ or even @(&`*`)r2 = (&`*`)`*`r3@ for @&r2 = &r3@.
+More precisely:
+The precise rules are
 \begin{itemize}
 \item
+if @R@ is an rvalue of type {@T &@$_1 \cdots$@ &@$_r$} where $r \ge 1$ references (@&@ symbols) then @&R@ has type {@T `*`&@$_{\color{red}2} \cdots$@ &@$_{\color{red}r}$}, \\ \ie @T@ pointer with $r-1$ references (@&@ symbols).
+If @R@ is an rvalue of type @T &@$_1\cdots$ @&@$_r$, where $r \ge 1$ references (@&@ symbols), than @&R@ has type @T `*`&@$_{\color{red}2}\cdots$ @&@$_{\color{red}r}$, \ie @T@ pointer with $r-1$ references (@&@ symbols).
 \item
 if @L@ is an lvalue of type {@T &@$_1 \cdots$@ &@$_l$} where $l \ge 0$ references (@&@ symbols) then @&L@ has type {@T `*`&@$_{\color{red}1} \cdots$@ &@$_{\color{red}l}$}, \\ \ie @T@ pointer with $l$ references (@&@ symbols).
+If @L@ is an lvalue of type @T &@$_1\cdots$ @&@$_l$, where $l \ge 0$ references (@&@ symbols), than @&L@ has type @T `*`&@$_{\color{red}1}\cdots$ @&@$_{\color{red}l}$, \ie @T@ pointer with $l$ references (@&@ symbols).
 \end{itemize}
+Since pointers and references share the same internal representation, code using either is equally performant; in fact the \CFA compiler converts references to pointers internally, and the choice between them is made solely on convenience, \eg many pointer or value accesses.
+Since pointers and references share the same internal representation, code using either is equally performant;
+in fact, the \CFA compiler converts references into pointers internally, and the choice between them is made solely on convenience, \eg many pointer or value accesses.
 By analogy to pointers, \CFA references also allow cv-qualifiers such as @const@:
 …
 There are three initialization contexts in \CFA: declaration initialization, argument/parameter binding, and return/temporary binding.
 In each of these contexts, the address-of operator on the target lvalue is elided.
 The syntactic motivation is clearest when considering overloaded operator-assignment, \eg @int ?+=?(int &, int)@; given @int x, y@, the expected call syntax is @x += y@, not @&x += y@.
 More generally, this initialization of references from lvalues rather than pointers is an instance of a ``lvalue-to-reference'' conversion rather than an elision of the address-of operator;
+The syntactic motivation is clearest when considering overloaded operator assignment, \eg @int ?+=?(int &, int)@; given @int x, y@, the expected call syntax is @x += y@, not @&x += y@.
+More generally, this initialization of references from lvalues rather than pointers is an instance of an ``lvalue-to-reference'' conversion rather than an elision of the address-of operator;
 this conversion is used in any context in \CFA where an implicit conversion is allowed.
 Similarly, use of a the value pointed to by a reference in an rvalue context can be thought of as a ``reference-to-rvalue'' conversion, and \CFA also includes a qualifier-adding ``reference-to-reference'' conversion, analogous to the @T *@ to @const T *@ conversion in standard C.
 The final reference conversion included in \CFA is ``rvalue-to-reference'' conversion, implemented by means of an implicit temporary.
+Similarly, use of the value pointed to by a reference in an rvalue context can be thought of as a ``reference-to-rvalue'' conversion, and \CFA also includes a qualifier-adding ``reference-to-reference'' conversion, analogous to the @T *@ to @const T *@ conversion in standard C.
+The final reference conversion included in \CFA is an ``rvalue-to-reference'' conversion, implemented by means of an implicit temporary.
 When an rvalue is used to initialize a reference, it is instead used to initialize a hidden temporary value with the same lexical scope as the reference, and the reference is initialized to the address of this temporary.
 \begin{cfa}
 …
 f( 3, x + y, (S){ 1.0, 7.0 }, (int [3]){ 1, 2, 3 } ); $\C{// pass rvalue to lvalue \(\Rightarrow\) implicit temporary}$
 \end{cfa}
+This allows complex values to be succinctly and efficiently passed to functions, without the syntactic overhead of explicit definition of a temporary variable or the runtime cost of pass-by-value.
+\CC allows a similar binding, but only for @const@ references; the more general semantics of \CFA are an attempt to avoid the \newterm{const poisoning} problem~\cite{Taylor10}, in which addition of a @const@ qualifier to one reference requires a cascading chain of added qualifiers.
+\subsection{Type Nesting}
+Nested types provide a mechanism to organize associated types and refactor a subset of members into a named aggregate (\eg sub-aggregates @name@, @address@, @department@, within aggregate @employe@).
+Java nested types are dynamic (apply to objects), \CC are static (apply to the \lstinline[language=C++]@class@), and C hoists (refactors) nested types into the enclosing scope, meaning there is no need for type qualification.
+Since \CFA in not object-oriented, adopting dynamic scoping does not make sense;
+instead \CFA adopts \CC static nesting, using the member-selection operator ``@.@'' for type qualification, as does Java, rather than the \CC type-selection operator ``@::@'' (see Figure~\ref{f:TypeNestingQualification}).
+This allows complex values to be succinctly and efficiently passed to functions, without the syntactic overhead of the explicit definition of a temporary variable or the runtime cost of pass-by-value.
+\CC allows a similar binding, but only for @const@ references; the more general semantics of \CFA are an attempt to avoid the \newterm{const poisoning} problem~\cite{Taylor10}, in which the addition of a @const@ qualifier to one reference requires a cascading chain of added qualifiers.
+\subsection{Type nesting}
+Nested types provide a mechanism to organize associated types and refactor a subset of members into a named aggregate (\eg subaggregates @name@, @address@, @department@, within aggregate @employe@).
+Java nested types are dynamic (apply to objects), \CC are static (apply to the \lstinline[language=C++]@class@), and C hoists (refactors) nested types into the enclosing scope, which means there is no need for type qualification.
+Since \CFA in not object oriented, adopting dynamic scoping does not make sense;
+instead, \CFA adopts \CC static nesting, using the member-selection operator ``@.@'' for type qualification, as does Java, rather than the \CC type-selection operator ``@::@'' (see Figure~\ref{f:TypeNestingQualification}).
+In the C left example, types @C@, @U@ and @T@ are implicitly hoisted outside of type @S@ into the containing block scope.
+In the \CFA right example, the types are not hoisted and accessible.
 \begin{figure}
 \centering
+\fontsize{9bp}{11bp}\selectfont\sf
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{3em}}l|l@{}}
 …
 \end{tabular}
 \lstMakeShortInline@%
 \caption{Type Nesting / Qualification}
+\caption{Type nesting / qualification}
 \label{f:TypeNestingQualification}
+\vspace*{-8pt}
 \end{figure}
+In the C left example, types @C@, @U@ and @T@ are implicitly hoisted outside of type @S@ into the containing block scope.
+In the \CFA right example, the types are not hoisted and accessible.
+\subsection{Constructors and Destructors}
+\vspace*{-8pt}
+\subsection{Constructors and destructors}
 \label{s:ConstructorsDestructors}
 One of the strengths (and weaknesses) of C is memory-management control, allowing resource release to be precisely specified versus unknown release with garbage-collected memory-management.
+One of the strengths (and weaknesses) of C is memory-management control, allowing resource release to be precisely specified versus unknown release with garbage-collected memory management.
 However, this manual approach is verbose, and it is useful to manage resources other than memory (\eg file handles) using the same mechanism as memory.
 \CC addresses these issues using Resource Aquisition Is Initialization (RAII), implemented by means of \newterm{constructor} and \newterm{destructor} functions;
+\CC addresses these issues using RAII, implemented by means of \newterm{constructor} and \newterm{destructor} functions;
 \CFA adopts constructors and destructors (and @finally@) to facilitate RAII.
 While constructors and destructors are a common feature of object-oriented programming-languages, they are an independent capability allowing \CFA to adopt them while retaining a procedural paradigm.
 Specifically, \CFA constructors and destructors are denoted by name and first parameter-type versus name and nesting in an aggregate type.
+While constructors and destructors are a common feature of object-oriented programming languages, they are an independent capability allowing \CFA to adopt them while retaining a procedural paradigm.
+Specifically, \CFA constructors and destructors are denoted by name and first parameter type versus name and nesting in an aggregate type.
 Constructor calls seamlessly integrate with existing C initialization syntax, providing a simple and familiar syntax to C programmers and allowing constructor calls to be inserted into legacy C code with minimal code changes.
 …
 The constructor and destructor have return type @void@, and the first parameter is a reference to the object type to be constructed or destructed.
 While the first parameter is informally called the @this@ parameter, as in object-oriented languages, any variable name may be used.
 Both constructors and destructors allow additional parameters after the @this@ parameter for specifying values for initialization/de-initialization\footnote{
 Destruction parameters are useful for specifying storage-management actions, such as de-initialize but not deallocate.}.
 \begin{cfa}
+Both constructors and destructors allow additional parameters after the @this@ parameter for specifying values for initialization/deinitialization\footnote{
+Destruction parameters are useful for specifying storage-management actions, such as deinitialize but not deallocate.}.
+\begin{cfa}[basicstyle=\linespread{0.9}\fontsize{9bp}{11bp}\selectfont\sf]
 struct VLA { int size, * data; };                       $\C{// variable length array of integers}$
 void ?{}( VLA & vla ) with ( vla ) { size = 10;  data = alloc( size ); }  $\C{// default constructor}$
 …
 \end{cfa}
 @VLA@ is a \newterm{managed type}\footnote{
 A managed type affects the runtime environment versus a self-contained type.}: a type requiring a non-trivial constructor or destructor, or with a member of a managed type.
+A managed type affects the runtime environment versus a self-contained type.}: a type requiring a nontrivial constructor or destructor, or with a member of a managed type.
 A managed type is implicitly constructed at allocation and destructed at deallocation to ensure proper interaction with runtime resources, in this case, the @data@ array in the heap.
 For details of the code-generation placement of implicit constructor and destructor calls among complex executable statements see~\cite[\S~2.2]{Schluntz17}.
 \CFA also provides syntax for \newterm{initialization} and \newterm{copy}:
+For details of the code-generation placement of implicit constructor and destructor calls among complex executable statements, see section~2.2 in the work of Schlintz~\cite{Schluntz17}.
+\CFA also provides syntax for \newterm{initialization} and \newterm{copy}.
 \begin{cfa}
 void ?{}( VLA & vla, int size, char fill = '\0' ) {  $\C{// initialization}$
 …
+}
 \end{cfa}
 (Note, the example is purposely simplified using shallow-copy semantics.)
 An initialization constructor-call has the same syntax as a C initializer, except the initialization values are passed as arguments to a matching constructor (number and type of paremeters).
+(Note that the example is purposely simplified using shallow-copy semantics.)
+An initialization constructor call has the same syntax as a C initializer, except that the initialization values are passed as arguments to a matching constructor (number and type of parameters).
 \begin{cfa}
 VLA va = `{` 20, 0 `}`,  * arr = alloc()`{` 5, 0 `}`;
 \end{cfa}
 Note, the use of a \newterm{constructor expression} to initialize the storage from the dynamic storage-allocation.
+Note the use of a \newterm{constructor expression} to initialize the storage from the dynamic storage allocation.
 Like \CC, the copy constructor has two parameters, the second of which is a value parameter with the same type as the first parameter;
 appropriate care is taken to not recursively call the copy constructor when initializing the second parameter.
 …
 \CFA constructors may be explicitly called, like Java, and destructors may be explicitly called, like \CC.
 Explicit calls to constructors double as a \CC-style \emph{placement syntax}, useful for construction of members in user-defined constructors and reuse of existing storage allocations.
 Like the other operators in \CFA, there is a concise syntax for constructor/destructor function calls:
+Like the other operators in \CFA, there is a concise syntax for constructor/destructor function calls.
 \begin{cfa}
+{
 …
 To provide a uniform type interface for @otype@ polymorphism, the \CFA compiler automatically generates a default constructor, copy constructor, assignment operator, and destructor for all types.
 These default functions can be overridden by user-generated versions.
 For compatibility with the standard behaviour of C, the default constructor and destructor for all basic, pointer, and reference types do nothing, while the copy constructor and assignment operator are bitwise copies;
 if default zero-initialization is desired, the default constructors can be overridden.
+For compatibility with the standard behavior of C, the default constructor and destructor for all basic, pointer, and reference types do nothing, whereas the copy constructor and assignment operator are bitwise copies;
+if default zero initialization is desired, the default constructors can be overridden.
 For user-generated types, the four functions are also automatically generated.
 @enum@ types are handled the same as their underlying integral type, and unions are also bitwise copied and no-op initialized and destructed.
 For compatibility with C, a copy constructor from the first union member type is also defined.
 For @struct@ types, each of the four functions are implicitly defined to call their corresponding functions on each member of the struct.
 To better simulate the behaviour of C initializers, a set of \newterm{member constructors} is also generated for structures.
 A constructor is generated for each non-empty prefix of a structure's member-list to copy-construct the members passed as parameters and default-construct the remaining members.
+For @struct@ types, each of the four functions is implicitly defined to call their corresponding functions on each member of the struct.
+To better simulate the behavior of C initializers, a set of \newterm{member constructors} is also generated for structures.
+A constructor is generated for each nonempty prefix of a structure's member list to copy-construct the members passed as parameters and default-construct the remaining members.
 To allow users to limit the set of constructors available for a type, when a user declares any constructor or destructor, the corresponding generated function and all member constructors for that type are hidden from expression resolution;
 similarly, the generated default constructor is hidden upon declaration of any constructor.
+similarly, the generated default constructor is hidden upon the declaration of any constructor.
 These semantics closely mirror the rule for implicit declaration of constructors in \CC\cite[p.~186]{ANSI98:C++}.
+In some circumstance programmers may not wish to have implicit constructor and destructor generation and calls.
+In these cases, \CFA provides the initialization syntax \lstinline|S x `@=` {}|, and the object becomes unmanaged, so implicit constructor and destructor calls are not generated.
+In some circumstance, programmers may not wish to have implicit constructor and destructor generation and calls.
+In these cases, \CFA provides the initialization syntax \lstinline|S x `@=` {}|, and the object becomes unmanaged;
+hence, implicit \mbox{constructor} and destructor calls are not generated.
 Any C initializer can be the right-hand side of an \lstinline|@=| initializer, \eg \lstinline|VLA a @= { 0, 0x0 }|, with the usual C initialization semantics.
 The same syntax can be used in a compound literal, \eg \lstinline|a = (VLA)`@`{ 0, 0x0 }|, to create a C-style literal.
 The point of \lstinline|@=| is to provide a migration path from legacy C code to \CFA, by providing a mechanism to incrementally convert to implicit initialization.
+The point of \lstinline|@=| is to provide a migration path from legacy C code to \CFA, by providing a mechanism to incrementally convert into implicit initialization.
 …
 \section{Literals}
 C already includes limited polymorphism for literals -- @0@ can be either an integer or a pointer literal, depending on context, while the syntactic forms of literals of the various integer and float types are very similar, differing from each other only in suffix.
 In keeping with the general \CFA approach of adding features while respecting the ``C-style'' of doing things, C's polymorphic constants and typed literal syntax are extended to interoperate with user-defined types, while maintaining a backwards-compatible semantics.
+C already includes limited polymorphism for literals---@0@ can be either an integer or a pointer literal, depending on context, whereas the syntactic forms of literals of the various integer and float types are very similar, differing from each other only in suffix.
+In keeping with the general \CFA approach of adding features while respecting the ``C style'' of doing things, C's polymorphic constants and typed literal syntax are extended to interoperate with user-defined types, while maintaining a backward-compatible semantics.
 A simple example is allowing the underscore, as in Ada, to separate prefixes, digits, and suffixes in all \CFA constants, \eg @0x`_`1.ffff`_`ffff`_`p`_`128`_`l@, where the underscore is also the standard separator in C identifiers.
 \CC uses a single quote as a separator but it is restricted among digits, precluding its use in the literal prefix or suffix, \eg @0x1.ffff@@`'@@ffffp128l@, and causes problems with most IDEs, which must be extended to deal with this alternate use of the single quote.
+\CC uses a single quote as a separator, but it is restricted among digits, precluding its use in the literal prefix or suffix, \eg @0x1.ffff@@`'@@ffffp128l@, and causes problems with most integrated development environments (IDEs), which must be extended to deal with this alternate use of the single quote.
 …
 In C, @0@ has the special property that it is the only ``false'' value;
 by the standard, any value that compares equal to @0@ is false, while any value that compares unequal to @0@ is true.
 As such, an expression @x@ in any boolean context (such as the condition of an @if@ or @while@ statement, or the arguments to @&&@, @||@, or @?:@\,) can be rewritten as @x != 0@ without changing its semantics.
+by the standard, any value that compares equal to @0@ is false, whereas any value that compares unequal to @0@ is true.
+As such, an expression @x@ in any Boolean context (such as the condition of an @if@ or @while@ statement, or the arguments to @&&@, @||@, or @?:@\,) can be rewritten as @x != 0@ without changing its semantics.
 Operator overloading in \CFA provides a natural means to implement this truth-value comparison for arbitrary types, but the C type system is not precise enough to distinguish an equality comparison with @0@ from an equality comparison with an arbitrary integer or pointer.
 To provide this precision, \CFA introduces a new type @zero_t@ as the type of literal @0@ (somewhat analagous to @nullptr_t@ and @nullptr@ in \CCeleven);
 …
 With this addition, \CFA rewrites @if (x)@ and similar expressions to @if ( (x) != 0 )@ or the appropriate analogue, and any type @T@ is ``truthy'' by defining an operator overload @int ?!=?( T, zero_t )@.
 \CC makes types truthy by adding a conversion to @bool@;
 prior to the addition of explicit cast operators in \CCeleven, this approach had the pitfall of making truthy types transitively convertable to any numeric type;
+prior to the addition of explicit cast operators in \CCeleven, this approach had the pitfall of making truthy types transitively convertible into any numeric type;
 \CFA avoids this issue.
 …
 \subsection{User Literals}
+\subsection{User literals}
 For readability, it is useful to associate units to scale literals, \eg weight (stone, pound, kilogram) or time (seconds, minutes, hours).
 The left of Figure~\ref{f:UserLiteral} shows the \CFA alternative call-syntax (postfix: literal argument before function name), using the backquote, to convert basic literals into user literals.
+The left of Figure~\ref{f:UserLiteral} shows the \CFA alternative call syntax (postfix: literal argument before function name), using the backquote, to convert basic literals into user literals.
 The backquote is a small character, making the unit (function name) predominate.
 For examples, the multi-precision integer-type in Section~\ref{s:MultiPrecisionIntegers} has user literals:
+For examples, the multiprecision integer type in Section~\ref{s:MultiPrecisionIntegers} has the following user literals.
 {\lstset{language=CFA,moredelim=**[is][\color{red}]{|}{|},deletedelim=**[is][]{`}{`}}
 \begin{cfa}
 …
 y = "12345678901234567890123456789"|`mp| + "12345678901234567890123456789"|`mp|;
 \end{cfa}
 Because \CFA uses a standard function, all types and literals are applicable, as well as overloading and conversions, where @?`@ denotes a postfix-function name and @`@ denotes a postfix-function call.
+Because \CFA uses a standard function, all types and literals are applicable, as well as overloading and conversions, where @?`@ denotes a postfix-function name and @`@  denotes a postfix-function call.
 }%
 \begin{cquote}
 …
 \end{cquote}
 The right of Figure~\ref{f:UserLiteral} shows the equivalent \CC version using the underscore for the call-syntax.
+The right of Figure~\ref{f:UserLiteral} shows the equivalent \CC version using the underscore for the call syntax.
 However, \CC restricts the types, \eg @unsigned long long int@ and @long double@ to represent integral and floating literals.
 After which, user literals must match (no conversions);
 …
 \begin{figure}
 \centering
+\fontsize{9bp}{11bp}\selectfont
 \lstset{language=CFA,moredelim=**[is][\color{red}]{|}{|},deletedelim=**[is][]{`}{`}}
 \lstDeleteShortInline@%
 …
 \end{tabular}
 \lstMakeShortInline@%
 \caption{User Literal}
+\caption{User literal}
 \label{f:UserLiteral}
 \end{figure}
 …
 \label{sec:libraries}
 As stated in Section~\ref{sec:poly-fns}, \CFA inherits a large corpus of library code, where other programming languages must rewrite or provide fragile inter-language communication with C.
+As stated in Section~\ref{sec:poly-fns}, \CFA inherits a large corpus of library code, where other programming languages must rewrite or provide fragile interlanguage communication with C.
 \CFA has replacement libraries condensing hundreds of existing C names into tens of \CFA overloaded names, all without rewriting the actual computations.
 In many cases, the interface is an inline wrapper providing overloading during compilation but zero cost at runtime.
+In many cases, the interface is an inline wrapper providing overloading during compilation but of zero cost at runtime.
 The following sections give a glimpse of the interface reduction to many C libraries.
 In many cases, @signed@/@unsigned@ @char@, @short@, and @_Complex@ functions are available (but not shown) to ensure expression computations remain in a single type, as conversions can distort results.
 …
 C library @limits.h@ provides lower and upper bound constants for the basic types.
 \CFA name overloading is used to condense these typed constants, \eg:
+\CFA name overloading is used to condense these typed constants.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \lstMakeShortInline@%
 \end{cquote}
 The result is a significant reduction in names to access typed constants, \eg:
+The result is a significant reduction in names to access typed constants.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 C library @math.h@ provides many mathematical functions.
 \CFA function overloading is used to condense these mathematical functions, \eg:
+\CFA function overloading is used to condense these mathematical functions.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \lstMakeShortInline@%
 \end{cquote}
 The result is a significant reduction in names to access math functions, \eg:
+The result is a significant reduction in names to access math functions.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \lstMakeShortInline@%
 \end{cquote}
 While \Celeven has type-generic math~\cite[\S~7.25]{C11} in @tgmath.h@ to provide a similar mechanism, these macros are limited, matching a function name with a single set of floating type(s).
+While \Celeven has type-generic math (see section~7.25 of the ISO/IEC 9899\cite{C11}) in @tgmath.h@ to provide a similar mechanism, these macros are limited, matching a function name with a single set of floating type(s).
 For example, it is impossible to overload @atan@ for both one and two arguments;
 instead the names @atan@ and @atan2@ are required (see Section~\ref{s:NameOverloading}).
 The key observation is that only a restricted set of type-generic macros are provided for a limited set of function names, which do not generalize across the type system, as in \CFA.
+instead, the names @atan@ and @atan2@ are required (see Section~\ref{s:NameOverloading}).
+The key observation is that only a restricted set of type-generic macros is provided for a limited set of function names, which do not generalize across the type system, as in \CFA.
 …
 C library @stdlib.h@ provides many general functions.
 \CFA function overloading is used to condense these utility functions, \eg:
+\CFA function overloading is used to condense these utility functions.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \lstMakeShortInline@%
 \end{cquote}
 The result is a significant reduction in names to access utility functions, \eg:
+The result is a significant reduction in names to access the utility functions.
 \begin{cquote}
 \lstDeleteShortInline@%
 …
 \lstMakeShortInline@%
 \end{cquote}
 In additon, there are polymorphic functions, like @min@ and @max@, that work on any type with operators @?<?@ or @?>?@.
+In addition, there are polymorphic functions, like @min@ and @max@, that work on any type with operator @?<?@ or @?>?@.
 The following shows one example where \CFA \emph{extends} an existing standard C interface to reduce complexity and provide safety.
 C/\Celeven provide a number of complex and overlapping storage-management operation to support the following capabilities:
 \begin{description}%[topsep=3pt,itemsep=2pt,parsep=0pt]
+C/\Celeven provide a number of complex and overlapping storage-management operations to support the following capabilities.
+\begin{list}{}{\itemsep=0pt\parsep=0pt\labelwidth=0pt\leftmargin\parindent\itemindent-\leftmargin\let\makelabel\descriptionlabel}
 \item[fill]
 an allocation with a specified character.
 \item[resize]
 an existing allocation to decrease or increase its size.
 In either case, new storage may or may not be allocated and, if there is a new allocation, as much data from the existing allocation is copied.
+In either case, new storage may or may not be allocated, and if there is a new allocation, as much data from the existing allocation are copied.
 For an increase in storage size, new storage after the copied data may be filled.
+\newpage
 \item[align]
 an allocation on a specified memory boundary, \eg, an address multiple of 64 or 128 for cache-line purposes.
 …
 allocation with a specified number of elements.
 An array may be filled, resized, or aligned.
 \end{description}
 Table~\ref{t:StorageManagementOperations} shows the capabilities provided by C/\Celeven allocation-functions and how all the capabilities can be combined into two \CFA functions.
 \CFA storage-management functions extend the C equivalents by overloading, providing shallow type-safety, and removing the need to specify the base allocation-size.
 Figure~\ref{f:StorageAllocation} contrasts \CFA and C storage-allocation performing the same operations with the same type safety.
+\end{list}
+Table~\ref{t:StorageManagementOperations} shows the capabilities provided by C/\Celeven allocation functions and how all the capabilities can be combined into two \CFA functions.
+\CFA storage-management functions extend the C equivalents by overloading, providing shallow type safety, and removing the need to specify the base allocation size.
+Figure~\ref{f:StorageAllocation} contrasts \CFA and C storage allocation performing the same operations with the same type safety.
 \begin{table}
 \caption{Storage-Management Operations}
+\caption{Storage-management operations}
 \label{t:StorageManagementOperations}
 \centering
 \lstDeleteShortInline@%
 \lstMakeShortInline~%
+\begin{tabular}{@{}r|r|l|l|l|l@{}}
+\multicolumn{1}{c}{}&           & \multicolumn{1}{c|}{fill}     & resize        & align & array \\
+\hline
+\begin{tabular}{@{}rrllll@{}}
+\multicolumn{1}{c}{}&           & \multicolumn{1}{c}{fill}      & resize        & align & array \\
 C               & ~malloc~                      & no                    & no            & no            & no    \\
                 & ~calloc~                      & yes (0 only)  & no            & no            & yes   \\
 …
                 & ~memalign~            & no                    & no            & yes           & no    \\
                 & ~posix_memalign~      & no                    & no            & yes           & no    \\
-\hline
 C11             & ~aligned_alloc~       & no                    & no            & yes           & no    \\
-\hline
 \CFA    & ~alloc~                       & yes/copy              & no/yes        & no            & yes   \\
                 & ~align_alloc~         & yes                   & no            & yes           & yes   \\
 …
 \begin{figure}
 \centering
+\fontsize{9bp}{11bp}\selectfont
 \begin{cfa}[aboveskip=0pt,xleftmargin=0pt]
 size_t  dim = 10;                                                       $\C{// array dimension}$
 …
 \end{tabular}
 \lstMakeShortInline@%
 \caption{\CFA versus C Storage-Allocation}
+\caption{\CFA versus C storage allocation}
 \label{f:StorageAllocation}
 \end{figure}
 Variadic @new@ (see Section~\ref{sec:variadic-tuples}) cannot support the same overloading because extra parameters are for initialization.
 Hence, there are @new@ and @anew@ functions for single and array variables, and the fill value is the arguments to the constructor, \eg:
+Hence, there are @new@ and @anew@ functions for single and array variables, and the fill value is the arguments to the constructor.
 \begin{cfa}
 struct S { int i, j; };
 …
 S * as = anew( dim, 2, 3 );                                     $\C{// each array element initialized to 2, 3}$
 \end{cfa}
 Note, \CC can only initialize array elements via the default constructor.
 Finally, the \CFA memory-allocator has \newterm{sticky properties} for dynamic storage: fill and alignment are remembered with an object's storage in the heap.
+Note that \CC can only initialize array elements via the default constructor.
+Finally, the \CFA memory allocator has \newterm{sticky properties} for dynamic storage: fill and alignment are remembered with an object's storage in the heap.
 When a @realloc@ is performed, the sticky properties are respected, so that new storage is correctly aligned and initialized with the fill character.
 …
 \label{s:IOLibrary}
 The goal of \CFA I/O is to simplify the common cases, while fully supporting polymorphism and user defined types in a consistent way.
+The goal of \CFA I/O is to simplify the common cases, while fully supporting polymorphism and user-defined types in a consistent way.
 The approach combines ideas from \CC and Python.
 The \CFA header file for the I/O library is @fstream@.
 …
 \lstMakeShortInline@%
 \end{cquote}
 The \CFA form has half the characters of the \CC form, and is similar to Python I/O with respect to implicit separators.
+The \CFA form has half the characters of the \CC form and is similar to Python I/O with respect to implicit separators.
 Similar simplification occurs for tuple I/O, which prints all tuple values separated by ``\lstinline[showspaces=true]@, @''.
 \begin{cfa}
 …
 \lstMakeShortInline@%
 \end{cquote}
 There is a weak similarity between the \CFA logical-or operator and the Shell pipe-operator for moving data, where data flows in the correct direction for input but the opposite direction for output.
+There is a weak similarity between the \CFA logical-or operator and the Shell pipe operator for moving data, where data flow in the correct direction for input but in the opposite direction for output.
 \begin{comment}
 The implicit separator character (space/blank) is a separator not a terminator.
 …
 \end{itemize}
 \end{comment}
 There are functions to set and get the separator string, and manipulators to toggle separation on and off in the middle of output.
 \subsection{Multi-precision Integers}
+There are functions to set and get the separator string and manipulators to toggle separation on and off in the middle of output.
+\subsection{Multiprecision integers}
 \label{s:MultiPrecisionIntegers}
 \CFA has an interface to the GMP multi-precision signed-integers~\cite{GMP}, similar to the \CC interface provided by GMP.
 The \CFA interface wraps GMP functions into operator functions to make programming with multi-precision integers identical to using fixed-sized integers.
 The \CFA type name for multi-precision signed-integers is @Int@ and the header file is @gmp@.
 Figure~\ref{f:GMPInterface} shows a multi-precision factorial-program contrasting the GMP interface in \CFA and C.
 \begin{figure}
+\CFA has an interface to the GNU multiple precision (GMP) signed integers~\cite{GMP}, similar to the \CC interface provided by GMP.
+The \CFA interface wraps GMP functions into operator functions to make programming with multiprecision integers identical to using fixed-sized integers.
+The \CFA type name for multiprecision signed integers is @Int@ and the header file is @gmp@.
+Figure~\ref{f:GMPInterface} shows a multiprecision factorial program contrasting the GMP interface in \CFA and C.
+\begin{figure}[b]
 \centering
+\fontsize{9bp}{11bp}\selectfont
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{3\parindentlnth}}l@{}}
 …
 \end{tabular}
 \lstMakeShortInline@%
 \caption{GMP Interface \CFA versus C}
+\caption{GMP interface \CFA versus C}
 \label{f:GMPInterface}
 \end{figure}
+\vspace{-4pt}
 \section{Polymorphism Evaluation}
 \label{sec:eval}
 …
 % Though \CFA provides significant added functionality over C, these features have a low runtime penalty.
 % In fact, it is shown that \CFA's generic programming can enable faster runtime execution than idiomatic @void *@-based C code.
 The experiment is a set of generic-stack micro-benchmarks~\cite{CFAStackEvaluation} in C, \CFA, and \CC (see implementations in Appendix~\ref{sec:BenchmarkStackImplementations}).
+The experiment is a set of generic-stack microbenchmarks~\cite{CFAStackEvaluation} in C, \CFA, and \CC (see implementations in Appendix~\ref{sec:BenchmarkStackImplementations}).
 Since all these languages share a subset essentially comprising standard C, maximal-performance benchmarks should show little runtime variance, differing only in length and clarity of source code.
 A more illustrative comparison measures the costs of idiomatic usage of each language's features.
 Figure~\ref{fig:BenchmarkTest} shows the \CFA benchmark tests for a generic stack based on a singly linked-list.
+Figure~\ref{fig:BenchmarkTest} shows the \CFA benchmark tests for a generic stack based on a singly linked list.
 The benchmark test is similar for the other languages.
 The experiment uses element types @int@ and @pair(short, char)@, and pushes $N=40M$ elements on a generic stack, copies the stack, clears one of the stacks, and finds the maximum value in the other stack.
 \begin{figure}
+\fontsize{9bp}{11bp}\selectfont
 \begin{cfa}[xleftmargin=3\parindentlnth,aboveskip=0pt,belowskip=0pt]
 int main() {
 …
+}
 \end{cfa}
 \caption{\protect\CFA Benchmark Test}
+\caption{\protect\CFA benchmark test}
 \label{fig:BenchmarkTest}
+\vspace*{-10pt}
 \end{figure}
 The structure of each benchmark implemented is: C with @void *@-based polymorphism, \CFA with parametric polymorphism, \CC with templates, and \CC using only class inheritance for polymorphism, called \CCV.
+The structure of each benchmark implemented is C with @void *@-based polymorphism, \CFA with parametric polymorphism, \CC with templates, and \CC using only class inheritance for polymorphism, called \CCV.
 The \CCV variant illustrates an alternative object-oriented idiom where all objects inherit from a base @object@ class, mimicking a Java-like interface;
 hence runtime checks are necessary to safely down-cast objects.
 The most notable difference among the implementations is in memory layout of generic types: \CFA and \CC inline the stack and pair elements into corresponding list and pair nodes, while C and \CCV lack such a capability and instead must store generic objects via pointers to separately-allocated objects.
 Note, the C benchmark uses unchecked casts as C has no runtime mechanism to perform such checks, while \CFA and \CC provide type-safety statically.
+hence, runtime checks are necessary to safely downcast objects.
+The most notable difference among the implementations is in memory layout of generic types: \CFA and \CC inline the stack and pair elements into corresponding list and pair nodes, whereas C and \CCV lack such capability and, instead, must store generic objects via pointers to separately allocated objects.
+Note that the C benchmark uses unchecked casts as C has no runtime mechanism to perform such checks, whereas \CFA and \CC provide type safety statically.
 Figure~\ref{fig:eval} and Table~\ref{tab:eval} show the results of running the benchmark in Figure~\ref{fig:BenchmarkTest} and its C, \CC, and \CCV equivalents.
 The graph plots the median of 5 consecutive runs of each program, with an initial warm-up run omitted.
+The graph plots the median of five consecutive runs of each program, with an initial warm-up run omitted.
 All code is compiled at \texttt{-O2} by gcc or g++ 6.4.0, with all \CC code compiled as \CCfourteen.
 The benchmarks are run on an Ubuntu 16.04 workstation with 16 GB of RAM and a 6-core AMD FX-6300 CPU with 3.5 GHz maximum clock frequency.
 …
 \begin{figure}
 \centering
 \input{timing}
 \caption{Benchmark Timing Results (smaller is better)}
+\resizebox{0.7\textwidth}{!}{\input{timing}}
+\caption{Benchmark timing results (smaller is better)}
 \label{fig:eval}
+\vspace*{-10pt}
 \end{figure}
 \begin{table}
+\vspace*{-10pt}
 \caption{Properties of benchmark code}
 \label{tab:eval}
 \centering
+\vspace*{-4pt}
 \newcommand{\CT}[1]{\multicolumn{1}{c}{#1}}
 \begin{tabular}{rrrrr}
                                                                         & \CT{C}        & \CT{\CFA}     & \CT{\CC}      & \CT{\CCV}             \\ \hline
 maximum memory usage (MB)                       & 10,001        & 2,502         & 2,503         & 11,253                \\
+\begin{tabular}{lrrrr}
+                                                                        & \CT{C}        & \CT{\CFA}     & \CT{\CC}      & \CT{\CCV}             \\
+maximum memory usage (MB)                       & 10\,001       & 2\,502        & 2\,503        & 11\,253               \\
 source code size (lines)                        & 201           & 191           & 125           & 294                   \\
 redundant type annotations (lines)      & 27            & 0                     & 2                     & 16                    \\
 binary size (KB)                                        & 14            & 257           & 14            & 37                    \\
 \end{tabular}
+\vspace*{-16pt}
 \end{table}
+The C and \CCV variants are generally the slowest with the largest memory footprint, because of their less-efficient memory layout and the pointer-indirection necessary to implement generic types;
+\enlargethispage{-10pt}
+The C and \CCV variants are generally the slowest with the largest memory footprint, due to their less-efficient memory layout and the pointer indirection necessary to implement generic types;
 this inefficiency is exacerbated by the second level of generic types in the pair benchmarks.
 By contrast, the \CFA and \CC variants run in roughly equivalent time for both the integer and pair because of equivalent storage layout, with the inlined libraries (\ie no separate compilation) and greater maturity of the \CC compiler contributing to its lead.
 \CCV is slower than C largely due to the cost of runtime type-checking of down-casts (implemented with @dynamic_cast@);
+By contrast, the \CFA and \CC variants run in roughly equivalent time for both the integer and pair because of the equivalent storage layout, with the inlined libraries (\ie no separate compilation) and greater maturity of the \CC compiler contributing to its lead.
+\CCV is slower than C largely due to the cost of runtime type checking of downcasts (implemented with @dynamic_cast@).
 The outlier for \CFA, pop @pair@, results from the complexity of the generated-C polymorphic code.
 The gcc compiler is unable to optimize some dead code and condense nested calls;
 …
 Finally, the binary size for \CFA is larger because of static linking with the \CFA libraries.
 \CFA is also competitive in terms of source code size, measured as a proxy for programmer effort. The line counts in Table~\ref{tab:eval} include implementations of @pair@ and @stack@ types for all four languages for purposes of direct comparison, though it should be noted that \CFA and \CC have pre-written data structures in their standard libraries that programmers would generally use instead. Use of these standard library types has minimal impact on the performance benchmarks, but shrinks the \CFA and \CC benchmarks to 39 and 42 lines, respectively.
+\CFA is also competitive in terms of source code size, measured as a proxy for programmer effort. The line counts in Table~\ref{tab:eval} include implementations of @pair@ and @stack@ types for all four languages for purposes of direct comparison, although it should be noted that \CFA and \CC have prewritten data structures in their standard libraries that programmers would generally use instead. Use of these standard library types has minimal impact on the performance benchmarks, but shrinks the \CFA and \CC benchmarks to 39 and 42 lines, respectively.
 The difference between the \CFA and \CC line counts is primarily declaration duplication to implement separate compilation; a header-only \CFA library would be similar in length to the \CC version.
 On the other hand, C does not have a generic collections-library in its standard distribution, resulting in frequent reimplementation of such collection types by C programmers.
 \CCV does not use the \CC standard template library by construction, and in fact includes the definition of @object@ and wrapper classes for @char@, @short@, and @int@ in its line count, which inflates this count somewhat, as an actual object-oriented language would include these in the standard library;
+On the other hand, C does not have a generic collections library in its standard distribution, resulting in frequent reimplementation of such collection types by C programmers.
+\CCV does not use the \CC standard template library by construction and, in fact, includes the definition of @object@ and wrapper classes for @char@, @short@, and @int@ in its line count, which inflates this count somewhat, as an actual object-oriented language would include these in the standard library;
 with their omission, the \CCV line count is similar to C.
 We justify the given line count by noting that many object-oriented languages do not allow implementing new interfaces on library types without subclassing or wrapper types, which may be similarly verbose.
 Line-count is a fairly rough measure of code complexity;
 another important factor is how much type information the programmer must specify manually, especially where that information is not compiler-checked.
 Such unchecked type information produces a heavier documentation burden and increased potential for runtime bugs, and is much less common in \CFA than C, with its manually specified function pointer arguments and format codes, or \CCV, with its extensive use of un-type-checked downcasts, \eg @object@ to @integer@ when popping a stack.
+Line count is a fairly rough measure of code complexity;
+another important factor is how much type information the programmer must specify manually, especially where that information is not compiler checked.
+Such unchecked type information produces a heavier documentation burden and increased potential for runtime bugs and is much less common in \CFA than C, with its manually specified function pointer arguments and format codes, or \CCV, with its extensive use of un-type-checked downcasts, \eg @object@ to @integer@ when popping a stack.
 To quantify this manual typing, the ``redundant type annotations'' line in Table~\ref{tab:eval} counts the number of lines on which the type of a known variable is respecified, either as a format specifier, explicit downcast, type-specific function, or by name in a @sizeof@, struct literal, or @new@ expression.
 The \CC benchmark uses two redundant type annotations to create a new stack nodes, while the C and \CCV benchmarks have several such annotations spread throughout their code.
+The \CC benchmark uses two redundant type annotations to create a new stack nodes, whereas the C and \CCV benchmarks have several such annotations spread throughout their code.
 The \CFA benchmark is able to eliminate all redundant type annotations through use of the polymorphic @alloc@ function discussed in Section~\ref{sec:libraries}.
+We conjecture these results scale across most generic data-types as the underlying polymorphism implement is constant.
+We conjecture that these results scale across most generic data types as the underlying polymorphism implement is constant.
+\vspace*{-8pt}
 \section{Related Work}
 \label{s:RelatedWork}
 …
 \CC provides three disjoint polymorphic extensions to C: overloading, inheritance, and templates.
 The overloading is restricted because resolution does not use the return type, inheritance requires learning object-oriented programming and coping with a restricted nominal-inheritance hierarchy, templates cannot be separately compiled resulting in compilation/code bloat and poor error messages, and determining how these mechanisms interact and which to use is confusing.
 In contrast, \CFA has a single facility for polymorphic code supporting type-safe separate-compilation of polymorphic functions and generic (opaque) types, which uniformly leverage the C procedural paradigm.
+In contrast, \CFA has a single facility for polymorphic code supporting type-safe separate compilation of polymorphic functions and generic (opaque) types, which uniformly leverage the C procedural paradigm.
 The key mechanism to support separate compilation is \CFA's \emph{explicit} use of assumed type properties.
 Until \CC concepts~\cite{C++Concepts} are standardized (anticipated for \CCtwenty), \CC provides no way to specify the requirements of a generic function beyond compilation errors during template expansion;
+Until \CC concepts~\cite{C++Concepts} are standardized (anticipated for \CCtwenty), \CC provides no way of specifying the requirements of a generic function beyond compilation errors during template expansion;
 furthermore, \CC concepts are restricted to template polymorphism.
 Cyclone~\cite{Grossman06} also provides capabilities for polymorphic functions and existential types, similar to \CFA's @forall@ functions and generic types.
 Cyclone existential types can include function pointers in a construct similar to a virtual function-table, but these pointers must be explicitly initialized at some point in the code, a tedious and potentially error-prone process.
+Cyclone existential types can include function pointers in a construct similar to a virtual function table, but these pointers must be explicitly initialized at some point in the code, which is a tedious and potentially error-prone process.
 Furthermore, Cyclone's polymorphic functions and types are restricted to abstraction over types with the same layout and calling convention as @void *@, \ie only pointer types and @int@.
 In \CFA terms, all Cyclone polymorphism must be dtype-static.
 While the Cyclone design provides the efficiency benefits discussed in Section~\ref{sec:generic-apps} for dtype-static polymorphism, it is more restrictive than \CFA's general model.
+Smith and Volpano~\cite{Smith98} present Polymorphic C, an ML dialect with polymorphic functions, C-like syntax, and pointer types; it lacks many of C's features, however, most notably structure types, and so is not a practical C replacement.
+Smith and Volpano~\cite{Smith98} present Polymorphic C, an ML dialect with polymorphic functions, C-like syntax, and pointer types;
+it lacks many of C's features, most notably structure types, and hence, is not a practical C replacement.
 Objective-C~\cite{obj-c-book} is an industrially successful extension to C.
 However, Objective-C is a radical departure from C, using an object-oriented model with message-passing.
+However, Objective-C is a radical departure from C, using an object-oriented model with message passing.
 Objective-C did not support type-checked generics until recently \cite{xcode7}, historically using less-efficient runtime checking of object types.
 The GObject~\cite{GObject} framework also adds object-oriented programming with runtime type-checking and reference-counting garbage-collection to C;
 these features are more intrusive additions than those provided by \CFA, in addition to the runtime overhead of reference-counting.
 Vala~\cite{Vala} compiles to GObject-based C, adding the burden of learning a separate language syntax to the aforementioned demerits of GObject as a modernization path for existing C code-bases.
 Java~\cite{Java8} included generic types in Java~5, which are type-checked at compilation and type-erased at runtime, similar to \CFA's.
 However, in Java, each object carries its own table of method pointers, while \CFA passes the method pointers separately to maintain a C-compatible layout.
+The GObject~\cite{GObject} framework also adds object-oriented programming with runtime type-checking and reference-counting garbage collection to C;
+these features are more intrusive additions than those provided by \CFA, in addition to the runtime overhead of reference counting.
+Vala~\cite{Vala} compiles to GObject-based C, adding the burden of learning a separate language syntax to the aforementioned demerits of GObject as a modernization path for existing C code bases.
+Java~\cite{Java8} included generic types in Java~5, which are type checked at compilation and type erased at runtime, similar to \CFA's.
+However, in Java, each object carries its own table of method pointers, whereas \CFA passes the method pointers separately to maintain a C-compatible layout.
 Java is also a garbage-collected, object-oriented language, with the associated resource usage and C-interoperability burdens.
 D~\cite{D}, Go, and Rust~\cite{Rust} are modern, compiled languages with abstraction features similar to \CFA traits, \emph{interfaces} in D and Go and \emph{traits} in Rust.
+D~\cite{D}, Go, and Rust~\cite{Rust} are modern compiled languages with abstraction features similar to \CFA traits, \emph{interfaces} in D and Go, and \emph{traits} in Rust.
 However, each language represents a significant departure from C in terms of language model, and none has the same level of compatibility with C as \CFA.
 D and Go are garbage-collected languages, imposing the associated runtime overhead.
 The necessity of accounting for data transfer between managed runtimes and the unmanaged C runtime complicates foreign-function interfaces to C.
 Furthermore, while generic types and functions are available in Go, they are limited to a small fixed set provided by the compiler, with no language facility to define more.
 D restricts garbage collection to its own heap by default, while Rust is not garbage-collected, and thus has a lighter-weight runtime more interoperable with C.
+D restricts garbage collection to its own heap by default, whereas Rust is not garbage collected and, thus, has a lighter-weight runtime more interoperable with C.
 Rust also possesses much more powerful abstraction capabilities for writing generic code than Go.
 On the other hand, Rust's borrow-checker provides strong safety guarantees but is complex and difficult to learn and imposes a distinctly idiomatic programming style.
+On the other hand, Rust's borrow checker provides strong safety guarantees but is complex and difficult to learn and imposes a distinctly idiomatic programming style.
 \CFA, with its more modest safety features, allows direct ports of C code while maintaining the idiomatic style of the original source.
+\subsection{Tuples/Variadics}
+\vspace*{-18pt}
+\subsection{Tuples/variadics}
+\vspace*{-5pt}
 Many programming languages have some form of tuple construct and/or variadic functions, \eg SETL, C, KW-C, \CC, D, Go, Java, ML, and Scala.
 SETL~\cite{SETL} is a high-level mathematical programming language, with tuples being one of the primary data types.
 Tuples in SETL allow subscripting, dynamic expansion, and multiple assignment.
+C provides variadic functions through @va_list@ objects, but the programmer is responsible for managing the number of arguments and their types, so the mechanism is type unsafe.
+C provides variadic functions through @va_list@ objects, but the programmer is responsible for managing the number of arguments and their types;
+thus, the mechanism is type unsafe.
 KW-C~\cite{Buhr94a}, a predecessor of \CFA, introduced tuples to C as an extension of the C syntax, taking much of its inspiration from SETL.
 The main contributions of that work were adding MRVF, tuple mass and multiple assignment, and record-member access.
 \CCeleven introduced @std::tuple@ as a library variadic template structure.
+\CCeleven introduced @std::tuple@ as a library variadic-template structure.
 Tuples are a generalization of @std::pair@, in that they allow for arbitrary length, fixed-size aggregation of heterogeneous values.
 Operations include @std::get<N>@ to extract values, @std::tie@ to create a tuple of references used for assignment, and lexicographic comparisons.
 \CCseventeen proposes \emph{structured bindings}~\cite{Sutter15} to eliminate pre-declaring variables and use of @std::tie@ for binding the results.
 This extension requires the use of @auto@ to infer the types of the new variables, so complicated expressions with a non-obvious type must be documented with some other mechanism.
+\CCseventeen proposes \emph{structured bindings}~\cite{Sutter15} to eliminate predeclaring variables and the use of @std::tie@ for binding the results.
+This extension requires the use of @auto@ to infer the types of the new variables; hence, complicated expressions with a nonobvious type must be documented with some other mechanism.
 Furthermore, structured bindings are not a full replacement for @std::tie@, as it always declares new variables.
 Like \CC, D provides tuples through a library variadic-template structure.
 Go does not have tuples but supports MRVF.
 Java's variadic functions appear similar to C's but are type-safe using homogeneous arrays, which are less useful than \CFA's heterogeneously-typed variadic functions.
+Java's variadic functions appear similar to C's but are type safe using homogeneous arrays, which are less useful than \CFA's heterogeneously typed variadic functions.
 Tuples are a fundamental abstraction in most functional programming languages, such as Standard ML~\cite{sml}, Haskell, and Scala~\cite{Scala}, which decompose tuples using pattern matching.
+\vspace*{-18pt}
 \subsection{C Extensions}
+\CC is the best known C-based language, and is similar to \CFA in that both are extensions to C with source and runtime backwards compatibility.
+Specific difference between \CFA and \CC have been identified in prior sections, with a final observation that \CFA has equal or fewer tokens to express the same notion in many cases.
+\vspace*{-5pt}
+\CC is the best known C-based language and is similar to \CFA in that both are extensions to C with source and runtime backward compatibility.
+Specific differences between \CFA and \CC have been identified in prior sections, with a final observation that \CFA has equal or fewer tokens to express the same notion in many cases.
 The key difference in design philosophies is that \CFA is easier for C programmers to understand by maintaining a procedural paradigm and avoiding complex interactions among extensions.
 \CC, on the other hand, has multiple overlapping features (such as the three forms of polymorphism), many of which have complex interactions with its object-oriented design.
 As a result, \CC has a steep learning curve for even experienced C programmers, especially when attempting to maintain performance equivalent to C legacy-code.
 There are several other C extension-languages with less usage and even more dramatic changes than \CC.
 Objective-C and Cyclone are two other extensions to C with different design goals than \CFA, as discussed above.
+As a result, \CC has a steep learning curve for even experienced C programmers, especially when attempting to maintain performance equivalent to C legacy code.
+There are several other C extension languages with less usage and even more dramatic changes than \CC.
+\mbox{Objective-C} and Cyclone are two other extensions to C with different design goals than \CFA, as discussed above.
 Other languages extend C with more focused features.
 $\mu$\CC~\cite{uC++book}, CUDA~\cite{Nickolls08}, ispc~\cite{Pharr12}, and Sierra~\cite{Leissa14} add concurrent or data-parallel primitives to C or \CC;
 data-parallel features have not yet been added to \CFA, but are easily incorporated within its design, while concurrency primitives similar to those in $\mu$\CC have already been added~\cite{Delisle18}.
 Finally, CCured~\cite{Necula02} and Ironclad \CC~\cite{DeLozier13} attempt to provide a more memory-safe C by annotating pointer types with garbage collection information; type-checked polymorphism in \CFA covers several of C's memory-safety issues, but more aggressive approaches such as annotating all pointer types with their nullability or requiring runtime garbage collection are contradictory to \CFA's backwards compatibility goals.
+data-parallel features have not yet been added to \CFA, but are easily incorporated within its design, whereas concurrency primitives similar to those in $\mu$\CC have already been added~\cite{Delisle18}.
+Finally, CCured~\cite{Necula02} and Ironclad \CC~\cite{DeLozier13} attempt to provide a more memory-safe C by annotating pointer types with garbage collection information; type-checked polymorphism in \CFA covers several of C's memory-safety issues, but more aggressive approaches such as annotating all pointer types with their nullability or requiring runtime garbage collection are contradictory to \CFA's backward compatibility goals.
 \section{Conclusion and Future Work}
 The goal of \CFA is to provide an evolutionary pathway for large C development-environments to be more productive and safer, while respecting the talent and skill of C programmers.
 While other programming languages purport to be a better C, they are in fact new and interesting languages in their own right, but not C extensions.
 The purpose of this paper is to introduce \CFA, and showcase language features that illustrate the \CFA type-system and approaches taken to achieve the goal of evolutionary C extension.
 The contributions are a powerful type-system using parametric polymorphism and overloading, generic types, tuples, advanced control structures, and extended declarations, which all have complex interactions.
+The goal of \CFA is to provide an evolutionary pathway for large C development environments to be more productive and safer, while respecting the talent and skill of C programmers.
+While other programming languages purport to be a better C, they are, in fact, new and interesting languages in their own right, but not C extensions.
+The purpose of this paper is to introduce \CFA, and showcase language features that illustrate the \CFA type system and approaches taken to achieve the goal of evolutionary C extension.
+The contributions are a powerful type system using parametric polymorphism and overloading, generic types, tuples, advanced control structures, and extended declarations, which all have complex interactions.
 The work is a challenging design, engineering, and implementation exercise.
 On the surface, the project may appear as a rehash of similar mechanisms in \CC.
 However, every \CFA feature is different than its \CC counterpart, often with extended functionality, better integration with C and its programmers, and always supporting separate compilation.
 All of these new features are being used by the \CFA development-team to build the \CFA runtime-system.
+All of these new features are being used by the \CFA development team to build the \CFA runtime system.
 Finally, we demonstrate that \CFA performance for some idiomatic cases is better than C and close to \CC, showing the design is practically applicable.
+While all examples in the paper compile and run, a public beta-release of \CFA will take 6--8 months to reduce compilation time, provide better debugging, and add a few more libraries.
+There is also new work on a number of \CFA features, including arrays with size, runtime type-information, virtual functions, user-defined conversions, and modules.
+While \CFA polymorphic functions use dynamic virtual-dispatch with low runtime overhead (see Section~\ref{sec:eval}), it is not as low as \CC template-inlining.
+Hence it may be beneficial to provide a mechanism for performance-sensitive code.
+Two promising approaches are an @inline@ annotation at polymorphic function call sites to create a template-specialization of the function (provided the code is visible) or placing an @inline@ annotation on polymorphic function-definitions to instantiate a specialized version for some set of types (\CC template specialization).
+These approaches are not mutually exclusive and allow performance optimizations to be applied only when necessary, without suffering global code-bloat.
+In general, we believe separate compilation, producing smaller code, works well with loaded hardware-caches, which may offset the benefit of larger inlined-code.
+While all examples in the paper compile and run, there are ongoing efforts to reduce compilation time, provide better debugging, and add more libraries;
+when this work is complete in early 2019, a public beta release will be available at \url{https://github.com/cforall/cforall}.
+There is also new work on a number of \CFA features, including arrays with size, runtime type information, virtual functions, user-defined conversions, and modules.
+While \CFA polymorphic functions use dynamic virtual dispatch with low runtime overhead (see Section~\ref{sec:eval}), it is not as low as \CC template inlining.
+Hence, it may be beneficial to provide a mechanism for performance-sensitive code.
+Two promising approaches are an @inline@ annotation at polymorphic function call sites to create a template specialization of the function (provided the code is visible) or placing an @inline@ annotation on polymorphic function definitions to instantiate a specialized version for some set of types (\CC template specialization).
+ These approaches are not mutually exclusive and allow performance optimizations to be applied only when necessary, without suffering global code bloat.
+In general, we believe separate compilation, producing smaller code, works well with loaded hardware caches, which may offset the benefit of larger inlined code.
 \section{Acknowledgments}
 The authors would like to recognize the design assistance of Glen Ditchfield, Richard Bilson, Thierry Delisle, Andrew Beach and Brice Dobry on the features described in this paper, and thank Magnus Madsen for feedback on the writing.
 Funding for this project has been provided by Huawei Ltd.\ (\url{http://www.huawei.com}), and Aaron Moss and Peter Buhr are partially funded by the Natural Sciences and Engineering Research Council of Canada.
+The authors would like to recognize the design assistance of Glen Ditchfield, Richard Bilson, Thierry Delisle, Andrew Beach, and Brice Dobry on the features described in this paper and thank Magnus Madsen for feedback on the writing.
+Funding for this project was provided by Huawei Ltd (\url{http://www.huawei.com}), and Aaron Moss and Peter Buhr were partially funded by the Natural Sciences and Engineering Research Council of Canada.
 {%
 \fontsize{9bp}{12bp}\selectfont%
+\vspace*{-3pt}
 \bibliography{pl}
 }%
 …
+\enlargethispage{1000pt}
 \subsection{\CFA}
 \label{s:CforallStack}
 …
+\newpage
 \subsection{\CC}

doc/proposals/ctordtor/Makefile

-              r7951100
+              rb067d9b
 ## Define the appropriate configuration variables.
+## Define the configuration variables.
+MACROS = ../../LaTeXmacros
+BIB = ../../bibliography
+Build = build
+Figures = figures
+Macros = ../../LaTeXmacros
+Bib = ../../bibliography
 TeXLIB = .:$(MACROS):$(MACROS)/listings:$(MACROS)/enumitem:$(BIB)/:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
+TeXLIB = .:${Macros}:${MACROS}/listings:${MACROS}/enumitem:${Bib}/:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+MAKEFLAGS = --no-print-directory # --silent
+VPATH = ${Build} ${Figures}
 ## Define the text source files.
 …
 DOCUMENT = ctor.pdf
+BASE = ${basename ${DOCUMENT}}
 # Directives #
+.PHONY : all clean                                      # not file names
 all : ${DOCUMENT}
 clean :
+        rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t *.cf \
+                ${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
+        @rm -frv ${DOCUMENT} ${BASE}.ps ${Build}
 # File Dependencies #
 ${DOCUMENT} : ${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${BASE}.ps
         ps2pdf $<
 ${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
         dvips $< -o $@
+${BASE}.ps : ${BASE}.dvi
+        dvips ${Build}/$< -o $@
 ${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
                 $(MACROS)/common.tex $(MACROS)/indexstyle $(BIB)/cfa.bib
+${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ${Macros}/common.tex ${Macros}/indexstyle ${Bib}/pl.bib | ${Build}
         # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
         if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
+        #if [ ! -r ${basename $@}.ind ] ; then touch ${Build}/${basename $@}.ind ; fi
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
         -${BibTeX} ${basename $@}
         # Some citations reference others so run steps again to resolve these citations
+        -${BibTeX} ${Build}/${basename $@}
+        # Some citations reference others so run again to resolve these citations
         ${LaTeX} ${basename $@}.tex
         -${BibTeX} ${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Make index from *.aux entries and input index at end of document
+        makeindex -s $(MACROS)/indexstyle ${basename $@}.idx
+        #makeindex -s ${Macros}/indexstyle ${Build}/${basename $@}.idx
+        # Run again to finish citations
         ${LaTeX} ${basename $@}.tex
         # Run again to get index title into table of contents
 …
 ## Define the default recipes.
+%.tex : %.fig
         fig2dev -L eepic $< > $@
+${Build}:
+        mkdir -p ${Build}
 %.ps : %.fig
         fig2dev -L ps $< > $@
+%.tex : %.fig | ${Build}
+        fig2dev -L eepic $< > ${Build}/$@
+%.pstex : %.fig
+        fig2dev -L pstex $< > $@
+        fig2dev -L pstex_t -p $@ $< > $@_t
+%.ps : %.fig | ${Build}
+        fig2dev -L ps $< > ${Build}/$@
+%.pstex : %.fig | ${Build}
+        fig2dev -L pstex $< > ${Build}/$@
+        fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 # Local Variables: #

doc/proposals/ctordtor/ctor.tex

-              r7951100
+              rb067d9b
-% inline code ©...© (copyright symbol) emacs: C-q M-)
-% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
-% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
-% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
-% LaTex escape §...§ (section symbol) emacs: C-q M-'
-% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
-% math escape $...$ (dollar symbol)
 \documentclass[twoside,11pt]{article}
 …
 \usepackage{textcomp}
 \usepackage[latin1]{inputenc}
 \usepackage{fullpage,times,comment}
 \usepackage{epic,eepic}
 \usepackage{upquote}                                                                    % switch curled `'" to straight
+\usepackage{upquote}                                    % switch curled `'" to straight
 \usepackage{calc}
 \usepackage{xspace}
 \usepackage{graphicx}
 \usepackage{varioref}                                                                   % extended references
 \usepackage{listings}                                                                   % format program code
 \usepackage[flushmargin]{footmisc}                                              % support label/reference in footnote
+\usepackage{varioref}                                   % extended references
+\usepackage{listings}                                   % format program code
+\usepackage[flushmargin]{footmisc}                      % support label/reference in footnote
 \usepackage{latexsym}                                   % \Box glyph
 \usepackage{mathptmx}                                   % better math font with "times"
 …
 \renewcommand{\UrlFont}{\small\sf}
 \setlength{\topmargin}{-0.45in}                                                 % move running title into header
+\setlength{\topmargin}{-0.45in}                         % move running title into header
 \setlength{\headsep}{0.25in}
 …
 \interfootnotelinepenalty=10000
+\CFAStyle                                               % use default CFA format-style
+% inline code ©...© (copyright symbol) emacs: C-q M-)
+% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
+% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
+% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
+% LaTex escape §...§ (section symbol) emacs: C-q M-'
+% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
+% math escape $...$ (dollar symbol)
 \title{
 …
 \thispagestyle{plain}
 \pagenumbering{arabic}

doc/proposals/flags.md

-              r7951100
+              rb067d9b
         ```
         FunFlags f = some_val();
         if ( f ) { sout | "f has some flag(s) set" | endl; }
         if ( f & FOO ) { sout | "f has FOO set" | endl; }
+        if ( f ) { sout | "f has some flag(s) set"; }
+        if ( f & FOO ) { sout | "f has FOO set"; }
         f |= FOO; // set FOO
         f -= FOO; // unset FOO
 …
         ```
         FunFlags f = some_val();
         if ( f.FOO ) { sout | "f has FOO set" | endl; }
+        if ( f.FOO ) { sout | "f has FOO set"; }
         f.FOO = true;    // set FOO
         f.FOO = false;   // unset FOO

doc/proposals/tuples/Makefile

-              r7951100
+              rb067d9b
 ## Define the appropriate configuration variables.
+## Define the configuration variables.
+MACROS = ../../LaTeXmacros
+BIB = ../../bibliography
+Build = build
+Figures = figures
+Macros = ../../LaTeXmacros
+Bib = ../../bibliography
 TeXLIB = .:$(MACROS):$(MACROS)/listings:$(MACROS)/enumitem:$(BIB)/:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
+TeXLIB = .:${Macros}:${MACROS}/listings:${MACROS}/enumitem:${Bib}/:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+MAKEFLAGS = --no-print-directory --silent #
+VPATH = ${Build} ${Figures}
 ## Define the text source files.
 …
 DOCUMENT = tuples.pdf
+BASE = ${basename ${DOCUMENT}}
 # Directives #
+.PHONY : all clean                                      # not file names
 all : ${DOCUMENT}
 clean :
+        rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t *.cf \
+                ${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
+        @rm -frv ${DOCUMENT} ${BASE}.ps ${Build}
 # File Dependencies #
 ${DOCUMENT} : ${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${BASE}.ps
         ps2pdf $<
 ${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
         dvips $< -o $@
+${BASE}.ps : ${BASE}.dvi
+        dvips ${Build}/$< -o $@
 ${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
                 $(MACROS)/common.tex $(MACROS)/indexstyle $(BIB)/cfa.bib
+${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ${Macros}/common.tex ${Macros}/indexstyle ${Bib}/pl.bib | ${Build}
         # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
         if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
+        #if [ ! -r ${basename $@}.ind ] ; then touch ${Build}/${basename $@}.ind ; fi
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
         -${BibTeX} ${basename $@}
         # Some citations reference others so run steps again to resolve these citations
+        -${BibTeX} ${Build}/${basename $@}
+        # Some citations reference others so run again to resolve these citations
         ${LaTeX} ${basename $@}.tex
         -${BibTeX} ${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Make index from *.aux entries and input index at end of document
+        makeindex -s $(MACROS)/indexstyle ${basename $@}.idx
+        #makeindex -s ${Macros}/indexstyle ${Build}/${basename $@}.idx
+        # Run again to finish citations
         ${LaTeX} ${basename $@}.tex
         # Run again to get index title into table of contents
 …
 ## Define the default recipes.
+%.tex : %.fig
         fig2dev -L eepic $< > $@
+${Build}:
+        mkdir -p ${Build}
 %.ps : %.fig
         fig2dev -L ps $< > $@
+%.tex : %.fig | ${Build}
+        fig2dev -L eepic $< > ${Build}/$@
+%.pstex : %.fig
+        fig2dev -L pstex $< > $@
+        fig2dev -L pstex_t -p $@ $< > $@_t
+%.ps : %.fig | ${Build}
+        fig2dev -L ps $< > ${Build}/$@
+%.pstex : %.fig | ${Build}
+        fig2dev -L pstex $< > ${Build}/$@
+        fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 # Local Variables: #

doc/proposals/tuples/tuples.tex

-              r7951100
+              rb067d9b
-% inline code ©...© (copyright symbol) emacs: C-q M-)
-% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
-% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
-% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
-% LaTex escape §...§ (section symbol) emacs: C-q M-'
-% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
-% math escape $...$ (dollar symbol)
 \documentclass[twoside,11pt]{article}
 …
 \usepackage{textcomp}
 \usepackage[latin1]{inputenc}
 \usepackage{fullpage,times,comment}
 \usepackage{epic,eepic}
 \usepackage{upquote}                                                                    % switch curled `'" to straight
+\usepackage{upquote}                                    % switch curled `'" to straight
 \usepackage{calc}
 \usepackage{xspace}
 \usepackage{graphicx}
 \usepackage{varioref}                                                                   % extended references
 \usepackage{listings}                                                                   % format program code
 \usepackage[flushmargin]{footmisc}                                              % support label/reference in footnote
+\usepackage{varioref}                                   % extended references
+\usepackage{listings}                                   % format program code
+\usepackage[flushmargin]{footmisc}                      % support label/reference in footnote
 \usepackage{latexsym}                                   % \Box glyph
 \usepackage{mathptmx}                                   % better math font with "times"
 …
 \renewcommand{\UrlFont}{\small\sf}
 \setlength{\topmargin}{-0.45in}                                                 % move running title into header
+\setlength{\topmargin}{-0.45in}                         % move running title into header
 \setlength{\headsep}{0.25in}
 …
 \interfootnotelinepenalty=10000
+\CFAStyle                                               % use default CFA format-style
+% inline code ©...© (copyright symbol) emacs: C-q M-)
+% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
+% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
+% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
+% LaTex escape §...§ (section symbol) emacs: C-q M-'
+% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
+% math escape $...$ (dollar symbol)
 \title{

doc/proposals/user_conversions.md

-              r7951100
+              rb067d9b
 There is also a set of _explicit_ conversions that are only allowed through a
 cast expression.
+Based on Glen's notes on conversions [1], I propose that safe and unsafe
+conversions be expressed as constructor variants, though I make explicit
+(cast) conversions a constructor variant as well rather than a dedicated
+operator.
+I propose that safe, unsafe, and explicit (cast) conversions be expressed as
+constructor variants.
 Throughout this article, I will use the following operator names for
 constructors and conversion functions from `From` to `To`:
+        void ?{} ( To*, To );            // copy constructor
+        void ?{} ( To*, From );          // explicit constructor
+        void ?{explicit} ( To*, From );  // explicit cast conversion
+        void ?{safe} ( To*, From );      // implicit safe conversion
+        void ?{unsafe} ( To*, From );    // implicit unsafe conversion
+[1] http://plg.uwaterloo.ca/~cforall/Conversions/index.html
+Glen's design made no distinction between constructors and unsafe implicit
+        void ?{} ( To&, To );            // copy constructor
+        void ?{} ( To&, From );          // explicit constructor
+        void ?{explicit} ( To&, From );  // explicit cast conversion
+        void ?{safe} ( To&, From );      // implicit safe conversion
+        void ?{unsafe} ( To&, From );    // implicit unsafe conversion
+It has been suggested that all constructors would define unsafe implicit
 conversions; this is elegant, but interacts poorly with tuples.
 Essentially, without making this distinction, a constructor like the following
 …
 multiplying the space of possible interpretations of all functions:
         void ?{}( Coord *this, int x, int y );
+        void ?{}( Coord& this, int x, int y );
 That said, it would certainly be possible to make a multiple-argument implicit
 …
 used infrequently:
         void ?{unsafe}( Coord *this, int x, int y );
+        void ?{unsafe}( Coord& this, int x, int y );
 An alternate possibility would be to only count two-arg constructors
 `void ?{} ( To*, From )` as unsafe conversions; under this semantics, safe and
+`void ?{} ( To&, From )` as unsafe conversions; under this semantics, safe and
 explicit conversions should also have a compiler-enforced restriction to
 ensure that they are two-arg functions (this restriction may be valuable
 …
 is convertable to `To`.
 If user-defined conversions are not added to the language,
 `void ?{} ( To*, From )` may be a suitable representation, relying on
+`void ?{} ( To&, From )` may be a suitable representation, relying on
 conversions on the argument types to account for transitivity.
+On the other hand, `To*` should perhaps match its target type exactly, so
+another assertion syntax specific to conversions may be required, e.g.
+`From -> To`.
+Since `To&` should be an exact match on `To`, this should put all the implicit
+conversions on the RHS.
+On the other hand, under some models (like [1]), implicit conversions are not
+allowed in assertion parameters, so another assertion syntax specific to
+conversions may be required, e.g. `From -> To`.
+It has also been suggested that, for programmer control, no implicit
+conversions (except, possibly, for polymorphic specialization) should be
+allowed in resolution of cast operators.
+[1] ../working/assertion_resolution.md
 ### Constructor Idiom ###
 …
 that we can use the full range of Cforall features for conversions, including
 polymorphism.
+Glen [1] defines a _constructor idiom_ that can be used to create chains of
+safe conversions without duplicating code; given a type `Safe` which members
+of another type `From` can be directly converted to, the constructor idiom
+allows us to write a conversion for any type `To` which `Safe` converts to:
+        forall(otype To | { void ?{safe}( To*, Safe ) })
+        void ?{safe}( To *this, From that ) {
+In an earlier version of this proposal, Glen Ditchfield defines a
+_constructor idiom_ that can be used to create chains of safe conversions
+without duplicating code; given a type `Safe` which members of another type
+`From` can be directly converted to, the constructor idiom allows us to write
+a conversion for any type `To` which `Safe` converts to:
+        forall(otype To | { void ?{safe}( To&, Safe ) })
+        void ?{safe}( To& this, From that ) {
                 Safe tmp = /* some expression involving that */;
                 *this = tmp; // uses assertion parameter
+                this{ tmp }; // initialize from assertion parameter
+        }
 …
 unsafe conversions.
+Glen's original suggestion said the copy constructor for `To` should also be
+accepted as a resolution for `void ?{safe}( To&, Safe )` (`Safe` == `To`),
+allowing this same code to be used for the single-step conversion as well.
+This proposal does come at the cost of an extra copy initialization of the
+target value, though.
+Contrariwise, if a monomorphic conversion from `From` to `Safe` is written,
+e.g:
+        void ?{safe}( Safe& this, From that ) {
+                this{ /* some parameters involving that */ };
+        }
+Then the code for a transitive conversion from `From` to any `To` type
+convertable from `Safe` is written:
+        forall(otype To | { void ?{safe}( To&, Safe ) })
+        void ?{safe}( To& this, From that ) {
+                Safe tmp = that;  // uses monomorphic conversion
+                this{ tmp };      // initialize from assertion parameter
+        }
+Given the entirely-boilerplate nature of this code, but negative performance
+implications of the unmodified constructor idiom, it might be fruitful to have
+transitive and single step conversion operators, and let CFA build the
+transitive conversions; some possible names:
+        void ?{safe}  (To&, From);    void ?{final safe} (To&, From);  // single-step
+        void ?{safe*} (To&, From);    void ?{safe}       (To&, From);  // transitive
 What selective non-use of the constructor idiom gives us is the ability to
 define a conversion that may only be the *last* conversion in a chain of such.
+Constructing a conversion graph able to unambiguously represent the full
+hierarchy of implicit conversions in C is provably impossible using only
+single-step conversions with no additional information (see Appendix A), but
+this mechanism is sufficiently powerful (see [1], though the design there has
+some minor bugs; the general idea is to use the constructor idiom to define
+two chains of conversions, one among the signed integral types, another among
+the unsigned, and to use monomorphic conversions to allow conversions between
+signed and unsigned integer types).
+One use for this is to solve the problem that `explicit` conversions were
+added to C++ for, that of conversions to `bool` chaining to become conversions
+to any arithmetic type.
+Another use is to unambiguously represent the full hierarchy of implicit
+conversions in C by making sign conversions non-transitive, allowing the
+compiler to resolve e.g. `int -> unsigned long` as
+`int -> long -> unsigned long` over `int -> unsigned int -> unsigned long`.
+See [2] for more details.
+[2] ../working/glen_conversions/index.html#usual
 ### Appendix A: Partial and Total Orders ###
 …
 convert from `int` to `unsigned long`, so we just put in a direct conversion
 and make the compiler smart enough to figure out the costs" - this is the
 approach taken by the existing compipler, but given that in a user-defined
+approach taken by the existing compiler, but given that in a user-defined
 conversion proposal the users can build an arbitrary graph of conversions,
 this case still needs to be handled.
 …
 exists a chain of conversions from `a` to `b` (see Appendix A for description
 of preorders and related constructs).
 This preorder corresponds roughly to a more usual type-theoretic concept of
+This preorder roughly corresponds to a more usual type-theoretic concept of
 subtyping ("if I can convert `a` to `b`, `a` is a more specific type than
 `b`"); however, since this graph is arbitrary, it may contain cycles, so if
 …
 and so is considered to be the nearer type.
 By transitivity, then, the conversion from `X` to `Y2` should be cheaper than
 the conversion from `X` to `W`, but in this case the `X` and `W` are
+the conversion from `X` to `W`, but in this case the `Y2` and `W` are
 incomparable by the conversion preorder, so the tie is broken by the shorter
 path from `X` to `W` in favour of `W`, contradicting the transitivity property

doc/refrat/Makefile

-              r7951100
+              rb067d9b
         dvips ${Build}/$< -o $@
 ${BASE}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
                 ${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib
+${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib | ${Build}
         # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
         if [ ! -r ${basename $@}.ind ] ; then touch ${Build}/${basename $@}.ind ; fi
 …
         mkdir -p ${Build}
 %.tex : %.fig ${Build}
+%.tex : %.fig | ${Build}
         fig2dev -L eepic $< > ${Build}/$@
 %.ps : %.fig ${Build}
+%.ps : %.fig | ${Build}
         fig2dev -L ps $< > ${Build}/$@
 %.pstex : %.fig ${Build}
+%.pstex : %.fig | ${Build}
         fig2dev -L pstex $< > ${Build}/$@
         fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t

doc/user/Makefile

-              r7951100
+              rb067d9b
 Figures = figures
 Macros = ../LaTeXmacros
 TeXLIB = .:${Macros}:${Build}:../bibliography:
+TeXLIB = .:${Macros}:${Build}:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+BibTeX = BIBINPUTS=../bibliography: && export BIBINPUTS && bibtex
 MAKEFLAGS = --no-print-directory --silent #
 …
 # File Dependencies #
+build/version: ../../configure | ${Build}
+        ../../configure --version | grep "cfa-cc configure" | grep -oEe "([0-9]+\.)+[0-9]+" > $@
 ${DOCUMENT} : ${BASE}.ps
         ps2pdf $<
 …
         dvips ${Build}/$< -o $@
 ${BASE}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
                 ${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib
+${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib build/version | ${Build}
         # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
         if [ ! -r ${basename $@}.ind ] ; then touch ${Build}/${basename $@}.ind ; fi
 …
 ## Define the default recipes.
 ${Build}:
+${Build} :
         mkdir -p ${Build}
 %.tex : %.fig ${Build}
+%.tex : %.fig | ${Build}
         fig2dev -L eepic $< > ${Build}/$@
 %.ps : %.fig ${Build}
+%.ps : %.fig | ${Build}
         fig2dev -L ps $< > ${Build}/$@
 %.pstex : %.fig ${Build}
+%.pstex : %.fig | ${Build}
         fig2dev -L pstex $< > ${Build}/$@
         fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t

doc/user/user.tex

-              r7951100
+              rb067d9b
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- Mode: Latex -*- %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
+%%
 %% 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.
 %%
 %% user.tex --
 %%
+%%
+%% user.tex --
+%%
 %% Author           : Peter A. Buhr
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Sun May  6 10:33:53 2018
 %% Update Count     : 3319
+%% Last Modified On : Sat Jul 13 18:36:18 2019
+%% Update Count     : 3876
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 % Names used in the document.
 \newcommand{\Version}{\input{../../version}}
+\newcommand{\Version}{\input{build/version}}
 \newcommand{\Textbf}[2][red]{{\color{#1}{\textbf{#2}}}}
 \newcommand{\Emph}[2][red]{{\color{#1}\textbf{\emph{#2}}}}
 …
 \CFA adds many modern programming-language features that directly lead to increased \emph{\Index{safety}} and \emph{\Index{productivity}}, while maintaining interoperability with existing C programs and achieving similar performance.
 Like C, \CFA is a statically typed, procedural (non-\Index{object-oriented}) language with a low-overhead runtime, meaning there is no global \Index{garbage-collection}, but \Index{regional garbage-collection}\index{garbage-collection!regional} is possible.
 The primary new features include parametric-polymorphic routines and types, exceptions, concurrency, and modules.
+The primary new features include polymorphic routines and types, exceptions, concurrency, and modules.
 One of the main design philosophies of \CFA is to ``\Index{describe not prescribe}'', which means \CFA tries to provide a pathway from low-level C programming to high-level \CFA programming, but it does not force programmers to ``do the right thing''.
 …
 As well, new programs can be written in \CFA using a combination of C and \CFA features.
 \Index*[C++]{\CC{}} had a similar goal 30 years ago, allowing object-oriented programming to be incrementally added to C.
 However, \CC currently has the disadvantages of a strong object-oriented bias, multiple legacy design-choices that cannot be updated, and active divergence of the language model from C, all of which requires significant effort and training to incrementally add \CC to a C-based project.
+\Index*[C++]{\CC{}}~\cite{c++:v1} had a similar goal 30 years ago, allowing object-oriented programming to be incrementally added to C.
+However, \CC currently has the disadvantages of a strong object-oriented bias, multiple legacy design-choices that cannot be updated, and active divergence of the language model from C, requiring significant effort and training to incrementally add \CC to a C-based project.
 In contrast, \CFA has 30 years of hindsight and a clean starting point.
 Like \Index*[C++]{\CC{}}, there may be both an old and new ways to achieve the same effect.
 For example, the following programs compare the \CFA, C, and \CC I/O mechanisms, where the programs output the same result.
 \begin{cquote}
+For example, the following programs compare the C, \CFA, and \CC I/O mechanisms, where the programs output the same result.
+\begin{center}
 \begin{tabular}{@{}l@{\hspace{1.5em}}l@{\hspace{1.5em}}l@{}}
 \multicolumn{1}{c@{\hspace{1.5em}}}{\textbf{C}} & \multicolumn{1}{c}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{\CC}}      \\
 …
 int main( void ) {
         int x = 0, y = 1, z = 2;
         ®sout | x | y | z | endl;®§\indexc{sout}§
+        ®sout | x | y | z;®§\indexc{sout}§
+}
 \end{cfa}
 …
 \end{cfa}
 \end{tabular}
 \end{cquote}
+\end{center}
 While the \CFA I/O looks similar to the \Index*[C++]{\CC{}} output style, there are important differences, such as automatic spacing between variables as in \Index*{Python} (see~\VRef{s:IOLibrary}).
 \subsection{Background}
 This document is a programmer reference-manual for the \CFA programming language.
 The manual covers the core features of the language and runtime-system, with simple examples illustrating syntax and semantics of each feature.
+The manual covers the core features of the language and runtime-system, with simple examples illustrating syntax and semantics of features.
 The manual does not teach programming, \ie how to combine the new constructs to build complex programs.
 A reader should already have an intermediate knowledge of control flow, data structures, and concurrency issues to understand the ideas presented, as well as some experience programming in C/\CC.
+The reader must have an intermediate knowledge of control flow, data structures, and concurrency issues to understand the ideas presented, as well as some experience programming in C/\CC.
 Implementers should refer to the \CFA Programming Language Specification for details about the language syntax and semantics.
 Changes to the syntax and additional features are expected to be included in later revisions.
 …
 \section{Why fix C?}
 The C programming language is a foundational technology for modern computing with millions of lines of code implementing everything from commercial operating-systems (especially UNIX systems) to hobby projects.
+The C programming language is a foundational technology for modern computing with millions of lines of code implementing everything from hobby projects to commercial operating-systems.
 This installation base and the programmers producing it represent a massive software-engineering investment spanning decades and likely to continue for decades more.
 Even with all its problems, C continues to be popular because it allows writing software at virtually any level in a computer system without restriction.
 For system programming, where direct access to hardware, storage management, and real-time issues are a requirement, C is usually the only language of choice.
 The TIOBE index~\cite{TIOBE} for March 2016 showed the following programming-language popularity: \Index*{Java} 20.5\%, C 14.5\%, \Index*[C++]{\CC{}} 6.7\%, \Csharp 4.3\%, \Index*{Python} 4.3\%, where the next 50 languages are less than 3\% each with a long tail.
 As well, for 30 years, C has been the number 1 and 2 most popular programming language:
+The TIOBE index~\cite{TIOBE} for July 2018 ranks the top five most \emph{popular} programming languages as \Index*{Java} 16\%, C 14\%, \Index*[C++]{\CC{}} 7.5\%, Python 6\%, Visual Basic 4\% = 47.5\%, where the next 50 languages are less than 4\% each, with a long tail.
+The top 3 rankings over the past 30 years are:
 \begin{center}
+\setlength{\tabcolsep}{1.5ex}
+\begin{tabular}{@{}r|c|c|c|c|c|c|c@{}}
+Ranking & 2016  & 2011  & 2006  & 2001  & 1996  & 1991  & 1986          \\
+\hline
+Java    & 1             & 1             & 1             & 3             & 29    & -             & -                     \\
+\hline
+\R{C}   & \R{2} & \R{2} & \R{2} & \R{1} & \R{1} & \R{1} & \R{1}         \\
+\hline
+\CC             & 3             & 3             & 3             & 2             & 2             & 2             & 7                     \\
+\setlength{\tabcolsep}{10pt}
+\begin{tabular}{@{}rccccccc@{}}
+                & 2018  & 2013  & 2008  & 2003  & 1998  & 1993  & 1988  \\ \hline
+Java    & 1             & 2             & 1             & 1             & 16    & -             & -             \\
+\R{C}   & \R{2} & \R{1} & \R{2} & \R{2} & \R{1} & \R{1} & \R{1} \\
+\CC             & 3             & 4             & 3             & 3             & 2             & 2             & 5             \\
 \end{tabular}
 \end{center}
 Hence, C is still an extremely important programming language, with double the usage of \Index*[C++]{\CC{}}; in many cases, \CC is often used solely as a better C.
 Love it or hate it, C has been an important and influential part of computer science for 40 years and its appeal is not diminishing.
 Unfortunately, C has many problems and omissions that make it an unacceptable programming language for modern needs.
+Nevertheless, C has many problems and omissions that make it an unacceptable programming language for modern needs.
 As stated, the goal of the \CFA project is to engineer modern language-features into C in an evolutionary rather than revolutionary way.
 …
 These languages have different syntax and semantics from C, do not interoperate directly with C, and are not systems languages because of restrictive memory-management or garbage collection.
 As a result, there is a significant learning curve to move to these languages, and C legacy-code must be rewritten.
+These costs can be prohibitive for many companies with a large software-base in C/\CC, and a significant number of programmers require retraining to the new programming language.
+The result of this project is a language that is largely backwards compatible with \Index*[C11]{\Celeven{}}~\cite{C11}, but fixes many of the well known C problems while containing modern language-features.
+Without significant extension to the C programming language, it is becoming unable to cope with the needs of modern programming problems and programmers;
+These costs can be prohibitive for many companies with a large software-base in C/\CC, and a significant number of programmers require retraining in the new programming language.
+The result of this project is a language that is largely backwards compatible with \Index*[C11]{\Celeven{}}~\cite{C11}, but fixes many of the well known C problems while adding modern language-features.
+To achieve these goals required a significant engineering exercise, where we had to ``think inside the existing C box''.
+Without these significant extension to C, it is unable to cope with the needs of modern programming problems and programmers;
 as a result, it will fade into disuse.
 Considering the large body of existing C code and programmers, there is significant impetus to ensure C is transformed into a modern programming language.
 …
 \begin{lstlisting}
 ®forall( otype T )® T identity( T val ) { return val; }
 int forty_two = identity( 42 );                 §\C{// T is bound to int, forty\_two == 42}§
+int forty_two = identity( 42 ); §\C{// T is bound to int, forty\_two == 42}§
 \end{lstlisting}
 % extending the C type system with parametric polymorphism and overloading, as opposed to the \Index*[C++]{\CC{}} approach of object-oriented extensions.
 …
 double key = 5.0, vals[10] = { /* 10 sorted floating values */ };
 double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp );      §\C{// search sorted array}§
+double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp ); §\C{// search sorted array}§
 \end{lstlisting}
 which can be augmented simply with a polymorphic, type-safe, \CFA-overloaded wrappers:
 …
 forall( otype T | { int ?<?( T, T ); } ) unsigned int bsearch( T key, const T * arr, size_t size ) {
         T * result = bsearch( key, arr, size ); §\C{// call first version}§
         return result ? result - arr : size; }  §\C{// pointer subtraction includes sizeof(T)}§
 double * val = bsearch( 5.0, vals, 10 );        §\C{// selection based on return type}§
+        T * result = bsearch( key, arr, size ); §\C{// call first version}§
+        return result ? result - arr : size; } §\C{// pointer subtraction includes sizeof(T)}§
+double * val = bsearch( 5.0, vals, 10 ); §\C{// selection based on return type}§
 int posn = bsearch( 5.0, vals, 10 );
 \end{lstlisting}
 …
 \begin{lstlisting}
 forall( dtype T | sized(T) ) T * malloc( void ) { return (T *)malloc( sizeof(T) ); }
 int * ip = malloc();                                    §\C{// select type and size from left-hand side}§
+int * ip = malloc(); §\C{// select type and size from left-hand side}§
 double * dp = malloc();
 struct S {...} * sp = malloc();
 …
 Whereas, \CFA wraps each of these routines into ones with the overloaded name ©abs©:
 \begin{cfa}
 char abs( char );
 ®extern "C" {® int abs( int ); ®}®              §\C{// use default C routine for int}§
 long int abs( long int );
 long long int abs( long long int );
 float abs( float );
 double abs( double );
 long double abs( long double );
 float _Complex abs( float _Complex );
 double _Complex abs( double _Complex );
 long double _Complex abs( long double _Complex );
+char ®abs®( char );
+extern "C" { int ®abs®( int ); } §\C{// use default C routine for int}§
+long int ®abs®( long int );
+long long int ®abs®( long long int );
+float ®abs®( float );
+double ®abs®( double );
+long double ®abs®( long double );
+float _Complex ®abs®( float _Complex );
+double _Complex ®abs®( double _Complex );
+long double _Complex ®abs®( long double _Complex );
 \end{cfa}
 The problem is the name clash between the library routine ©abs© and the \CFA names ©abs©.
 Hence, names appearing in an ©extern "C"© block have \newterm*{C linkage}.
 Then overloading polymorphism uses a mechanism called \newterm{name mangling}\index{mangling!name} to create unique names that are different from C names, which are not mangled.
 Hence, there is the same need as in \CC, to know if a name is a C or \CFA name, so it can be correctly formed.
 There is no way around this problem, other than C's approach of creating unique names for each pairing of operation and type.
+Hence, there is the same need, as in \CC, to know if a name is a C or \CFA name, so it can be correctly formed.
+There is no way around this problem, other than C's approach of creating unique names for each pairing of operation and types.
 This example strongly illustrates a core idea in \CFA: \emph{the \Index{power of a name}}.
 …
 \begin{description}
 \item
 \Indexc{-std=gnu99}\index{compilation option!-std=gnu99@{©-std=gnu99©}}
 The 1999 C standard plus GNU extensions.
 \item
 \Indexc[deletekeywords=inline]{-fgnu89-inline}\index{compilation option!-fgnu89-inline@{\lstinline[deletekeywords=inline]@-fgnu89-inline@}}
 Use the traditional GNU semantics for inline routines in C99 mode, which allows inline routines in header files.
+\Indexc{-std=gnu11}\index{compilation option!-std=gnu11@{©-std=gnu11©}}
+The 2011 C standard plus GNU extensions.
+\item
+\Indexc[deletekeywords=inline]{-fgnu89-inline}\index{compilation option!-fgnu89-inline@{\lstinline[deletekeywords=inline]$-fgnu89-inline$}}
+Use the traditional GNU semantics for inline routines in C11 mode, which allows inline routines in header files.
 \end{description}
 The following new \CFA options are available:
 …
 \begin{cfa}
 #ifndef __CFORALL__
 #include <stdio.h>§\indexc{stdio.h}§    §\C{// C header file}§
+#include <stdio.h>§\indexc{stdio.h}§ §\C{// C header file}§
 #else
 #include <fstream>§\indexc{fstream}§    §\C{// \CFA header file}§
+#include <fstream>§\indexc{fstream}§ §\C{// \CFA header file}§
 #endif
 \end{cfa}
+which conditionally includes the correct header file, if the program is compiled using \Indexc{gcc} or \Indexc{cfa}.
+which conditionally includes the correct header file, if the program is compiled using \Indexc{gcc} or \Indexc{cfa}.
+The \CFA translator has multiple steps.
+The following flags control how the tranlator works, the stages run, and printing within a stage.
+The majority of these flags are used by \CFA developers, but some are occasionally useful to programmers.
+\begin{description}[topsep=5pt,itemsep=0pt,parsep=0pt]
+\item
+\Indexc{-h}\index{translator option!-h@{©-h©}}, \Indexc{--help}\index{translator option!--help@{©--help©}} \, print help message
+\item
+\Indexc{-l}\index{translator option!-l@{©-l©}}, \Indexc{--libcfa}\index{translator option!--libcfa@{©--libcfa©}} \, generate libcfa.c
+\item
+\Indexc{-L}\index{translator option!-L@{©-L©}}, \Indexc{--linemarks}\index{translator option!--linemarks@{©--linemarks©}} \, generate line marks
+\item
+\Indexc{-m}\index{translator option!-m@{©-m©}}, \Indexc{--no-main}\index{translator option!--no-main@{©--no-main©}} \, do not replace main
+\item
+\Indexc{-N}\index{translator option!-N@{©-N©}}, \Indexc{--no-linemarks}\index{translator option!--no-linemarks@{©--no-linemarks©}} \, do not generate line marks
+\item
+\Indexc{-n}\index{translator option!-n@{©-n©}}, \Indexc{--no-prelude}\index{translator option!--no-prelude@{©--no-prelude©}} \, do not read prelude
+\item
+\Indexc{-p}\index{translator option!-p@{©-p©}}, \Indexc{--prototypes}\index{translator option!--prototypes@{©--prototypes©}} \, generate prototypes for prelude functions
+\item
+\Indexc{-P}\index{translator option!-P@{©-P©}}, \Indexc{--print}\index{translator option!--print@{©--print©}} \, one of:
+\begin{description}[topsep=0pt,itemsep=0pt,parsep=0pt]
+\item
+\Indexc{altexpr}\index{translator option!-P@{©-P©}!©altexpr©}\index{translator option!--print@{©-print©}!©altexpr©} \, alternatives for expressions
+\item
+\Indexc{ascodegen}\index{translator option!-P@{©-P©}!©ascodegen©}\index{translator option!--print@{©-print©}!©ascodegen©} \, as codegen rather than AST
+\item
+\Indexc{ast}\index{translator option!-P@{©-P©}!©ast©}\index{translator option!--print@{©-print©}!©ast©} \, AST after parsing
+\item
+\Indexc{astdecl}\index{translator option!-P@{©-P©}!©astdecl©}\index{translator option!--print@{©-print©}!©astdecl©} \, AST after declaration validation pass
+\item
+\Indexc{asterr}\index{translator option!-P@{©-P©}!©asterr©}\index{translator option!--print@{©-print©}!©asterr©} \, AST on error
+\item
+\Indexc{astexpr}\index{translator option!-P@{©-P©}!©astexpr©}\index{translator option!--print@{©-print©}!©altexpr©} \, AST after expression analysis
+\item
+\Indexc{astgen}\index{translator option!-P@{©-P©}!©astgen©}\index{translator option!--print@{©-print©}!©astgen©} \, AST after instantiate generics
+\item
+\Indexc{box}\index{translator option!-P@{©-P©}!©box©}\index{translator option!--print@{©-print©}!©box©} \, before box step
+\item
+\Indexc{ctordtor}\index{translator option!-P@{©-P©}!©ctordtor©}\index{translator option!--print@{©-print©}!©ctordtor©} \, after ctor/dtor are replaced
+\item
+\Indexc{codegen}\index{translator option!-P@{©-P©}!©codegen©}\index{translator option!--print@{©-print©}!©codegen©} \, before code generation
+\item
+\Indexc{declstats}\index{translator option!-P@{©-P©}!©declstats©}\index{translator option!--print@{©-print©}!©declstats©} \, code property statistics
+\item
+\Indexc{parse}\index{translator option!-P@{©-P©}!©parse©}\index{translator option!--print@{©-print©}!©parse©} \, yacc (parsing) debug information
+\item
+\Indexc{pretty}\index{translator option!-P@{©-P©}!©pretty©}\index{translator option!--print@{©-print©}!©pretty©} \, prettyprint for ascodegen flag
+\item
+\Indexc{resolver}\index{translator option!-P@{©-P©}!©resolver©}\index{translator option!--print@{©-print©}!©resolver©} \, before resolver step
+\item
+\Indexc{rproto}\index{translator option!-P@{©-P©}!©rproto©}\index{translator option!--print@{©-print©}!©rproto©} \, resolver-proto instance
+\item
+\Indexc{rsteps}\index{translator option!-P@{©-P©}!©rsteps©}\index{translator option!--print@{©-print©}!©rsteps©} \, resolver steps
+\item
+\Indexc{symevt}\index{translator option!-P@{©-P©}!©symevt©}\index{translator option!--print@{©-print©}!©symevt©} \, symbol table events
+\item
+\Indexc{tree}\index{translator option!-P@{©-P©}!©tree©}\index{translator option!--print@{©-print©}!©tree©} \, parse tree
+\item
+\Indexc{tuple}\index{translator option!-P@{©-P©}!©tuple©}\index{translator option!--print@{©-print©}!©tuple©} \, after tuple expansion
+\end{description}
+\item
+\Indexc{--prelude-dir} <directory> \, prelude directory for debug/nodebug
+\item
+\Indexc{-S}\index{translator option!-S@{©-S©}!©counters,heap,time,all,none©}, \Indexc{--statistics}\index{translator option!--statistics@{©--statistics©}!©counters,heap,time,all,none©} <option-list> \, enable profiling information:
+\begin{description}[topsep=0pt,itemsep=0pt,parsep=0pt]
+\item
+\Indexc{counters,heap,time,all,none}
+\end{description}
+\item
+\Indexc{-t}\index{translator option!-t@{©-t©}}, \Indexc{--tree}\index{translator option!--tree@{©--tree©}} build in tree
+\end{description}
+\section{Backquote Identifiers}
+\label{s:BackquoteIdentifiers}
+\CFA introduces several new keywords (see \VRef{s:CFAKeywords}) that can clash with existing C variable-names in legacy code.
+Keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism:
+\begin{cfa}
+int ®`®otype®`® = 3; §\C{// make keyword an identifier}§
+double ®`®forall®`® = 3.5;
+\end{cfa}
+Existing C programs with keyword clashes can be converted by enclosing keyword identifiers in backquotes, and eventually the identifier name can be changed to a non-keyword name.
+\VRef[Figure]{f:HeaderFileInterposition} shows how clashes in existing C header-files (see~\VRef{s:StandardHeaders}) can be handled using preprocessor \newterm{interposition}: ©#include_next© and ©-I filename©.
+Several common C header-files with keyword clashes are fixed in the standard \CFA header-library, so there is a seamless programming-experience.
+\begin{figure}
+\begin{cfa}
+// include file uses the CFA keyword "with".
+#if ! defined( with ) §\C{// nesting ?}§
+#define with ®`®with®`® §\C{// make keyword an identifier}§
+#define __CFA_BFD_H__
+#endif
+®#include_next <bfdlink.h> §\C{// must have internal check for multiple expansion}§
+®
+#if defined( with ) && defined( __CFA_BFD_H__ ) §\C{// reset only if set}§
+#undef with
+#undef __CFA_BFD_H__
+#endif
+\end{cfa}
+\caption{Header-File Interposition}
+\label{f:HeaderFileInterposition}
+\end{figure}
 …
 Numeric constants are extended to allow \Index{underscore}s\index{constant!underscore}, \eg:
 \begin{cfa}
 ®_®147®_®483®_®648;                                    §\C{// decimal constant}§
 ®_®ul;                                                                §\C{// decimal unsigned long constant}§
 ®_®377;                                                                §\C{// octal constant}§
 x®_®ff®_®ff;                                                   §\C{// hexadecimal constant}§
 x®_®ef3d®_®aa5c;                                               §\C{// hexadecimal constant}§
 .141®_®592®_®654;                                              §\C{// floating constant}§
 ®_®e®_®+1®_®00;                                               §\C{// floating constant}§
 x®_®ff®_®ff®_®p®_®3;                                   §\C{// hexadecimal floating}§
 x®_®1.ffff®_®ffff®_®p®_®128®_®l;               §\C{// hexadecimal floating long constant}§
 L®_®§"\texttt{\textbackslash{x}}§®_®§\texttt{ff}§®_®§\texttt{ee}"§;     §\C{// wide character constant}§
+®_®147®_®483®_®648; §\C{// decimal constant}§
+®_®ul; §\C{// decimal unsigned long constant}§
+®_®377; §\C{// octal constant}§
+x®_®ff®_®ff; §\C{// hexadecimal constant}§
+x®_®ef3d®_®aa5c; §\C{// hexadecimal constant}§
+.141®_®592®_®654; §\C{// floating constant}§
+®_®e®_®+1®_®00; §\C{// floating constant}§
+x®_®ff®_®ff®_®p®_®3; §\C{// hexadecimal floating}§
+x®_®1.ffff®_®ffff®_®p®_®128®_®l; §\C{// hexadecimal floating long constant}§
+L®_®§"\texttt{\textbackslash{x}}§®_®§\texttt{ff}§®_®§\texttt{ee}"§; §\C{// wide character constant}§
 \end{cfa}
 The rules for placement of underscores are:
 …
+\section{Backquote Identifiers}
+\label{s:BackquoteIdentifiers}
+\CFA introduces several new keywords (see \VRef{s:CFAKeywords}) that can clash with existing C variable-names in legacy code.
+Keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism:
+\begin{cfa}
+int ®`®otype®`® = 3;                    §\C{// make keyword an identifier}§
+double ®`®forall®`® = 3.5;
+\end{cfa}
+Existing C programs with keyword clashes can be converted by enclosing keyword identifiers in backquotes, and eventually the identifier name can be changed to a non-keyword name.
+\VRef[Figure]{f:HeaderFileInterposition} shows how clashes in existing C header-files (see~\VRef{s:StandardHeaders}) can be handled using preprocessor \newterm{interposition}: ©#include_next© and ©-I filename©.
+Several common C header-files with keyword clashes are fixed in the standard \CFA header-library, so there is a seamless programming-experience.
+\section{Exponentiation Operator}
+C, \CC, and Java (and many other programming languages) have no exponentiation operator\index{exponentiation!operator}\index{operator!exponentiation}, \ie $x^y$, and instead use a routine, like \Indexc{pow}, to perform the exponentiation operation.
+\CFA extends the basic operators with the exponentiation operator ©?\?©\index{?\\?@©?\?©} and ©?\=?©\index{?\\=?@©\=?©}, as in, ©x \ y© and ©x \= y©, which means $x^y$ and $x \leftarrow x^y$.
+The priority of the exponentiation operator is between the cast and multiplicative operators, so that ©w * (int)x \ (int)y * z© is parenthesized as ©((w * (((int)x) \ ((int)y))) * z)©.
+As for \Index{division}, there are exponentiation operators for integral and floating types, including the builtin \Index{complex} types.
+Integral exponentiation\index{exponentiation!unsigned integral} is performed with repeated multiplication\footnote{The multiplication computation is $O(\log y)$.} (or shifting if the exponent is 2).
+Overflow from large exponents or negative exponents return zero.
+Floating exponentiation\index{exponentiation!floating} is performed using \Index{logarithm}s\index{exponentiation!logarithm}, so the exponent cannot be negative.
+\begin{cfa}
+sout | 1 ®\® 0 | 1 ®\® 1 | 2 ®\® 8 | -4 ®\® 3 | 5 ®\® 3 | 5 ®\® 32 | 5L ®\® 32 | 5L ®\® 64 | -4 ®\® -3 | -4.0 ®\® -3 | 4.0 ®\® 2.1
+           | (1.0f+2.0fi) ®\® (3.0f+2.0fi);
+1 256 -64 125 ®0® 3273344365508751233 ®0® ®0® -0.015625 18.3791736799526 0.264715-1.1922i
+\end{cfa}
+Note, ©5 ®\® 32© and ©5L ®\® 64© overflow, and ©-4 ®\® -3© is a fraction but stored in an integer so all three computations generate an integral zero.
+Parenthesis are necessary for complex constants or the expression is parsed as ©1.0f+®(®2.0fi \ 3.0f®)®+2.0fi©.
+The exponentiation operator is available for all the basic types, but for user-defined types, only the integral-computation version is available.
+\begin{cfa}
+forall( otype OT | { void ?{}( OT & this, one_t ); OT ?*?( OT, OT ); } )
+OT ?®\®?( OT ep, unsigned int y );
+forall( otype OT | { void ?{}( OT & this, one_t ); OT ?*?( OT, OT ); } )
+OT ?®\®?( OT ep, unsigned long int y );
+\end{cfa}
+The user type ©T© must define multiplication, one, ©1©, and, ©*©.
+\section{Control Structures}
+\CFA identifies inconsistent, problematic, and missing control structures in C, and extends, modifies, and adds control structures to increase functionality and safety.
+%\subsection{\texorpdfstring{\protect\lstinline@if@/\protect\lstinline@while@ Statement}{if Statement}}
+\subsection{\texorpdfstring{\LstKeywordStyle{if}/\LstKeywordStyle{while} Statement}{if/while Statement}}
+The ©if©/©while© expression allows declarations, similar to ©for© declaration expression.
+(Does not make sense for ©do©-©while©.)
+\begin{cfa}
+if ( ®int x = f()® ) ... §\C{// x != 0}§
+if ( ®int x = f(), y = g()® ) ... §\C{// x != 0 \&\& y != 0}§
+if ( ®int x = f(), y = g(); x < y® ) ... §\C{// relational expression}§
+if ( ®struct S { int i; } x = { f() }; x.i < 4® ) §\C{// relational expression}§
+while ( ®int x = f()® ) ... §\C{// x != 0}§
+while ( ®int x = f(), y = g()® ) ... §\C{// x != 0 \&\& y != 0}§
+while ( ®int x = f(), y = g(); x < y® ) ... §\C{// relational expression}§
+while ( ®struct S { int i; } x = { f() }; x.i < 4® ) ... §\C{// relational expression}§
+\end{cfa}
+Unless a relational expression is specified, each variable is compared not equal to 0, which is the standard semantics for the ©if©/©while© expression, and the results are combined using the logical ©&&© operator.\footnote{\CC only provides a single declaration always compared not equal to 0.}
+The scope of the declaration(s) is local to the @if@ statement but exist within both the ``then'' and ``else'' clauses.
+\subsection{Loop Control}
+The ©for©/©while©/©do-while© loop-control allows empty or simplified ranges (see Figure~\ref{f:LoopControlExamples}).
+\begin{itemize}
+\item
+An empty conditional implies ©1©.
+\item
+The up-to range ©~©\index{~@©~©} means exclusive range [M,N).
+\item
+The up-to range ©~=©\index{~=@©~=©} means inclusive range [M,N].
+\item
+The down-to range ©-~©\index{-~@©-~©} means exclusive range [N,M).
+\item
+The down-to range ©-~=©\index{-~=@©-~=©} means inclusive range [N,M].
+\item
+©@© means put nothing in this field.
+\item
+©0© is the implicit start value;
+\item
+©1© is the implicit increment value.
+\item
+The up-to range uses ©+=© for increment;
+\item
+The down-to range uses ©-=© for decrement.
+\item
+The loop index is polymorphic in the type of the start value or comparison value when start is implicitly ©0©.
+\end{itemize}
 \begin{figure}
+\begin{cfa}
+// include file uses the CFA keyword "with".
+#if ! defined( with )                   §\C{// nesting ?}§
+#define with ®`®with®`®                 §\C{// make keyword an identifier}§
+#define __CFA_BFD_H__
+#endif
+®#include_next <bfdlink.h>              §\C{// must have internal check for multiple expansion}§
+®
+#if defined( with ) && defined( __CFA_BFD_H__ ) §\C{// reset only if set}§
+#undef with
+#undef __CFA_BFD_H__
+#endif
+\end{cfa}
+\caption{Header-File Interposition}
+\label{f:HeaderFileInterposition}
+\begin{cquote}
+\begin{tabular}{@{}l|l@{}}
+\multicolumn{1}{c|}{loop control} & \multicolumn{1}{c}{output} \\
+\hline
+\begin{cfa}
+sout | nlOff;
+while ®()® { sout | "empty"; break; } sout | nl;
+do { sout | "empty"; break; } while ®()®; sout | nl;
+for ®()® { sout | "empty"; break; } sout | nl;
+for ( ®0® ) { sout | "A"; } sout | "zero" | nl;
+for ( ®1® ) { sout | "A"; } sout | nl;
+for ( ®10® ) { sout | "A"; } sout | nl;
+for ( ®1 ~= 10 ~ 2® ) { sout | "B"; } sout | nl;
+for ( ®10 -~= 1 ~ 2® ) { sout | "C"; } sout | nl;
+for ( ®0.5 ~ 5.5® ) { sout | "D"; } sout | nl;
+for ( ®5.5 -~ 0.5® ) { sout | "E"; } sout | nl;
+for ( ®i; 10® ) { sout | i; } sout | nl;
+for ( ®i; 1 ~= 10 ~ 2® ) { sout | i; } sout | nl;
+for ( ®i; 10 -~= 1 ~ 2® ) { sout | i; } sout | nl;
+for ( ®i; 0.5 ~ 5.5® ) { sout | i; } sout | nl;
+for ( ®i; 5.5 -~ 0.5® ) { sout | i; } sout | nl;
+for ( ®ui; 2u ~= 10u ~ 2u® ) { sout | ui; } sout | nl;
+for ( ®ui; 10u -~= 2u ~ 2u® ) { sout | ui; } sout | nl;
+enum { N = 10 };
+for ( ®N® ) { sout | "N"; } sout | nl;
+for ( ®i; N® ) { sout | i; } sout | nl;
+for ( ®i; N -~ 0® ) { sout | i; } sout | nl;
+const int start = 3, comp = 10, inc = 2;
+for ( ®i; start ~ comp ~ inc + 1® ) { sout | i; } sout | nl;
+for ( ®i; 1 ~ @® ) { if ( i > 10 ) break;
+        sout | i; } sout | nl;
+for ( ®i; 10 -~ @® ) { if ( i < 0 ) break;
+        sout | i; } sout | nl;
+for ( ®i; 2 ~ @ ~ 2® ) { if ( i > 10 ) break;
+        sout | i; } sout | nl;
+for ( ®i; 2.1 ~ @ ~ @® ) { if ( i > 10.5 ) break;
+        sout | i; i += 1.7; } sout | nl;
+for ( ®i; 10 -~ @ ~ 2® ) { if ( i < 0 ) break;
+        sout | i; } sout | nl;
+for ( ®i; 12.1 ~ @ ~ @® ) { if ( i < 2.5 ) break;
+        sout | i; i -= 1.7; } sout | nl;
+for ( ®i; 5 : j; -5 ~ @® ) { sout | i | j; } sout | nl;
+for ( ®i; 5 : j; -5 -~ @® ) { sout | i | j; } sout | nl;
+for ( ®i; 5 : j; -5 ~ @ ~ 2® ) { sout | i | j; } sout | nl;
+for ( ®i; 5 : j; -5 -~ @ ~ 2® ) { sout | i | j; } sout | nl;
+for ( ®j; -5 ~ @ : i; 5® ) { sout | i | j; } sout | nl;
+for ( ®j; -5 -~ @ : i; 5® ) { sout | i | j; } sout | nl;
+for ( ®j; -5 ~ @ ~ 2 : i; 5® ) { sout | i | j; } sout | nl;
+for ( ®j; -5 -~ @ ~ 2 : i; 5® ) { sout | i | j; } sout | nl;
+for ( ®j; -5 -~ @ ~ 2 : i; 5 : k; 1.5 ~ @® ) {
+        sout | i | j | k; } sout | nl;
+for ( ®j; -5 -~ @ ~ 2 : k; 1.5 ~ @ : i; 5® ) {
+        sout | i | j | k; } sout | nl;
+for ( ®k; 1.5 ~ @ : j; -5 -~ @ ~ 2 : i; 5® ) {
+        sout | i | j | k; } sout | nl;
+\end{cfa}
+&
+\begin{cfa}
+empty
+empty
+empty
+zero
+A
+A A A A A A A A A A
+B B B B B
+C C C C C
+D D D D D
+E E E E E
+1 2 3 4 5 6 7 8 9
+3 5 7 9
+8 6 4 2
+.5 1.5 2.5 3.5 4.5
+.5 4.5 3.5 2.5 1.5
+4 6 8 10
+8 6 4 2
+N N N N N N N N N N
+1 2 3 4 5 6 7 8 9
+9 8 7 6 5 4 3 2 1
+6 9
+2 3 4 5 6 7 8 9 10
+9 8 7 6 5 4 3 2 1 0
+4 6 8 10
+.1 3.8 5.5 7.2 8.9
+8 6 4 2 0
+.1 10.4 8.7 7 5.3 3.6
+-5 1 -4 2 -3 3 -2 4 -1
+-5 1 -6 2 -7 3 -8 4 -9
+-5 1 -3 2 -1 3 1 4 3
+-5 1 -7 2 -9 3 -11 4 -13
+-5 1 -4 2 -3 3 -2 4 -1
+-5 1 -6 2 -7 3 -8 4 -9
+-5 1 -3 2 -1 3 1 4 3
+-5 1 -7 2 -9 3 -11 4 -13
+-5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5
+-5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5
+-5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5
+\end{cfa}
+\end{tabular}
+\end{cquote}
+\caption{Loop Control Examples}
+\label{f:LoopControlExamples}
 \end{figure}
+\section{Exponentiation Operator}
+C, \CC, and Java (and many other programming languages) have no exponentiation operator\index{exponentiation!operator}\index{operator!exponentiation}, \ie $x^y$, and instead use a routine, like \Indexc{pow}, to perform the exponentiation operation.
+\CFA extends the basic operators with the exponentiation operator ©?\?©\index{?\\?@\lstinline@?\?@} and ©?\=?©\index{?\\=?@\lstinline@?\=?@}, as in, ©x \ y© and ©x \= y©, which means $x^y$ and $x \leftarrow x^y$.
+The priority of the exponentiation operator is between the cast and multiplicative operators, so that ©w * (int)x \ (int)y * z© is parenthesized as ©((w * (((int)x) \ ((int)y))) * z)©.
+As for \Index{division}, there are exponentiation operators for integral and floating types, including the builtin \Index{complex} types.
+Unsigned integral exponentiation\index{exponentiation!unsigned integral} is performed with repeated multiplication\footnote{The multiplication computation is $O(\log y)$.} (or shifting if the base is 2).
+Signed integral exponentiation\index{exponentiation!signed integral} is performed with repeated multiplication (or shifting if the base is 2), but yields a floating result because $x^{-y}=1/x^y$.
+Hence, it is important to designate exponent integral-constants as unsigned or signed: ©3 \ 3u© return an integral result, while ©3 \ 3© returns a floating result.
+Floating exponentiation\index{exponentiation!floating} is performed using \Index{logarithm}s\index{exponentiation!logarithm}, so the base cannot be negative.
+\begin{cfa}
+sout | 2 ®\® 8u | 4 ®\® 3u | -4 ®\® 3u | 4 ®\® -3 | -4 ®\® -3 | 4.0 ®\® 2.1 | (1.0f+2.0fi) ®\® (3.0f+2.0fi) | endl;
+64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i
+\end{cfa}
+Parenthesis are necessary for the complex constants or the expresion is parsed as ©1.0f+(2.0fi \ 3.0f)+2.0fi©.
+The exponentiation operator is available for all the basic types, but for user-defined types, only the integral-computation versions are available.
+For returning an integral value, the user type ©T© must define multiplication, ©*©, and one, ©1©;
+for returning a floating value, an additional divide of type ©T© into a ©double© returning a ©double© (©double ?/?( double, T )©) is necessary for negative exponents.
+\section{\texorpdfstring{Labelled \protect\lstinline@continue@ / \protect\lstinline@break@}{Labelled continue / break}}
+%\section{\texorpdfstring{\protect\lstinline@switch@ Statement}{switch Statement}}
+\subsection{\texorpdfstring{\LstKeywordStyle{switch} Statement}{switch Statement}}
+C allows a number of questionable forms for the ©switch© statement:
+\begin{enumerate}
+\item
+By default, the end of a ©case© clause\footnote{
+In this section, the term \emph{case clause} refers to either a ©case© or ©default© clause.}
+\emph{falls through} to the next ©case© clause in the ©switch© statement;
+to exit a ©switch© statement from a ©case© clause requires explicitly terminating the clause with a transfer statement, most commonly ©break©:
+\begin{cfa}
+switch ( i ) {
+  case 1:
+        ...
+        // fall-through
+  case 2:
+        ...
+        break;  // exit switch statement
+}
+\end{cfa}
+The ability to fall-through to the next clause \emph{is} a useful form of control flow, specifically when a sequence of case actions compound:
+\begin{cquote}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\begin{cfa}
+switch ( argc ) {
+  case 3:
+        // open output file
+        // fall-through
+  case 2:
+        // open input file
+        break;  // exit switch statement
+  default:
+        // usage message
+}
+\end{cfa}
+&
+\begin{cfa}
+if ( argc == 3 ) {
+        // open output file
+        ®// open input file
+®} else if ( argc == 2 ) {
+        ®// open input file (duplicate)
+®} else {
+        // usage message
+}
+\end{cfa}
+\end{tabular}
+\end{cquote}
+In this example, case 2 is always done if case 3 is done.
+This control flow is difficult to simulate with if statements or a ©switch© statement without fall-through as code must be duplicated or placed in a separate routine.
+C also uses fall-through to handle multiple case-values resulting in the same action:
+\begin{cfa}
+switch ( i ) {
+  ®case 1: case 3: case 5:®     // odd values
+        // odd action
+        break;
+  ®case 2: case 4: case 6:®     // even values
+        // even action
+        break;
+}
+\end{cfa}
+However, this situation is handled in other languages without fall-through by allowing a list of case values.
+While fall-through itself is not a problem, the problem occurs when fall-through is the default, as this semantics is unintuitive to many programmers and is different from virtually all other programming languages with a ©switch© statement.
+Hence, default fall-through semantics results in a large number of programming errors as programmers often \emph{forget} the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through.
+\item
+It is possible to place ©case© clauses on statements nested \emph{within} the body of the ©switch© statement:
+\begin{cfa}
+switch ( i ) {
+  case 0:
+        if ( j < k ) {
+                ...
+          ®case 1:®             // transfer into "if" statement
+                ...
+        } // if
+  case 2:
+        while ( j < 5 ) {
+                ...
+          ®case 3:®             // transfer into "while" statement
+                ...
+        } // while
+} // switch
+\end{cfa}
+The problem with this usage is branching into control structures, which is known to cause both comprehension and technical difficulties.
+The comprehension problem occurs from the inability to determine how control reaches a particular point due to the number of branches leading to it.
+The technical problem results from the inability to ensure declaration and initialization of variables when blocks are not entered at the beginning.
+There are no positive arguments for this kind of control flow, and therefore, there is a strong impetus to eliminate it.
+Nevertheless, C does have an idiom where this capability is used, known as ``\Index*{Duff's device}''~\cite{Duff83}:
+\begin{cfa}
+register int n = (count + 7) / 8;
+switch ( count % 8 ) {
+case 0: do{ *to = *from++;
+case 7:         *to = *from++;
+case 6:         *to = *from++;
+case 5:         *to = *from++;
+case 4:         *to = *from++;
+case 3:         *to = *from++;
+case 2:         *to = *from++;
+case 1:         *to = *from++;
+                } while ( --n > 0 );
+}
+\end{cfa}
+which unrolls a loop N times (N = 8 above) and uses the ©switch© statement to deal with any iterations not a multiple of N.
+While efficient, this sort of special purpose usage is questionable:
+\begin{quote}
+Disgusting, no? But it compiles and runs just fine. I feel a combination of pride and revulsion at this
+discovery.~\cite{Duff83}
+\end{quote}
+\item
+It is possible to place the ©default© clause anywhere in the list of labelled clauses for a ©switch© statement, rather than only at the end.
+Virtually all programming languages with a ©switch© statement require the ©default© clause to appear last in the case-clause list.
+The logic for this semantics is that after checking all the ©case© clauses without success, the ©default© clause is selected;
+hence, physically placing the ©default© clause at the end of the ©case© clause list matches with this semantics.
+This physical placement can be compared to the physical placement of an ©else© clause at the end of a series of connected ©if©/©else© statements.
+\item
+It is possible to place unreachable code at the start of a ©switch© statement, as in:
+\begin{cfa}
+switch ( x ) {
+        ®int y = 1;® §\C{// unreachable initialization}§
+        ®x = 7;® §\C{// unreachable code without label/branch}§
+  case 0: ...
+        ...
+        ®int z = 0;® §\C{// unreachable initialization, cannot appear after case}§
+        z = 2;
+  case 1:
+        ®x = z;® §\C{// without fall through, z is uninitialized}§
+}
+\end{cfa}
+While the declaration of the local variable ©y© is useful with a scope across all ©case© clauses, the initialization for such a variable is defined to never be executed because control always transfers over it.
+Furthermore, any statements before the first ©case© clause can only be executed if labelled and transferred to using a ©goto©, either from outside or inside of the ©switch©, both of which are problematic.
+As well, the declaration of ©z© cannot occur after the ©case© because a label can only be attached to a statement, and without a fall through to case 3, ©z© is uninitialized.
+The key observation is that the ©switch© statement branches into control structure, \ie there are multiple entry points into its statement body.
+\end{enumerate}
+Before discussing potential language changes to deal with these problems, it is worth observing that in a typical C program:
+\begin{itemize}
+\item
+the number of ©switch© statements is small,
+\item
+most ©switch© statements are well formed (\ie no \Index*{Duff's device}),
+\item
+the ©default© clause is usually written as the last case-clause,
+\item
+and there is only a medium amount of fall-through from one ©case© clause to the next, and most of these result from a list of case values executing common code, rather than a sequence of case actions that compound.
+\end{itemize}
+These observations put into perspective the \CFA changes to the ©switch©.
+\begin{enumerate}
+\item
+Eliminating default fall-through has the greatest potential for affecting existing code.
+However, even if fall-through is removed, most ©switch© statements would continue to work because of the explicit transfers already present at the end of each ©case© clause, the common placement of the ©default© clause at the end of the case list, and the most common use of fall-through, \ie a list of ©case© clauses executing common code, \eg:
+\begin{cfa}
+case 1:  case 2:  case 3: ...
+\end{cfa}
+still works.
+Nevertheless, reversing the default action would have a non-trivial effect on case actions that compound, such as the above example of processing shell arguments.
+Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthrough©/©fallthru©, \eg:
+\begin{cfa}
+®choose® ( i ) {
+  case 1:  case 2:  case 3:
+        ...
+        ®// implicit end of switch (break)
+  ®case 5:
+        ...
+        ®fallthru®; §\C{// explicit fall through}§
+  case 7:
+        ...
+        ®break® §\C{// explicit end of switch (redundant)}§
+  default:
+        j = 3;
+}
+\end{cfa}
+Like the ©switch© statement, the ©choose© statement retains the fall-through semantics for a list of ©case© clauses;
+An implicit ©break© is applied only at the end of the \emph{statements} following a ©case© clause.
+An explicit ©fallthru© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement.
+As well, allowing an explicit ©break© from the ©choose© is a carry over from the ©switch© statement, and expected by C programmers.
+\item
+\Index*{Duff's device} is eliminated from both ©switch© and ©choose© statements, and only invalidates a small amount of very questionable code.
+Hence, the ©case© clause must appear at the same nesting level as the ©switch©/©choose© body, as is done in most other programming languages with ©switch© statements.
+\item
+The issue of ©default© at locations other than at the end of the cause clause can be solved by using good programming style, and there are a few reasonable situations involving fall-through where the ©default© clause needs to appear is locations other than at the end.
+Therefore, no change is made for this issue.
+\item
+Dealing with unreachable code in a ©switch©/©choose© body is solved by restricting declarations and associated initialization to the start of statement body, which is executed \emph{before} the transfer to the appropriate ©case© clause\footnote{
+Essentially, these declarations are hoisted before the ©switch©/©choose© statement and both declarations and statement are surrounded by a compound statement.} and precluding statements before the first ©case© clause.
+Further declarations at the same nesting level as the statement body are disallowed to ensure every transfer into the body is sound.
+\begin{cfa}
+switch ( x ) {
+        ®int i = 0;® §\C{// allowed only at start}§
+  case 0:
+        ...
+        ®int j = 0;® §\C{// disallowed}§
+  case 1:
+        {
+                ®int k = 0;® §\C{// allowed at different nesting levels}§
+                ...
+          ®case 2:® §\C{// disallow case in nested statements}§
+        }
+  ...
+}
+\end{cfa}
+\end{enumerate}
+%\section{\texorpdfstring{\protect\lstinline@case@ Clause}{case Clause}}
+\subsection{\texorpdfstring{\LstKeywordStyle{case} Statement}{case Statement}}
+C restricts the ©case© clause of a ©switch© statement to a single value.
+For multiple ©case© clauses associated with the same statement, it is necessary to have multiple ©case© clauses rather than multiple values.
+Requiring a ©case© clause for each value does not seem to be in the spirit of brevity normally associated with C.
+Therefore, the ©case© clause is extended with a list of values, as in:
+\begin{cquote}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\
+\begin{cfa}
+switch ( i ) {
+  case ®1, 3, 5®:
+        ...
+  case ®2, 4, 6®:
+        ...
+}
+\end{cfa}
+&
+\begin{cfa}
+switch ( i ) {
+  case 1: case 3 : case 5:
+        ...
+  case 2: case 4 : case 6:
+        ...
+}
+\end{cfa}
+&
+\begin{cfa}
+// odd values
+// even values
+\end{cfa}
+\end{tabular}
+\end{cquote}
+In addition, subranges are allowed to specify case values.\footnote{
+gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, because a space is required after a number, otherwise the period is a decimal point.}
+\begin{cfa}
+switch ( i ) {
+  case ®1~5:® §\C{// 1, 2, 3, 4, 5}§
+        ...
+  case ®10~15:® §\C{// 10, 11, 12, 13, 14, 15}§
+        ...
+}
+\end{cfa}
+Lists of subranges are also allowed.
+\begin{cfa}
+case ®1~5, 12~21, 35~42®:
+\end{cfa}
+% for ()  => for ( ;; )
+% for ( 10 - t ) => for ( typeof(10 - t) ? = 0 ; ? < 10 - t; ? += 1 ) // using 0 and 1
+% for ( i ; 10 - t ) => for ( typeof(10 - t) i = 0 ; i < 10 - t; i += 1 ) // using 0 and 1
+% for ( T i ; 10 - t ) => for ( T i = 0 ; i < 10 - t; i += 1 ) // using 0 and 1
+% for ( 3~9 ) => for ( int ? = 3 ; ? < 9; ? += 1 ) // using 1
+% for ( i ; 3~9 ) => for ( int i = 3 ; i < 9; i += 1 ) // using 1
+% for ( T i ; 3~9 ) => for ( T i = 3 ; i < 9; i += 1 ) // using 1
+%\subsection{\texorpdfstring{Labelled \protect\lstinline@continue@ / \protect\lstinline@break@}{Labelled continue / break}}
+\subsection{\texorpdfstring{Labelled \LstKeywordStyle{continue} / \LstKeywordStyle{break} Statement}{Labelled continue / break Statement}}
 While C provides ©continue© and ©break© statements for altering control flow, both are restricted to one level of nesting for a particular control structure.
 Unfortunately, this restriction forces programmers to use \Indexc{goto} to achieve the equivalent control-flow for more than one level of nesting.
 To prevent having to switch to the ©goto©, \CFA extends the \Indexc{continue}\index{continue@\lstinline@continue@!labelled}\index{labelled!continue@©continue©} and \Indexc{break}\index{break@\lstinline@break@!labelled}\index{labelled!break@©break©} with a target label to support static multi-level exit\index{multi-level exit}\index{static multi-level exit}~\cite{Buhr85}, as in Java.
+To prevent having to switch to the ©goto©, \CFA extends the \Indexc{continue}\index{continue@©continue©!labelled}\index{labelled!continue@©continue©} and \Indexc{break}\index{break@©break©!labelled}\index{labelled!break@©break©} with a target label to support static multi-level exit\index{multi-level exit}\index{static multi-level exit}~\cite{Buhr85}, as in Java.
 For both ©continue© and ©break©, the target label must be directly associated with a ©for©, ©while© or ©do© statement;
 for ©break©, the target label can also be associated with a ©switch©, ©if© or compound (©{}©) statement.
 …
 \end{figure}
 Both labelled ©continue© and ©break© are a ©goto©\index{goto@\lstinline@goto@!restricted} restricted in the following ways:
+Both labelled ©continue© and ©break© are a ©goto©\index{goto@©goto©!restricted} restricted in the following ways:
 \begin{itemize}
 \item
 …
 With ©goto©, the label is at the end of the control structure, which fails to convey this important clue early enough to the reader.
 Finally, using an explicit target for the transfer instead of an implicit target allows new constructs to be added or removed without affecting existing constructs.
+The implicit targets of the current ©continue© and ©break©, \ie the closest enclosing loop or ©switch©, change as certain constructs are added or removed.
+\section{\texorpdfstring{\protect\lstinline@switch@ Statement}{switch Statement}}
+C allows a number of questionable forms for the ©switch© statement:
+\begin{enumerate}
+\item
+By default, the end of a ©case© clause\footnote{
+In this section, the term \emph{case clause} refers to either a ©case© or ©default© clause.}
+\emph{falls through} to the next ©case© clause in the ©switch© statement;
+to exit a ©switch© statement from a ©case© clause requires explicitly terminating the clause with a transfer statement, most commonly ©break©:
+\begin{cfa}
+switch ( i ) {
+  case 1:
+        ...
+        // fall-through
+  case 2:
+        ...
+        break;  // exit switch statement
+}
+\end{cfa}
+The ability to fall-through to the next clause \emph{is} a useful form of control flow, specifically when a sequence of case actions compound:
+\begin{cquote}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\begin{cfa}
+switch ( argc ) {
+  case 3:
+        // open output file
+        // fall-through
+  case 2:
+        // open input file
+        break;  // exit switch statement
+  default:
+        // usage message
+}
+\end{cfa}
+&
+\begin{cfa}
+if ( argc == 3 ) {
+        // open output file
+        ®// open input file
+®} else if ( argc == 2 ) {
+        ®// open input file (duplicate)
+®} else {
+        // usage message
+}
+\end{cfa}
+\end{tabular}
+\end{cquote}
+In this example, case 2 is always done if case 3 is done.
+This control flow is difficult to simulate with if statements or a ©switch© statement without fall-through as code must be duplicated or placed in a separate routine.
+C also uses fall-through to handle multiple case-values resulting in the same action:
+\begin{cfa}
+switch ( i ) {
+  ®case 1: case 3: case 5:®     // odd values
+        // odd action
+        break;
+  ®case 2: case 4: case 6:®     // even values
+        // even action
+        break;
+}
+\end{cfa}
+However, this situation is handled in other languages without fall-through by allowing a list of case values.
+While fall-through itself is not a problem, the problem occurs when fall-through is the default, as this semantics is unintuitive to many programmers and is different from virtually all other programming languages with a ©switch© statement.
+Hence, default fall-through semantics results in a large number of programming errors as programmers often \emph{forget} the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through.
+\item
+It is possible to place ©case© clauses on statements nested \emph{within} the body of the ©switch© statement:
+\begin{cfa}
+switch ( i ) {
+  case 0:
+        if ( j < k ) {
+                ...
+          ®case 1:®             // transfer into "if" statement
+                ...
+        } // if
+  case 2:
+        while ( j < 5 ) {
+                ...
+          ®case 3:®             // transfer into "while" statement
+                ...
+        } // while
+} // switch
+\end{cfa}
+The problem with this usage is branching into control structures, which is known to cause both comprehension and technical difficulties.
+The comprehension problem occurs from the inability to determine how control reaches a particular point due to the number of branches leading to it.
+The technical problem results from the inability to ensure declaration and initialization of variables when blocks are not entered at the beginning.
+There are no positive arguments for this kind of control flow, and therefore, there is a strong impetus to eliminate it.
+Nevertheless, C does have an idiom where this capability is used, known as ``\Index*{Duff's device}''~\cite{Duff83}:
+\begin{cfa}
+register int n = (count + 7) / 8;
+switch ( count % 8 ) {
+case 0: do{ *to = *from++;
+case 7:         *to = *from++;
+case 6:         *to = *from++;
+case 5:         *to = *from++;
+case 4:         *to = *from++;
+case 3:         *to = *from++;
+case 2:         *to = *from++;
+case 1:         *to = *from++;
+                } while ( --n > 0 );
+}
+\end{cfa}
+which unrolls a loop N times (N = 8 above) and uses the ©switch© statement to deal with any iterations not a multiple of N.
+While efficient, this sort of special purpose usage is questionable:
+\begin{quote}
+Disgusting, no? But it compiles and runs just fine. I feel a combination of pride and revulsion at this
+discovery.~\cite{Duff83}
+\end{quote}
+\item
+It is possible to place the ©default© clause anywhere in the list of labelled clauses for a ©switch© statement, rather than only at the end.
+Virtually all programming languages with a ©switch© statement require the ©default© clause to appear last in the case-clause list.
+The logic for this semantics is that after checking all the ©case© clauses without success, the ©default© clause is selected;
+hence, physically placing the ©default© clause at the end of the ©case© clause list matches with this semantics.
+This physical placement can be compared to the physical placement of an ©else© clause at the end of a series of connected ©if©/©else© statements.
+\item
+It is possible to place unreachable code at the start of a ©switch© statement, as in:
+\begin{cfa}
+switch ( x ) {
+        ®int y = 1;®                            §\C{// unreachable initialization}§
+        ®x = 7;®                                        §\C{// unreachable code without label/branch}§
+  case 0: ...
+        ...
+        ®int z = 0;®                            §\C{// unreachable initialization, cannot appear after case}§
+        z = 2;
+  case 1:
+        ®x = z;®                                        §\C{// without fall through, z is uninitialized}§
+}
+\end{cfa}
+While the declaration of the local variable ©y© is useful with a scope across all ©case© clauses, the initialization for such a variable is defined to never be executed because control always transfers over it.
+Furthermore, any statements before the first ©case© clause can only be executed if labelled and transferred to using a ©goto©, either from outside or inside of the ©switch©, both of which are problematic.
+As well, the declaration of ©z© cannot occur after the ©case© because a label can only be attached to a statement, and without a fall through to case 3, ©z© is uninitialized.
+The key observation is that the ©switch© statement branches into control structure, \ie there are multiple entry points into its statement body.
+\end{enumerate}
+Before discussing potential language changes to deal with these problems, it is worth observing that in a typical C program:
+\begin{itemize}
+\item
+the number of ©switch© statements is small,
+\item
+most ©switch© statements are well formed (\ie no \Index*{Duff's device}),
+\item
+the ©default© clause is usually written as the last case-clause,
+\item
+and there is only a medium amount of fall-through from one ©case© clause to the next, and most of these result from a list of case values executing common code, rather than a sequence of case actions that compound.
+\end{itemize}
+These observations put into perspective the \CFA changes to the ©switch©.
+\begin{enumerate}
+\item
+Eliminating default fall-through has the greatest potential for affecting existing code.
+However, even if fall-through is removed, most ©switch© statements would continue to work because of the explicit transfers already present at the end of each ©case© clause, the common placement of the ©default© clause at the end of the case list, and the most common use of fall-through, \ie a list of ©case© clauses executing common code, \eg:
+\begin{cfa}
+case 1:  case 2:  case 3: ...
+\end{cfa}
+still works.
+Nevertheless, reversing the default action would have a non-trivial effect on case actions that compound, such as the above example of processing shell arguments.
+Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthrough©/©fallthru©, \eg:
+\begin{cfa}
+®choose® ( i ) {
+  case 1:  case 2:  case 3:
+        ...
+        ®// implicit end of switch (break)
+  ®case 5:
+        ...
+        ®fallthru®;                                     §\C{// explicit fall through}§
+  case 7:
+        ...
+        ®break®                                         §\C{// explicit end of switch (redundant)}§
+  default:
+        j = 3;
+}
+\end{cfa}
+Like the ©switch© statement, the ©choose© statement retains the fall-through semantics for a list of ©case© clauses;
+An implicit ©break© is applied only at the end of the \emph{statements} following a ©case© clause.
+An explicit ©fallthru© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement.
+As well, allowing an explicit ©break© from the ©choose© is a carry over from the ©switch© statement, and expected by C programmers.
+\item
+\Index*{Duff's device} is eliminated from both ©switch© and ©choose© statements, and only invalidates a small amount of very questionable code.
+Hence, the ©case© clause must appear at the same nesting level as the ©switch©/©choose© body, as is done in most other programming languages with ©switch© statements.
+\item
+The issue of ©default© at locations other than at the end of the cause clause can be solved by using good programming style, and there are a few reasonable situations involving fall-through where the ©default© clause needs to appear is locations other than at the end.
+Therefore, no change is made for this issue.
+\item
+Dealing with unreachable code in a ©switch©/©choose© body is solved by restricting declarations and associated initialization to the start of statement body, which is executed \emph{before} the transfer to the appropriate ©case© clause\footnote{
+Essentially, these declarations are hoisted before the ©switch©/©choose© statement and both declarations and statement are surrounded by a compound statement.} and precluding statements before the first ©case© clause.
+Further declarations at the same nesting level as the statement body are disallowed to ensure every transfer into the body is sound.
+\begin{cfa}
+switch ( x ) {
+        ®int i = 0;®                            §\C{// allowed only at start}§
+  case 0:
+        ...
+        ®int j = 0;®                            §\C{// disallowed}§
+  case 1:
+        {
+                ®int k = 0;®                    §\C{// allowed at different nesting levels}§
+                ...
+          ®case 2:®                                     §\C{// disallow case in nested statements}§
+        }
+  ...
+}
+\end{cfa}
+\end{enumerate}
+\section{\texorpdfstring{\protect\lstinline@case@ Clause}{case Clause}}
+C restricts the ©case© clause of a ©switch© statement to a single value.
+For multiple ©case© clauses associated with the same statement, it is necessary to have multiple ©case© clauses rather than multiple values.
+Requiring a ©case© clause for each value does not seem to be in the spirit of brevity normally associated with C.
+Therefore, the ©case© clause is extended with a list of values, as in:
+\begin{cquote}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\
+\begin{cfa}
+switch ( i ) {
+  case ®1, 3, 5®:
+        ...
+  case ®2, 4, 6®:
+        ...
+}
+\end{cfa}
+&
+\begin{cfa}
+switch ( i ) {
+  case 1: case 3 : case 5:
+        ...
+  case 2: case 4 : case 6:
+        ...
+}
+\end{cfa}
+&
+\begin{cfa}
+// odd values
+// even values
+\end{cfa}
+\end{tabular}
+\end{cquote}
+In addition, subranges are allowed to specify case values.\footnote{
+gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, because a space is required after a number, otherwise the period is a decimal point.}
+\begin{cfa}
+switch ( i ) {
+  case ®1~5:®                                   §\C{// 1, 2, 3, 4, 5}§
+        ...
+  case ®10~15:®                                 §\C{// 10, 11, 12, 13, 14, 15}§
+        ...
+}
+\end{cfa}
+Lists of subranges are also allowed.
+\begin{cfa}
+case ®1~5, 12~21, 35~42®:
+\end{cfa}
+\section{\texorpdfstring{\protect\lstinline@with@ Statement}{with Statement}}
+Otherwise, the implicit targets of the current ©continue© and ©break©, \ie the closest enclosing loop or ©switch©, change as certain constructs are added or removed.
+%\section{\texorpdfstring{\protect\lstinline@with@ Statement}{with Statement}}
+\section{\texorpdfstring{\LstKeywordStyle{with} Statement}{with Statement}}
 \label{s:WithStatement}
 Grouping heterogeneous data into \newterm{aggregate}s (structure/union) is a common programming practice, and an aggregate can be further organized into more complex structures, such as arrays and containers:
 \begin{cfa}
 struct S {                                                                      §\C{// aggregate}§
         char c;                                                                 §\C{// fields}§
+struct S { §\C{// aggregate}§
+        char c; §\C{// fields}§
         int i;
         double d;
 …
 \begin{cfa}
 void f( S s ) {
         `s.`c; `s.`i; `s.`d;                                    §\C{// access containing fields}§
+        ®s.®c; ®s.®i; ®s.®d; §\C{// access containing fields}§
+}
 \end{cfa}
 …
 \begin{C++}
 struct S {
         char c;                                                                 §\C{// fields}§
+        char c; §\C{// fields}§
         int i;
         double d;
         void f() {                                                              §\C{// implicit ``this'' aggregate}§
                 `this->`c; `this->`i; `this->`d;        §\C{// access containing fields}§
+        void f() { §\C{// implicit ``this'' aggregate}§
+                ®this->®c; ®this->®i; ®this->®d; §\C{// access containing fields}§
+        }
+}
 \end{C++}
 Object-oriented nesting of member functions in a \lstinline[language=C++]@class/struct@ allows eliding \lstinline[language=C++]$this->$ because of lexical scoping.
+Object-oriented nesting of member functions in a \lstinline[language=C++]@class/struct@ allows eliding \lstinline[language=C++]@this->@ because of lexical scoping.
 However, for other aggregate parameters, qualification is necessary:
 \begin{cfa}
 struct T { double m, n; };
 int S::f( T & t ) {                                                     §\C{// multiple aggregate parameters}§
         c; i; d;                                                                §\C{\color{red}// this--{\textgreater}.c, this--{\textgreater}.i, this--{\textgreater}.d}§
         `t.`m; `t.`n;                                                   §\C{// must qualify}§
+}
 \end{cfa}
 To simplify the programmer experience, \CFA provides a @with@ statement (see Pascal~\cite[\S~4.F]{Pascal}) to elide aggregate qualification to fields by opening a scope containing the field identifiers.
+int S::f( T & t ) { §\C{// multiple aggregate parameters}§
+        c; i; d; §\C{\color{red}// this--{\textgreater}.c, this--{\textgreater}.i, this--{\textgreater}.d}§
+        ®t.®m; ®t.®n; §\C{// must qualify}§
+}
+\end{cfa}
+To simplify the programmer experience, \CFA provides a ©with© statement (see Pascal~\cite[\S~4.F]{Pascal}) to elide aggregate qualification to fields by opening a scope containing the field identifiers.
 Hence, the qualified fields become variables with the side-effect that it is easier to optimizing field references in a block.
 \begin{cfa}
 void f( S & this ) `with ( this )` {            §\C{// with statement}§
         c; i; d;                                                                §\C{\color{red}// this.c, this.i, this.d}§
+void f( S & this ) ®with ( this )® { §\C{// with statement}§
+        c; i; d; §\C{\color{red}// this.c, this.i, this.d}§
+}
 \end{cfa}
 with the generality of opening multiple aggregate-parameters:
 \begin{cfa}
 void f( S & s, T & t ) `with ( s, t )` {                §\C{// multiple aggregate parameters}§
         c; i; d;                                                                §\C{\color{red}// s.c, s.i, s.d}§
         m; n;                                                                   §\C{\color{red}// t.m, t.n}§
+}
 \end{cfa}
 In detail, the @with@ statement has the form:
+void f( S & s, T & t ) ®with ( s, t )® { §\C{// multiple aggregate parameters}§
+        c; i; d; §\C{\color{red}// s.c, s.i, s.d}§
+        m; n; §\C{\color{red}// t.m, t.n}§
+}
+\end{cfa}
+In detail, the ©with© statement has the form:
 \begin{cfa}
 §\emph{with-statement}§:
 …
 The difference between parallel and nesting occurs for fields with the same name and type:
 \begin{cfa}
 struct S { int `i`; int j; double m; } s, w;
 struct T { int `i`; int k; int m; } t, w;
+struct S { int ®i®; int j; double m; } s, w;
+struct T { int ®i®; int k; int m; } t, w;
 with ( s, t ) {
         j + k;                                                                  §\C{// unambiguous, s.j + t.k}§
         m = 5.0;                                                                §\C{// unambiguous, t.m = 5.0}§
         m = 1;                                                                  §\C{// unambiguous, s.m = 1}§
         int a = m;                                                              §\C{// unambiguous, a = s.i }§
         double b = m;                                                   §\C{// unambiguous, b = t.m}§
         int c = s.i + t.i;                                              §\C{// unambiguous, qualification}§
         (double)m;                                                              §\C{// unambiguous, cast}§
+}
 \end{cfa}
 For parallel semantics, both @s.i@ and @t.i@ are visible, so @i@ is ambiguous without qualification;
 for nested semantics, @t.i@ hides @s.i@, so @i@ implies @t.i@.
+        j + k; §\C{// unambiguous, s.j + t.k}§
+        m = 5.0; §\C{// unambiguous, t.m = 5.0}§
+        m = 1; §\C{// unambiguous, s.m = 1}§
+        int a = m; §\C{// unambiguous, a = s.i }§
+        double b = m; §\C{// unambiguous, b = t.m}§
+        int c = s.i + t.i; §\C{// unambiguous, qualification}§
+        (double)m; §\C{// unambiguous, cast}§
+}
+\end{cfa}
+For parallel semantics, both ©s.i© and ©t.i© are visible, so ©i© is ambiguous without qualification;
+for nested semantics, ©t.i© hides ©s.i©, so ©i© implies ©t.i©.
 \CFA's ability to overload variables means fields with the same name but different types are automatically disambiguated, eliminating most qualification when opening multiple aggregates.
 Qualification or a cast is used to disambiguate.
 There is an interesting problem between parameters and the function-body @with@, \eg:
 \begin{cfa}
 void ?{}( S & s, int i ) with ( s ) {           §\C{// constructor}§
         `s.i = i;`  j = 3;  m = 5.5;                    §\C{// initialize fields}§
+}
 \end{cfa}
 Here, the assignment @s.i = i@ means @s.i = s.i@, which is meaningless, and there is no mechanism to qualify the parameter @i@, making the assignment impossible using the function-body @with@.
+There is an interesting problem between parameters and the function-body ©with©, \eg:
+\begin{cfa}
+void ?{}( S & s, int i ) with ( s ) { §\C{// constructor}§
+        ®s.i = i;®  j = 3;  m = 5.5; §\C{// initialize fields}§
+}
+\end{cfa}
+Here, the assignment ©s.i = i© means ©s.i = s.i©, which is meaningless, and there is no mechanism to qualify the parameter ©i©, making the assignment impossible using the function-body ©with©.
 To solve this problem, parameters are treated like an initialized aggregate:
 \begin{cfa}
 …
 and implicitly opened \emph{after} a function-body open, to give them higher priority:
 \begin{cfa}
 void ?{}( S & s, int `i` ) with ( s ) `with( §\emph{\color{red}params}§ )` {
         s.i = `i`; j = 3; m = 5.5;
+}
 \end{cfa}
 Finally, a cast may be used to disambiguate among overload variables in a @with@ expression:
 \begin{cfa}
 with ( w ) { ... }                                                      §\C{// ambiguous, same name and no context}§
 with ( (S)w ) { ... }                                           §\C{// unambiguous, cast}§
 \end{cfa}
 and @with@ expressions may be complex expressions with type reference (see Section~\ref{s:References}) to aggregate:
+void ?{}( S & s, int ®i® ) with ( s ) ®with( §\emph{\color{red}params}§ )® {
+        s.i = ®i®; j = 3; m = 5.5;
+}
+\end{cfa}
+Finally, a cast may be used to disambiguate among overload variables in a ©with© expression:
+\begin{cfa}
+with ( w ) { ... } §\C{// ambiguous, same name and no context}§
+with ( (S)w ) { ... } §\C{// unambiguous, cast}§
+\end{cfa}
+and ©with© expressions may be complex expressions with type reference (see Section~\ref{s:References}) to aggregate:
 % \begin{cfa}
 % struct S { int i, j; } sv;
 % with ( sv ) {                                                         §\C{// implicit reference}§
+% with ( sv ) { §\C{// implicit reference}§
 %       S & sr = sv;
 %       with ( sr ) {                                                   §\C{// explicit reference}§
+%       with ( sr ) { §\C{// explicit reference}§
 %               S * sp = &sv;
 %               with ( *sp ) {                                          §\C{// computed reference}§
 %                       i = 3; j = 4;                                   §\C{\color{red}// sp--{\textgreater}i, sp--{\textgreater}j}§
+%               with ( *sp ) { §\C{// computed reference}§
+%                       i = 3; j = 4; §\C{\color{red}// sp--{\textgreater}i, sp--{\textgreater}j}§
 %               }
 %               i = 2; j = 3;                                           §\C{\color{red}// sr.i, sr.j}§
+%               i = 2; j = 3; §\C{\color{red}// sr.i, sr.j}§
 %       }
 %       i = 1; j = 2;                                                   §\C{\color{red}// sv.i, sv.j}§
+%       i = 1; j = 2; §\C{\color{red}// sv.i, sv.j}§
 % }
 % \end{cfa}
 …
 class C {
         int i, j;
         int mem() {                                     §\C{\color{red}// implicit "this" parameter}§
                 i = 1;                                  §\C{\color{red}// this->i}§
                 j = 2;                                  §\C{\color{red}// this->j}§
+        int mem() { §\C{\color{red}// implicit "this" parameter}§
+                i = 1; §\C{\color{red}// this->i}§
+                j = 2; §\C{\color{red}// this->j}§
+        }
+}
 …
 \begin{cfa}
 struct S { int i, j; };
 int mem( S & ®this® ) {                 §\C{// explicit "this" parameter}§
         ®this.®i = 1;                           §\C{// "this" is not elided}§
+int mem( S & ®this® ) { §\C{// explicit "this" parameter}§
+        ®this.®i = 1; §\C{// "this" is not elided}§
         ®this.®j = 2;
+}
 …
 \begin{cfa}
 int mem( S & this ) ®with( this )® { §\C{// with clause}§
         i = 1;                                          §\C{\color{red}// this.i}§
         j = 2;                                          §\C{\color{red}// this.j}§
+        i = 1; §\C{\color{red}// this.i}§
+        j = 2; §\C{\color{red}// this.j}§
+}
 \end{cfa}
 …
         struct S1 { ... } s1;
         struct S2 { ... } s2;
         ®with( s1 )® {                          §\C{// with statement}§
+        ®with( s1 )® { §\C{// with statement}§
                 // access fields of s1 without qualification
                 ®with s2® {                             §\C{// nesting}§
+                ®with s2® { §\C{// nesting}§
                         // access fields of s1 and s2 without qualification
+                }
 …
 Non-local transfer can cause stack unwinding, \ie non-local routine termination, depending on the kind of raise.
 \begin{cfa}
 exception_t E {};                               §\C{// exception type}§
+exception_t E {}; §\C{// exception type}§
 void f(...) {
         ... throw E{}; ...                      §\C{// termination}§
         ... throwResume E{}; ...        §\C{// resumption}§
+        ... throw E{}; ... §\C{// termination}§
+        ... throwResume E{}; ... §\C{// resumption}§
+}
 try {
         f(...);
 } catch( E e ; §boolean-predicate§ ) {                  §\C[8cm]{// termination handler}§
+} catch( E e ; §boolean-predicate§ ) {          §\C[8cm]{// termination handler}§
         // recover and continue
 } catchResume( E e ; §boolean-predicate§ ) {    §\C{// resumption handler}\CRT§
+} catchResume( E e ; §boolean-predicate§ ) { §\C{// resumption handler}\CRT§
         // repair and return
 } finally {
 …
 For example, a routine returning a \Index{pointer} to an array of integers is defined and used in the following way:
 \begin{cfa}
 int ®(*®f®())[®5®]® {...};                              §\C{// definition}§
  ... ®(*®f®())[®3®]® += 1;                              §\C{// usage}§
+int ®(*®f®())[®5®]® {...}; §\C{// definition}§
+ ... ®(*®f®())[®3®]® += 1; §\C{// usage}§
 \end{cfa}
 Essentially, the return type is wrapped around the routine name in successive layers (like an \Index{onion}).
+While attempting to make the two contexts consistent is a laudable goal, it has not worked out in practice.
+While attempting to make the two contexts consistent is a laudable goal, it has not worked out in practice, even though Dennis Richie believed otherwise:
+\begin{quote}
+In spite of its difficulties, I believe that the C's approach to declarations remains plausible, and am comfortable with it; it is a useful unifying principle.~\cite[p.~12]{Ritchie93}
+\end{quote}
 \CFA provides its own type, variable and routine declarations, using a different syntax.
 …
 *x = 3;                 // implicit dereference
 int * ®const® y = (int *)104;
 *y = *x;                // implicit dereference
+*y = *x;                        // implicit dereference
 \end{cfa}
 \end{tabular}
 …
 \hline
 \begin{cfa}
 lda             r1,100  // load address of x
 ld               r2,(r1)          // load value of x
 lda             r3,104  // load address of y
 st               r2,(r3)          // store x into y
+lda             r1,100   // load address of x
+ld               r2,(r1)   // load value of x
+lda             r3,104   // load address of y
+st               r2,(r3)   // store x into y
 \end{cfa}
+&
 \begin{cfa}
 ld              r2,(100)        // load value of x
 st              r2,(104)        // store x into y
+ld              r2,(100)   // load value of x
+st              r2,(104)   // store x into y
 \end{cfa}
 \end{tabular}
 …
 \begin{cfa}
 int x, y, ®*® p1, ®*® p2, ®**® p3;
 p1 = ®&®x;               // p1 points to x
 p2 = p1;                 // p2 points to x
 p1 = ®&®y;               // p1 points to y
 p3 = &p2;               // p3 points to p2
+p1 = ®&®x;     // p1 points to x
+p2 = p1;     // p2 points to x
+p1 = ®&®y;     // p1 points to y
+p3 = &p2;  // p3 points to p2
 \end{cfa}
+&
 …
 For example, \Index*{Algol68}~\cite{Algol68} infers pointer dereferencing to select the best meaning for each pointer usage
 \begin{cfa}
 p2 = p1 + x;                                    §\C{// compiler infers *p2 = *p1 + x;}§
+p2 = p1 + x; §\C{// compiler infers *p2 = *p1 + x;}§
 \end{cfa}
 Algol68 infers the following dereferencing ©*p2 = *p1 + x©, because adding the arbitrary integer value in ©x© to the address of ©p1© and storing the resulting address into ©p2© is an unlikely operation.
 Unfortunately, automatic dereferencing does not work in all cases, and so some mechanism is necessary to fix incorrect choices.
+Unfortunately, automatic dereferencing does not work in all cases, and so some mechanism is necessary to fix incorrect choices.
 Rather than inferring dereference, most programming languages pick one implicit dereferencing semantics, and the programmer explicitly indicates the other to resolve address-duality.
 In C, objects of pointer type always manipulate the pointer object's address:
 \begin{cfa}
 p1 = p2;                                                §\C{// p1 = p2\ \ rather than\ \ *p1 = *p2}§
 p2 = p1 + x;                                    §\C{// p2 = p1 + x\ \ rather than\ \ *p2 = *p1 + x}§
+p1 = p2; §\C{// p1 = p2\ \ rather than\ \ *p1 = *p2}§
+p2 = p1 + x; §\C{// p2 = p1 + x\ \ rather than\ \ *p2 = *p1 + x}§
 \end{cfa}
 even though the assignment to ©p2© is likely incorrect, and the programmer probably meant:
 \begin{cfa}
 p1 = p2;                                                §\C{// pointer address assignment}§
 ®*®p2 = ®*®p1 + x;                              §\C{// pointed-to value assignment / operation}§
+p1 = p2; §\C{// pointer address assignment}§
+®*®p2 = ®*®p1 + x; §\C{// pointed-to value assignment / operation}§
 \end{cfa}
 The C semantics work well for situations where manipulation of addresses is the primary meaning and data is rarely accessed, such as storage management (©malloc©/©free©).
 …
 \begin{cfa}
 int x, y, ®&® r1, ®&® r2, ®&&® r3;
 ®&®r1 = &x;                                             §\C{// r1 points to x}§
 ®&®r2 = &r1;                                    §\C{// r2 points to x}§
 ®&®r1 = &y;                                             §\C{// r1 points to y}§
 ®&&®r3 = ®&®&r2;                                §\C{// r3 points to r2}§
+®&®r1 = &x; §\C{// r1 points to x}§
+®&®r2 = &r1; §\C{// r2 points to x}§
+®&®r1 = &y; §\C{// r1 points to y}§
+®&&®r3 = ®&®&r2; §\C{// r3 points to r2}§
 r2 = ((r1 + r2) * (r3 - r1)) / (r3 - 15); §\C{// implicit dereferencing}§
 \end{cfa}
 …
 For a \CFA reference type, the cancellation on the left-hand side of assignment leaves the reference as an address (\Index{lvalue}):
 \begin{cfa}
 (&®*®)r1 = &x;                                  §\C{// (\&*) cancel giving address in r1 not variable pointed-to by r1}§
+(&®*®)r1 = &x; §\C{// (\&*) cancel giving address in r1 not variable pointed-to by r1}§
 \end{cfa}
 Similarly, the address of a reference can be obtained for assignment or computation (\Index{rvalue}):
 \begin{cfa}
 (&(&®*®)®*®)r3 = &(&®*®)r2;             §\C{// (\&*) cancel giving address in r2, (\&(\&*)*) cancel giving address in r3}§
+(&(&®*®)®*®)r3 = &(&®*®)r2; §\C{// (\&*) cancel giving address in r2, (\&(\&*)*) cancel giving address in r3}§
 \end{cfa}
 Cancellation\index{cancellation!pointer/reference}\index{pointer!cancellation} works to arbitrary depth.
 …
 int x, *p1 = &x, **p2 = &p1, ***p3 = &p2,
                  &r1 = x,    &&r2 = r1,   &&&r3 = r2;
 ***p3 = 3;                                              §\C{// change x}§
 r3 = 3;                                                 §\C{// change x, ***r3}§
 **p3 = ...;                                             §\C{// change p1}§
 &r3 = ...;                                              §\C{// change r1, (\&*)**r3, 1 cancellation}§
 *p3 = ...;                                              §\C{// change p2}§
 &&r3 = ...;                                             §\C{// change r2, (\&(\&*)*)*r3, 2 cancellations}§
 &&&r3 = p3;                                             §\C{// change r3 to p3, (\&(\&(\&*)*)*)r3, 3 cancellations}§
+***p3 = 3; §\C{// change x}§
+r3 = 3; §\C{// change x, ***r3}§
+**p3 = ...; §\C{// change p1}§
+&r3 = ...; §\C{// change r1, (\&*)**r3, 1 cancellation}§
+*p3 = ...; §\C{// change p2}§
+&&r3 = ...; §\C{// change r2, (\&(\&*)*)*r3, 2 cancellations}§
+&&&r3 = p3; §\C{// change r3 to p3, (\&(\&(\&*)*)*)r3, 3 cancellations}§
 \end{cfa}
 Furthermore, both types are equally performant, as the same amount of dereferencing occurs for both types.
 …
 As for a pointer type, a reference type may have qualifiers:
 \begin{cfa}
 const int cx = 5;                                       §\C{// cannot change cx;}§
 const int & cr = cx;                            §\C{// cannot change what cr points to}§
 ®&®cr = &cx;                                            §\C{// can change cr}§
 cr = 7;                                                         §\C{// error, cannot change cx}§
 int & const rc = x;                                     §\C{// must be initialized}§
 ®&®rc = &x;                                                     §\C{// error, cannot change rc}§
 const int & const crc = cx;                     §\C{// must be initialized}§
 crc = 7;                                                        §\C{// error, cannot change cx}§
 ®&®crc = &cx;                                           §\C{// error, cannot change crc}§
+const int cx = 5; §\C{// cannot change cx;}§
+const int & cr = cx; §\C{// cannot change what cr points to}§
+®&®cr = &cx; §\C{// can change cr}§
+cr = 7; §\C{// error, cannot change cx}§
+int & const rc = x; §\C{// must be initialized}§
+®&®rc = &x; §\C{// error, cannot change rc}§
+const int & const crc = cx; §\C{// must be initialized}§
+crc = 7; §\C{// error, cannot change cx}§
+®&®crc = &cx; §\C{// error, cannot change crc}§
 \end{cfa}
 Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be the null pointer unless an arbitrary pointer is coerced\index{coercion} into the reference}:
 \begin{cfa}
 int & const cr = *0;                            §\C{// where 0 is the int * zero}§
+int & const cr = *0; §\C{// where 0 is the int * zero}§
 \end{cfa}
 Note, constant reference-types do not prevent \Index{addressing errors} because of explicit storage-management:
 …
 cr = 5;
 free( &cr );
 cr = 7;                                                         §\C{// unsound pointer dereference}§
+cr = 7; §\C{// unsound pointer dereference}§
 \end{cfa}
 …
 \begin{cfa}
 int w, x, y, z, & ar[3] = { x, y, z }; §\C{// initialize array of references}§
 &ar[1] = &w;                                            §\C{// change reference array element}§
 typeof( ar[1] ) p;                                      §\C{// (gcc) is int, \ie the type of referenced object}§
 typeof( &ar[1] ) q;                                     §\C{// (gcc) is int \&, \ie the type of reference}§
 sizeof( ar[1] ) == sizeof( int );       §\C{// is true, \ie the size of referenced object}§
 sizeof( &ar[1] ) == sizeof( int *)      §\C{// is true, \ie the size of a reference}§
+&ar[1] = &w; §\C{// change reference array element}§
+typeof( ar[1] ) p; §\C{// (gcc) is int, \ie the type of referenced object}§
+typeof( &ar[1] ) q; §\C{// (gcc) is int \&, \ie the type of reference}§
+sizeof( ar[1] ) == sizeof( int ); §\C{// is true, \ie the size of referenced object}§
+sizeof( &ar[1] ) == sizeof( int *) §\C{// is true, \ie the size of a reference}§
 \end{cfa}
 …
 Therefore, for pointer/reference initialization, the initializing value must be an address not a value.
 \begin{cfa}
 int * p = &x;                                           §\C{// assign address of x}§
 ®int * p = x;®                                          §\C{// assign value of x}§
 int & r = x;                                            §\C{// must have address of x}§
+int * p = &x; §\C{// assign address of x}§
+®int * p = x;® §\C{// assign value of x}§
+int & r = x; §\C{// must have address of x}§
 \end{cfa}
 Like the previous example with C pointer-arithmetic, it is unlikely assigning the value of ©x© into a pointer is meaningful (again, a warning is usually given).
 …
 Similarly, when a reference type is used for a parameter/return type, the call-site argument does not require a reference operator for the same reason.
 \begin{cfa}
 int & f( int & r );                                     §\C{// reference parameter and return}§
 z = f( x ) + f( y );                            §\C{// reference operator added, temporaries needed for call results}§
+int & f( int & r ); §\C{// reference parameter and return}§
+z = f( x ) + f( y ); §\C{// reference operator added, temporaries needed for call results}§
 \end{cfa}
 Within routine ©f©, it is possible to change the argument by changing the corresponding parameter, and parameter ©r© can be locally reassigned within ©f©.
 …
 void f( int & r );
 void g( int * p );
 f( 3 );                   g( ®&®3 );            §\C{// compiler implicit generates temporaries}§
 f( x + y );             g( ®&®(x + y) );        §\C{// compiler implicit generates temporaries}§
+f( 3 );                   g( ®&®3 ); §\C{// compiler implicit generates temporaries}§
+f( x + y );             g( ®&®(x + y) ); §\C{// compiler implicit generates temporaries}§
 \end{cfa}
 Essentially, there is an implicit \Index{rvalue} to \Index{lvalue} conversion in this case.\footnote{
 …
 \begin{cfa}
 void f( int i );
 void (* fp)( int );                                     §\C{// routine pointer}§
 fp = f;                                                         §\C{// reference initialization}§
 fp = &f;                                                        §\C{// pointer initialization}§
 fp = *f;                                                        §\C{// reference initialization}§
 fp(3);                                                          §\C{// reference invocation}§
 (*fp)(3);                                                       §\C{// pointer invocation}§
+void (* fp)( int ); §\C{// routine pointer}§
+fp = f; §\C{// reference initialization}§
+fp = &f; §\C{// pointer initialization}§
+fp = *f; §\C{// reference initialization}§
+fp(3); §\C{// reference invocation}§
+(*fp)(3); §\C{// pointer invocation}§
 \end{cfa}
 While C's treatment of routine objects has similarity to inferring a reference type in initialization contexts, the examples are assignment not initialization, and all possible forms of assignment are possible (©f©, ©&f©, ©*f©) without regard for type.
 Instead, a routine object should be referenced by a ©const© reference:
 \begin{cfa}
 ®const® void (®&® fr)( int ) = f;       §\C{// routine reference}§
 fr = ...                                                        §\C{// error, cannot change code}§
 &fr = ...;                                                      §\C{// changing routine reference}§
 fr( 3 );                                                        §\C{// reference call to f}§
 (*fr)(3);                                                       §\C{// error, incorrect type}§
+®const® void (®&® fr)( int ) = f; §\C{// routine reference}§
+fr = ... §\C{// error, cannot change code}§
+&fr = ...; §\C{// changing routine reference}§
+fr( 3 ); §\C{// reference call to f}§
+(*fr)(3); §\C{// error, incorrect type}§
 \end{cfa}
 because the value of the routine object is a routine literal, \ie the routine code is normally immutable during execution.\footnote{
 …
 \begin{itemize}
 \item
 if ©R© is an \Index{rvalue} of type ©T &$_1$...&$_r$© where $r \ge 1$ references (©&© symbols) then ©&R© has type ©T ®*®&$_{\color{red}2}$...&$_{\color{red}r}$©, \ie ©T© pointer with $r-1$ references (©&© symbols).
 \item
 if ©L© is an \Index{lvalue} of type ©T &$_1$...&$_l$© where $l \ge 0$ references (©&© symbols) then ©&L© has type ©T ®*®&$_{\color{red}1}$...&$_{\color{red}l}$©, \ie ©T© pointer with $l$ references (©&© symbols).
+if ©R© is an \Index{rvalue} of type ©T &©$_1\cdots$ ©&©$_r$, where $r \ge 1$ references (©&© symbols), than ©&R© has type ©T ®*®&©$_{\color{red}2}\cdots$ ©&©$_{\color{red}r}$, \ie ©T© pointer with $r-1$ references (©&© symbols).
+\item
+if ©L© is an \Index{lvalue} of type ©T &©$_1\cdots$ ©&©$_l$, where $l \ge 0$ references (©&© symbols), than ©&L© has type ©T ®*®&©$_{\color{red}1}\cdots$ ©&©$_{\color{red}l}$, \ie ©T© pointer with $l$ references (©&© symbols).
 \end{itemize}
 The following example shows the first rule applied to different \Index{rvalue} contexts:
 …
 int x, * px, ** ppx, *** pppx, **** ppppx;
 int & rx = x, && rrx = rx, &&& rrrx = rrx ;
 x = rrrx;               // rrrx is an lvalue with type int &&& (equivalent to x)
 px = &rrrx;             // starting from rrrx, &rrrx is an rvalue with type int *&&& (&x)
 ppx = &&rrrx;   // starting from &rrrx, &&rrrx is an rvalue with type int **&& (&rx)
 pppx = &&&rrrx; // starting from &&rrrx, &&&rrrx is an rvalue with type int ***& (&rrx)
 ppppx = &&&&rrrx; // starting from &&&rrrx, &&&&rrrx is an rvalue with type int **** (&rrrx)
+x = rrrx; §\C[2.0in]{// rrrx is an lvalue with type int \&\&\& (equivalent to x)}§
+px = &rrrx; §\C{// starting from rrrx, \&rrrx is an rvalue with type int *\&\&\& (\&x)}§
+ppx = &&rrrx; §\C{// starting from \&rrrx, \&\&rrrx is an rvalue with type int **\&\& (\&rx)}§
+pppx = &&&rrrx; §\C{// starting from \&\&rrrx, \&\&\&rrrx is an rvalue with type int ***\& (\&rrx)}§
+ppppx = &&&&rrrx; §\C{// starting from \&\&\&rrrx, \&\&\&\&rrrx is an rvalue with type int **** (\&rrrx)}§
 \end{cfa}
 The following example shows the second rule applied to different \Index{lvalue} contexts:
 …
 int x, * px, ** ppx, *** pppx;
 int & rx = x, && rrx = rx, &&& rrrx = rrx ;
 rrrx = 2;               // rrrx is an lvalue with type int &&& (equivalent to x)
 &rrrx = px;             // starting from rrrx, &rrrx is an rvalue with type int *&&& (rx)
 &&rrrx = ppx;   // starting from &rrrx, &&rrrx is an rvalue with type int **&& (rrx)
 &&&rrrx = pppx; // starting from &&rrrx, &&&rrrx is an rvalue with type int ***& (rrrx)
+rrrx = 2; §\C{// rrrx is an lvalue with type int \&\&\& (equivalent to x)}§
+&rrrx = px; §\C{// starting from rrrx, \&rrrx is an rvalue with type int *\&\&\& (rx)}§
+&&rrrx = ppx; §\C{// starting from \&rrrx, \&\&rrrx is an rvalue with type int **\&\& (rrx)}§
+&&&rrrx = pppx; §\C{// starting from \&\&rrrx, \&\&\&rrrx is an rvalue with type int ***\& (rrrx)}\CRT§
 \end{cfa}
 …
 \begin{cfa}
 int x;
 x + 1;                  // lvalue variable (int) converts to rvalue for expression
+x + 1; §\C[2.0in]{// lvalue variable (int) converts to rvalue for expression}§
 \end{cfa}
 An rvalue has no type qualifiers (©cv©), so the lvalue qualifiers are dropped.
 …
 \begin{cfa}
 int x, &r = x, f( int p );
 x = ®r® + f( ®r® );  // lvalue reference converts to rvalue
+x = ®r® + f( ®r® ); §\C{// lvalue reference converts to rvalue}§
 \end{cfa}
 An rvalue has no type qualifiers (©cv©), so the reference qualifiers are dropped.
 …
 lvalue to reference conversion: \lstinline[deletekeywords=lvalue]@lvalue-type cv1 T@ converts to ©cv2 T &©, which allows implicitly converting variables to references.
 \begin{cfa}
 int x, &r = ®x®, f( int & p ); // lvalue variable (int) convert to reference (int &)
 f( ®x® );               // lvalue variable (int) convert to reference (int &)
+int x, &r = ®x®, f( int & p ); §\C{// lvalue variable (int) convert to reference (int \&)}§
+f( ®x® ); §\C{// lvalue variable (int) convert to reference (int \&)}§
 \end{cfa}
 Conversion can restrict a type, where ©cv1© $\le$ ©cv2©, \eg passing an ©int© to a ©const volatile int &©, which has low cost.
 …
 \begin{cfa}
 int x, & f( int & p );
 f( ®x + 3® );   // rvalue parameter (int) implicitly converts to lvalue temporary reference (int &)
 ®&f®(...) = &x; // rvalue result (int &) implicitly converts to lvalue temporary reference (int &)
+f( ®x + 3® );   §\C[1.5in]{// rvalue parameter (int) implicitly converts to lvalue temporary reference (int \&)}§
+®&f®(...) = &x; §\C{// rvalue result (int \&) implicitly converts to lvalue temporary reference (int \&)}\CRT§
 \end{cfa}
 In both case, modifications to the temporary are inaccessible (\Index{warning}).
 …
 in both cases the type is assumed to be void as opposed to old style C defaults of int return type and unknown parameter types, respectively, as in:
 \begin{cfa}
 [§\,§] g();                                                     §\C{// no input or output parameters}§
 [ void ] g( void );                                     §\C{// no input or output parameters}§
+[§\,§] g(); §\C{// no input or output parameters}§
+[ void ] g( void ); §\C{// no input or output parameters}§
 \end{cfa}
 …
 \begin{cfa}
 typedef int foo;
 int f( int (* foo) );                           §\C{// foo is redefined as a parameter name}§
+int f( int (* foo) ); §\C{// foo is redefined as a parameter name}§
 \end{cfa}
 The string ``©int (* foo)©'' declares a C-style named-parameter of type pointer to an integer (the parenthesis are superfluous), while the same string declares a \CFA style unnamed parameter of type routine returning integer with unnamed parameter of type pointer to foo.
 …
 C-style declarations can be used to declare parameters for \CFA style routine definitions, \eg:
 \begin{cfa}
 [ int ] f( * int, int * );                      §\C{// returns an integer, accepts 2 pointers to integers}§
 [ * int, int * ] f( int );                      §\C{// returns 2 pointers to integers, accepts an integer}§
+[ int ] f( * int, int * ); §\C{// returns an integer, accepts 2 pointers to integers}§
+[ * int, int * ] f( int ); §\C{// returns 2 pointers to integers, accepts an integer}§
 \end{cfa}
 The reason for allowing both declaration styles in the new context is for backwards compatibility with existing preprocessor macros that generate C-style declaration-syntax, as in:
 \begin{cfa}
 #define ptoa( n, d ) int (*n)[ d ]
 int f( ptoa( p, 5 ) ) ...                       §\C{// expands to int f( int (*p)[ 5 ] )}§
 [ int ] f( ptoa( p, 5 ) ) ...           §\C{// expands to [ int ] f( int (*p)[ 5 ] )}§
+int f( ptoa( p, 5 ) ) ... §\C{// expands to int f( int (*p)[ 5 ] )}§
+[ int ] f( ptoa( p, 5 ) ) ... §\C{// expands to [ int ] f( int (*p)[ 5 ] )}§
 \end{cfa}
 Again, programmers are highly encouraged to use one declaration form or the other, rather than mixing the forms.
 …
         int z;
         ... x = 0; ... y = z; ...
         ®return;®                                                       §\C{// implicitly return x, y}§
+        ®return;® §\C{// implicitly return x, y}§
+}
 \end{cfa}
 …
 [ int x, int y ] f() {
         ...
 }                                                                               §\C{// implicitly return x, y}§
+} §\C{// implicitly return x, y}§
 \end{cfa}
 In this case, the current values of ©x© and ©y© are returned to the calling routine just as if a ©return© had been encountered.
 …
 [ int x, int y ] f( int, x, int y ) {
         ...
 }                                                                               §\C{// implicitly return x, y}§
+} §\C{// implicitly return x, y}§
 \end{cfa}
 This notation allows the compiler to eliminate temporary variables in nested routine calls.
 \begin{cfa}
 [ int x, int y ] f( int, x, int y );    §\C{// prototype declaration}§
+[ int x, int y ] f( int, x, int y ); §\C{// prototype declaration}§
 int a, b;
 [a, b] = f( f( f( a, b ) ) );
 …
 as well, parameter names are optional, \eg:
 \begin{cfa}
 [ int x ] f ();                                                 §\C{// returning int with no parameters}§
 [ * int ] g (int y);                                    §\C{// returning pointer to int with int parameter}§
 [ ] h ( int, char );                                    §\C{// returning no result with int and char parameters}§
 [ * int, int ] j ( int );                               §\C{// returning pointer to int and int, with int parameter}§
+[ int x ] f (); §\C{// returning int with no parameters}§
+[ * int ] g (int y); §\C{// returning pointer to int with int parameter}§
+[ ] h ( int, char ); §\C{// returning no result with int and char parameters}§
+[ * int, int ] j ( int ); §\C{// returning pointer to int and int, with int parameter}§
 \end{cfa}
 This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa).
 …
 The syntax for pointers to \CFA routines specifies the pointer name on the right, \eg:
 \begin{cfa}
 * [ int x ] () fp;                                              §\C{// pointer to routine returning int with no parameters}§
 * [ * int ] (int y) gp;                                 §\C{// pointer to routine returning pointer to int with int parameter}§
 * [ ] (int,char) hp;                                    §\C{// pointer to routine returning no result with int and char parameters}§
 * [ * int,int ] ( int ) jp;                             §\C{// pointer to routine returning pointer to int and int, with int parameter}§
+* [ int x ] () fp; §\C{// pointer to routine returning int with no parameters}§
+* [ * int ] (int y) gp; §\C{// pointer to routine returning pointer to int with int parameter}§
+* [ ] (int,char) hp; §\C{// pointer to routine returning no result with int and char parameters}§
+* [ * int,int ] ( int ) jp; §\C{// pointer to routine returning pointer to int and int, with int parameter}§
 \end{cfa}
 While parameter names are optional, \emph{a routine name cannot be specified};
 for example, the following is incorrect:
 \begin{cfa}
 * [ int x ] f () fp;                                    §\C{// routine name "f" is not allowed}§
+* [ int x ] f () fp; §\C{// routine name "f" is not allowed}§
 \end{cfa}
 …
 whereas a named (keyword) call may be:
 \begin{cfa}
 p( z : 3, x : 4, y : 7 );       §\C{// rewrite $\Rightarrow$ p( 4, 7, 3 )}§
+p( z : 3, x : 4, y : 7 );  §\C{// rewrite $\Rightarrow$ p( 4, 7, 3 )}§
 \end{cfa}
 Here the order of the arguments is unimportant, and the names of the parameters are used to associate argument values with the corresponding parameters.
 …
 For example, the following routine prototypes and definition are all valid.
 \begin{cfa}
 void p( int, int, int );                        §\C{// equivalent prototypes}§
+void p( int, int, int ); §\C{// equivalent prototypes}§
 void p( int x, int y, int z );
 void p( int y, int x, int z );
 void p( int z, int y, int x );
 void p( int q, int r, int s ) {}        §\C{// match with this definition}§
+void p( int q, int r, int s ) {} §\C{// match with this definition}§
 \end{cfa}
 Forcing matching parameter names in routine prototypes with corresponding routine definitions is possible, but goes against a strong tradition in C programming.
 …
 int f( int x, double y );
 f( j : 3, i : 4 );                              §\C{// 1st f}§
 f( x : 7, y : 8.1 );                    §\C{// 2nd f}§
 f( 4, 5 );                                              §\C{// ambiguous call}§
+f( j : 3, i : 4 ); §\C{// 1st f}§
+f( x : 7, y : 8.1 ); §\C{// 2nd f}§
+f( 4, 5 );  §\C{// ambiguous call}§
 \end{cfa}
 However, named arguments compound routine resolution in conjunction with conversions:
 \begin{cfa}
 f( i : 3, 5.7 );                                §\C{// ambiguous call ?}§
+f( i : 3, 5.7 ); §\C{// ambiguous call ?}§
 \end{cfa}
 Depending on the cost associated with named arguments, this call could be resolvable or ambiguous.
 …
 the allowable positional calls are:
 \begin{cfa}
 p();                                                    §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§
 p( 4 );                                                 §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§
 p( 4, 4 );                                              §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§
 p( 4, 4, 4 );                                   §\C{// rewrite $\Rightarrow$ p( 4, 4, 4 )}§
+p(); §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§
+p( 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§
+p( 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§
+p( 4, 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 4 )}§
 // empty arguments
 p(  , 4, 4 );                                   §\C{// rewrite $\Rightarrow$ p( 1, 4, 4 )}§
 p( 4,  , 4 );                                   §\C{// rewrite $\Rightarrow$ p( 4, 2, 4 )}§
 p( 4, 4,   );                                   §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§
 p( 4,  ,   );                                   §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§
 p(  , 4,   );                                   §\C{// rewrite $\Rightarrow$ p( 1, 4, 3 )}§
 p(  ,  , 4 );                                   §\C{// rewrite $\Rightarrow$ p( 1, 2, 4 )}§
 p(  ,  ,   );                                   §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§
+p(  , 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 1, 4, 4 )}§
+p( 4,  , 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 4 )}§
+p( 4, 4,   ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§
+p( 4,  ,   ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§
+p(  , 4,   ); §\C{// rewrite $\Rightarrow$ p( 1, 4, 3 )}§
+p(  ,  , 4 ); §\C{// rewrite $\Rightarrow$ p( 1, 2, 4 )}§
+p(  ,  ,   ); §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§
 \end{cfa}
 Here the missing arguments are inserted from the default values in the parameter list.
 …
 Default values may only appear in a prototype versus definition context:
 \begin{cfa}
 void p( int x, int y = 2, int z = 3 );          §\C{// prototype: allowed}§
 void p( int, int = 2, int = 3 );                        §\C{// prototype: allowed}§
 void p( int x, int y = 2, int z = 3 ) {}        §\C{// definition: not allowed}§
+void p( int x, int y = 2, int z = 3 ); §\C{// prototype: allowed}§
+void p( int, int = 2, int = 3 ); §\C{// prototype: allowed}§
+void p( int x, int y = 2, int z = 3 ) {} §\C{// definition: not allowed}§
 \end{cfa}
 The reason for this restriction is to allow separate compilation.
 …
 \begin{cfa}
 void p( int x, int y = 2, int z = 3... );
 p( 1, 4, 5, 6, z : 3 );         §\C{// assume p( /* positional */, ... , /* named */ );}§
 p( 1, z : 3, 4, 5, 6 );         §\C{// assume p( /* positional */, /* named */, ... );}§
+p( 1, 4, 5, 6, z : 3 ); §\C{// assume p( /* positional */, ... , /* named */ );}§
+p( 1, z : 3, 4, 5, 6 ); §\C{// assume p( /* positional */, /* named */, ... );}§
 \end{cfa}
 The first call is an error because arguments 4 and 5 are actually positional not ellipse arguments;
 …
 Furthermore, overloading cannot handle accessing default arguments in the middle of a positional list, via a missing argument, such as:
 \begin{cfa}
 p( 1, /* default */, 5 );               §\C{// rewrite $\Rightarrow$ p( 1, 2, 5 )}§
+p( 1, /* default */, 5 ); §\C{// rewrite $\Rightarrow$ p( 1, 2, 5 )}§
 \end{cfa}
 …
 \begin{cfa}
 struct {
         int f1;                                 §\C{// named field}§
         int f2 : 4;                             §\C{// named field with bit field size}§
         int : 3;                                §\C{// unnamed field for basic type with bit field size}§
         int ;                                   §\C{// disallowed, unnamed field}§
         int *;                                  §\C{// disallowed, unnamed field}§
         int (*)( int );                 §\C{// disallowed, unnamed field}§
+        int f1; §\C{// named field}§
+        int f2 : 4; §\C{// named field with bit field size}§
+        int : 3; §\C{// unnamed field for basic type with bit field size}§
+        int ; §\C{// disallowed, unnamed field}§
+        int *; §\C{// disallowed, unnamed field}§
+        int (*)( int ); §\C{// disallowed, unnamed field}§
 };
 \end{cfa}
 …
 \begin{cfa}
 struct {
         int , , ;                               §\C{// 3 unnamed fields}§
+        int , , ; §\C{// 3 unnamed fields}§
+}
 \end{cfa}
 …
         struct T t;
 } s;
 …
 const unsigned int size = 5;
 int ia[size];
 ...                                             §\C{// assign values to array ia}§
 qsort( ia, size );              §\C{// sort ascending order using builtin ?<?}§
+... §\C{// assign values to array ia}§
+qsort( ia, size ); §\C{// sort ascending order using builtin ?<?}§
+{
         ®int ?<?( int x, int y ) { return x > y; }® §\C{// nested routine}§
         qsort( ia, size );      §\C{// sort descending order by local redefinition}§
+        qsort( ia, size ); §\C{// sort descending order by local redefinition}§
+}
 \end{cfa}
 …
 The following program in undefined in \CFA (and Indexc{gcc})
 \begin{cfa}
 [* [int]( int )] foo() {                §\C{// int (* foo())( int )}§
+[* [int]( int )] foo() { §\C{// int (* foo())( int )}§
         int ®i® = 7;
         int bar( int p ) {
                 ®i® += 1;                               §\C{// dependent on local variable}§
                 sout | ®i® | endl;
+                ®i® += 1; §\C{// dependent on local variable}§
+                sout | ®i®;
+        }
         return bar;                                     §\C{// undefined because of local dependence}§
+        return bar; §\C{// undefined because of local dependence}§
+}
 int main() {
         * [int]( int ) fp = foo();      §\C{// int (* fp)( int )}§
         sout | fp( 3 ) | endl;
+}
 \end{cfa}
 because
+        * [int]( int ) fp = foo(); §\C{// int (* fp)( int )}§
+        sout | fp( 3 );
+}
+\end{cfa}
+because
 Currently, there are no \Index{lambda} expressions, \ie unnamed routines because routine names are very important to properly select the correct routine.
 …
 In C and \CFA, lists of elements appear in several contexts, such as the parameter list of a routine call.
 \begin{cfa}
 f( ®2, x, 3 + i® );                             §\C{// element list}§
+f( ®2, x, 3 + i® ); §\C{// element list}§
 \end{cfa}
 A list of elements is called a \newterm{tuple}, and is different from a \Index{comma expression}.
 …
 typedef struct { int quot, rem; } div_t;        §\C[7cm]{// from include stdlib.h}§
 div_t div( int num, int den );
 div_t qr = div( 13, 5 );                                        §\C{// return quotient/remainder aggregate}§
 printf( "%d %d\n", qr.quot, qr.rem );           §\C{// print quotient/remainder}§
+div_t qr = div( 13, 5 ); §\C{// return quotient/remainder aggregate}§
+printf( "%d %d\n", qr.quot, qr.rem ); §\C{// print quotient/remainder}§
 \end{cfa}
 This approach requires a name for the return type and fields, where \Index{naming} is a common programming-language issue.
 …
 For example, consider C's \Indexc{modf} function, which returns the integral and fractional part of a floating value.
 \begin{cfa}
 double modf( double x, double * i );            §\C{// from include math.h}§
 double intp, frac = modf( 13.5, &intp );        §\C{// return integral and fractional components}§
 printf( "%g %g\n", intp, frac );                        §\C{// print integral/fractional components}§
+double modf( double x, double * i ); §\C{// from include math.h}§
+double intp, frac = modf( 13.5, &intp ); §\C{// return integral and fractional components}§
+printf( "%g %g\n", intp, frac ); §\C{// print integral/fractional components}§
 \end{cfa}
 This approach requires allocating storage for the return values, which complicates the call site with a sequence of variable declarations leading to the call.
 …
 When a function call is passed as an argument to another call, the best match of actual arguments to formal parameters is evaluated given all possible expression interpretations in the current scope.
 \begin{cfa}
 void g( int, int );                                                     §\C{// 1}§
 void g( double, double );                                       §\C{// 2}§
 g( div( 13, 5 ) );                                                      §\C{// select 1}§
 g( modf( 13.5 ) );                                                      §\C{// select 2}§
+void g( int, int ); §\C{// 1}§
+void g( double, double ); §\C{// 2}§
+g( div( 13, 5 ) ); §\C{// select 1}§
+g( modf( 13.5 ) ); §\C{// select 2}§
 \end{cfa}
 In this case, there are two overloaded ©g© routines.
 …
 The previous examples can be rewritten passing the multiple returned-values directly to the ©printf© function call.
 \begin{cfa}
 [ int, int ] div( int x, int y );                       §\C{// from include stdlib}§
 printf( "%d %d\n", div( 13, 5 ) );                      §\C{// print quotient/remainder}§
 [ double, double ] modf( double x );            §\C{// from include math}§
 printf( "%g %g\n", modf( 13.5 ) );                      §\C{// print integral/fractional components}§
+[ int, int ] div( int x, int y ); §\C{// from include stdlib}§
+printf( "%d %d\n", div( 13, 5 ) ); §\C{// print quotient/remainder}§
+[ double, double ] modf( double x ); §\C{// from include math}§
+printf( "%g %g\n", modf( 13.5 ) ); §\C{// print integral/fractional components}§
 \end{cfa}
 This approach provides the benefits of compile-time checking for appropriate return statements as in aggregation, but without the required verbosity of declaring a new named type.
 …
 \begin{cfa}
 int quot, rem;
 [ quot, rem ] = div( 13, 5 );                           §\C{// assign multiple variables}§
 printf( "%d %d\n", quot, rem );                         §\C{// print quotient/remainder}\CRT§
+[ quot, rem ] = div( 13, 5 ); §\C{// assign multiple variables}§
+printf( "%d %d\n", quot, rem ); §\C{// print quotient/remainder}\CRT§
 \end{cfa}
 Here, the multiple return-values are matched in much the same way as passing multiple return-values to multiple parameters in a call.
 …
 \subsection{Expressions}
+% Change order of expression evaluation.
+% http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0145r2.pdf
 Multiple-return-value functions provide \CFA with a new syntax for expressing a combination of expressions in the return statement and a combination of types in a function signature.
 …
 In \CFA, it is possible to overcome this restriction by declaring a \newterm{tuple variable}.
 \begin{cfa}
 [int, int] ®qr® = div( 13, 5 );                 §\C{// initialize tuple variable}§
 printf( "%d %d\n", ®qr® );                              §\C{// print quotient/remainder}§
+[int, int] ®qr® = div( 13, 5 ); §\C{// initialize tuple variable}§
+printf( "%d %d\n", ®qr® ); §\C{// print quotient/remainder}§
 \end{cfa}
 It is now possible to match the multiple return-values to a single variable, in much the same way as \Index{aggregation}.
 …
 One way to access the individual components of a tuple variable is with assignment.
 \begin{cfa}
 [ quot, rem ] = qr;                                             §\C{// assign multiple variables}§
+[ quot, rem ] = qr; §\C{// assign multiple variables}§
 \end{cfa}
 …
 [int, double] * p;
 int y = x.0;                                                    §\C{// access int component of x}§
 y = f().1;                                                              §\C{// access int component of f}§
 p->0 = 5;                                                               §\C{// access int component of tuple pointed-to by p}§
 g( x.1, x.0 );                                                  §\C{// rearrange x to pass to g}§
 double z = [ x, f() ].0.1;                              §\C{// access second component of first component of tuple expression}§
+int y = x.0; §\C{// access int component of x}§
+y = f().1; §\C{// access int component of f}§
+p->0 = 5; §\C{// access int component of tuple pointed-to by p}§
+g( x.1, x.0 ); §\C{// rearrange x to pass to g}§
+double z = [ x, f() ].0.1; §\C{// access second component of first component of tuple expression}§
 \end{cfa}
 Tuple-index expressions can occur on any tuple-typed expression, including tuple-returning functions, square-bracketed tuple expressions, and other tuple-index expressions, provided the retrieved component is also a tuple.
 …
 double y;
 [int, double] z;
 [y, x] = 3.14;                                                  §\C{// mass assignment}§
+[y, x] = 3.14; §\C{// mass assignment}§
 [x, y] = z;                                                         §\C{// multiple assignment}§
 z = 10;                                                         §\C{// mass assignment}§
 z = [x, y];                                                             §\C{// multiple assignment}§
+z = [x, y]; §\C{// multiple assignment}§
 \end{cfa}
 Let $L_i$ for $i$ in $[0, n)$ represent each component of the flattened left side, $R_i$ represent each component of the flattened right side of a multiple assignment, and $R$ represent the right side of a mass assignment.
 …
         double c, d;
         [ void ] f( [ int, int ] );
         f( [ c, a ] = [ b, d ] = 1.5 );  // assignments in parameter list
+        f( [ c, a ] = [ b, d ] = 1.5 ); §\C{// assignments in parameter list}§
 \end{cfa}
 The tuple expression begins with a mass assignment of ©1.5© into ©[b, d]©, which assigns ©1.5© into ©b©, which is truncated to ©1©, and ©1.5© into ©d©, producing the tuple ©[1, 1.5]© as a result.
 …
 \begin{cfa}
 struct S;
 void ?{}(S *);         // (1)
 void ?{}(S *, int);    // (2)
 void ?{}(S * double);  // (3)
 void ?{}(S *, S);      // (4)
 [S, S] x = [3, 6.28];  // uses (2), (3), specialized constructors
 [S, S] y;              // uses (1), (1), default constructor
 [S, S] z = x.0;        // uses (4), (4), copy constructor
+void ?{}(S *); §\C{// (1)}§
+void ?{}(S *, int); §\C{// (2)}§
+void ?{}(S * double); §\C{// (3)}§
+void ?{}(S *, S); §\C{// (4)}§
+[S, S] x = [3, 6.28]; §\C{// uses (2), (3), specialized constructors}§
+[S, S] y; §\C{// uses (1), (1), default constructor}§
+[S, S] z = x.0; §\C{// uses (4), (4), copy constructor}§
 \end{cfa}
 In this example, ©x© is initialized by the multiple constructor calls ©?{}(&x.0, 3)© and ©?{}(&x.1, 6.28)©, while ©y© is initialized by two default constructor calls ©?{}(&y.0)© and ©?{}(&y.1)©.
 …
 A member-access tuple may be used anywhere a tuple can be used, \eg:
 \begin{cfa}
 s.[ y, z, x ] = [ 3, 3.2, 'x' ];                §\C{// equivalent to s.x = 'x', s.y = 3, s.z = 3.2}§
 f( s.[ y, z ] );                                                §\C{// equivalent to f( s.y, s.z )}§
+s.[ y, z, x ] = [ 3, 3.2, 'x' ]; §\C{// equivalent to s.x = 'x', s.y = 3, s.z = 3.2}§
+f( s.[ y, z ] ); §\C{// equivalent to f( s.y, s.z )}§
 \end{cfa}
 Note, the fields appearing in a record-field tuple may be specified in any order;
 …
 void f( double, long );
 f( x.[ 0, 3 ] );                                                §\C{// f( x.0, x.3 )}§
 x.[ 0, 1 ] = x.[ 1, 0 ];                                §\C{// [ x.0, x.1 ] = [ x.1, x.0 ]}§
+f( x.[ 0, 3 ] ); §\C{// f( x.0, x.3 )}§
+x.[ 0, 1 ] = x.[ 1, 0 ]; §\C{// [ x.0, x.1 ] = [ x.1, x.0 ]}§
 [ long, int, long ] y = x.[ 2, 0, 2 ];
 \end{cfa}
 …
 \begin{cfa}
 [ int, float, double ] f();
 [ double, float ] x = f().[ 2, 1 ];             §\C{// f() called once}§
+[ double, float ] x = f().[ 2, 1 ]; §\C{// f() called once}§
 \end{cfa}
 …
 That is, a cast can be used to select the type of an expression when it is ambiguous, as in the call to an overloaded function.
 \begin{cfa}
 int f();     // (1)
 double f();  // (2)
 f();       // ambiguous - (1),(2) both equally viable
 (int)f();  // choose (2)
+int f(); §\C{// (1)}§
+double f(); §\C{// (2)}§
+f(); §\C{// ambiguous - (1),(2) both equally viable}§
+(int)f(); §\C{// choose (2)}§
 \end{cfa}
 Since casting is a fundamental operation in \CFA, casts need to be given a meaningful interpretation in the context of tuples.
 …
 void g();
 (void)f();  // valid, ignore results
 (int)g();   // invalid, void cannot be converted to int
+(void)f(); §\C{// valid, ignore results}§
+(int)g(); §\C{// invalid, void cannot be converted to int}§
 struct A { int x; };
 (struct A)f();  // invalid, int cannot be converted to A
+(struct A)f(); §\C{// invalid, int cannot be converted to A}§
 \end{cfa}
 In C, line 4 is a valid cast, which calls ©f© and discards its result.
 …
         [int, [int, int], int] g();
         ([int, double])f();           // (1) valid
         ([int, int, int])g();         // (2) valid
         ([void, [int, int]])g();      // (3) valid
         ([int, int, int, int])g();    // (4) invalid
         ([int, [int, int, int]])g();  // (5) invalid
+        ([int, double])f(); §\C{// (1) valid}§
+        ([int, int, int])g(); §\C{// (2) valid}§
+        ([void, [int, int]])g(); §\C{// (3) valid}§
+        ([int, int, int, int])g(); §\C{// (4) invalid}§
+        ([int, [int, int, int]])g(); §\C{// (5) invalid}§
 \end{cfa}
 …
 void f([int, int], int, int);
 f([0, 0], 0, 0);    // no cost
 f(0, 0, 0, 0);      // cost for structuring
 f([0, 0,], [0, 0]); // cost for flattening
 f([0, 0, 0], 0);    // cost for flattening and structuring
+f([0, 0], 0, 0); §\C{// no cost}§
+f(0, 0, 0, 0); §\C{// cost for structuring}§
+f([0, 0,], [0, 0]); §\C{// cost for flattening}§
+f([0, 0, 0], 0); §\C{// cost for flattening and structuring}§
 \end{cfa}
 …
 [ unsigned int, char ]
 [ double, double, double ]
 [ * int, int * ]                §\C{// mix of CFA and ANSI}§
+[ * int, int * ] §\C{// mix of CFA and ANSI}§
 [ * [ 5 ] int, * * char, * [ [ int, int ] ] (int, int) ]
 \end{cfa}
 …
 Examples of declarations using tuple types are:
 \begin{cfa}
 [ int, int ] x;                 §\C{// 2 element tuple, each element of type int}§
 * [ char, char ] y;             §\C{// pointer to a 2 element tuple}§
+[ int, int ] x; §\C{// 2 element tuple, each element of type int}§
+* [ char, char ] y; §\C{// pointer to a 2 element tuple}§
 [ [ int, int ] ] z ([ int, int ]);
 \end{cfa}
 …
 [ int, int ] w1;
 [ int, int, int ] w2;
 [ void ] f (int, int, int); /* three input parameters of type int */
 [ void ] g ([ int, int, int ]); /* 3 element tuple as input */
+[ void ] f (int, int, int); §\C{// three input parameters of type int}§
+[ void ] g ([ int, int, int ]); §\C{3 element tuple as input}§
 f( [ 1, 2, 3 ] );
 f( w1, 3 );
 …
 [ int, int, int, int ] w = [ 1, 2, 3, 4 ];
 int x = 5;
 [ x, w ] = [ w, x ];            §\C{// all four tuple coercions}§
+[ x, w ] = [ w, x ]; §\C{// all four tuple coercions}§
 \end{cfa}
 Starting on the right-hand tuple in the last assignment statement, w is opened, producing a tuple of four values;
 …
 both these examples produce indeterminate results:
 \begin{cfa}
 f( x++, x++ );                          §\C{// C routine call with side effects in arguments}§
 [ v1, v2 ] = [ x++, x++ ];      §\C{// side effects in righthand side of multiple assignment}§
+f( x++, x++ ); §\C{// C routine call with side effects in arguments}§
+[ v1, v2 ] = [ x++, x++ ]; §\C{// side effects in righthand side of multiple assignment}§
 \end{cfa}
 …
+\section{I/O Library}
+\label{s:IOLibrary}
+\index{input/output library}
+The goal of \CFA I/O is to simplify the common cases\index{I/O!common case}, while fully supporting polymorphism and user defined types in a consistent way.
+The approach combines ideas from \CC and Python.
+The \CFA header file for the I/O library is \Indexc{fstream}.
+The common case is printing out a sequence of variables separated by whitespace.
+\section{Stream I/O Library}
+\label{s:StreamIOLibrary}
+\index{input/output stream library}
+\index{stream library}
+The goal of \CFA stream input/output (I/O) is to simplify the common cases\index{I/O!common case}, while fully supporting polymorphism and user defined types in a consistent way.
+Stream I/O can be implicitly or explicitly formatted.
+Implicit formatting means \CFA selects the output or input format for values that match with the type of a variable.
+Explicit formatting means additional information is specified to augment how an output or input of value is interpreted.
+\CFA formatting is a cross between C ©printf© and \CC ©cout© manipulators, and Python implicit spacing and newline.
+Specifically:
+\begin{itemize}
+\item
+©printf©/Python format codes are dense, making them difficult to read and remember.
+\CFA/\CC format manipulators are named, making them easier to read and remember.
+\item
+©printf©/Python separates format codes from associated variables, making it difficult to match codes with variables.
+\CFA/\CC co-locate codes with associated variables, where \CFA has the tighter binding.
+\item
+Format manipulators in \CFA have local effect, whereas \CC have global effect, except ©setw©.
+Hence, it is common programming practice to toggle manipulators on and then back to the default to prevent downstream side-effects.
+Without this programming style, errors occur when moving prints, as manipulator effects incorrectly flow into the new location.
+(To guarantee no side-effects, manipulator values must be saved and restored across function calls.)
+\item
+\CFA has more sophisticated implicit spacing between values than Python, plus implicit newline at the end of a print.
+\end{itemize}
+The \CFA header file for the I/O library is \Indexc{fstream.hfa}.
+For implicit formatted output, the common case is printing a series of variables separated by whitespace.
 \begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{\CC}}      \\
+\begin{tabular}{@{}l@{\hspace{2em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{2em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{\CC}}       & \multicolumn{1}{c}{\textbf{Python}}   \\
 \begin{cfa}
 int x = 1, y = 2, z = 3;
 sout | x ®|® y ®|® z | endl;
+sout | x ®|® y ®|® z;
 \end{cfa}
+&
 …
 cout << x ®<< " "® << y ®<< " "® << z << endl;
+\end{cfa}
+&
+\begin{cfa}
+x = 1;  y = 2;  z = 3
+print( x, y, z )
 \end{cfa}
 \\
 …
+&
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+2 3
+® ®2® ®3
+\end{cfa}
+&
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+® ®2® ®3
 \end{cfa}
 \end{tabular}
 \end{cquote}
 The \CFA form has half the characters of the \CC form, and is similar to \Index*{Python} I/O with respect to implicit separators.
 Similar simplification occurs for \Index{tuple} I/O, which prints all tuple values separated by ``\lstinline[showspaces=true]@, @''.
+The \CFA form has half the characters of the \CC form, and is similar to \Index*{Python} I/O with respect to implicit separators and newline.
+Similar simplification occurs for \Index{tuple} I/O, which flattens the tuple and prints each value separated by ``\lstinline[showspaces=true]@, @''.
 \begin{cfa}
 [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
 sout | t1 | t2 | endl;                                  §\C{// print tuples}§
+sout | t1 | t2; §\C{// print tuples}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 ®, ®2®, ®3 4®, ®5®, ®6
 \end{cfa}
 Finally, \CFA uses the logical-or operator for I/O as it is the lowest-priority overloadable operator, other than assignment.
+Finally, \CFA uses the logical-or operator for I/O as it is the lowest-priority \emph{overloadable} operator, other than assignment.
 Therefore, fewer output expressions require parenthesis.
 \begin{cquote}
 …
+&
 \begin{cfa}
 sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
+sout | x * 3 | y + 1 | z << 2 | x == y | ®(®x | y®)® | ®(®x || y®)® | ®(®x > z ? 1 : 2®)®;
 \end{cfa}
 \\
 …
+&
 \begin{cfa}
 cout << x * 3 << y + 1 << ®(®z << 2®)® << ®(®x == y®)® << (x | y) << (x || y) << (x > z ? 1 : 2) << endl;
+cout << x * 3 << y + 1 << ®(®z << 2®)® << ®(®x == y®)® << ®(®x | y®)® << ®(®x || y®)® << ®(®x > z ? 1 : 2®)® << endl;
 \end{cfa}
 \\
 …
 \end{tabular}
 \end{cquote}
+There is a weak similarity between the \CFA logical-or operator and the Shell pipe-operator for moving data, where data flows in the correct direction for input but the opposite direction for output.
+Input and output use a uniform operator, ©|©, rather than separate operators, as in ©>>© and ©<<© for \CC.
+There is a weak similarity between the \CFA logical-or operator and the \Index{Shell pipe-operator} for moving data, where data flows in the correct direction for input but the opposite direction for output.
+For implicit formatted input, the common case is reading a sequence of values separated by whitespace, where the type of an input constant must match with the type of the input variable.
+\begin{cquote}
+\begin{lrbox}{\LstBox}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+int x;   double y   char z;
+\end{cfa}
+\end{lrbox}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{@{}l@{}}{\usebox\LstBox} \\
+\multicolumn{1}{c@{\hspace{2em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{\CC}}       & \multicolumn{1}{c}{\textbf{Python}}   \\
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+sin | x | y | z;
+\end{cfa}
+&
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+cin >> x >> y >> z;
+\end{cfa}
+&
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+x = int(input());  y = float(input());  z = input();
+\end{cfa}
+\\
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®1® ®2.5® ®A®
+\end{cfa}
+&
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®1® ®2.5® ®A®
+\end{cfa}
+&
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®1®
+®2.5®
+®A®
+\end{cfa}
+\end{tabular}
+\end{cquote}
 \subsection{Implicit Separator}
 The \Index{implicit separator}\index{I/O!separator} character (space/blank) is a separator not a terminator.
+The \Index{implicit separator}\index{I/O!separator} character (space/blank) is a separator not a terminator for output.
 The rules for implicitly adding the separator are:
 \begin{enumerate}
 …
 A separator does not appear at the start or end of a line.
 \begin{cfa}[belowskip=0pt]
 sout | 1 | 2 | 3 | endl;
+sout | 1 | 2 | 3;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 A separator does not appear before or after a character literal or variable.
 \begin{cfa}
 sout | '1' | '2' | '3' | endl;
+sout | '1' | '2' | '3';
 \end{cfa}
 \item
 A separator does not appear before or after a null (empty) C string.
 \begin{cfa}
 sout | 1 | "" | 2 | "" | 3 | endl;
+A separator does not appear before or after a null (empty) C string, which is a local mechanism to disable insertion of the separator character.
+\begin{cfa}
+sout | 1 | "" | 2 | "" | 3;
 \end{cfa}
+which is a local mechanism to disable insertion of the separator character.
+\item
+A separator does not appear before a C string starting with the (extended) \Index*{ASCII}\index{ASCII!extended} characters: \lstinline[mathescape=off,basicstyle=\tt]@([{=$£¥¡¿«@
+\item
+{\lstset{language=CFA,deletedelim=**[is][]{¢}{¢}}
+A separator does not appear before a C string starting with the (extended) \Index*{ASCII}\index{ASCII!extended} characters: \lstinline[basicstyle=\tt]@,.;!?)]}%¢»@, where \lstinline[basicstyle=\tt]@»@ is a closing citation mark.
+\begin{cfa}[belowskip=0pt]
+sout | 1 | ", x" | 2 | ". x" | 3 | "; x" | 4 | "! x" | 5 | "? x" | 6 | "% x"
+                | 7 | "¢ x" | 8 | "» x" | 9 | ") x" | 10 | "] x" | 11 | "} x";
+\end{cfa}
+\begin{cfa}[basicstyle=\tt,showspaces=true,aboveskip=0pt,belowskip=0pt]
+®,® x 2®.® x 3®;® x 4®!® x 5®?® x 6®%® x 7§\color{red}\textcent§ x 8®»® x 9®)® x 10®]® x 11®}® x
+\end{cfa}}%
+\item
+A separator does not appear after a C string ending with the (extended) \Index*{ASCII}\index{ASCII!extended} characters: \lstinline[mathescape=off,basicstyle=\tt]@([{=$£¥¡¿«@, where \lstinline[basicstyle=\tt]@¡¿@ are inverted opening exclamation and question marks, and \lstinline[basicstyle=\tt]@«@ is an opening citation mark.
 %$
 \begin{cfa}[mathescape=off]
 sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x =" | 4 | "x $" | 5 | "x £" | 6 | "x ¥"
                 | 7 | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10 | endl;
+                | 7 | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10;
 \end{cfa}
 %$
 …
 \end{cfa}
 %$
+where \lstinline[basicstyle=\tt]@¡¿@ are inverted opening exclamation and question marks, and \lstinline[basicstyle=\tt]@«@ is an opening citation mark.
+\item
+{\lstset{language=CFA,deletedelim=**[is][]{¢}{¢}}
+A seperator does not appear after a C string ending with the (extended) \Index*{ASCII}\index{ASCII!extended} characters: \lstinline[basicstyle=\tt]@,.;!?)]}%¢»@
+\item
+A seperator does not appear before/after a C string starting/ending with the \Index*{ASCII} quote or whitespace characters: \lstinline[basicstyle=\tt,showspaces=true]@`'": \t\v\f\r\n@
 \begin{cfa}[belowskip=0pt]
+sout | 1 | ", x" | 2 | ". x" | 3 | "; x" | 4 | "! x" | 5 | "? x" | 6 | "% x"
+                | 7 | "¢ x" | 8 | "» x" | 9 | ") x" | 10 | "] x" | 11 | "} x" | endl;
+\end{cfa}
+\begin{cfa}[basicstyle=\tt,showspaces=true,aboveskip=0pt,belowskip=0pt]
+®,® x 2®.® x 3®;® x 4®!® x 5®?® x 6®%® x 7§\color{red}\textcent§ x 8®»® x 9®)® x 10®]® x 11®}® x
+\end{cfa}}%
+where \lstinline[basicstyle=\tt]@»@ is a closing citation mark.
+\item
+A seperator does not appear before or after a C string begining/ending with the \Index*{ASCII} quote or whitespace characters: \lstinline[basicstyle=\tt,showspaces=true]@`'": \t\v\f\r\n@
+\begin{cfa}[belowskip=0pt]
+sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x:" | 4 | ":x " | 5 | " x\t" | 6 | "\tx" | endl;
+sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x:" | 4 | ":x " | 5 | " x\t" | 6 | "\tx";
 \end{cfa}
 \begin{cfa}[basicstyle=\tt,showspaces=true,showtabs=true,aboveskip=0pt,belowskip=0pt]
 …
 If a space is desired before or after one of the special string start/end characters, simply insert a space.
 \begin{cfa}[belowskip=0pt]
 sout | "x (§\color{red}\texttt{\textvisiblespace}§" | 1 | "§\color{red}\texttt{\textvisiblespace}§) x" | 2 | "§\color{red}\texttt{\textvisiblespace}§, x" | 3 | "§\color{red}\texttt{\textvisiblespace}§:x:§\color{red}\texttt{\textvisiblespace}§" | 4 | endl;
+sout | "x (§\color{red}\texttt{\textvisiblespace}§" | 1 | "§\color{red}\texttt{\textvisiblespace}§) x" | 2 | "§\color{red}\texttt{\textvisiblespace}§, x" | 3 | "§\color{red}\texttt{\textvisiblespace}§:x:§\color{red}\texttt{\textvisiblespace}§" | 4;
 \end{cfa}
 \begin{cfa}[basicstyle=\tt,showspaces=true,showtabs=true,aboveskip=0pt,belowskip=0pt]
 …
+\subsection{Manipulator}
+The following \CC-style \Index{manipulator}s and routines control implicit seperation.
+\subsection{Separation Manipulators}
+The following \Index{manipulator}s control \Index{implicit output separation}.
+The effect of these manipulators is global for an output stream (except ©sepOn© and ©sepOff©).
 \begin{enumerate}
 \item
 Routines \Indexc{sepSet}\index{manipulator!sepSet@©sepSet©} and \Indexc{sep}\index{manipulator!sep@©sep©}/\Indexc{sepGet}\index{manipulator!sepGet@©sepGet©} set and get the separator string.
+\Indexc{sepSet}\index{manipulator!sepSet@©sepSet©} and \Indexc{sep}\index{manipulator!sep@©sep©}/\Indexc{sepGet}\index{manipulator!sepGet@©sepGet©} set and get the separator string.
 The separator string can be at most 16 characters including the ©'\0'© string terminator (15 printable characters).
 \begin{cfa}[mathescape=off,belowskip=0pt]
 sepSet( sout, ", $" );                                          §\C{// set separator from " " to ", \$"}§
 sout | 1 | 2 | 3 | " \"" | ®sep® | "\"" | endl;
+sepSet( sout, ", $" ); §\C{// set separator from " " to ", \$"}§
+sout | 1 | 2 | 3 | " \"" | ®sep® | "\"";
 \end{cfa}
 %$
 …
 %$
 \begin{cfa}[belowskip=0pt]
 sepSet( sout, " " );                                            §\C{// reset separator to " "}§
 sout | 1 | 2 | 3 | " \"" | ®sepGet( sout )® | "\"" | endl;
+sepSet( sout, " " ); §\C{// reset separator to " "}§
+sout | 1 | 2 | 3 | " \"" | ®sepGet( sout )® | "\"";
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
 ©sepGet© can be used to store a separator and then restore it:
 \begin{cfa}[belowskip=0pt]
 char store[®sepSize®];                                          §\C{// sepSize is the maximum separator size}§
 strcpy( store, sepGet( sout ) );                          §\C{// copy current separator}§
 sepSet( sout, "_" );                                            §\C{// change separator to underscore}§
 sout | 1 | 2 | 3 | endl;
+char store[®sepSize®]; §\C{// sepSize is the maximum separator size}§
+strcpy( store, sepGet( sout ) ); §\C{// copy current separator}§
+sepSet( sout, "_" ); §\C{// change separator to underscore}§
+sout | 1 | 2 | 3;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
 sepSet( sout, store );                                          §\C{// change separator back to original}§
 sout | 1 | 2 | 3 | endl;
+sepSet( sout, store ); §\C{// change separator back to original}§
+sout | 1 | 2 | 3;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
 \item
 Routine \Indexc{sepSetTuple}\index{manipulator!sepSetTuple@©sepSetTuple©} and \Indexc{sepTuple}\index{manipulator!sepTuple@©sepTuple©}/\Indexc{sepGetTuple}\index{manipulator!sepGetTuple@©sepGetTuple©} get and set the tuple separator-string.
+\Indexc{sepSetTuple}\index{manipulator!sepSetTuple@©sepSetTuple©} and \Indexc{sepTuple}\index{manipulator!sepTuple@©sepTuple©}/\Indexc{sepGetTuple}\index{manipulator!sepGetTuple@©sepGetTuple©} get and set the tuple separator-string.
 The tuple separator-string can be at most 16 characters including the ©'\0'© string terminator (15 printable characters).
 \begin{cfa}[belowskip=0pt]
 sepSetTuple( sout, " " );                                       §\C{// set tuple separator from ", " to " "}§
 sout | t1 | t2 | " \"" | ®sepTuple® | "\"" | endl;
+sepSetTuple( sout, " " ); §\C{// set tuple separator from ", " to " "}§
+sout | t1 | t2 | " \"" | ®sepTuple® | "\"";
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
 sepSetTuple( sout, ", " );                                      §\C{// reset tuple separator to ", "}§
 sout | t1 | t2 | " \"" | ®sepGetTuple( sout )® | "\"" | endl;
+sepSetTuple( sout, ", " ); §\C{// reset tuple separator to ", "}§
+sout | t1 | t2 | " \"" | ®sepGetTuple( sout )® | "\"";
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
 \item
 Manipulators \Indexc{sepDisable}\index{manipulator!sepDisable@©sepDisable©} and \Indexc{sepEnable}\index{manipulator!sepEnable@©sepEnable©} \emph{globally} toggle printing the separator, \ie the seperator is adjusted with respect to all subsequent printed items.
+\Indexc{sepDisable}\index{manipulator!sepDisable@©sepDisable©} and \Indexc{sepEnable}\index{manipulator!sepEnable@©sepEnable©} toggle printing the separator.
 \begin{cfa}[belowskip=0pt]
 sout | sepDisable | 1 | 2 | 3 | endl;           §\C{// globally turn off implicit separator}§
+sout | sepDisable | 1 | 2 | 3; §\C{// turn off implicit separator}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
 sout | sepEnable | 1 | 2 | 3 | endl;            §\C{// globally turn on implicit separator}§
+sout | sepEnable | 1 | 2 | 3; §\C{// turn on implicit separator}§
 \end{cfa}
 \begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \item
 Manipulators \Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} \emph{locally} toggle printing the separator, \ie the seperator is adjusted only with respect to the next printed item.
+\Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} toggle printing the separator with respect to the next printed item, and then return to the global seperator setting.
 \begin{cfa}[belowskip=0pt]
 sout | 1 | sepOff | 2 | 3 | endl;                       §\C{// locally turn off implicit separator}§
+sout | 1 | sepOff | 2 | 3; §\C{// turn off implicit separator for the next item}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
 sout | sepDisable | 1 | sepOn | 2 | 3 | endl; §\C{// locally turn on implicit separator}§
+sout | sepDisable | 1 | sepOn | 2 | 3; §\C{// turn on implicit separator for the next item}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 The tuple separator also responses to being turned on and off.
 \begin{cfa}[belowskip=0pt]
 sout | t1 | sepOff | t2 | endl;                         §\C{// locally turn on/off implicit separator}§
+sout | t1 | sepOff | t2; §\C{// turn off implicit separator for the next item}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 use ©sep© to accomplish this functionality.
 \begin{cfa}[belowskip=0pt]
 sout | sepOn | 1 | 2 | 3 | sepOn | endl ;       §\C{// sepOn does nothing at start/end of line}§
+sout | sepOn | 1 | 2 | 3 | sepOn; §\C{// sepOn does nothing at start/end of line}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
 sout | sep | 1 | 2 | 3 | sep | endl ;           §\C{// use sep to print separator at start/end of line}§
+sout | sep | 1 | 2 | 3 | sep ; §\C{// use sep to print separator at start/end of line}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 ® ®1 2 3® ®
+\end{cfa}
+\end{enumerate}
+\subsection{Newline Manipulators}
+The following \Index{manipulators} control \Index{newline separation} for input and output.
+For input:
+\begin{enumerate}[parsep=0pt]
+\item
+\Indexc{nl}\index{manipulator!nl@©nl©} scans characters until the next newline character, i.e., ignore the remaining characters in the line.
+\item
+\Indexc{nlOn}\index{manipulator!nlOn@©nlOn©} reads the newline character, when reading single characters.
+\item
+\Indexc{nlOff}\index{manipulator!nlOff@©nlOff©} does \emph{not} read the newline character, when reading single characters.
+\end{enumerate}
+For example, in:
+\begin{cfa}
+sin | i | ®nl® | j;
+®2®
+\end{cfa}
+variable ©i© is assigned 1, the 2 is skipped, and variable ©j© is assigned 3.
+For output:
+\begin{enumerate}[parsep=0pt]
+\item
+\Indexc{nl}\index{manipulator!nl@©nl©} inserts a newline.
+\begin{cfa}
+sout | nl; §\C{// only print newline}§
+sout | 2; §\C{// implicit newline}§
+sout | 3 | nl | 4 | nl; §\C{// terminating nl merged with implicit newline}§
+sout | 5 | nl | nl; §\C{// again terminating nl merged with implicit newline}§
+sout | 6; §\C{// implicit newline}§
+\end{cfa}
+Note, a terminating ©nl© is merged (overrides) with the implicit newline at the end of the ©sout© expression, otherwise it is impossible to to print a single newline
+\item
+\Indexc{nlOn}\index{manipulator!nlOn@©nlOn©} implicitly prints a newline at the end of each output expression.
+\item
+\Indexc{nlOff}\index{manipulator!nlOff@©nlOff©} does \emph{not} implicitly print a newline at the end of each output expression.
+\end{enumerate}
+\subsection{Output Value Manipulators}
+The following \Index{manipulator}s control formatting of output values (printing), and only affect the format of the argument.
+\begin{enumerate}
+\item
+\Indexc{bin}( integer )\index{manipulator!bin@©bin©} print value in base 2 preceded by ©0b©/©0B©.
+\begin{cfa}[belowskip=0pt]
+sout | bin( 0 ) | bin( 27HH ) | bin( 27H ) | bin( 27 ) | bin( 27L );
+b0 0b11011 0b11011 0b11011 0b11011
+sout | bin( -27HH ) | bin( -27H ) | bin( -27 ) | bin( -27L );
+b11100101 0b1111111111100101 0b11111111111111111111111111100101 0b®(58 1s)®100101
+\end{cfa}
+\item
+\Indexc{oct}( integer )\index{manipulator!oct@©oct©} print value in base 8 preceded by ©0©.
+\begin{cfa}[belowskip=0pt]
+sout | oct( 0 ) | oct( 27HH ) | oct( 27H ) | oct( 27 ) | oct( 27L );
+033 033 033 033
+sout | oct( -27HH ) | oct( -27H ) | oct( -27 ) | oct( -27L );
+0177745 037777777745 01777777777777777777745
+\end{cfa}
+Note, octal 0 is \emph{not} preceded by ©0© to prevent confusion.
+\item
+\Indexc{hex}( integer / floating-point )\index{manipulator!hex@©hex©} print value in base 16 preceded by ©0x©/©0X©.
+\begin{cfa}[belowskip=0pt]
+sout | hex( 0 ) | hex( 27HH ) | hex( 27H ) | hex( 27 ) | hex( 27L );
+0x1b 0x1b 0x1b 0x1b
+sout | hex( -27HH ) | hex( -27H ) | hex( -27 ) | hex( -27L );
+xe5 0xffe5 0xffffffe5 0xffffffffffffffe5
+sout | hex( 0.0 ) | hex( 27.5F ) | hex( 27.5 ) | hex( 27.5L );
+x0.p+0 0x1.b8p+4 0x1.b8p+4 0xd.cp+1
+sout | hex( -27.5F ) | hex( -27.5 ) | hex( -27.5L );
+-0x1.b8p+4 -0x1.b8p+4 -0xd.cp+1
+\end{cfa}
+\item
+\Indexc{sci}( floating-point )\index{manipulator!sci@©sci©} print value in scientific notation with exponent.
+Default is 6 digits of precision.
+\begin{cfa}[belowskip=0pt]
+sout | sci( 0.0 ) | sci( 27.5 ) | sci( -27.5 );
+.000000e+00 2.750000e+01 -2.750000e+01
+\end{cfa}
+\item
+\Indexc{upcase}( bin / hex / floating-point )\index{manipulator!upcase@©upcase©} print letters in a value in upper case. Lower case is the default.
+\begin{cfa}[belowskip=0pt]
+sout | upcase( bin( 27 ) ) | upcase( hex( 27 ) ) | upcase( 27.5e-10 ) | upcase( hex( 27.5 ) );
+®B®11011 0®X®1®B® 2.75®E®-09 0®X®1.®B®8®P®+4
+\end{cfa}
+\item
+\Indexc{nobase}( integer )\index{manipulator!nobase@©nobase©} do not precede ©bin©, ©oct©, ©hex© with ©0b©/©0B©, ©0©, or ©0x©/©0X©.
+Printing the base is the default.
+\begin{cfa}[belowskip=0pt]
+sout | nobase( bin( 27 ) ) | nobase( oct( 27 ) ) | nobase( hex( 27 ) );
+33 1b
+\end{cfa}
+\item
+\Indexc{nodp}( floating-point )\index{manipulator!nodp@©nodp©} do not print a decimal point if there are no fractional digits.
+Printing a decimal point is the default, if there are no fractional digits.
+\begin{cfa}[belowskip=0pt]
+sout | 0. | nodp( 0. ) | 27.0 | nodp( 27.0 ) | nodp( 27.5 );
+.0 ®0® 27.0 ®27® 27.5
+\end{cfa}
+\item
+\Indexc{sign}( integer / floating-point )\index{manipulator!sign@©sign©} prefix with plus or minus sign (©+© or ©-©). Only printing the minus sign is the default.
+\begin{cfa}[belowskip=0pt]
+sout | sign( 27 ) | sign( -27 ) | sign( 27. ) | sign( -27. ) | sign( 27.5 ) | sign( -27.5 );
+®+®27 -27 ®+®27.0 -27.0 ®+®27.5 -27.5
+\end{cfa}
+\item
+\Indexc{wd}©( unsigned char minimum, T val )©\index{manipulator!wd@©wd©}, ©wd( unsigned char minimum, unsigned char precision, T val )©
+For all types, ©minimum© is the minimum number of printed characters.
+If the value is shorter than the minimum, it is padded on the right with spaces.
+\begin{cfa}[belowskip=0pt]
+sout | wd( 4, 34) | wd( 3, 34 ) | wd( 2, 34 );
+sout | wd( 10, 4.) | wd( 9, 4. ) | wd( 8, 4. );
+sout | wd( 4, "ab" ) | wd( 3, "ab" ) | wd( 2, "ab" );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®  ®34 ® ®34 34
+®  ®4.000000 ® ®4.000000 4.000000
+®  ®ab ® ®ab ab
+\end{cfa}
+If the value is larger, it is printed without truncation, ignoring the ©minimum©.
+\begin{cfa}[belowskip=0pt]
+sout | wd( 4, 34567 ) | wd( 3, 34567 ) | wd( 2, 34567 );
+sout | wd( 4, 3456. ) | wd( 3, 3456. ) | wd( 2, 3456. );
+sout | wd( 4, "abcde" ) | wd( 3, "abcde" ) | wd( 2,"abcde" );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®7® 345®67® 34®567®
+®.® 345®6.® 34®56.®
+abcd®e® abc®de® ab®cde®
+\end{cfa}
+For integer types, ©precision© is the minimum number of printed digits.
+If the value is shorter, it is padded on the left with leading zeros.
+\begin{cfa}[belowskip=0pt]
+sout | wd( 4,3, 34 ) | wd( 8,4, 34 ) | wd( 10,10, 34 );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+ ®0®34     ®00®34 ®00000000®34
+\end{cfa}
+If the value is larger, it is printed without truncation, ignoring the ©precision©.
+\begin{cfa}[belowskip=0pt]
+sout | wd( 4,1, 3456 ) | wd( 8,2, 3456 ) | wd( 10,3, 3456 );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+     3456       3456
+\end{cfa}
+If ©precision© is 0, nothing is printed for zero.
+If ©precision© is greater than the minimum, it becomes the minimum.
+\begin{cfa}[belowskip=0pt]
+sout | wd( 4,0, 0 ) | wd( 3,10, 34 );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®    ® ®00000000®34
+\end{cfa}
+For floating-point types, ©precision© is the minimum number of digits after the decimal point.
+\begin{cfa}[belowskip=0pt]
+sout | wd( 6,3, 27.5 ) | wd( 8,1, 27.5 ) | wd( 8,0, 27.5 ) | wd( 3,8, 27.5 );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+.®500®     27.®5®      28. 27.®50000000®
+\end{cfa}
+For the C-string type, ©precision© is the maximum number of printed characters, so the string is truncared if it exceeds the maximum.
+\begin{cfa}[belowskip=0pt]
+sout | wd( 6,8, "abcd" ) | wd( 6,8, "abcdefghijk" ) | wd( 6,3, "abcd" );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+  abcd abcdefgh    abc
+\end{cfa}
+\item
+\Indexc{ws( unsigned char minimum, unsigned char significant, floating-point )}\index{manipulator!ws@©ws©}
+For floating-point type, ©minimum© is the same as for manipulator ©wd©, but ©significant© is the maximum number of significant digits to be printed for both the integer and fractions (versus only the fraction for ©wd©).
+If a value's significant digits is greater than ©significant©, the last significant digit is rounded up.
+\begin{cfa}[belowskip=0pt]
+sout | ws(6,6, 234.567) | ws(6,5, 234.567) | ws(6,4, 234.567) | ws(6,3, 234.567);
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+.567 234.5®7®  234.®6®    23®5®
+\end{cfa}
+If a value's magnitude is greater than ©significant©, the value is printed in scientific notation with the specified number of significant digits.
+\begin{cfa}[belowskip=0pt]
+sout | ws(6,6, 234567.) | ws(6,5, 234567.) | ws(6,4, 234567.) | ws(6,3, 234567.);
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+. 2.3457®e+05® 2.346®e+05® 2.35®e+05®
+\end{cfa}
+If ©significant© is greater than ©minimum©, it defines the number of printed characters.
+\begin{cfa}[belowskip=0pt]
+sout | ws(3,6, 234567.) | ws(4,6, 234567.) | ws(5,6, 234567.) | ws(6,6, 234567.);
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+. 234567. 234567. 234567.
+\end{cfa}
+\item
+\Indexc{left}( field-width )\index{manipulator!left@©left©} left justify within the given field.
+\begin{cfa}[belowskip=0pt]
+sout | left(wd(4, 27)) | left(wd(10, 27.)) | left(wd(10, 27.5)) | left(wd(4,3, 27)) | left(wd(10,3, 27.5));
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®  ® 27.000000  27.500000  027  27.500®    ®
+\end{cfa}
+\item
+\Indexc{pad0}( field-width )\index{manipulator!pad0@©pad0©} left pad with zeroes (0).
+\begin{cfa}[belowskip=0pt]
+sout | pad0( wd( 4, 27 ) ) | pad0( wd( 4,3, 27 ) ) | pad0( wd( 8,3, 27.5 ) );
+®00®27  ®0®27 ®00®27.500
 \end{cfa}
 \end{enumerate}
 …
 int main( void ) {
         int x = 1, y = 2, z = 3;
         sout | x | y | z | endl;
+        sout | x | y | z;
         [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
         sout | t1 | t2 | endl;                                          // print tuples
         sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
         sout | 1 | 2 | 3 | endl;
         sout | '1' | '2' | '3' | endl;
         sout | 1 | "" | 2 | "" | 3 | endl;
+        sout | t1 | t2;                                         // print tuples
+        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
+        sout | 1 | 2 | 3;
+        sout | '1' | '2' | '3';
+        sout | 1 | "" | 2 | "" | 3;
         sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x =" | 4 | "x $" | 5 | "x £" | 6 | "x ¥"
                 | 7 | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10 | endl;
+                | 7 | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10;
         sout | 1 | ", x" | 2 | ". x" | 3 | "; x" | 4 | "! x" | 5 | "? x" | 6 | "% x"
                 | 7 | "¢ x" | 8 | "» x" | 9 | ") x" | 10 | "] x" | 11 | "} x" | endl;
         sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x:" | 4 | ":x " | 5 | " x\t" | 6 | "\tx" | endl;
         sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4 | endl;
+                | 7 | "¢ x" | 8 | "» x" | 9 | ") x" | 10 | "] x" | 11 | "} x";
+        sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x:" | 4 | ":x " | 5 | " x\t" | 6 | "\tx";
+        sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4;
         sepSet( sout, ", $" );                                          // set separator from " " to ", $"
         sout | 1 | 2 | 3 | " \"" | sep | "\"" | endl;
+        sout | 1 | 2 | 3 | " \"" | sep | "\"";
         sepSet( sout, " " );                                            // reset separator to " "
         sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
+        sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"";
         char store[sepSize];
         strcpy( store, sepGet( sout ) );
         sepSet( sout, "_" );
         sout | 1 | 2 | 3 | endl;
+        sout | 1 | 2 | 3;
         sepSet( sout, store );
         sout | 1 | 2 | 3 | endl;
+        sout | 1 | 2 | 3;
         sepSetTuple( sout, " " );                                       // set tuple separator from ", " to " "
         sout | t1 | t2 | " \"" | sepTuple | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepTuple | "\"";
         sepSetTuple( sout, ", " );                                      // reset tuple separator to ", "
         sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sout | sepDisable | 1 | 2 | 3 | endl;           // globally turn off implicit separator
         sout | sepEnable | 1 | 2 | 3 | endl;            // globally turn on implicit separator
         sout | 1 | sepOff | 2 | 3 | endl;                       // locally turn on implicit separator
         sout | sepDisable | 1 | sepOn | 2 | 3 | endl; // globally turn off implicit separator
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"";
+        sout | sepDisable | 1 | 2 | 3;          // globally turn off implicit separator
+        sout | sepEnable | 1 | 2 | 3;           // globally turn on implicit separator
+        sout | 1 | sepOff | 2 | 3;                      // locally turn on implicit separator
+        sout | sepDisable | 1 | sepOn | 2 | 3; // globally turn off implicit separator
         sout | sepEnable;
         sout | t1 | sepOff | t2 | endl;                         // locally turn on/off implicit separator
         sout | sepOn | 1 | 2 | 3 | sepOn | endl ;       // sepOn does nothing at start/end of line
         sout | sep | 1 | 2 | 3 | sep | endl ;           // use sep to print separator at start/end of line
+        sout | t1 | sepOff | t2;                                // locally turn on/off implicit separator
+        sout | sepOn | 1 | 2 | 3 | sepOn ;      // sepOn does nothing at start/end of line
+        sout | sep | 1 | 2 | 3 | sep ;          // use sep to print separator at start/end of line
+}
 …
 \end{comment}
 %$
+\subsection{Input Value Manipulators}
+The format of numeric input values in the same as C constants without a trailing type suffix, as the input value-type is denoted by the input variable.
+For ©_Bool© type, the constants are ©true© and ©false©.
+For integral types, any number of digits, optionally preceded by a sign (©+© or ©-©), where a
+\begin{itemize}
+\item
+©1©-©9© prefix introduces a decimal value (©0©-©9©),
+\item
+©0© prefix introduces an octal value (©0©-©7©), and
+\item
+©0x© or ©0X© prefix introduces a hexadecimal value (©0©-©f©) with lower or upper case letters.
+\end{itemize}
+For floating-point types, any number of decimal digits, optionally preceded by a sign (©+© or ©-©), optionally containing a decimal point, and optionally followed by an exponent, ©e© or ©E©, with signed (optional) decimal digits.
+Floating-point values can also be written in hexadecimal format preceded by ©0x© or ©0X© with hexadecimal digits and exponent denoted by ©p© or ©P©.
+For the C-string type, the input values are \emph{not} the same as C-string constants, \ie double quotes bracketing arbitrary text with escape sequences.
+Instead, the next sequence of non-whitespace characters are read, and the input sequence is terminated with delimiter ©'\0'©.
+The string variable \emph{must} be large enough to contain the input sequence.
+The following \Index{manipulator}s control formatting of input values (reading), and only affect the format of the argument.
+\begin{enumerate}
+\item
+\Indexc{skip( const char * pattern )}\index{manipulator!skip@©skip©} / ©skip( unsigned int length )© / ©const char * pattern©
+The argument defines a ©pattern© or ©length©.
+The ©pattern© is composed of white-space and non-white-space characters, where \emph{any} white-space character matches 0 or more input white-space characters (hence, consecutive white-space characters in the pattern are combined), and each non-white-space character matches exactly with an input character.
+The ©length© is composed of the next $N$ characters, including the newline character.
+If the match successes, the input characters are discarded, and input continues with the next character.
+If the match fails, the input characters are left unread.
+\begin{cfa}[belowskip=0pt]
+char sk[$\,$] = "abc";
+sin | "abc " | skip( sk ) | skip( 5 ); // match input sequence
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®abc   ®
+®abc  ®
+®xx®
+\end{cfa}
+\item
+\Indexc{wdi}©( unsigned int maximum, T & val )©\index{manipulator!wdi@©wdi©}
+For all types except ©char©, ©maximum© is the maximum number of characters read for the current operation.
+\begin{cfa}[belowskip=0pt]
+char s[10];   int i;   double d;
+sin | wdi( 4, s ) | wdi( 3, i ) | wdi( 8, d );  // c == "abcd", i == 123, d == 3.456E+2
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®abcd1233.456E+2®
+\end{cfa}
+Note, input ©wdi© cannot be overloaded with output ©wd© because both have the same parameters but return different types.
+Currently, \CFA cannot distinguish between these two manipulators in the middle of an ©sout©/©sin© expression based on return type.
+\item
+\Indexc{ignore( T & val )}\index{manipulator!ignore@©ignore©}
+For all types, the data is read from the stream depending on the argument type but ignored, \ie it is not stored in the argument.
+\begin{cfa}[belowskip=0pt]
+double d;
+sin | ignore( d );  // d is unchanged
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®  -75.35e-4® 25
+\end{cfa}
+\item
+\Indexc{incl( const char * scanset, char * s )}\index{manipulator!incl@©incl©}
+For the C-string type, the argument defines a ©scanset© that matches any number of characters \emph{in} the set.
+Matching characters are read into the C string and null terminated.
+\begin{cfa}[belowskip=0pt]
+char s[10];
+sin | incl( "abc", s );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®bca®xyz
+\end{cfa}
+\item
+\Indexc{excl( const char * scanset, char * s )}\index{manipulator!excl@©excl©}
+For the C-string type, the argument defines a ©scanset© that matches any number of characters \emph{not in} the set.
+Non-matching characters are read into the C string and null terminated.
+\begin{cfa}[belowskip=0pt]
+char s[10];
+sin | excl( "abc", s );
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®xyz®bca
+\end{cfa}
+\end{enumerate}
 …
 \begin{itemize}
 \item
 preventing having to determine or write long generic types,
 \item
 ensure secondary variables, related to a primary variable, always have the same type.
+not determining or writing long generic types,
+\item
+ensuring secondary variables, related to a primary variable, always have the same type.
 \end{itemize}
 …
 There is also the conundrum in type inferencing of when to \emph{\Index{brand}} a type.
 That is, when is the type of the variable more important than the type of its initialization expression.
 For example, if a change is made in an initialization expression, it can cause significant cascading type changes and/or errors.
+For example, if a change is made in an initialization expression, it can cause cascading type changes and/or errors.
 At some point, a variable type needs to remain constant and the expression to be in error when it changes.
 …
 coroutine Fibonacci {
         int fn;                                                         §\C{// used for communication}§
+        int fn; §\C{// used for communication}§
 };
 void ?{}( Fibonacci * this ) {
 …
+}
 void main( Fibonacci * this ) {
         int fn1, fn2;                                           §\C{// retained between resumes}§
         this->fn = 0;                                           §\C{// case 0}§
+        int fn1, fn2; §\C{// retained between resumes}§
+        this->fn = 0; §\C{// case 0}§
         fn1 = this->fn;
         suspend();                                                      §\C{// return to last resume}§
         this->fn = 1;                                           §\C{// case 1}§
+        suspend(); §\C{// return to last resume}§
+        this->fn = 1; §\C{// case 1}§
         fn2 = fn1;
         fn1 = this->fn;
         suspend();                                                      §\C{// return to last resume}§
         for ( ;; ) {                                            §\C{// general case}§
+        suspend(); §\C{// return to last resume}§
+        for ( ;; ) { §\C{// general case}§
                 this->fn = fn1 + fn2;
                 fn2 = fn1;
                 fn1 = this->fn;
                 suspend();                                              §\C{// return to last resume}§
+                suspend(); §\C{// return to last resume}§
         } // for
+}
 int next( Fibonacci * this ) {
         resume( this );                                         §\C{// transfer to last suspend}§
+        resume( this ); §\C{// transfer to last suspend}§
         return this->fn;
+}
 …
         Fibonacci f1, f2;
         for ( int i = 1; i <= 10; i += 1 ) {
                 sout | next( &f1 ) | ' ' | next( &f2 ) | endl;
+                sout | next( &f1 ) | ' ' | next( &f2 );
         } // for
+}
 …
                 MyThread f[4];
+        }
         sout | global.value | endl;
+        sout | global.value;
+}
 \end{cfa}
 …
 void main( First * this ) {
         for ( int i = 0; i < 10; i += 1 ) {
                 sout | "First : Suspend No." | i + 1 | endl;
+                sout | "First : Suspend No." | i + 1;
                 yield();
+        }
 …
         wait( this->lock );
         for ( int i = 0; i < 10; i += 1 ) {
                 sout | "Second : Suspend No." | i + 1 | endl;
+                sout | "Second : Suspend No." | i + 1;
                 yield();
+        }
 …
 int main( void ) {
         signal_once lock;
         sout | "User main begin" | endl;
+        sout | "User main begin";
+        {
                 processor p;
 …
+                }
+        }
         sout | "User main end" | endl;
+        sout | "User main end";
+}
 \end{cfa}
 …
 void ?{}( Line * l ) {
         l->lnth = 0.0;
         sout | "default" | endl;
+        sout | "default";
+}
 …
 void ?{}( Line * l, float lnth ) {
         l->lnth = lnth;
         sout | "lnth" | l->lnth | endl;
+        sout | "lnth" | l->lnth;
+}
 …
 // destructor
 void ^?() {
         sout | "destroyed" | endl;
+        sout | "destroyed";
         l.lnth = 0.0;
+}
 …
 In \CFA, there are ambiguous cases with dereference and operator identifiers, \eg ©int *?*?()©, where the string ©*?*?© can be interpreted as:
 \begin{cfa}
 *?§\color{red}\textvisiblespace§*?              §\C{// dereference operator, dereference operator}§
 *§\color{red}\textvisiblespace§?*?              §\C{// dereference, multiplication operator}§
+*?§\color{red}\textvisiblespace§*? §\C{// dereference operator, dereference operator}§
+*§\color{red}\textvisiblespace§?*? §\C{// dereference, multiplication operator}§
 \end{cfa}
 By default, the first interpretation is selected, which does not yield a meaningful parse.
 …
 \eg:
 \begin{cfa}
 x;                                                              §\C{// int x}§
 *y;                                                             §\C{// int *y}§
 f( p1, p2 );                                    §\C{// int f( int p1, int p2 );}§
 g( p1, p2 ) int p1, p2;                 §\C{// int g( int p1, int p2 );}§
+x; §\C{// int x}§
+*y; §\C{// int *y}§
+f( p1, p2 ); §\C{// int f( int p1, int p2 );}§
+g( p1, p2 ) int p1, p2; §\C{// int g( int p1, int p2 );}§
 \end{cfa}
 \CFA continues to support K\&R routine definitions:
 \begin{cfa}
 f( a, b, c )                                    §\C{// default int return}§
         int a, b; char c                        §\C{// K\&R parameter declarations}§
+f( a, b, c ) §\C{// default int return}§
+        int a, b; char c §\C{// K\&R parameter declarations}§
+{
         ...
 …
 int rtn( int i );
 int rtn( char c );
 rtn( 'x' );                                             §\C{// programmer expects 2nd rtn to be called}§
+rtn( 'x' ); §\C{// programmer expects 2nd rtn to be called}§
 \end{cfa}
 \item[Rationale:] it is more intuitive for the call to ©rtn© to match the second version of definition of ©rtn© rather than the first.
 In particular, output of ©char© variable now print a character rather than the decimal ASCII value of the character.
 \begin{cfa}
 sout | 'x' | " " | (int)'x' | endl;
+sout | 'x' | " " | (int)'x';
 x 120
 \end{cfa}
 …
 \item[Change:] make string literals ©const©:
 \begin{cfa}
 char * p = "abc";                               §\C{// valid in C, deprecated in \CFA}§
 char * q = expr ? "abc" : "de"; §\C{// valid in C, invalid in \CFA}§
+char * p = "abc"; §\C{// valid in C, deprecated in \CFA}§
+char * q = expr ? "abc" : "de"; §\C{// valid in C, invalid in \CFA}§
 \end{cfa}
 The type of a string literal is changed from ©[] char© to ©const [] char©.
 …
 \begin{cfa}
 char * p = "abc";
 p[0] = 'w';                                             §\C{// segment fault or change constant literal}§
+p[0] = 'w'; §\C{// segment fault or change constant literal}§
 \end{cfa}
 The same problem occurs when passing a string literal to a routine that changes its argument.
 …
 \item[Change:] remove \newterm{tentative definitions}, which only occurs at file scope:
 \begin{cfa}
 int i;                                                  §\C{// forward definition}§
 int *j = ®&i®;                                  §\C{// forward reference, valid in C, invalid in \CFA}§
 int i = 0;                                              §\C{// definition}§
+int i; §\C{// forward definition}§
+int *j = ®&i®; §\C{// forward reference, valid in C, invalid in \CFA}§
+int i = 0; §\C{// definition}§
 \end{cfa}
 is valid in C, and invalid in \CFA because duplicate overloaded object definitions at the same scope level are disallowed.
 …
 \begin{cfa}
 struct X { int i; struct X *next; };
 static struct X a;                              §\C{// forward definition}§
+static struct X a; §\C{// forward definition}§
 static struct X b = { 0, ®&a® };§\C{// forward reference, valid in C, invalid in \CFA}§
 static struct X a = { 1, &b };  §\C{// definition}§
+static struct X a = { 1, &b }; §\C{// definition}§
 \end{cfa}
 \item[Rationale:] avoids having different initialization rules for builtin types and user-defined types.
 …
 struct Person {
         enum ®Colour® { R, G, B };      §\C[7cm]{// nested type}§
         struct Face {                           §\C{// nested type}§
                 ®Colour® Eyes, Hair;    §\C{// type defined outside (1 level)}§
+        struct Face { §\C{// nested type}§
+                ®Colour® Eyes, Hair; §\C{// type defined outside (1 level)}§
         };
         ®.Colour® shirt;                        §\C{// type defined outside (top level)}§
         ®Colour® pants;                         §\C{// type defined same level}§
         Face looks[10];                         §\C{// type defined same level}§
+        ®.Colour® shirt; §\C{// type defined outside (top level)}§
+        ®Colour® pants; §\C{// type defined same level}§
+        Face looks[10]; §\C{// type defined same level}§
 };
 ®Colour® c = R;                                 §\C{// type/enum defined same level}§
+®Colour® c = R; §\C{// type/enum defined same level}§
 Person®.Colour® pc = Person®.®R;§\C{// type/enum defined inside}§
 Person®.®Face pretty;                   §\C{// type defined inside}\CRT§
+Person®.®Face pretty; §\C{// type defined inside}\CRT§
 \end{cfa}
 In C, the name of the nested types belongs to the same scope as the name of the outermost enclosing structure, \ie the nested types are hoisted to the scope of the outer-most type, which is not useful and confusing.
 …
 \item[Difficulty of converting:] Semantic transformation. To make the struct type name visible in the scope of the enclosing struct, the struct tag could be declared in the scope of the enclosing struct, before the enclosing struct is defined. Example:
 \begin{cfa}
 struct Y;                                               §\C{// struct Y and struct X are at the same scope}§
+struct Y; §\C{// struct Y and struct X are at the same scope}§
 struct X {
         struct Y { /* ... */ } y;
 …
 \begin{cfa}
 void foo() {
         int * b = malloc( sizeof(int) );        §\C{// implicitly convert void * to int *}§
         char * c = b;                           §\C{// implicitly convert int * to void *, and then void * to char *}§
+        int * b = malloc( sizeof(int) ); §\C{// implicitly convert void * to int *}§
+        char * c = b; §\C{// implicitly convert int * to void *, and then void * to char *}§
+}
 \end{cfa}
 …
 void * memalign( size_t align, size_t size );§\indexc{memalign}§
 int posix_memalign( void ** ptr, size_t align, size_t size );§\indexc{posix_memalign}§
+}
-// §\CFA§ safe equivalents, i.e., implicit size specification
-forall( dtype T | sized(T) ) T * malloc( void );
-forall( dtype T | sized(T) ) T * calloc( size_t dim );
-forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size );
-forall( dtype T | sized(T) ) T * memalign( size_t align );
-forall( dtype T | sized(T) ) T * aligned_alloc( size_t align );
-forall( dtype T | sized(T) ) int posix_memalign( T ** ptr, size_t align );
-// §\CFA§ safe general allocation, fill, resize, array
-forall( dtype T | sized(T) ) T * alloc( void );§\indexc{alloc}§
-forall( dtype T | sized(T) ) T * alloc( char fill );
-forall( dtype T | sized(T) ) T * alloc( size_t dim );
-forall( dtype T | sized(T) ) T * alloc( size_t dim, char fill );
-forall( dtype T | sized(T) ) T * alloc( T ptr[], size_t dim );
-forall( dtype T | sized(T) ) T * alloc( T ptr[], size_t dim, char fill );
-// §\CFA§ safe general allocation, align, fill, array
-forall( dtype T | sized(T) ) T * align_alloc( size_t align );
-forall( dtype T | sized(T) ) T * align_alloc( size_t align, char fill );
-forall( dtype T | sized(T) ) T * align_alloc( size_t align, size_t dim );
-forall( dtype T | sized(T) ) T * align_alloc( size_t align, size_t dim, char fill );
 // C unsafe initialization/copy
-extern "C" {
 void * memset( void * dest, int c, size_t size );
 void * memcpy( void * dest, const void * src, size_t size );
+}
+forall( dtype T | sized(T) ) {
+// §\CFA§ safe equivalents, i.e., implicit size specification
+        T * malloc( void );
+        T * calloc( size_t dim );
+        T * realloc( T * ptr, size_t size );
+        T * memalign( size_t align );
+        T * aligned_alloc( size_t align );
+        int posix_memalign( T ** ptr, size_t align );
+// §\CFA§ safe general allocation, fill, resize, array
+        T * alloc( void );§\indexc{alloc}§
+        T * alloc( char fill );
+        T * alloc( size_t dim );
+        T * alloc( size_t dim, char fill );
+        T * alloc( T ptr[], size_t dim );
+        T * alloc( T ptr[], size_t dim, char fill );
+// §\CFA§ safe general allocation, align, fill, array
+        T * align_alloc( size_t align );
+        T * align_alloc( size_t align, char fill );
+        T * align_alloc( size_t align, size_t dim );
+        T * align_alloc( size_t align, size_t dim, char fill );
 // §\CFA§ safe initialization/copy, i.e., implicit size specification
 forall( dtype T | sized(T) ) T * memset( T * dest, char c );§\indexc{memset}§
 forall( dtype T | sized(T) ) T * memcpy( T * dest, const T * src );§\indexc{memcpy}§
+        T * memset( T * dest, char c );§\indexc{memset}§
+        T * memcpy( T * dest, const T * src );§\indexc{memcpy}§
 // §\CFA§ safe initialization/copy array
+forall( dtype T | sized(T) ) T * memset( T dest[], size_t dim, char c );
+forall( dtype T | sized(T) ) T * memcpy( T dest[], const T src[], size_t dim );
+        T * amemset( T dest[], char c, size_t dim );
+        T * amemcpy( T dest[], const T src[], size_t dim );
+}
 // §\CFA§ allocation/deallocation and constructor/destructor
 …
 \subsection{Conversion}
+\subsection{String to Value Conversion}
 \leavevmode
 …
 \leavevmode
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
 forall( otype T | { int ?<?( T, T ); } )        §\C{// location}§
+forall( otype T | { int ?<?( T, T ); } ) §\C{// location}§
 T * bsearch( T key, const T * arr, size_t dim );§\indexc{bsearch}§
 forall( otype T | { int ?<?( T, T ); } )        §\C{// position}§
+forall( otype T | { int ?<?( T, T ); } ) §\C{// position}§
 unsigned int bsearch( T key, const T * arr, size_t dim );
 forall( otype T | { int ?<?( T, T ); } )
 void qsort( const T * arr, size_t dim );§\indexc{qsort}§
+forall( otype E | { int ?<?( E, E ); } ) {
+        E * bsearch( E key, const E * vals, size_t dim );§\indexc{bsearch}§ §\C{// location}§
+        size_t bsearch( E key, const E * vals, size_t dim );§\C{// position}§
+        E * bsearchl( E key, const E * vals, size_t dim );§\indexc{bsearchl}§
+        size_t bsearchl( E key, const E * vals, size_t dim );
+        E * bsearchu( E key, const E * vals, size_t dim );§\indexc{bsearchu}§
+        size_t bsearchu( E key, const E * vals, size_t dim );
+}
+forall( otype K, otype E | { int ?<?( K, K ); K getKey( const E & ); } ) {
+        E * bsearch( K key, const E * vals, size_t dim );
+        size_t bsearch( K key, const E * vals, size_t dim );
+        E * bsearchl( K key, const E * vals, size_t dim );
+        size_t bsearchl( K key, const E * vals, size_t dim );
+        E * bsearchu( K key, const E * vals, size_t dim );
+        size_t bsearchu( K key, const E * vals, size_t dim );
+}
+forall( otype E | { int ?<?( E, E ); } ) {
+        void qsort( E * vals, size_t dim );§\indexc{qsort}§
+}
 \end{cfa}
 …
 \leavevmode
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+void rand48seed( long int s );§\indexc{rand48seed}§
+char rand48();§\indexc{rand48}§
+int rand48();
+unsigned int rand48();
+long int rand48();
+unsigned long int rand48();
+float rand48();
+double rand48();
+float _Complex rand48();
+double _Complex rand48();
+long double _Complex rand48();
+void srandom( unsigned int seed );§\indexc{srandom}§
+char random( void );§\indexc{random}§
+char random( char u ); §\C{// [0,u)}§
+char random( char l, char u ); §\C{// [l,u)}§
+int random( void );
+int random( int u ); §\C{// [0,u)}§
+int random( int l, int u ); §\C{// [l,u)}§
+unsigned int random( void );
+unsigned int random( unsigned int u ); §\C{// [0,u)}§
+unsigned int random( unsigned int l, unsigned int u ); §\C{// [l,u)}§
+long int random( void );
+long int random( long int u ); §\C{// [0,u)}§
+long int random( long int l, long int u ); §\C{// [l,u)}§
+unsigned long int random( void );
+unsigned long int random( unsigned long int u ); §\C{// [0,u)}§
+unsigned long int random( unsigned long int l, unsigned long int u ); §\C{// [l,u)}§
+float random( void );                                            §\C{// [0.0, 1.0)}§
+double random( void );                                           §\C{// [0.0, 1.0)}§
+float _Complex random( void );                           §\C{// [0.0, 1.0)+[0.0, 1.0)i}§
+double _Complex random( void );                          §\C{// [0.0, 1.0)+[0.0, 1.0)i}§
+long double _Complex random( void );             §\C{// [0.0, 1.0)+[0.0, 1.0)i}§
 \end{cfa}
 …
 [ int, long double ] remquo( long double, long double );
 float div( float, float, int * );§\indexc{div}§ §\C{// alternative name for remquo}§
+float div( float, float, int * );§\indexc{div}§ §\C{// alternative name for remquo}§
 double div( double, double, int * );
 long double div( long double, long double, int * );
 …
 long double atan2( long double, long double );
 float atan( float, float );                                     §\C{// alternative name for atan2}§
+float atan( float, float ); §\C{// alternative name for atan2}§
 double atan( double, double );§\indexc{atan}§
 long double atan( long double, long double );
 …
 \section{Time}
 \label{s:TimeLib}
+\section{Time Keeping}
+\label{s:TimeKeeping}
 %\subsection{\texorpdfstring{\protect\lstinline@Duration@}{Duration}}
 \subsection{\texorpdfstring{\LstKeywordStyle{\textmd{Duration}}}{Duration}}
+\subsection{\texorpdfstring{\LstBasicStyle{Duration}}{Duration}}
 \label{s:Duration}
 …
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
 struct Duration {
         int64_t tv;                                                     §\C{// nanoseconds}§
+        int64_t tv; §\C{// nanoseconds}§
 };
 …
 Duration abs( Duration rhs );
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Duration dur );
 Duration ?`ns( int64_t nsec );
 …
 int64_t ?`d( Duration dur );
 int64_t ?`w( Duration dur );
+Duration max( Duration lhs, Duration rhs );
+Duration min( Duration lhs, Duration rhs );
 \end{cfa}
 %\subsection{\texorpdfstring{\protect\lstinline@\timeval@}{timeval}}
 \subsection{\texorpdfstring{\LstKeywordStyle{\textmd{timeval}}}{timeval}}
+\subsection{\texorpdfstring{\LstBasicStyle{timeval}}{timeval}}
 \label{s:timeval}
 …
+\subsection{\texorpdfstring{\protect\lstinline@timespec@}{timespec}}
+%\subsection{\texorpdfstring{\protect\lstinline@timespec@}{timespec}}
+\subsection{\texorpdfstring{\LstBasicStyle{timespec}}{timespec}}
 \label{s:timespec}
 …
+\subsection{\texorpdfstring{\protect\lstinline@itimerval@}{itimerval}}
+%\subsection{\texorpdfstring{\protect\lstinline@itimerval@}{itimerval}}
+\subsection{\texorpdfstring{\LstBasicStyle{itimerval}}{itimerval}}
 \label{s:itimerval}
 …
+\subsection{\texorpdfstring{\protect\lstinline@Time@}{Time}}
+%\subsection{\texorpdfstring{\protect\lstinline@Time@}{Time}}
+\subsection{\texorpdfstring{\LstBasicStyle{Time}}{Time}}
 \label{s:Time}
 …
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
 struct Time {
         uint64_t tv;                                            §\C{// nanoseconds since UNIX epoch}§
+        uint64_t tv; §\C{// nanoseconds since UNIX epoch}§
 };
 void ?{}( Time & time );
 void ?{}( Time & time, zero_t );
+void ?{}( Time & time, int year, int month = 0, int day = 0, int hour = 0, int min = 0, int sec = 0, int nsec = 0 );
 Time ?=?( Time & time, zero_t );
 …
 Time ?=?( Time & time, timespec t );
+Time ?+?( Time & lhs, Duration rhs ) { return (Time)@{ lhs.tv + rhs.tv }; }
+Time ?+?( Duration lhs, Time rhs ) { return rhs + lhs; }
+Time ?+=?( Time & lhs, Duration rhs ) { lhs = lhs + rhs; return lhs; }
+Duration ?-?( Time lhs, Time rhs ) { return (Duration)@{ lhs.tv - rhs.tv }; }
+Time ?-?( Time lhs, Duration rhs ) { return (Time)@{ lhs.tv - rhs.tv }; }
+Time ?-=?( Time & lhs, Duration rhs ) { lhs = lhs - rhs; return lhs; }
+_Bool ?==?( Time lhs, Time rhs ) { return lhs.tv == rhs.tv; }
+_Bool ?!=?( Time lhs, Time rhs ) { return lhs.tv != rhs.tv; }
+_Bool ?<?( Time lhs, Time rhs ) { return lhs.tv < rhs.tv; }
+_Bool ?<=?( Time lhs, Time rhs ) { return lhs.tv <= rhs.tv; }
+_Bool ?>?( Time lhs, Time rhs ) { return lhs.tv > rhs.tv; }
+_Bool ?>=?( Time lhs, Time rhs ) { return lhs.tv >= rhs.tv; }
+forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Time time );
+Time ?+?( Time & lhs, Duration rhs );
+Time ?+?( Duration lhs, Time rhs );
+Time ?+=?( Time & lhs, Duration rhs );
+Duration ?-?( Time lhs, Time rhs );
+Time ?-?( Time lhs, Duration rhs );
+Time ?-=?( Time & lhs, Duration rhs );
+_Bool ?==?( Time lhs, Time rhs );
+_Bool ?!=?( Time lhs, Time rhs );
+_Bool ?<?( Time lhs, Time rhs );
+_Bool ?<=?( Time lhs, Time rhs );
+_Bool ?>?( Time lhs, Time rhs );
+_Bool ?>=?( Time lhs, Time rhs );
 char * yy_mm_dd( Time time, char * buf );
 …
 size_t strftime( char * buf, size_t size, const char * fmt, Time time );
+forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Time time );
 \end{cfa}
 …
 %\subsection{\texorpdfstring{\protect\lstinline@Clock@}{Clock}}
 \subsection{\texorpdfstring{\LstKeywordStyle{\textmd{Clock}}}{Clock}}
+\subsection{\texorpdfstring{\LstBasicStyle{Clock}}{Clock}}
 \label{s:Clock}
 …
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
 struct Clock {
         Duration offset;                                        §\C{// for virtual clock: contains offset from real-time}§
         int clocktype;                                          §\C{// implementation only -1 (virtual), CLOCK\_REALTIME}§
+        Duration offset; §\C{// for virtual clock: contains offset from real-time}§
+        int clocktype; §\C{// implementation only -1 (virtual), CLOCK\_REALTIME}§
 };
 …
 void ?{}( Clock & clk );
 void ?{}( Clock & clk, Duration adj );
+Duration getRes();
+Time getTimeNsec();                                             §\C{// with nanoseconds}§
+Time getTime();                                                 §\C{// without nanoseconds}§
+Duration getResNsec(); §\C{// with nanoseconds}§
+Duration getRes(); §\C{// without nanoseconds}§
+Time getTimeNsec(); §\C{// with nanoseconds}§
+Time getTime(); §\C{// without nanoseconds}§
 Time getTime( Clock & clk );
 Time ?()( Clock & clk );
 …
 \begin{cfa}
 void ?{}( Int * this );                                 §\C{// constructor/destructor}§
+void ?{}( Int * this ); §\C{// constructor/destructor}§
 void ?{}( Int * this, Int init );
 void ?{}( Int * this, zero_t );
 …
 void ^?{}( Int * this );
 Int ?=?( Int * lhs, Int rhs );                  §\C{// assignment}§
+Int ?=?( Int * lhs, Int rhs ); §\C{// assignment}§
 Int ?=?( Int * lhs, long int rhs );
 Int ?=?( Int * lhs, unsigned long int rhs );
 …
 unsigned long int narrow( Int val );
 int ?==?( Int oper1, Int oper2 );               §\C{// comparison}§
+int ?==?( Int oper1, Int oper2 ); §\C{// comparison}§
 int ?==?( Int oper1, long int oper2 );
 int ?==?( long int oper2, Int oper1 );
 …
 int ?>=?( unsigned long int oper1, Int oper2 );
 Int +?( Int oper );                                             §\C{// arithmetic}§
+Int +?( Int oper ); §\C{// arithmetic}§
 Int -?( Int oper );
 Int ~?( Int oper );
 …
 Int ?>>=?( Int * lhs, mp_bitcnt_t shift );
 Int abs( Int oper );                                    §\C{// number functions}§
+Int abs( Int oper ); §\C{// number functions}§
 Int fact( unsigned long int N );
 Int gcd( Int oper1, Int oper2 );
 …
 #include <gmp>§\indexc{gmp}§
 int main( void ) {
         sout | "Factorial Numbers" | endl;
+        sout | "Factorial Numbers";
         Int fact = 1;
         sout | 0 | fact | endl;
+        sout | 0 | fact;
         for ( unsigned int i = 1; i <= 40; i += 1 ) {
                 fact *= i;
                 sout | i | fact | endl;
+                sout | i | fact;
+        }
+}
 …
 // implementation
 struct Rational {§\indexc{Rational}§
         long int numerator, denominator;        §\C{// invariant: denominator > 0}§
+        long int numerator, denominator; §\C{// invariant: denominator > 0}§
 }; // Rational
 Rational rational();                                    §\C{// constructors}§
+Rational rational(); §\C{// constructors}§
 Rational rational( long int n );
 Rational rational( long int n, long int d );
 …
 void ?{}( Rational * r, one_t );
 long int numerator( Rational r );               §\C{// numerator/denominator getter/setter}§
+long int numerator( Rational r ); §\C{// numerator/denominator getter/setter}§
 long int numerator( Rational r, long int n );
 long int denominator( Rational r );
 long int denominator( Rational r, long int d );
 int ?==?( Rational l, Rational r );             §\C{// comparison}§
+int ?==?( Rational l, Rational r ); §\C{// comparison}§
 int ?!=?( Rational l, Rational r );
 int ?<?( Rational l, Rational r );
 …
 int ?>=?( Rational l, Rational r );
 Rational -?( Rational r );                              §\C{// arithmetic}§
+Rational -?( Rational r ); §\C{// arithmetic}§
 Rational ?+?( Rational l, Rational r );
 Rational ?-?( Rational l, Rational r );
 …
 Rational ?/?( Rational l, Rational r );
 double widen( Rational r );                             §\C{// conversion}§
+double widen( Rational r ); §\C{// conversion}§
 Rational narrow( double f, long int md );

doc/working/exception/impl/exception.c

-              r7951100
+              rb067d9b
                                         // Get a function pointer from the relative offset and call it
                                         // _Unwind_Reason_Code (*matcher)() = (_Unwind_Reason_Code (*)())lsd_info.LPStart + imatcher;
+                                        // _Unwind_Reason_Code (*matcher)() = (_Unwind_Reason_Code (*)())lsd_info.LPStart + imatcher;
                                         _Unwind_Reason_Code (*matcher)() =
 …
         // on how the assembly works.
         // Setup the personality routine
+        #if defined(__PIC__)
+        asm volatile (".cfi_personality 0x9b,CFA.ref.__gcfa_personality_v0");
+        // Setup the exception table
+        asm volatile (".cfi_lsda 0x1b, .LLSDACFA2");
+        #else
         asm volatile (".cfi_personality 0x3,__gcfa_personality_v0");
         // Setup the exception table
         asm volatile (".cfi_lsda 0x3, .LLSDACFA2");
+        #endif
         // Label which defines the start of the area for which the handler is setup
 …
 // Some more works need to be done if we want to have a single
 // call to the try routine
+#if defined(__PIC__)
+asm (
+        //HEADER
+        ".LFECFA1:\n"
+        "       .globl  __gcfa_personality_v0\n"
+        "       .section        .gcc_except_table,\"a\",@progbits\n"
+        ".LLSDACFA2:\n"                                                 //TABLE header
+        "       .byte   0xff\n"
+        "       .byte   0xff\n"
+        "       .byte   0x1\n"
+        "       .uleb128 .LLSDACSECFA2-.LLSDACSBCFA2\n"         // BODY length
+        // Body uses language specific data and therefore could be modified arbitrarily
+        ".LLSDACSBCFA2:\n"                                              // BODY start
+        "       .uleb128 .TRYSTART-__try_terminate\n"           // Handled area start  (relative to start of function)
+        "       .uleb128 .TRYEND-.TRYSTART\n"                           // Handled area length
+        "       .uleb128 .CATCH-__try_terminate\n"                      // Handler landing pad adress  (relative to start of function)
+        "       .uleb128 1\n"                                           // Action code, gcc seems to use always 0
+        ".LLSDACSECFA2:\n"                                              // BODY end
+        "       .text\n"                                                        // TABLE footer
+        "       .size   __try_terminate, .-__try_terminate\n"
+);
+// Somehow this piece of helps with the resolution of debug symbols.
+__attribute__((unused)) static const int dummy = 0;
+asm (
+        "       .hidden CFA.ref.__gcfa_personality_v0\n"        // Declare an new hidden symbol
+        "       .weak   CFA.ref.__gcfa_personality_v0\n"
+        "       .section        .data.rel.local.CFA.ref.__gcfa_personality_v0,\"awG\",@progbits,CFA.ref.__gcfa_personality_v0,comdat\n" // No clue what this does specifically
+        "       .align 8\n"
+        "       .type CFA.ref.__gcfa_personality_v0, @object\n" // Type of our hidden symbol (it's not actually the function itself)
+        "       .size CFA.ref.__gcfa_personality_v0, 8\n"               // Size of our hidden symbol
+        "CFA.ref.__gcfa_personality_v0:\n"
+        "       .quad __gcfa_personality_v0\n"
+);
+#else
 asm (
         //HEADER
 …
         "       .text\n"                                                        // TABLE footer
         "       .size   __try_terminate, .-__try_terminate\n"
-        "       .ident  \"GCC: (Ubuntu 6.2.0-3ubuntu11~16.04) 6.2.0 20160901\"\n"
-//      "       .section        .note.GNU-stack,\"x\",@progbits\n"
 );
+#endif

src/CodeGen/CodeGenerator.cc

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat May  5 09:08:32 2018
 // Update Count     : 494
+// Last Modified On : Sat Oct 19 19:30:38 2019
+// Update Count     : 506
 //
 #include "CodeGenerator.h"
 …
         void CodeGenerator::updateLocation( CodeLocation const & to ) {
                 // skip if linemarks shouldn't appear or if codelocation is unset
                 if ( !lineMarks || to.isUnset() ) return;
+                if ( !options.lineMarks || to.isUnset() ) return;
                 if ( currentLocation.followedBy( to, 0 ) ) {
 …
+        }
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), printExprTypes( printExprTypes ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( 0, CodeGenerator::tabsize ), output( os ), printLabels( *this ), options( pretty, genC, lineMarks, printExprTypes ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, const Options &options ) : indent( 0, CodeGenerator::tabsize ), output( os ), printLabels( *this ), options(options), endl( *this ) {}
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
                 // GCC builtins should always be printed unmangled
                 if ( pretty || decl->linkage.is_gcc_builtin ) return decl->name;
+                if ( options.pretty || decl->linkage.is_gcc_builtin ) return decl->name;
                 if ( decl->mangleName != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
 …
                 output << "__attribute__ ((";
                 for ( list< Attribute * >::iterator attr( attributes.begin() );; ) {
                         output << (*attr)->get_name();
                         if ( ! (*attr)->get_parameters().empty() ) {
+                        output << (*attr)->name;
+                        if ( ! (*attr)->parameters.empty() ) {
                                 output << "(";
                                 genCommaList( (*attr)->get_parameters().begin(), (*attr)->get_parameters().end() );
+                                genCommaList( (*attr)->parameters.begin(), (*attr)->parameters.end() );
                                 output << ")";
                         } // if
 …
                 previsit( (BaseSyntaxNode *)node );
                 GuardAction( [this, node](){
                         if ( printExprTypes ) {
                                 output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
+                        if ( options.printExprTypes && node->result ) {
+                                output << " /* " << genType( node->result, "", options ) << " */ ";
+                        }
                 } );
 …
         void CodeGenerator::postvisit( FunctionDecl * functionDecl ) {
                 // deleted decls should never be used, so don't print them
                 if ( functionDecl->isDeleted && genC ) return;
+                if ( functionDecl->isDeleted && options.genC ) return;
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
 …
                 functionDecl->get_funcSpec().print( output );
+                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty, genC );
+                Options subOptions = options;
+                subOptions.anonymousUnused = functionDecl->has_body();
+                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), subOptions );
                 asmName( functionDecl );
 …
         void CodeGenerator::postvisit( ObjectDecl * objectDecl ) {
                 // deleted decls should never be used, so don't print them
+                if ( objectDecl->isDeleted && genC ) return;
+                if (objectDecl->get_name().empty() && genC ) {
+                if ( objectDecl->isDeleted && options.genC ) return;
+                // gcc allows an empty declarator (no name) for bit-fields and C states: 6.7.2.1 Structure and union specifiers,
+                // point 4, page 113: If the (bit field) value is zero, the declaration shall have no declarator.  For anything
+                // else, the anonymous name refers to the anonymous object for plan9 inheritance.
+                if ( objectDecl->get_name().empty() && options.genC && ! objectDecl->get_bitfieldWidth() ) {
                         // only generate an anonymous name when generating C code, otherwise it clutters the output too much
                         static UniqueName name = { "__anonymous_object" };
                         objectDecl->set_name( name.newName() );
+                        // Stops unused parameter warnings.
+                        if ( options.anonymousUnused ) {
+                                objectDecl->attributes.push_back( new Attribute( "unused" ) );
+                        }
+                }
 …
                 handleStorageClass( objectDecl );
                 output << genType( objectDecl->get_type(), mangleName( objectDecl ), pretty, genC );
+                output << genType( objectDecl->get_type(), mangleName( objectDecl ), options.pretty, options.genC );
                 asmName( objectDecl );
 …
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
                 if( ! aggDecl->get_parameters().empty() && ! genC ) {
+                if( ! aggDecl->parameters.empty() && ! options.genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         output << "forall(";
                         genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
+                        genCommaList( aggDecl->parameters.begin(), aggDecl->parameters.end() );
                         output << ")" << endl;
                         output << indent;
 …
                 output << kind;
                 genAttributes( aggDecl->get_attributes() );
                 output << aggDecl->get_name();
+                genAttributes( aggDecl->attributes );
+                output << aggDecl->name;
                 if ( aggDecl->has_body() ) {
                         std::list< Declaration * > & memb = aggDecl->get_members();
+                        std::list< Declaration * > & memb = aggDecl->members;
                         output << " {" << endl;
 …
         void CodeGenerator::postvisit( TraitDecl * traitDecl ) {
                 assertf( ! genC, "TraitDecls should not reach code generation." );
+                assertf( ! options.genC, "TraitDecls should not reach code generation." );
                 extension( traitDecl );
                 handleAggregate( traitDecl, "trait " );
 …
         void CodeGenerator::postvisit( TypedefDecl * typeDecl ) {
                 assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
+                assertf( ! options.genC, "Typedefs are removed and substituted in earlier passes." );
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
+                output << genType( typeDecl->get_base(), typeDecl->get_name(), options ) << endl;
+        }
         void CodeGenerator::postvisit( TypeDecl * typeDecl ) {
                 assertf( ! genC, "TypeDecls should not reach code generation." );
+                assertf( ! options.genC, "TypeDecls should not reach code generation." );
                 output << typeDecl->genTypeString() << " " << typeDecl->name;
                 if ( typeDecl->sized ) {
 …
         void CodeGenerator::postvisit( ConstructorInit * init ){
                 assertf( ! genC, "ConstructorInit nodes should not reach code generation." );
+                assertf( ! options.genC, "ConstructorInit nodes should not reach code generation." );
                 // pseudo-output for constructor/destructor pairs
                 output << "<ctorinit>{" << endl << ++indent << "ctor: ";
 …
                                         } else {
                                                 // no constructors with 0 or more than 2 parameters
                                                 assertf( ! genC, "UntypedExpr constructor/destructor with 0 or more than 2 parameters." );
+                                                assertf( ! options.genC, "UntypedExpr constructor/destructor with 0 or more than 2 parameters." );
                                                 output << "(";
                                                 (*arg++)->accept( *visitor );
 …
                         // an lvalue cast, this has been taken out.
                         output << "(";
                         output << genType( castExpr->get_result(), "", pretty, genC );
+                        output << genType( castExpr->get_result(), "", options );
                         output << ")";
                 } // if
 …
         void CodeGenerator::postvisit( KeywordCastExpr * castExpr ) {
                 assertf( ! genC, "KeywordCast should not reach code generation." );
+                assertf( ! options.genC, "KeywordCast should not reach code generation." );
                 extension( castExpr );
                 output << "((" << castExpr->targetString() << " &)";
 …
         void CodeGenerator::postvisit( VirtualCastExpr * castExpr ) {
                 assertf( ! genC, "VirtualCastExpr should not reach code generation." );
+                assertf( ! options.genC, "VirtualCastExpr should not reach code generation." );
                 extension( castExpr );
                 output << "(virtual ";
 …
         void CodeGenerator::postvisit( UntypedMemberExpr * memberExpr ) {
                 assertf( ! genC, "UntypedMemberExpr should not reach code generation." );
+                assertf( ! options.genC, "UntypedMemberExpr should not reach code generation." );
                 extension( memberExpr );
                 memberExpr->get_aggregate()->accept( *visitor );
 …
                 output << "sizeof(";
                 if ( sizeofExpr->get_isType() ) {
                         output << genType( sizeofExpr->get_type(), "", pretty, genC );
+                        output << genType( sizeofExpr->get_type(), "", options );
                 } else {
                         sizeofExpr->get_expr()->accept( *visitor );
 …
                 output << "__alignof__(";
                 if ( alignofExpr->get_isType() ) {
                         output << genType( alignofExpr->get_type(), "", pretty, genC );
+                        output << genType( alignofExpr->get_type(), "", options );
                 } else {
                         alignofExpr->get_expr()->accept( *visitor );
 …
         void CodeGenerator::postvisit( UntypedOffsetofExpr * offsetofExpr ) {
                 assertf( ! genC, "UntypedOffsetofExpr should not reach code generation." );
+                assertf( ! options.genC, "UntypedOffsetofExpr should not reach code generation." );
                 output << "offsetof(";
                 output << genType( offsetofExpr->get_type(), "", pretty, genC );
+                output << genType( offsetofExpr->get_type(), "", options );
                 output << ", " << offsetofExpr->get_member();
                 output << ")";
 …
                 // use GCC builtin
                 output << "__builtin_offsetof(";
                 output << genType( offsetofExpr->get_type(), "", pretty, genC );
+                output << genType( offsetofExpr->get_type(), "", options );
                 output << ", " << mangleName( offsetofExpr->get_member() );
                 output << ")";
 …
         void CodeGenerator::postvisit( OffsetPackExpr * offsetPackExpr ) {
                 assertf( ! genC, "OffsetPackExpr should not reach code generation." );
                 output << "__CFA_offsetpack(" << genType( offsetPackExpr->get_type(), "", pretty, genC ) << ")";
+                assertf( ! options.genC, "OffsetPackExpr should not reach code generation." );
+                output << "__CFA_offsetpack(" << genType( offsetPackExpr->get_type(), "", options ) << ")";
+        }
 …
                 extension( commaExpr );
                 output << "(";
                 if ( genC ) {
+                if ( options.genC ) {
                         // arg1 of a CommaExpr is never used, so it can be safely cast to void to reduce gcc warnings.
                         commaExpr->set_arg1( new CastExpr( commaExpr->get_arg1() ) );
 …
         void CodeGenerator::postvisit( TupleAssignExpr * tupleExpr ) {
                 assertf( ! genC, "TupleAssignExpr should not reach code generation." );
+                assertf( ! options.genC, "TupleAssignExpr should not reach code generation." );
                 tupleExpr->stmtExpr->accept( *visitor );
+        }
         void CodeGenerator::postvisit( UntypedTupleExpr * tupleExpr ) {
                 assertf( ! genC, "UntypedTupleExpr should not reach code generation." );
+                assertf( ! options.genC, "UntypedTupleExpr should not reach code generation." );
                 extension( tupleExpr );
                 output << "[";
 …
         void CodeGenerator::postvisit( TupleExpr * tupleExpr ) {
                 assertf( ! genC, "TupleExpr should not reach code generation." );
+                assertf( ! options.genC, "TupleExpr should not reach code generation." );
                 extension( tupleExpr );
                 output << "[";
 …
         void CodeGenerator::postvisit( TupleIndexExpr * tupleExpr ) {
                 assertf( ! genC, "TupleIndexExpr should not reach code generation." );
+                assertf( ! options.genC, "TupleIndexExpr should not reach code generation." );
                 extension( tupleExpr );
                 tupleExpr->get_tuple()->accept( *visitor );
 …
         void CodeGenerator::postvisit( TypeExpr * typeExpr ) {
                 // if ( genC ) std::cerr << "typeexpr still exists: " << typeExpr << std::endl;
                 // assertf( ! genC, "TypeExpr should not reach code generation." );
                 if ( ! genC ) {
                         output<< genType( typeExpr->get_type(), "", pretty, genC );
+                // if ( options.genC ) std::cerr << "typeexpr still exists: " << typeExpr << std::endl;
+                // assertf( ! options.genC, "TypeExpr should not reach code generation." );
+                if ( ! options.genC ) {
+                        output << genType( typeExpr->get_type(), "", options );
+                }
+        }
 …
         void CodeGenerator::postvisit( CompoundLiteralExpr *compLitExpr ) {
                 assert( compLitExpr->get_result() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
                 output << "(" << genType( compLitExpr->get_result(), "", pretty, genC ) << ")";
+                output << "(" << genType( compLitExpr->get_result(), "", options ) << ")";
                 compLitExpr->get_initializer()->accept( *visitor );
+        }
         void CodeGenerator::postvisit( UniqueExpr * unqExpr ) {
                 assertf( ! genC, "Unique expressions should not reach code generation." );
+                assertf( ! options.genC, "Unique expressions should not reach code generation." );
                 output << "unq<" << unqExpr->get_id() << ">{ ";
                 unqExpr->get_expr()->accept( *visitor );
 …
         void CodeGenerator::postvisit( ConstructorExpr * expr ) {
                 assertf( ! genC, "Unique expressions should not reach code generation." );
+                assertf( ! options.genC, "Unique expressions should not reach code generation." );
                 expr->callExpr->accept( *visitor );
+        }
         void CodeGenerator::postvisit( DeletedExpr * expr ) {
                 assertf( ! genC, "Deleted expressions should not reach code generation." );
+                assertf( ! options.genC, "Deleted expressions should not reach code generation." );
                 expr->expr->accept( *visitor );
+        }
+        void CodeGenerator::postvisit( DefaultArgExpr * arg ) {
+                assertf( ! options.genC, "Default argument expressions should not reach code generation." );
+                arg->expr->accept( *visitor );
+        }
         void CodeGenerator::postvisit( GenericExpr * expr ) {
                 assertf( ! genC, "C11 _Generic expressions should not reach code generation." );
+                assertf( ! options.genC, "C11 _Generic expressions should not reach code generation." );
                 output << "_Generic(";
                 expr->control->accept( *visitor );
 …
                                 output << "default: ";
                         } else {
                                 output << genType( assoc.type, "", pretty, genC ) << ": ";
+                                output << genType( assoc.type, "", options ) << ": ";
+                        }
                         assoc.expr->accept( *visitor );
 …
         void CodeGenerator::postvisit( ExprStmt * exprStmt ) {
                 assert( exprStmt );
                 if ( genC ) {
+                if ( options.genC ) {
                         // cast the top-level expression to void to reduce gcc warnings.
                         exprStmt->set_expr( new CastExpr( exprStmt->get_expr() ) );
 …
                   case BranchStmt::FallThrough:
                   case BranchStmt::FallThroughDefault:
                         assertf( ! genC, "fallthru should not reach code generation." );
+                        assertf( ! options.genC, "fallthru should not reach code generation." );
                   output << "fallthru";
                         break;
                 } // switch
                 // print branch target for labelled break/continue/fallthru in debug mode
                 if ( ! genC && branchStmt->get_type() != BranchStmt::Goto ) {
+                if ( ! options.genC && branchStmt->get_type() != BranchStmt::Goto ) {
                         if ( ! branchStmt->get_target().empty() ) {
                                 output << " " << branchStmt->get_target();
 …
         void CodeGenerator::postvisit( ThrowStmt * throwStmt ) {
                 assertf( ! genC, "Throw statements should not reach code generation." );
+                assertf( ! options.genC, "Throw statements should not reach code generation." );
                 output << ((throwStmt->get_kind() == ThrowStmt::Terminate) ?
 …
+        }
         void CodeGenerator::postvisit( CatchStmt * stmt ) {
                 assertf( ! genC, "Catch statements should not reach code generation." );
+                assertf( ! options.genC, "Catch statements should not reach code generation." );
                 output << ((stmt->get_kind() == CatchStmt::Terminate) ?
 …
         void CodeGenerator::postvisit( WaitForStmt * stmt ) {
                 assertf( ! genC, "Waitfor statements should not reach code generation." );
+                assertf( ! options.genC, "Waitfor statements should not reach code generation." );
                 bool first = true;
 …
         void CodeGenerator::postvisit( WithStmt * with ) {
                 if ( ! genC ) {
+                if ( ! options.genC ) {
                         output << "with ( ";
                         genCommaList( with->exprs.begin(), with->exprs.end() );
 …
         void CodeGenerator::postvisit( ImplicitCtorDtorStmt * stmt ) {
                 assertf( ! genC, "ImplicitCtorDtorStmts should not reach code generation." );
+                assertf( ! options.genC, "ImplicitCtorDtorStmts should not reach code generation." );
                 stmt->callStmt->accept( *visitor );
+        }

src/CodeGen/CodeGenerator.h

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Aug 18 15:40:00 2017
 // Update Count     : 56
+// Last Modified On : Tue Apr 30 12:01:00 2019
+// Update Count     : 57
 //
 …
 #include <string>                 // for string
+#include "CodeGen/Options.h"      // for Options
 #include "Common/Indenter.h"      // for Indenter
 #include "Common/PassVisitor.h"   // for PassVisitor
 …
                 CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false, bool printExprTypes = false );
+                CodeGenerator( std::ostream &os, const Options &options );
                 //*** Turn off visit_children for all nodes
 …
                 void postvisit( ConstructorExpr * );
                 void postvisit( DeletedExpr * );
+                void postvisit( DefaultArgExpr * );
                 void postvisit( GenericExpr * );
 …
                 std::ostream & output;
                 LabelPrinter printLabels;
+                bool pretty = false;  // pretty print
+                bool genC = false;    // true if output has to be C code
+                bool lineMarks = false;
+                bool printExprTypes = false;
+                Options options;
         public:
                 LineEnder endl;

src/CodeGen/GenType.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 17 09:02:28 2017
 // Update Count     : 22
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May  1 15:24:00 2019
+// Update Count     : 23
 //
 #include "GenType.h"
 …
 namespace CodeGen {
         struct GenType : public WithVisitorRef<GenType>, public WithShortCircuiting {
+                GenType( const std::string &typeString, bool pretty = false, bool genC = false, bool lineMarks = false );
+                std::string get_typeString() const { return typeString; }
+                void set_typeString( const std::string &newValue ) { typeString = newValue; }
+                std::string typeString;
+                GenType( const std::string &typeString, const Options &options );
                 void previsit( BaseSyntaxNode * );
 …
                 void postvisit( ZeroType * zeroType );
                 void postvisit( OneType * oneType );
+                void postvisit( GlobalScopeType * globalType );
                 void postvisit( TraitInstType * inst );
                 void postvisit( TypeofType * typeof );
+                void postvisit( QualifiedType * qualType );
           private:
 …
                 void genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic );
+                std::string typeString;
+                bool pretty = false; // pretty print
+                bool genC = false;   // generating C code?
+                bool lineMarks = false;
+                Options options;
         };
+        std::string genType( Type *type, const std::string &baseString, const Options &options ) {
+                PassVisitor<GenType> gt( baseString, options );
+                std::ostringstream os;
+                if ( ! type->get_attributes().empty() ) {
+                        PassVisitor<CodeGenerator> cg( os, options );
+                        cg.pass.genAttributes( type->get_attributes() );
+                } // if
+                type->accept( gt );
+                return os.str() + gt.pass.typeString;
+        }
         std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
+                PassVisitor<GenType> gt( baseString, pretty, genC, lineMarks );
+                std::ostringstream os;
+                if ( ! type->get_attributes().empty() ) {
+                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        cg.pass.genAttributes( type->get_attributes() );
+                } // if
+                type->accept( gt );
+                return os.str() + gt.pass.get_typeString();
+        }
+  std::string genPrettyType( Type * type, const std::string & baseString ) {
+        return genType( type, baseString, true, false );
+  }
+        GenType::GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks ) : typeString( typeString ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
+                return genType( type, baseString, Options(pretty, genC, lineMarks, false ) );
+        }
+        std::string genPrettyType( Type * type, const std::string & baseString ) {
+                return genType( type, baseString, true, false );
+        }
+        GenType::GenType( const std::string &typeString, const Options &options ) : typeString( typeString ), options( options ) {}
         // *** BaseSyntaxNode
 …
                 } // if
                 if ( dimension != 0 ) {
                         PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
 …
         void GenType::postvisit( ReferenceType * refType ) {
                 assert( refType->base != 0);
                 assertf( ! genC, "Reference types should not reach code generation." );
+                assertf( ! options.genC, "Reference types should not reach code generation." );
                 handleQualifiers( refType );
                 typeString = "&" + typeString;
 …
                         } // if
                 } else {
                         PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "(" ;
 …
                 // add forall
                 if( ! funcType->forall.empty() && ! genC ) {
+                if( ! funcType->forall.empty() && ! options.genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         std::ostringstream os;
                         PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "forall(";
                         cg.pass.genCommaList( funcType->forall.begin(), funcType->forall.end() );
 …
                 if ( ! refType->parameters.empty() ) {
                         std::ostringstream os;
                         PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "(";
                         cg.pass.genCommaList( refType->parameters.begin(), refType->parameters.end() );
 …
         void GenType::postvisit( StructInstType * structInst )  {
                 typeString = structInst->name + handleGeneric( structInst ) + " " + typeString;
                 if ( genC ) typeString = "struct " + typeString;
+                if ( options.genC ) typeString = "struct " + typeString;
                 handleQualifiers( structInst );
+        }
 …
         void GenType::postvisit( UnionInstType * unionInst ) {
                 typeString = unionInst->name + handleGeneric( unionInst ) + " " + typeString;
                 if ( genC ) typeString = "union " + typeString;
+                if ( options.genC ) typeString = "union " + typeString;
                 handleQualifiers( unionInst );
+        }
 …
         void GenType::postvisit( EnumInstType * enumInst ) {
                 typeString = enumInst->name + " " + typeString;
                 if ( genC ) typeString = "enum " + typeString;
+                if ( options.genC ) typeString = "enum " + typeString;
                 handleQualifiers( enumInst );
+        }
 …
         void GenType::postvisit( TupleType * tupleType ) {
                 assertf( ! genC, "Tuple types should not reach code generation." );
+                assertf( ! options.genC, "Tuple types should not reach code generation." );
                 unsigned int i = 0;
                 std::ostringstream os;
 …
                 for ( Type * t : *tupleType ) {
                         i++;
                         os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
+                        os << genType( t, "", options ) << (i == tupleType->size() ? "" : ", ");
+                }
                 os << "] ";
 …
         void GenType::postvisit( ZeroType * zeroType ) {
                 // ideally these wouldn't hit codegen at all, but should be safe to make them ints
                 typeString = (pretty ? "zero_t " : "long int ") + typeString;
+                typeString = (options.pretty ? "zero_t " : "long int ") + typeString;
                 handleQualifiers( zeroType );
+        }
 …
         void GenType::postvisit( OneType * oneType ) {
                 // ideally these wouldn't hit codegen at all, but should be safe to make them ints
                 typeString = (pretty ? "one_t " : "long int ") + typeString;
+                typeString = (options.pretty ? "one_t " : "long int ") + typeString;
                 handleQualifiers( oneType );
+        }
+        void GenType::postvisit( GlobalScopeType * globalType ) {
+                assertf( ! options.genC, "Global scope type should not reach code generation." );
+                handleQualifiers( globalType );
+        }
         void GenType::postvisit( TraitInstType * inst ) {
                 assertf( ! genC, "Trait types should not reach code generation." );
+                assertf( ! options.genC, "Trait types should not reach code generation." );
                 typeString = inst->name + " " + typeString;
                 handleQualifiers( inst );
 …
         void GenType::postvisit( TypeofType * typeof ) {
                 std::ostringstream os;
                 PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                PassVisitor<CodeGenerator> cg( os, options );
                 os << "typeof(";
                 typeof->expr->accept( cg );
 …
+        }
+        void GenType::postvisit( QualifiedType * qualType ) {
+                assertf( ! options.genC, "Qualified types should not reach code generation." );
+                std::ostringstream os;
+                os << genType( qualType->parent, "", options ) << "." << genType( qualType->child, "", options ) << typeString;
+                typeString = os.str();
+                handleQualifiers( qualType );
+        }
         void GenType::handleQualifiers( Type * type ) {
                 if ( type->get_const() ) {
 …
                         typeString = "_Atomic " + typeString;
                 } // if
-                if ( type->get_lvalue() && ! genC ) {
-                        // when not generating C code, print lvalue for debugging.
-                        typeString = "lvalue " + typeString;
+                }
+        }
 } // namespace CodeGen

src/CodeGen/GenType.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul 21 22:17:23 2017
 // Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Apr 30 11:47:00 2019
+// Update Count     : 3
 //
 …
 #include <string>  // for string
+#include "CodeGen/Options.h" // for Options
 class Type;
 namespace CodeGen {
+        std::string genType( Type *type, const std::string &baseString, const Options &options );
         std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false, bool lineMarks = false );
   std::string genPrettyType( Type * type, const std::string & baseString );

src/CodeGen/module.mk

-              r7951100
+              rb067d9b
 #       ArgTweak/Mutate.cc
 SRC +=  CodeGen/Generate.cc \
+SRC_CODEGEN = \
         CodeGen/CodeGenerator.cc \
+        CodeGen/FixMain.cc \
         CodeGen/GenType.cc \
-        CodeGen/FixNames.cc \
-        CodeGen/FixMain.cc \
         CodeGen/OperatorTable.cc
+SRC += $(SRC_CODEGEN) CodeGen/Generate.cc CodeGen/FixNames.cc
+SRCDEMANGLE += $(SRC_CODEGEN)

src/CodeTools/module.mk

r7951100	rb067d9b
16	16
17	17	SRC += CodeTools/DeclStats.cc \
	18	CodeTools/ResolvProtoDump.cc \
18	19	CodeTools/TrackLoc.cc

src/Common/Assert.cc

-              r7951100
+              rb067d9b
+}
+void abort(const char *fmt, ... ) noexcept __attribute__((noreturn, format(printf, 1, 2)));
+void abort(const char *fmt, ... ) noexcept {
+        va_list args;
+        va_start( args, fmt );
+        vfprintf( stderr, fmt, args );
+        va_end( args );
+        fprintf( stderr, "\n" );
+        abort();
+}
 // Local Variables: //
 // tab-width: 4 //

src/Common/Debug.h

r7951100	rb067d9b
28	28	namespace Debug {
29	29	/// debug codegen a translation unit
30		static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::~~Compiler~~ ) {
	30	static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Builtin ) {
31	31	#ifdef DEBUG
32	32	std::list< Declaration * > decls;

src/Common/Indenter.h

-              r7951100
+              rb067d9b
 struct Indenter {
         static unsigned tabsize;
+        static unsigned tabsize;  ///< default number of spaces in one level of indentation
+        Indenter( unsigned int amt = tabsize, unsigned int indent = 0 ) : amt( amt ), indent( indent ) {}
+        unsigned int amt;  // amount 1 level increases indent by (i.e. how much to increase by in operator++)
+        unsigned int indent;
+        unsigned int indent;      ///< number of spaces to indent
+        unsigned int amt;         ///< spaces in one level of indentation
+        Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
+        Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }
+        Indenter( unsigned int indent = 0, unsigned int amt = tabsize )
+        : indent( indent ), amt( amt ) {}
+        Indenter & operator+=(int nlevels) { indent += nlevels; return *this; }
+        Indenter & operator-=(int nlevels) { indent -= nlevels; return *this; }
         Indenter operator+(int nlevels) { Indenter indenter = *this; return indenter += nlevels; }
         Indenter operator-(int nlevels) { Indenter indenter = *this; return indenter -= nlevels; }
 …
 inline std::ostream & operator<<( std::ostream & out, const Indenter & indent ) {
         return out << std::string(indent.indent, ' ');
+        return out << std::string(indent.indent * indent.amt, ' ');
+}

src/Common/PassVisitor.h

-              r7951100
+              rb067d9b
 #include <stack>
+#include <type_traits>
+#include "Common/Stats.h"
 #include "Common/utility.h"
 …
         virtual void visit( ObjectDecl * objectDecl ) override final;
+        virtual void visit( const ObjectDecl * objectDecl ) override final;
         virtual void visit( FunctionDecl * functionDecl ) override final;
+        virtual void visit( const FunctionDecl * functionDecl ) override final;
         virtual void visit( StructDecl * aggregateDecl ) override final;
+        virtual void visit( const StructDecl * aggregateDecl ) override final;
         virtual void visit( UnionDecl * aggregateDecl ) override final;
+        virtual void visit( const UnionDecl * aggregateDecl ) override final;
         virtual void visit( EnumDecl * aggregateDecl ) override final;
+        virtual void visit( const EnumDecl * aggregateDecl ) override final;
         virtual void visit( TraitDecl * aggregateDecl ) override final;
+        virtual void visit( const TraitDecl * aggregateDecl ) override final;
         virtual void visit( TypeDecl * typeDecl ) override final;
+        virtual void visit( const TypeDecl * typeDecl ) override final;
         virtual void visit( TypedefDecl * typeDecl ) override final;
+        virtual void visit( const TypedefDecl * typeDecl ) override final;
         virtual void visit( AsmDecl * asmDecl ) override final;
+        virtual void visit( const AsmDecl * asmDecl ) override final;
         virtual void visit( StaticAssertDecl * assertDecl ) override final;
+        virtual void visit( const StaticAssertDecl * assertDecl ) override final;
         virtual void visit( CompoundStmt * compoundStmt ) override final;
+        virtual void visit( const CompoundStmt * compoundStmt ) override final;
         virtual void visit( ExprStmt * exprStmt ) override final;
+        virtual void visit( const ExprStmt * exprStmt ) override final;
         virtual void visit( AsmStmt * asmStmt ) override final;
+        virtual void visit( const AsmStmt * asmStmt ) override final;
         virtual void visit( DirectiveStmt * dirStmt ) override final;
+        virtual void visit( const DirectiveStmt * dirStmt ) override final;
         virtual void visit( IfStmt * ifStmt ) override final;
+        virtual void visit( const IfStmt * ifStmt ) override final;
         virtual void visit( WhileStmt * whileStmt ) override final;
+        virtual void visit( const WhileStmt * whileStmt ) override final;
         virtual void visit( ForStmt * forStmt ) override final;
+        virtual void visit( const ForStmt * forStmt ) override final;
         virtual void visit( SwitchStmt * switchStmt ) override final;
+        virtual void visit( const SwitchStmt * switchStmt ) override final;
         virtual void visit( CaseStmt * caseStmt ) override final;
+        virtual void visit( const CaseStmt * caseStmt ) override final;
         virtual void visit( BranchStmt * branchStmt ) override final;
+        virtual void visit( const BranchStmt * branchStmt ) override final;
         virtual void visit( ReturnStmt * returnStmt ) override final;
+        virtual void visit( const ReturnStmt * returnStmt ) override final;
         virtual void visit( ThrowStmt * throwStmt ) override final;
+        virtual void visit( const ThrowStmt * throwStmt ) override final;
         virtual void visit( TryStmt * tryStmt ) override final;
+        virtual void visit( const TryStmt * tryStmt ) override final;
         virtual void visit( CatchStmt * catchStmt ) override final;
+        virtual void visit( const CatchStmt * catchStmt ) override final;
         virtual void visit( FinallyStmt * finallyStmt ) override final;
+        virtual void visit( const FinallyStmt * finallyStmt ) override final;
         virtual void visit( WaitForStmt * waitforStmt ) override final;
+        virtual void visit( const WaitForStmt * waitforStmt ) override final;
         virtual void visit( WithStmt * withStmt ) override final;
+        virtual void visit( const WithStmt * withStmt ) override final;
         virtual void visit( NullStmt * nullStmt ) override final;
+        virtual void visit( const NullStmt * nullStmt ) override final;
         virtual void visit( DeclStmt * declStmt ) override final;
+        virtual void visit( const DeclStmt * declStmt ) override final;
         virtual void visit( ImplicitCtorDtorStmt * impCtorDtorStmt ) override final;
+        virtual void visit( const ImplicitCtorDtorStmt * impCtorDtorStmt ) override final;
         virtual void visit( ApplicationExpr * applicationExpr ) override final;
+        virtual void visit( const ApplicationExpr * applicationExpr ) override final;
         virtual void visit( UntypedExpr * untypedExpr ) override final;
+        virtual void visit( const UntypedExpr * untypedExpr ) override final;
         virtual void visit( NameExpr * nameExpr ) override final;
+        virtual void visit( const NameExpr * nameExpr ) override final;
         virtual void visit( CastExpr * castExpr ) override final;
+        virtual void visit( const CastExpr * castExpr ) override final;
         virtual void visit( KeywordCastExpr * castExpr ) override final;
+        virtual void visit( const KeywordCastExpr * castExpr ) override final;
         virtual void visit( VirtualCastExpr * castExpr ) override final;
+        virtual void visit( const VirtualCastExpr * castExpr ) override final;
         virtual void visit( AddressExpr * addressExpr ) override final;
+        virtual void visit( const AddressExpr * addressExpr ) override final;
         virtual void visit( LabelAddressExpr * labAddressExpr ) override final;
+        virtual void visit( const LabelAddressExpr * labAddressExpr ) override final;
         virtual void visit( UntypedMemberExpr * memberExpr ) override final;
+        virtual void visit( const UntypedMemberExpr * memberExpr ) override final;
         virtual void visit( MemberExpr * memberExpr ) override final;
+        virtual void visit( const MemberExpr * memberExpr ) override final;
         virtual void visit( VariableExpr * variableExpr ) override final;
+        virtual void visit( const VariableExpr * variableExpr ) override final;
         virtual void visit( ConstantExpr * constantExpr ) override final;
+        virtual void visit( const ConstantExpr * constantExpr ) override final;
         virtual void visit( SizeofExpr * sizeofExpr ) override final;
+        virtual void visit( const SizeofExpr * sizeofExpr ) override final;
         virtual void visit( AlignofExpr * alignofExpr ) override final;
+        virtual void visit( const AlignofExpr * alignofExpr ) override final;
         virtual void visit( UntypedOffsetofExpr * offsetofExpr ) override final;
+        virtual void visit( const UntypedOffsetofExpr * offsetofExpr ) override final;
         virtual void visit( OffsetofExpr * offsetofExpr ) override final;
+        virtual void visit( const OffsetofExpr * offsetofExpr ) override final;
         virtual void visit( OffsetPackExpr * offsetPackExpr ) override final;
         virtual void visit( AttrExpr * attrExpr ) override final;
+        virtual void visit( const OffsetPackExpr * offsetPackExpr ) override final;
         virtual void visit( LogicalExpr * logicalExpr ) override final;
+        virtual void visit( const LogicalExpr * logicalExpr ) override final;
         virtual void visit( ConditionalExpr * conditionalExpr ) override final;
+        virtual void visit( const ConditionalExpr * conditionalExpr ) override final;
         virtual void visit( CommaExpr * commaExpr ) override final;
+        virtual void visit( const CommaExpr * commaExpr ) override final;
         virtual void visit( TypeExpr * typeExpr ) override final;
+        virtual void visit( const TypeExpr * typeExpr ) override final;
         virtual void visit( AsmExpr * asmExpr ) override final;
+        virtual void visit( const AsmExpr * asmExpr ) override final;
         virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr ) override final;
+        virtual void visit( const ImplicitCopyCtorExpr * impCpCtorExpr ) override final;
         virtual void visit( ConstructorExpr *  ctorExpr ) override final;
+        virtual void visit( const ConstructorExpr *  ctorExpr ) override final;
         virtual void visit( CompoundLiteralExpr * compLitExpr ) override final;
+        virtual void visit( const CompoundLiteralExpr * compLitExpr ) override final;
         virtual void visit( RangeExpr * rangeExpr ) override final;
+        virtual void visit( const RangeExpr * rangeExpr ) override final;
         virtual void visit( UntypedTupleExpr * tupleExpr ) override final;
+        virtual void visit( const UntypedTupleExpr * tupleExpr ) override final;
         virtual void visit( TupleExpr * tupleExpr ) override final;
+        virtual void visit( const TupleExpr * tupleExpr ) override final;
         virtual void visit( TupleIndexExpr * tupleExpr ) override final;
+        virtual void visit( const TupleIndexExpr * tupleExpr ) override final;
         virtual void visit( TupleAssignExpr * assignExpr ) override final;
+        virtual void visit( const TupleAssignExpr * assignExpr ) override final;
         virtual void visit( StmtExpr *  stmtExpr ) override final;
+        virtual void visit( const StmtExpr *  stmtExpr ) override final;
         virtual void visit( UniqueExpr *  uniqueExpr ) override final;
+        virtual void visit( const UniqueExpr *  uniqueExpr ) override final;
         virtual void visit( UntypedInitExpr *  initExpr ) override final;
+        virtual void visit( const UntypedInitExpr *  initExpr ) override final;
         virtual void visit( InitExpr *  initExpr ) override final;
+        virtual void visit( const InitExpr *  initExpr ) override final;
         virtual void visit( DeletedExpr *  delExpr ) override final;
+        virtual void visit( const DeletedExpr *  delExpr ) override final;
+        virtual void visit( DefaultArgExpr * argExpr ) override final;
+        virtual void visit( const DefaultArgExpr * argExpr ) override final;
         virtual void visit( GenericExpr * genExpr ) override final;
+        virtual void visit( const GenericExpr * genExpr ) override final;
         virtual void visit( VoidType * basicType ) override final;
+        virtual void visit( const VoidType * basicType ) override final;
         virtual void visit( BasicType * basicType ) override final;
+        virtual void visit( const BasicType * basicType ) override final;
         virtual void visit( PointerType * pointerType ) override final;
+        virtual void visit( const PointerType * pointerType ) override final;
         virtual void visit( ArrayType * arrayType ) override final;
+        virtual void visit( const ArrayType * arrayType ) override final;
         virtual void visit( ReferenceType * referenceType ) override final;
+        virtual void visit( const ReferenceType * referenceType ) override final;
+        virtual void visit( QualifiedType * qualType ) override final;
+        virtual void visit( const QualifiedType * qualType ) override final;
         virtual void visit( FunctionType * functionType ) override final;
+        virtual void visit( const FunctionType * functionType ) override final;
         virtual void visit( StructInstType * aggregateUseType ) override final;
+        virtual void visit( const StructInstType * aggregateUseType ) override final;
         virtual void visit( UnionInstType * aggregateUseType ) override final;
+        virtual void visit( const UnionInstType * aggregateUseType ) override final;
         virtual void visit( EnumInstType * aggregateUseType ) override final;
+        virtual void visit( const EnumInstType * aggregateUseType ) override final;
         virtual void visit( TraitInstType * aggregateUseType ) override final;
+        virtual void visit( const TraitInstType * aggregateUseType ) override final;
         virtual void visit( TypeInstType * aggregateUseType ) override final;
+        virtual void visit( const TypeInstType * aggregateUseType ) override final;
         virtual void visit( TupleType * tupleType ) override final;
+        virtual void visit( const TupleType * tupleType ) override final;
         virtual void visit( TypeofType * typeofType ) override final;
+        virtual void visit( const TypeofType * typeofType ) override final;
         virtual void visit( AttrType * attrType ) override final;
+        virtual void visit( const AttrType * attrType ) override final;
         virtual void visit( VarArgsType * varArgsType ) override final;
+        virtual void visit( const VarArgsType * varArgsType ) override final;
         virtual void visit( ZeroType * zeroType ) override final;
+        virtual void visit( const ZeroType * zeroType ) override final;
         virtual void visit( OneType * oneType ) override final;
+        virtual void visit( const OneType * oneType ) override final;
+        virtual void visit( GlobalScopeType * globalType ) override final;
+        virtual void visit( const GlobalScopeType * globalType ) override final;
         virtual void visit( Designation * designation ) override final;
+        virtual void visit( const Designation * designation ) override final;
         virtual void visit( SingleInit * singleInit ) override final;
+        virtual void visit( const SingleInit * singleInit ) override final;
         virtual void visit( ListInit * listInit ) override final;
+        virtual void visit( const ListInit * listInit ) override final;
         virtual void visit( ConstructorInit * ctorInit ) override final;
+        virtual void visit( Subrange * subrange ) override final;
+        virtual void visit( const ConstructorInit * ctorInit ) override final;
         virtual void visit( Constant * constant ) override final;
+        virtual void visit( const Constant * constant ) override final;
         virtual void visit( Attribute * attribute ) override final;
+        virtual void visit( const Attribute * attribute ) override final;
         virtual DeclarationWithType * mutate( ObjectDecl * objectDecl ) override final;
 …
         virtual Statement * mutate( FinallyStmt * finallyStmt ) override final;
         virtual Statement * mutate( WaitForStmt * waitforStmt ) override final;
         virtual Statement * mutate( WithStmt * withStmt ) override final;
+        virtual Declaration * mutate( WithStmt * withStmt ) override final;
         virtual NullStmt * mutate( NullStmt * nullStmt ) override final;
         virtual Statement * mutate( DeclStmt * declStmt ) override final;
 …
         virtual Expression * mutate( OffsetofExpr * offsetofExpr ) override final;
         virtual Expression * mutate( OffsetPackExpr * offsetPackExpr ) override final;
-        virtual Expression * mutate( AttrExpr * attrExpr ) override final;
         virtual Expression * mutate( LogicalExpr * logicalExpr ) override final;
         virtual Expression * mutate( ConditionalExpr * conditionalExpr ) override final;
 …
         virtual Expression * mutate( InitExpr *  initExpr ) override final;
         virtual Expression * mutate( DeletedExpr *  delExpr ) override final;
+        virtual Expression * mutate( DefaultArgExpr * argExpr ) override final;
         virtual Expression * mutate( GenericExpr * genExpr ) override final;
 …
         virtual Type * mutate( ArrayType * arrayType ) override final;
         virtual Type * mutate( ReferenceType * referenceType ) override final;
+        virtual Type * mutate( QualifiedType * qualType ) override final;
         virtual Type * mutate( FunctionType * functionType ) override final;
         virtual Type * mutate( StructInstType * aggregateUseType ) override final;
 …
         virtual Type * mutate( ZeroType * zeroType ) override final;
         virtual Type * mutate( OneType * oneType ) override final;
+        virtual Type * mutate( GlobalScopeType * globalType ) override final;
         virtual Designation * mutate( Designation * designation ) override final;
 …
         virtual Initializer * mutate( ConstructorInit * ctorInit ) override final;
-        virtual Subrange * mutate( Subrange * subrange ) override final;
         virtual Constant * mutate( Constant * constant ) override final;
 …
 private:
+        bool inFunction = false;
         template<typename pass_t> friend void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
+        template<typename pass_t> friend void acceptAll( const std::list< const Declaration * > &decls, PassVisitor< pass_t >& visitor );
         template<typename pass_t> friend void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
         template< typename TreeType, typename pass_t > friend void maybeAccept_impl( TreeType * tree, PassVisitor< pass_t > & visitor );
+        template< typename TreeType, typename pass_t > friend void maybeAccept_impl( const TreeType * tree, PassVisitor< pass_t > & visitor );
         template< typename TreeType, typename pass_t > friend void maybeMutate_impl( TreeType *& tree, PassVisitor< pass_t > & mutator );
         template< typename Container, typename pass_t > friend void maybeAccept_impl( Container & container, PassVisitor< pass_t > & visitor );
+        template< typename Container, typename pass_t > friend void maybeAccept_impl( const Container & container, PassVisitor< pass_t > & visitor );
         template< typename Container, typename pass_t > friend void maybeMutate_impl( Container & container, PassVisitor< pass_t > & mutator );
         template<typename node_type> void call_previsit ( node_type * node ) { previsit_impl ( pass, node, 0 ); }
+        template<typename node_type> void call_previsit ( const node_type * node ) { previsit_impl ( pass, node, 0 ); }
         template<typename node_type> void call_postvisit( node_type * node ) { postvisit_impl( pass, node, 0 ); }
+        template<typename node_type> void call_postvisit( const node_type * node ) { postvisit_impl( pass, node, 0 ); }
         template<typename node_type> void call_premutate ( node_type * node ) { premutate_impl( pass, node, 0 ); }
 …
         void visitStatementList ( std::list< Statement* > &statements );
         void mutateStatementList( std::list< Statement* > &statements );
+        void visitStatementList ( const std::list< Statement * > & statements );
         template< typename func_t >
 …
         Statement * visitStatement ( Statement * stmt );
         Statement * mutateStatement( Statement * stmt );
+        void visitStatement ( const Statement * stmt );
         template< typename func_t >
 …
         Expression * visitExpression ( Expression * expr );
         Expression * mutateExpression( Expression * expr );
+        TypeSubstitution **             get_env_ptr    () { return env_impl             ( pass, 0); }
+        void visitExpression ( const Expression * expr );
+        auto                                    get_env_ptr    () -> decltype(env_impl( pass, 0)) { return env_impl( pass, 0); }
         std::list< Statement* > *       get_beforeStmts() { return stmtsToAddBefore_impl( pass, 0); }
         std::list< Statement* > *       get_afterStmts () { return stmtsToAddAfter_impl ( pass, 0); }
 …
         void indexerScopeEnter  ()                                    { indexer_impl_enterScope  ( pass, 0       ); }
         void indexerScopeLeave  ()                                    { indexer_impl_leaveScope  ( pass, 0       ); }
         void indexerAddId       ( DeclarationWithType       * node  ) { indexer_impl_addId       ( pass, 0, node ); }
         void indexerAddType     ( NamedTypeDecl             * node  ) { indexer_impl_addType     ( pass, 0, node ); }
+        void indexerAddId       ( const DeclarationWithType * node  ) { indexer_impl_addId       ( pass, 0, node ); }
+        void indexerAddType     ( const NamedTypeDecl       * node  ) { indexer_impl_addType     ( pass, 0, node ); }
         void indexerAddStruct   ( const std::string         & id    ) { indexer_impl_addStruct   ( pass, 0, id   ); }
         void indexerAddStruct   ( StructDecl                * node  ) { indexer_impl_addStruct   ( pass, 0, node ); }
         void indexerAddStructFwd( StructDecl                * node  ) { indexer_impl_addStructFwd( pass, 0, node ); }
         void indexerAddEnum     ( EnumDecl                  * node  ) { indexer_impl_addEnum     ( pass, 0, node ); }
+        void indexerAddStruct   ( const StructDecl          * node  ) { indexer_impl_addStruct   ( pass, 0, node ); }
+        void indexerAddStructFwd( const StructDecl          * node  ) { indexer_impl_addStructFwd( pass, 0, node ); }
+        void indexerAddEnum     ( const EnumDecl            * node  ) { indexer_impl_addEnum     ( pass, 0, node ); }
         void indexerAddUnion    ( const std::string         & id    ) { indexer_impl_addUnion    ( pass, 0, id   ); }
         void indexerAddUnion    ( UnionDecl                 * node  ) { indexer_impl_addUnion    ( pass, 0, node ); }
         void indexerAddUnionFwd ( UnionDecl                 * node  ) { indexer_impl_addUnionFwd ( pass, 0, node ); }
         void indexerAddTrait    ( TraitDecl                 * node  ) { indexer_impl_addTrait    ( pass, 0, node ); }
         void indexerAddWith     ( std::list< Expression * > & exprs, BaseSyntaxNode * withStmt ) { indexer_impl_addWith( pass, 0, exprs, withStmt ); }
+        void indexerAddUnion    ( const UnionDecl           * node  ) { indexer_impl_addUnion    ( pass, 0, node ); }
+        void indexerAddUnionFwd ( const UnionDecl           * node  ) { indexer_impl_addUnionFwd ( pass, 0, node ); }
+        void indexerAddTrait    ( const TraitDecl           * node  ) { indexer_impl_addTrait    ( pass, 0, node ); }
+        void indexerAddWith     ( const std::list< Expression * > & exprs, const Declaration * withStmt ) { indexer_impl_addWith( pass, 0, exprs, withStmt ); }
         template< typename TreeType, typename VisitorType >
         friend inline void indexerScopedAccept( TreeType * tree, VisitorType &visitor );
+        friend inline void indexerScopedAccept( TreeType * tree, VisitorType & visitor );
         template< typename TreeType, typename VisitorType >
+        friend inline void indexerScopedMutate( TreeType *& tree, VisitorType &visitor );
+        friend inline void indexerScopedAccept( const TreeType * tree, VisitorType & visitor );
+        template< typename TreeType, typename VisitorType >
+        friend inline void indexerScopedMutate( TreeType *& tree, VisitorType & visitor );
 };
 …
 public:
         TypeSubstitution * env = nullptr;
+};
+class WithConstTypeSubstitution {
+protected:
+        WithConstTypeSubstitution() = default;
+        ~WithConstTypeSubstitution() = default;
+public:
+        const TypeSubstitution * env = nullptr;
 };
 …
 };
+#include "Common/Stats.h"
+extern struct PassVisitorStats {
+        size_t depth = 0;
+        Stats::Counters::MaxCounter<double> * max = nullptr;
+        Stats::Counters::AverageCounter<double> * avg = nullptr;
+} pass_visitor_stats;
 #include "SynTree/TypeSubstitution.h"
 #include "PassVisitor.impl.h"

src/Common/PassVisitor.impl.h

-              r7951100
+              rb067d9b
 #define MUTATE_END( type, node )                \
+        return call_postmutate< type * >( node ); \
+#define VISIT_BODY( node )          \
+        VISIT_START( node );          \
+        if( children_guard ) {        \
+                Visitor::visit( node ); \
+        }                             \
+        VISIT_END( node );            \
+#define MUTATE_BODY( type, node )    \
+        MUTATE_START( node );          \
+        if( children_guard ) {         \
+                Mutator::mutate( node ); \
+        }                              \
+        MUTATE_END( type, node );      \
+        auto __return = call_postmutate< type * >( node ); \
+        assert( __return ); \
+        return __return;
 …
         SemanticErrorException errors;
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
                 if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
 …
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
+        }
+        pass_visitor_stats.depth--;
+        if ( ! errors.isEmpty() ) {
+                throw errors;
+        }
+}
+template< typename pass_type >
+inline void acceptAll( const std::list< const Declaration * > & decls, PassVisitor< pass_type >& visitor ) {
+        SemanticErrorException errors;
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
+        for ( const Declaration * decl : decls ) {
+                try {
+                        // run visitor on declaration
+                        maybeAccept_impl( decl, visitor );
+                }
+                catch( SemanticErrorException &e ) {
+                        errors.append( e );
+                }
+        }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
 …
         SemanticErrorException errors;
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
 …
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
+        }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
 …
+}
+template< typename TreeType, typename pass_type >
+inline void maybeAccept_impl( const TreeType * tree, PassVisitor< pass_type > & visitor ) {
+        if ( ! visitor.get_visit_children() ) return;
+        if ( tree ) {
+                tree->accept( visitor );
+        }
+}
 template< typename Container, typename pass_type >
 inline void maybeAccept_impl( Container & container, PassVisitor< pass_type > & visitor ) {
         if ( ! visitor.get_visit_children() ) return;
         SemanticErrorException errors;
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
 …
+                }
+        }
+        pass_visitor_stats.depth--;
+        if ( ! errors.isEmpty() ) {
+                throw errors;
+        }
+}
+template< typename Container, typename pass_type >
+inline void maybeAccept_impl( const Container & container, PassVisitor< pass_type > & visitor ) {
+        if ( ! visitor.get_visit_children() ) return;
+        SemanticErrorException errors;
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
+        for ( const auto & i : container ) {
+                try {
+                        if ( i ) {
+                                i->accept( visitor );
+                        }
+                } catch( SemanticErrorException &e ) {
+                        errors.append( e );
+                }
+        }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
 …
 template< typename Container, typename pass_type >
 inline void maybeMutate_impl( Container & container, PassVisitor< pass_type > & mutator ) {
         if ( ! mutator.get_visit_children() ) return;
         SemanticErrorException errors;
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
 …
                 } // try
         } // for
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
 …
         DeclList_t* afterDecls  = get_afterDecls();
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
 …
                 try {
                         func( *i );
+                        assert( *i );
                         assert(( empty( beforeStmts ) && empty( afterStmts ))
                             || ( empty( beforeDecls ) && empty( afterDecls )) );
 …
                 if ( !empty( beforeStmts ) ) { statements.splice( i, *beforeStmts ); }
+        }
+        pass_visitor_stats.depth--;
         if ( !empty( afterDecls ) ) { splice( std::back_inserter( statements ), afterDecls); }
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visitStatementList( const std::list< Statement * > & statements ) {
+        if ( ! get_visit_children() ) return;
+        SemanticErrorException errors;
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
+        for ( const Statement * i : statements ) {
+                try {
+                        maybeAccept_impl( i, *this );
+                } catch ( SemanticErrorException &e ) {
+                        errors.append( e );
+                }
+        }
+        pass_visitor_stats.depth--;
+        if ( !errors.isEmpty() ) { throw errors; }
+}
+template< typename pass_type >
 void PassVisitor< pass_type >::mutateStatementList( std::list< Statement * > & statements ) {
         handleStatementList( statements, [this]( Statement *& stmt) {
 …
         // don't want statements from outer CompoundStmts to be added to this CompoundStmt
         ValueGuardPtr< TypeSubstitution * >  oldEnv        ( get_env_ptr    () );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< DeclList_t >          oldBeforeDecls( get_beforeDecls() );
         ValueGuardPtr< DeclList_t >          oldAfterDecls ( get_afterDecls () );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visitStatement( const Statement * stmt ) {
+        if ( ! get_visit_children() ) return;
+        // don't want statements from outer CompoundStmts to be added to this CompoundStmt
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
+        maybeAccept_impl( stmt, *this );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutateStatement( Statement * stmt ) {
         return handleStatement( stmt, [this]( Statement * stmt ) {
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visitExpression( const Expression * expr ) {
+        if ( ! get_visit_children() ) return;
+        if( !expr ) return;
+        auto env_ptr = get_env_ptr();
+        if ( env_ptr && expr->get_env() ) {
+                *env_ptr = expr->get_env();
+        }
+        maybeAccept_impl( expr, *this );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutateExpression( Expression * expr ) {
         return handleExpression(expr, [this]( Expression * expr ) {
 …
 template< typename TreeType, typename VisitorType >
 inline void indexerScopedAccept( TreeType * tree, VisitorType & visitor ) {
+        if ( ! visitor.get_visit_children() ) return;
+        auto guard = makeFuncGuard(
+                [&visitor]() { visitor.indexerScopeEnter(); },
+                [&visitor]() { visitor.indexerScopeLeave(); }
+        );
+        maybeAccept_impl( tree, visitor );
+}
+template< typename TreeType, typename VisitorType >
+inline void indexerScopedAccept( const TreeType * tree, VisitorType & visitor ) {
         if ( ! visitor.get_visit_children() ) return;
         auto guard = makeFuncGuard(
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ObjectDecl * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->type         , *this );
+        maybeAccept_impl( node->init         , *this );
+        maybeAccept_impl( node->bitfieldWidth, *this );
+        maybeAccept_impl( node->attributes   , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 DeclarationWithType * PassVisitor< pass_type >::mutate( ObjectDecl * node ) {
         MUTATE_START( node );
 …
                         indexerAddId( &func );
                         maybeAccept_impl( node->type, *this );
+                        // function body needs to have the same scope as parameters - CompoundStmt will not enter
+                        // a new scope if inFunction is true
+                        ValueGuard< bool > oldInFunction( inFunction );
+                        inFunction = true;
+                        maybeAccept_impl( node->statements, *this );
+                        maybeAccept_impl( node->attributes, *this );
+                }
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const FunctionDecl * node ) {
+        VISIT_START( node );
+        indexerAddId( node );
+        maybeAccept_impl( node->withExprs, *this );
+        {
+                // with clause introduces a level of scope (for the with expression members).
+                // with clause exprs are added to the indexer before parameters so that parameters
+                // shadow with exprs and not the other way around.
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                indexerAddWith( node->withExprs, node );
+                {
+                        auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                        // implicit add __func__ identifier as specified in the C manual 6.4.2.2
+                        static ObjectDecl func(
+                                "__func__", noStorageClasses, LinkageSpec::C, nullptr,
+                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
+                                nullptr
+                        );
+                        indexerAddId( &func );
+                        maybeAccept_impl( node->type, *this );
+                        // function body needs to have the same scope as parameters - CompoundStmt will not enter
+                        // a new scope if inFunction is true
+                        ValueGuard< bool > oldInFunction( inFunction );
+                        inFunction = true;
                         maybeAccept_impl( node->statements, *this );
                         maybeAccept_impl( node->attributes, *this );
 …
                         indexerAddId( &func );
                         maybeMutate_impl( node->type, *this );
+                        // function body needs to have the same scope as parameters - CompoundStmt will not enter
+                        // a new scope if inFunction is true
+                        ValueGuard< bool > oldInFunction( inFunction );
+                        inFunction = true;
                         maybeMutate_impl( node->statements, *this );
                         maybeMutate_impl( node->attributes, *this );
 …
 template< typename pass_type >
 Declaration * PassVisitor< pass_type >::mutate( StructDecl * node ) {
         MUTATE_START( node );
+void PassVisitor< pass_type >::visit( const StructDecl * node ) {
+        VISIT_START( node );
         // make up a forward declaration and add it before processing the members
 …
+        {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->parameters, *this );
+                maybeAccept_impl( node->members   , *this );
+        }
+        // this addition replaces the forward declaration
+        indexerAddStruct( node );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Declaration * PassVisitor< pass_type >::mutate( StructDecl * node ) {
+        MUTATE_START( node );
+        // make up a forward declaration and add it before processing the members
+        // needs to be on the heap because addStruct saves the pointer
+        indexerAddStructFwd( node );
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 maybeMutate_impl( node->parameters, *this );
                 maybeMutate_impl( node->members   , *this );
 …
         VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const UnionDecl * node ) {
+        VISIT_START( node );
+        // make up a forward declaration and add it before processing the members
+        indexerAddUnionFwd( node );
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->parameters, *this );
+                maybeAccept_impl( node->members   , *this );
+        }
+        indexerAddUnion( node );
+        VISIT_END( node );
+}
 template< typename pass_type >
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const EnumDecl * node ) {
+        VISIT_START( node );
+        indexerAddEnum( node );
+        // unlike structs, traits, and unions, enums inject their members into the global scope
+        maybeAccept_impl( node->parameters, *this );
+        maybeAccept_impl( node->members   , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Declaration * PassVisitor< pass_type >::mutate( EnumDecl * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TraitDecl * node ) {
+        VISIT_START( node );
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->parameters, *this );
+                maybeAccept_impl( node->members   , *this );
+        }
+        indexerAddTrait( node );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TraitDecl * node ) {
         VISIT_START( node );
 …
+}
+template< typename pass_type >
+Declaration * PassVisitor< pass_type >::mutate( TypeDecl * node ) {
+        MUTATE_START( node );
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TypeDecl * node ) {
+        VISIT_START( node );
+        {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 maybeMutate_impl( node->parameters, *this );
                 maybeMutate_impl( node->base      , *this );
+                maybeAccept_impl( node->parameters, *this );
+                maybeAccept_impl( node->base      , *this );
+        }
 …
         indexerAddType( node );
+        maybeAccept_impl( node->assertions, *this );
+        indexerScopedAccept( node->init, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Declaration * PassVisitor< pass_type >::mutate( TypeDecl * node ) {
+        MUTATE_START( node );
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeMutate_impl( node->parameters, *this );
+                maybeMutate_impl( node->base      , *this );
+        }
+        // see A NOTE ON THE ORDER OF TRAVERSAL, above
+        // note that assertions come after the type is added to the symtab, since they are not part of the type proper
+        // and may depend on the type itself
+        indexerAddType( node );
         maybeMutate_impl( node->assertions, *this );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TypedefDecl * node ) {
+        VISIT_START( node );
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->parameters, *this );
+                maybeAccept_impl( node->base      , *this );
+        }
+        indexerAddType( node );
+        maybeAccept_impl( node->assertions, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Declaration * PassVisitor< pass_type >::mutate( TypedefDecl * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AsmDecl * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->stmt, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 AsmDecl * PassVisitor< pass_type >::mutate( AsmDecl * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const StaticAssertDecl * node ) {
+        VISIT_START( node );
+        visitExpression( node->condition );
+        maybeAccept_impl( node->message, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 StaticAssertDecl * PassVisitor< pass_type >::mutate( StaticAssertDecl * node ) {
         MUTATE_START( node );
 …
         VISIT_START( node );
+        {
+                auto guard1 = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                // do not enter a new scope if inFunction is true - needs to check old state before the assignment
+                ValueGuard< bool > oldInFunction( inFunction );
+                auto guard1 = makeFuncGuard( [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeEnter(); }, [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeLeave(); } );
                 auto guard2 = makeFuncGuard( [this]() { call_beginScope();   }, [this]() { call_endScope();     } );
+                inFunction = false;
                 visitStatementList( node->kids );
+        }
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const CompoundStmt * node ) {
+        VISIT_START( node );
+        {
+                // do not enter a new scope if inFunction is true - needs to check old state before the assignment
+                ValueGuard< bool > oldInFunction( inFunction );
+                auto guard1 = makeFuncGuard( [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeEnter(); }, [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeLeave(); } );
+                auto guard2 = makeFuncGuard( [this]() { call_beginScope();   }, [this]() { call_endScope();     } );
+                inFunction = false;
+                visitStatementList( node->kids );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
 CompoundStmt * PassVisitor< pass_type >::mutate( CompoundStmt * node ) {
         MUTATE_START( node );
+        {
+                auto guard1 = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                // do not enter a new scope if inFunction is true - needs to check old state before the assignment
+                ValueGuard< bool > oldInFunction( inFunction );
+                auto guard1 = makeFuncGuard( [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeEnter(); }, [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeLeave(); } );
                 auto guard2 = makeFuncGuard( [this]() { call_beginScope();   }, [this]() { call_endScope();     } );
+                inFunction = false;
                 mutateStatementList( node->kids );
+        }
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ExprStmt * node ) {
+        VISIT_START( node );
+        visitExpression( node->expr );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ExprStmt * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AsmStmt * node ) {
+        VISIT_START( node )
+        maybeAccept_impl( node->instruction, *this );
+        maybeAccept_impl( node->output, *this );
+        maybeAccept_impl( node->input, *this );
+        maybeAccept_impl( node->clobber, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( AsmStmt * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const DirectiveStmt * node ) {
+        VISIT_START( node )
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( DirectiveStmt * node ) {
         MUTATE_START( node );
 …
                 // if statements introduce a level of scope (for the initialization)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 maybeAccept_impl( node->get_initialization(), *this );
+                maybeAccept_impl( node->initialization, *this );
                 visitExpression ( node->condition );
                 node->thenPart = visitStatement( node->thenPart );
 …
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( IfStmt * node ) {
         MUTATE_START( node );
+void PassVisitor< pass_type >::visit( const IfStmt * node ) {
+        VISIT_START( node );
+        {
                 // if statements introduce a level of scope (for the initialization)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeMutate_impl( node->get_initialization(), *this );
+                maybeAccept_impl( node->initialization, *this );
+                visitExpression ( node->condition );
+                visitStatement  ( node->thenPart );
+                visitStatement  ( node->elsePart );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( IfStmt * node ) {
+        MUTATE_START( node );
+        {
+                // if statements introduce a level of scope (for the initialization)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeMutate_impl( node->initialization, *this );
                 node->condition = mutateExpression( node->condition );
                 node->thenPart  = mutateStatement ( node->thenPart  );
 …
                 visitExpression ( node->condition );
                 node->body = visitStatement( node->body );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const WhileStmt * node ) {
+        VISIT_START( node );
+        {
+                // while statements introduce a level of scope (for the initialization)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->initialization, *this );
+                visitExpression ( node->condition );
+                visitStatement  ( node->body );
+        }
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ForStmt * node ) {
+        VISIT_START( node );
+        {
+                // for statements introduce a level of scope (for the initialization)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->initialization, *this );
+                visitExpression( node->condition );
+                visitExpression( node->increment );
+                visitStatement ( node->body );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( ForStmt * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const SwitchStmt * node ) {
+        VISIT_START( node );
+        visitExpression   ( node->condition  );
+        visitStatementList( node->statements );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( SwitchStmt * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const CaseStmt * node ) {
+        VISIT_START( node );
+        visitExpression   ( node->condition );
+        visitStatementList( node->stmts     );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( CaseStmt * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const BranchStmt * node ) {
+        VISIT_START( node );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( BranchStmt * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ReturnStmt * node ) {
+        VISIT_START( node );
+        visitExpression( node->expr );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( ReturnStmt * node ) {
         MUTATE_START( node );
 …
 //--------------------------------------------------------------------------
 // ThrowStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ThrowStmt * node ) {
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ThrowStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->expr, *this );
+        maybeAccept_impl( node->target, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( ThrowStmt * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TryStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->block       , *this );
+        maybeAccept_impl( node->handlers    , *this );
+        maybeAccept_impl( node->finallyBlock, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TryStmt * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const CatchStmt * node ) {
+        VISIT_START( node );
+        {
+                // catch statements introduce a level of scope (for the caught exception)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->decl, *this );
+                visitExpression ( node->cond );
+                visitStatement  ( node->body );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( CatchStmt * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const FinallyStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->block, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( FinallyStmt * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const WaitForStmt * node ) {
+        VISIT_START( node );
+        for( auto & clause : node->clauses ) {
+                maybeAccept_impl( clause.target.function, *this );
+                maybeAccept_impl( clause.target.arguments, *this );
+                maybeAccept_impl( clause.statement, *this );
+                maybeAccept_impl( clause.condition, *this );
+        }
+        maybeAccept_impl( node->timeout.time, *this );
+        maybeAccept_impl( node->timeout.statement, *this );
+        maybeAccept_impl( node->timeout.condition, *this );
+        maybeAccept_impl( node->orelse.statement, *this );
+        maybeAccept_impl( node->orelse.condition, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( WaitForStmt * node ) {
         MUTATE_START( node );
 …
 //--------------------------------------------------------------------------
 // NullStmt
+// WithStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( WithStmt * node ) {
 …
 template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( WithStmt * node ) {
+void PassVisitor< pass_type >::visit( const WithStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->exprs, *this );
+        {
+                // catch statements introduce a level of scope (for the caught exception)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                indexerAddWith( node->exprs, node );
+                maybeAccept_impl( node->stmt, *this );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
+Declaration * PassVisitor< pass_type >::mutate( WithStmt * node ) {
         MUTATE_START( node );
         maybeMutate_impl( node->exprs, *this );
 …
                 maybeMutate_impl( node->stmt, *this );
+        }
+        MUTATE_END( Declaration, node );
+}
+//--------------------------------------------------------------------------
+// NullStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( NullStmt * node ) {
+        VISIT_START( node );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const NullStmt * node ) {
+        VISIT_START( node );
+        VISIT_END( node );
+}
+template< typename pass_type >
+NullStmt * PassVisitor< pass_type >::mutate( NullStmt * node ) {
+        MUTATE_START( node );
+        MUTATE_END( NullStmt, node );
+}
+//--------------------------------------------------------------------------
+// DeclStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( DeclStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->decl, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const DeclStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->decl, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( DeclStmt * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->decl, *this );
         MUTATE_END( Statement, node );
+}
 //--------------------------------------------------------------------------
+// NullStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( NullStmt * node ) {
+        VISIT_START( node );
+        VISIT_END( node );
+}
+template< typename pass_type >
+NullStmt * PassVisitor< pass_type >::mutate( NullStmt * node ) {
+        MUTATE_START( node );
+        MUTATE_END( NullStmt, node );
+}
+//--------------------------------------------------------------------------
+// DeclStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( DeclStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->decl, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( DeclStmt * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->decl, *this );
+// ImplicitCtorDtorStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( ImplicitCtorDtorStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->callStmt, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ImplicitCtorDtorStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->callStmt, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( ImplicitCtorDtorStmt * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->callStmt, *this );
         MUTATE_END( Statement, node );
 …
 //--------------------------------------------------------------------------
-// ImplicitCtorDtorStmt
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( ImplicitCtorDtorStmt * node ) {
-        VISIT_START( node );
-        maybeAccept_impl( node->callStmt, *this );
-        VISIT_END( node );
+}
-template< typename pass_type >
-Statement * PassVisitor< pass_type >::mutate( ImplicitCtorDtorStmt * node ) {
-        MUTATE_START( node );
-        maybeMutate_impl( node->callStmt, *this );
-        MUTATE_END( Statement, node );
+}
-//--------------------------------------------------------------------------
 // ApplicationExpr
 template< typename pass_type >
 …
         indexerScopedAccept( node->result  , *this );
+        maybeAccept_impl        ( node->function, *this );
+        maybeAccept_impl        ( node->args    , *this );
+        maybeAccept_impl   ( node->function, *this );
+        maybeAccept_impl   ( node->args    , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ApplicationExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result  , *this );
+        maybeAccept_impl   ( node->function, *this );
+        maybeAccept_impl   ( node->args    , *this );
         VISIT_END( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const UntypedExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        for ( auto expr : node->args ) {
+                visitExpression( expr );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( UntypedExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const NameExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( NameExpr * node ) {
         MUTATE_START( node );
 …
         indexerScopedAccept( node->result, *this );
+        maybeAccept_impl        ( node->arg   , *this );
+        maybeAccept_impl   ( node->arg   , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const CastExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->arg   , *this );
         VISIT_END( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const KeywordCastExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->arg   , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( KeywordCastExpr * node ) {
         MUTATE_START( node );
 …
         indexerScopedAccept( node->result, *this );
+        maybeAccept_impl( node->arg, *this );
+        maybeAccept_impl   ( node->arg, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const VirtualCastExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->arg, *this );
         VISIT_END( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AddressExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->arg   , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( AddressExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const LabelAddressExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( LabelAddressExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UntypedMemberExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result   , *this );
+        maybeAccept_impl   ( node->aggregate, *this );
+        maybeAccept_impl   ( node->member   , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const UntypedMemberExpr * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const MemberExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result   , *this );
+        maybeAccept_impl   ( node->aggregate, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( MemberExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const VariableExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( VariableExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ConstantExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result   , *this );
+        maybeAccept_impl   ( &node->constant, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ConstantExpr * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( SizeofExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        if ( node->get_isType() ) {
+                maybeAccept_impl( node->type, *this );
+        } else {
+                maybeAccept_impl( node->expr, *this );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const SizeofExpr * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AlignofExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        if ( node->get_isType() ) {
+                maybeAccept_impl( node->type, *this );
+        } else {
+                maybeAccept_impl( node->expr, *this );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( AlignofExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const UntypedOffsetofExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->type  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( UntypedOffsetofExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const OffsetofExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->type  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( OffsetofExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const OffsetPackExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->type  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( OffsetPackExpr * node ) {
         MUTATE_START( node );
 …
 //--------------------------------------------------------------------------
-// AttrExpr
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( AttrExpr * node ) {
-        VISIT_START( node );
-        indexerScopedAccept( node->result, *this );
-        if ( node->get_isType() ) {
-                maybeAccept_impl( node->type, *this );
-        } else {
-                maybeAccept_impl( node->expr, *this );
+        }
-        VISIT_END( node );
+}
-template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( AttrExpr * node ) {
-        MUTATE_START( node );
-        indexerScopedMutate( node->env   , *this );
-        indexerScopedMutate( node->result, *this );
-        if ( node->get_isType() ) {
-                maybeMutate_impl( node->type, *this );
-        } else {
-                maybeMutate_impl( node->expr, *this );
+        }
-        MUTATE_END( Expression, node );
+}
-//--------------------------------------------------------------------------
 // LogicalExpr
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( LogicalExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->arg1  , *this );
+        maybeAccept_impl   ( node->arg2  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const LogicalExpr * node ) {
         VISIT_START( node );
 …
         maybeAccept_impl        ( node->arg2  , *this );
         maybeAccept_impl        ( node->arg3  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ConditionalExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->arg1  , *this );
+        maybeAccept_impl   ( node->arg2  , *this );
+        maybeAccept_impl   ( node->arg3  , *this );
         VISIT_END( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const CommaExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->arg1  , *this );
+        maybeAccept_impl   ( node->arg2  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( CommaExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TypeExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->type, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( TypeExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AsmExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result    , *this );
+        maybeAccept_impl   ( node->inout     , *this );
+        maybeAccept_impl   ( node->constraint, *this );
+        maybeAccept_impl   ( node->operand   , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AsmExpr * node ) {
         VISIT_START( node );
 …
         VISIT_START( node );
+        indexerScopedAccept( node->result     , *this );
+        maybeAccept_impl   ( node->callExpr   , *this );
+        maybeAccept_impl   ( node->tempDecls  , *this );
+        maybeAccept_impl   ( node->returnDecls, *this );
+        maybeAccept_impl   ( node->dtors      , *this );
+        indexerScopedAccept( node->result    , *this );
+        maybeAccept_impl   ( node->callExpr  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ImplicitCopyCtorExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result    , *this );
+        maybeAccept_impl   ( node->callExpr  , *this );
         VISIT_END( node );
 …
         MUTATE_START( node );
+        indexerScopedMutate( node->env        , *this );
+        indexerScopedMutate( node->result     , *this );
+        maybeMutate_impl   ( node->callExpr   , *this );
+        maybeMutate_impl   ( node->tempDecls  , *this );
+        maybeMutate_impl   ( node->returnDecls, *this );
+        maybeMutate_impl   ( node->dtors      , *this );
+        indexerScopedMutate( node->env       , *this );
+        indexerScopedMutate( node->result    , *this );
+        maybeMutate_impl   ( node->callExpr  , *this );
         MUTATE_END( Expression, node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ConstructorExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result  , *this );
+        maybeAccept_impl   ( node->callExpr, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ConstructorExpr * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const CompoundLiteralExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result     , *this );
+        maybeAccept_impl   ( node->initializer, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( CompoundLiteralExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( RangeExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->low   , *this );
+        maybeAccept_impl   ( node->high  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const RangeExpr * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const UntypedTupleExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->exprs , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( UntypedTupleExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TupleExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->exprs , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( TupleExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TupleIndexExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->tuple , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( TupleIndexExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TupleAssignExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result  , *this );
+        maybeAccept_impl( node->stmtExpr, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( TupleAssignExpr * node ) {
         MUTATE_START( node );
 …
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
         ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const StmtExpr * node ) {
+        VISIT_START( node );
+        // don't want statements from outer CompoundStmts to be added to this StmtExpr
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
+        ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
+        ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
+        indexerScopedAccept( node->result     , *this );
+        maybeAccept_impl   ( node->statements , *this );
+        maybeAccept_impl   ( node->returnDecls, *this );
+        maybeAccept_impl   ( node->dtors      , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( StmtExpr * node ) {
         MUTATE_START( node );
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
         ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const UniqueExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->expr  , *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( UniqueExpr * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UntypedInitExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->expr  , *this );
+        // not currently visiting initAlts, but this doesn't matter since this node is only used in the resolver.
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const UntypedInitExpr * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const InitExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->expr  , *this );
+        maybeAccept_impl   ( node->designation, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( InitExpr * node ) {
         MUTATE_START( node );
 …
         indexerScopedAccept( node->result, *this );
+        maybeAccept_impl( node->expr, *this );
+        maybeAccept_impl   ( node->expr, *this );
+        // don't visit deleteStmt, because it is a pointer to somewhere else in the tree.
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const DeletedExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->expr, *this );
         // don't visit deleteStmt, because it is a pointer to somewhere else in the tree.
 …
 //--------------------------------------------------------------------------
+// DefaultArgExpr
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( DefaultArgExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->expr, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const DefaultArgExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl   ( node->expr, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Expression * PassVisitor< pass_type >::mutate( DefaultArgExpr * node ) {
+        MUTATE_START( node );
+        indexerScopedMutate( node->env, *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl( node->expr, *this );
+        MUTATE_END( Expression, node );
+}
+//--------------------------------------------------------------------------
 // GenericExpr
 template< typename pass_type >
 …
         maybeAccept_impl( node->control, *this );
         for ( GenericExpr::Association & assoc : node->associations ) {
+                indexerScopedAccept( assoc.type, *this );
+                maybeAccept_impl( assoc.expr, *this );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const GenericExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl( node->control, *this );
+        for ( const GenericExpr::Association & assoc : node->associations ) {
                 indexerScopedAccept( assoc.type, *this );
                 maybeAccept_impl( assoc.expr, *this );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const VoidType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( VoidType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( BasicType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const BasicType * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const PointerType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        // xxx - should PointerType visit/mutate dimension?
+        maybeAccept_impl( node->base, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( PointerType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ArrayType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->dimension, *this );
+        maybeAccept_impl( node->base, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( ArrayType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ReferenceType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->base, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( ReferenceType * node ) {
         MUTATE_START( node );
 …
         maybeMutate_impl( node->forall, *this );
         maybeMutate_impl( node->base, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// QualifiedType
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( QualifiedType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->parent, *this );
+        maybeAccept_impl( node->child, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const QualifiedType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->parent, *this );
+        maybeAccept_impl( node->child, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( QualifiedType * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->parent, *this );
+        maybeMutate_impl( node->child, *this );
         MUTATE_END( Type, node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const FunctionType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->returnVals, *this );
+        maybeAccept_impl( node->parameters, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( FunctionType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const StructInstType * node ) {
+        VISIT_START( node );
+        indexerAddStruct( node->name );
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->forall    , *this );
+                maybeAccept_impl( node->parameters, *this );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( StructInstType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const UnionInstType * node ) {
+        VISIT_START( node );
+        indexerAddStruct( node->name );
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->forall    , *this );
+                maybeAccept_impl( node->parameters, *this );
+        }
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( UnionInstType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const EnumInstType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->parameters, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( EnumInstType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TraitInstType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall    , *this );
+        maybeAccept_impl( node->parameters, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( TraitInstType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeInstType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall    , *this );
+        maybeAccept_impl( node->parameters, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TypeInstType * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TupleType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->types, *this );
+        maybeAccept_impl( node->members, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( TupleType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeofType * node ) {
+        VISIT_START( node );
+        assert( node->expr );
+        maybeAccept_impl( node->expr, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const TypeofType * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AttrType * node ) {
+        VISIT_START( node );
+        if ( node->isType ) {
+                assert( node->type );
+                maybeAccept_impl( node->type, *this );
+        } else {
+                assert( node->expr );
+                maybeAccept_impl( node->expr, *this );
+        } // if
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( AttrType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const VarArgsType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( VarArgsType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ZeroType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( ZeroType * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const OneType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( OneType * node ) {
         MUTATE_START( node );
 …
 //--------------------------------------------------------------------------
+// GlobalScopeType
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( GlobalScopeType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const GlobalScopeType * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( GlobalScopeType * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->forall, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
 // Designation
 template< typename pass_type >
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const Designation * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->designators, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Designation * PassVisitor< pass_type >::mutate( Designation * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const SingleInit * node ) {
+        VISIT_START( node );
+        visitExpression( node->value );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Initializer * PassVisitor< pass_type >::mutate( SingleInit * node ) {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ListInit * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->designations, *this );
+        maybeAccept_impl( node->initializers, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ListInit * node ) {
         VISIT_START( node );
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const ConstructorInit * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->ctor, *this );
+        maybeAccept_impl( node->dtor, *this );
+        maybeAccept_impl( node->init, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Initializer * PassVisitor< pass_type >::mutate( ConstructorInit * node ) {
         MUTATE_START( node );
 …
 //--------------------------------------------------------------------------
-// Subrange
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( Subrange * node ) {
-        VISIT_START( node );
-        VISIT_END( node );
+}
-template< typename pass_type >
-Subrange * PassVisitor< pass_type >::mutate( Subrange * node  )  {
-        MUTATE_START( node );
-        MUTATE_END( Subrange, node );
+}
-//--------------------------------------------------------------------------
 // Attribute
 template< typename pass_type >
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( const Constant * node ) {
+        VISIT_START( node );
+        VISIT_END( node );
+}
+template< typename pass_type >
 Constant * PassVisitor< pass_type >::mutate( Constant * node  )  {
         MUTATE_START( node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Attribute * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->parameters, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const Attribute * node ) {
         VISIT_START( node );
 …
         MUTATE_END( TypeSubstitution, node );
+}
+#undef VISIT_START
+#undef VISIT_END
+#undef MUTATE_START
+#undef MUTATE_END

src/Common/PassVisitor.proto.h

-              r7951100
+              rb067d9b
 static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
+template<typename pass_type, typename node_type>
+static inline auto previsit_impl( pass_type& pass, const node_type * node, __attribute__((unused)) int unused ) -> decltype( pass.previsit( node ), void() ) {
+        pass.previsit( node );
+}
+template<typename pass_type, typename node_type>
+static inline void previsit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) const node_type * node, __attribute__((unused)) long unused ) {}
+template<typename pass_type, typename node_type>
+static inline auto postvisit_impl( pass_type& pass, const node_type * node, __attribute__((unused)) int unused ) -> decltype( pass.postvisit( node ), void() ) {
+        pass.postvisit( node );
+}
+template<typename pass_type, typename node_type>
+static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) const node_type * node, __attribute__((unused)) long unused ) {}
 //---------------------------------------------------------
 // Mutate
 …
 static inline type * name##_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) long unused ) { return nullptr;}    \
 FIELD_PTR( TypeSubstitution *, env )
+FIELD_PTR( const TypeSubstitution *, env )
 FIELD_PTR( std::list< Statement* >, stmtsToAddBefore )
 FIELD_PTR( std::list< Statement* >, stmtsToAddAfter  )
 …
 FIELD_PTR( PassVisitor<pass_type> * const, visitor )
+#undef FIELD_PTR
 //---------------------------------------------------------
 // Indexer
 …
         pass.indexer.func( arg );                                                                                                \
 }                                                                                                                              \
+                                                                                                                               \
+template<typename pass_type>                                                                                                   \
+static inline void indexer_impl_##func ( pass_type &, long, type ) { }                                                          \
+template<typename pass_type>                                                                                                   \
+static inline void indexer_impl_##func ( pass_type &, long, type ) { }
 #define INDEXER_FUNC2( func, type1, type2 )                                                                                             \
 …
         pass.indexer.func( arg1, arg2 );                                                                                                \
 }                                                                                                                              \
+                                                                                                                               \
 template<typename pass_type>                                                                                                   \
 static inline void indexer_impl_##func ( pass_type &, long, type1, type2 ) { }
+INDEXER_FUNC1( addId     , DeclarationWithType *       );
+INDEXER_FUNC1( addType   , NamedTypeDecl *             );
+INDEXER_FUNC1( addStruct , StructDecl *                );
+INDEXER_FUNC1( addEnum   , EnumDecl *                  );
+INDEXER_FUNC1( addUnion  , UnionDecl *                 );
+INDEXER_FUNC1( addTrait  , TraitDecl *                 );
+INDEXER_FUNC2( addWith   , std::list< Expression * > &, BaseSyntaxNode * );
+template<typename pass_type>
+static inline auto indexer_impl_addStructFwd( pass_type & pass, int, StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
+INDEXER_FUNC1( addId     , const DeclarationWithType *       );
+INDEXER_FUNC1( addType   , const NamedTypeDecl *             );
+INDEXER_FUNC1( addStruct , const StructDecl *                );
+INDEXER_FUNC1( addEnum   , const EnumDecl *                  );
+INDEXER_FUNC1( addUnion  , const UnionDecl *                 );
+INDEXER_FUNC1( addTrait  , const TraitDecl *                 );
+INDEXER_FUNC2( addWith   , const std::list< Expression * > &, const Declaration * );
+#undef INDEXER_FUNC1
+#undef INDEXER_FUNC2
+template<typename pass_type>
+static inline auto indexer_impl_addStructFwd( pass_type & pass, int, const StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
         StructDecl * fwd = new StructDecl( decl->name );
         cloneAll( decl->parameters, fwd->parameters );
 …
 template<typename pass_type>
 static inline auto indexer_impl_addStructFwd( pass_type &, long, StructDecl * ) {}
 template<typename pass_type>
 static inline auto indexer_impl_addUnionFwd( pass_type & pass, int, UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
+static inline auto indexer_impl_addStructFwd( pass_type &, long, const StructDecl * ) {}
+template<typename pass_type>
+static inline auto indexer_impl_addUnionFwd( pass_type & pass, int, const UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
         UnionDecl * fwd = new UnionDecl( decl->name );
         cloneAll( decl->parameters, fwd->parameters );
 …
 template<typename pass_type>
 static inline auto indexer_impl_addUnionFwd( pass_type &, long, UnionDecl * ) {}
+static inline auto indexer_impl_addUnionFwd( pass_type &, long, const UnionDecl * ) {}
 template<typename pass_type>

src/Common/ScopedMap.h

-              r7951100
+              rb067d9b
 #include <vector>
+/// Default (empty) ScopedMap note type
+struct EmptyNote {};
 /// A map where the items are placed into nested scopes;
+/// inserted items are placed into the innermost scope, lookup looks from the innermost scope outward
+template<typename Key, typename Value>
+/// inserted items are placed into the innermost scope, lookup looks from the innermost scope outward.
+/// Scopes may be annotated with a value; the annotation defaults to empty
+template<typename Key, typename Value, typename Note = EmptyNote>
 class ScopedMap {
+        typedef std::map< Key, Value > Scope;
+        typedef std::map< Key, Value > MapType;
+        struct Scope {
+                MapType map;
+                Note note;
+                template<typename N>
+                Scope(N&& n) : map(), note(std::forward<N>(n)) {}
+                Scope() = default;
+                Scope(const Scope&) = default;
+                Scope(Scope&&) = default;
+                Scope& operator= (const Scope&) = default;
+                Scope& operator= (Scope&&) = default;
+        };
         typedef std::vector< Scope > ScopeList;
         ScopeList scopes; ///< scoped list of maps
 public:
         typedef typename Scope::key_type key_type;
         typedef typename Scope::mapped_type mapped_type;
         typedef typename Scope::value_type value_type;
+        typedef typename MapType::key_type key_type;
+        typedef typename MapType::mapped_type mapped_type;
+        typedef typename MapType::value_type value_type;
         typedef typename ScopeList::size_type size_type;
         typedef typename ScopeList::difference_type difference_type;
         typedef typename Scope::reference reference;
         typedef typename Scope::const_reference const_reference;
         typedef typename Scope::pointer pointer;
         typedef typename Scope::const_pointer const_pointer;
+        typedef typename MapType::reference reference;
+        typedef typename MapType::const_reference const_reference;
+        typedef typename MapType::pointer pointer;
+        typedef typename MapType::const_pointer const_pointer;
         class iterator : public std::iterator< std::bidirectional_iterator_tag,
 …
         friend class ScopedMap;
         friend class const_iterator;
                 typedef typename std::map< Key, Value >::iterator wrapped_iterator;
                 typedef typename std::vector< std::map< Key, Value > > scope_list;
+                typedef typename ScopedMap::MapType::iterator wrapped_iterator;
+                typedef typename ScopedMap::ScopeList scope_list;
                 typedef typename scope_list::size_type size_type;
                 /// Checks if this iterator points to a valid item
                 bool is_valid() const {
                         return it != (*scopes)[level].end();
+                        return it != (*scopes)[level].map.end();
+                }
 …
                 iterator& operator++ () {
                         if ( it == (*scopes)[level].end() ) {
+                        if ( it == (*scopes)[level].map.end() ) {
                                 if ( level == 0 ) return *this;
                                 --level;
                                 it = (*scopes)[level].begin();
+                                it = (*scopes)[level].map.begin();
                         } else {
                                 ++it;
 …
                 iterator& operator-- () {
                         // may fail if this is the begin iterator; allowed by STL spec
                         if ( it == (*scopes)[level].begin() ) {
+                        if ( it == (*scopes)[level].map.begin() ) {
                                 ++level;
                                 it = (*scopes)[level].end();
+                                it = (*scopes)[level].map.end();
+                        }
                         --it;
 …
                 size_type get_level() const { return level; }
+                Note& get_note() { return (*scopes)[level].note; }
+                const Note& get_note() const { return (*scopes)[level].note; }
         private:
 …
                                                      value_type > {
         friend class ScopedMap;
                 typedef typename std::map< Key, Value >::iterator wrapped_iterator;
                 typedef typename std::map< Key, Value >::const_iterator wrapped_const_iterator;
                 typedef typename std::vector< std::map< Key, Value > > scope_list;
+                typedef typename ScopedMap::MapType::iterator wrapped_iterator;
+                typedef typename ScopedMap::MapType::const_iterator wrapped_const_iterator;
+                typedef typename ScopedMap::ScopeList scope_list;
                 typedef typename scope_list::size_type size_type;
                 /// Checks if this iterator points to a valid item
                 bool is_valid() const {
                         return it != (*scopes)[level].end();
+                        return it != (*scopes)[level].map.end();
+                }
 …
                 const_iterator& operator++ () {
                         if ( it == (*scopes)[level].end() ) {
+                        if ( it == (*scopes)[level].map.end() ) {
                                 if ( level == 0 ) return *this;
                                 --level;
                                 it = (*scopes)[level].begin();
+                                it = (*scopes)[level].map.begin();
                         } else {
                                 ++it;
 …
                 const_iterator& operator-- () {
                         // may fail if this is the begin iterator; allowed by STL spec
                         if ( it == (*scopes)[level].begin() ) {
+                        if ( it == (*scopes)[level].map.begin() ) {
                                 ++level;
                                 it = (*scopes)[level].end();
+                                it = (*scopes)[level].map.end();
+                        }
                         --it;
 …
                 size_type get_level() const { return level; }
+                const Note& get_note() const { return (*scopes)[level].note; }
         private:
 …
+        }
+        // Starts a new scope with the given note
+        template<typename N>
+        void beginScope( N&& n ) {
+                scopes.emplace_back( std::forward<N>(n) );
+        }
         /// Ends a scope; invalidates any iterators pointing to elements of that scope
         void endScope() {
 …
         /// Default constructor initializes with one scope
+        ScopedMap() { beginScope(); }
+        iterator begin() { return iterator(scopes, scopes.back().begin(), currentScope()).next_valid(); }
+        const_iterator begin() const { return const_iterator(scopes, scopes.back().begin(), currentScope()).next_valid(); }
+        const_iterator cbegin() const { return const_iterator(scopes, scopes.back().begin(), currentScope()).next_valid(); }
+        iterator end() { return iterator(scopes, scopes[0].end(), 0); }
+        const_iterator end() const { return const_iterator(scopes, scopes[0].end(), 0); }
+        const_iterator cend() const { return const_iterator(scopes, scopes[0].end(), 0); }
+        ScopedMap() : scopes() { beginScope(); }
+        /// Constructs with a given note on the outermost scope
+        template<typename N>
+        ScopedMap( N&& n ) : scopes() { beginScope(std::forward<N>(n)); }
+        iterator begin() { return iterator(scopes, scopes.back().map.begin(), currentScope()).next_valid(); }
+        const_iterator begin() const { return const_iterator(scopes, scopes.back().map.begin(), currentScope()).next_valid(); }
+        const_iterator cbegin() const { return const_iterator(scopes, scopes.back().map.begin(), currentScope()).next_valid(); }
+        iterator end() { return iterator(scopes, scopes[0].map.end(), 0); }
+        const_iterator end() const { return const_iterator(scopes, scopes[0].map.end(), 0); }
+        const_iterator cend() const { return const_iterator(scopes, scopes[0].map.end(), 0); }
         /// Gets the index of the current scope (counted from 1)
         size_type currentScope() const { return scopes.size() - 1; }
+        /// Gets the note at the given scope
+        Note& getNote( size_type i ) { return scopes[i].note; }
+        const Note& getNote( size_type i ) const { return scopes[i].note; }
         /// Finds the given key in the outermost scope it occurs; returns end() for none such
         iterator find( const Key &key ) {
                 for ( size_type i = scopes.size() - 1; ; --i ) {
                         typename Scope::iterator val = scopes[i].find( key );
                         if ( val != scopes[i].end() ) return iterator( scopes, val, i );
+                        typename MapType::iterator val = scopes[i].map.find( key );
+                        if ( val != scopes[i].map.end() ) return iterator( scopes, val, i );
                         if ( i == 0 ) break;
+                }
 …
+        }
         const_iterator find( const Key &key ) const {
                         return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->find( key ) );
+                        return const_iterator( const_cast< ScopedMap< Key, Value, Note >* >(this)->find( key ) );
+        }
         /// Finds the given key in the provided scope; returns end() for none such
         iterator findAt( size_type scope, const Key& key ) {
                 typename Scope::iterator val = scopes[scope].find( key );
                 if ( val != scopes[scope].end() ) return iterator( scopes, val, scope );
+                typename MapType::iterator val = scopes[scope].map.find( key );
+                if ( val != scopes[scope].map.end() ) return iterator( scopes, val, scope );
                 return end();
+        }
         const_iterator findAt( size_type scope, const Key& key ) const {
                 return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->findAt( scope, key ) );
+                return const_iterator( const_cast< ScopedMap< Key, Value, Note >* >(this)->findAt( scope, key ) );
+        }
 …
                 if ( it.level == 0 ) return end();
                 for ( size_type i = it.level - 1; ; --i ) {
                         typename Scope::iterator val = scopes[i].find( key );
                         if ( val != scopes[i].end() ) return iterator( scopes, val, i );
+                        typename MapType::iterator val = scopes[i].map.find( key );
+                        if ( val != scopes[i].map.end() ) return iterator( scopes, val, i );
                         if ( i == 0 ) break;
+                }
 …
+        }
         const_iterator findNext( const_iterator &it, const Key &key ) const {
                         return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->findNext( it, key ) );
+                        return const_iterator( const_cast< ScopedMap< Key, Value, Note >* >(this)->findNext( it, key ) );
+        }
 …
         template< typename value_type_t >
         std::pair< iterator, bool > insert( value_type_t&& value ) {
                 std::pair< typename Scope::iterator, bool > res = scopes.back().insert( std::forward<value_type_t>( value ) );
+                std::pair< typename MapType::iterator, bool > res = scopes.back().map.insert( std::forward<value_type_t>( value ) );
                 return std::make_pair( iterator(scopes, std::move( res.first ), scopes.size()-1), std::move( res.second ) );
+        }
 …
         template< typename value_type_t >
         std::pair< iterator, bool > insert( iterator at, value_type_t&& value ) {
                 Scope& scope = (*at.scopes) [ at.level ];
                 std::pair< typename Scope::iterator, bool > res = scope.insert( std::forward<value_type_t>( value ) );
+                MapType& scope = (*at.scopes)[ at.level ].map;
+                std::pair< typename MapType::iterator, bool > res = scope.insert( std::forward<value_type_t>( value ) );
                 return std::make_pair( iterator(scopes, std::move( res.first ), at.level), std::move( res.second ) );
+        }
 …
         template< typename value_type_t >
         std::pair< iterator, bool > insertAt( size_type scope, value_type_t&& value ) {
                 std::pair< typename Scope::iterator, bool > res = scopes.at(scope).insert( std::forward<value_type_t>( value ) );
+                std::pair< typename MapType::iterator, bool > res = scopes.at(scope).map.insert( std::forward<value_type_t>( value ) );
                 return std::make_pair( iterator(scopes, std::move( res.first ), scope), std::move( res.second ) );
+        }
 …
         iterator erase( iterator pos ) {
                 Scope& scope = (*pos.scopes) [ pos.level ];
+                MapType& scope = (*pos.scopes)[ pos.level ].map;
                 const typename iterator::wrapped_iterator& new_it = scope.erase( pos.it );
                 iterator it( *pos.scopes, new_it, pos.level );

src/Common/SemanticError.h

-              r7951100
+              rb067d9b
 // 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
 //
 …
 #include "ErrorObjects.h"
+#include "AST/Node.hpp"
 #include <cstring>
 …
         {"reference-conversion"   , "rvalue to reference conversion of rvalue: %s" , Severity::Warn},
         {"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},
 };
 …
         RvalueToReferenceConversion,
         BadQualifiersZeroOne,
+        NUMBER_OF_WARNINGS, //This MUST be the last warning
+        AggrForwardDecl,
+        SuperfluousDecl,
+        GccAttributes,
+        NUMBER_OF_WARNINGS, // This MUST be the last warning
 };

src/Common/module.mk

-              r7951100
+              rb067d9b
 ###############################################################################
+SRC += Common/SemanticError.cc \
+       Common/UniqueName.cc \
+       Common/DebugMalloc.cc \
+       Common/Assert.cc \
+       Common/Heap.cc
+SRC_COMMON = \
+      Common/Assert.cc \
+      Common/Eval.cc \
+      Common/PassVisitor.cc \
+      Common/SemanticError.cc \
+      Common/Stats/Counter.cc \
+      Common/Stats/Heap.cc \
+      Common/Stats/Stats.cc \
+      Common/Stats/Time.cc \
+      Common/UniqueName.cc
+SRC += $(SRC_COMMON) Common/DebugMalloc.cc
+SRCDEMANGLE += $(SRC_COMMON)

src/Common/utility.h

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun May  6 22:24:16 2018
 // Update Count     : 40
+// Last Modified On : Wed Jul 24 14:28:19 2019
+// Update Count     : 41
 //
 #pragma once
+#include <cassert>
 #include <cctype>
 #include <algorithm>
 …
 #include <string>
 #include <type_traits>
 #include <cassert>
+#include <utility>
+#include <vector>
 #include "Common/Indenter.h"
+class Expression;
+/// bring std::move into global scope
+using std::move;
+/// partner to move that copies any copyable type
+template<typename T>
+T copy( const T & x ) { return x; }
 template< typename T >
 …
 template< typename Container >
 void deleteAll( Container &container ) {
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 delete *i;
+void deleteAll( const Container &container ) {
+        for ( const auto &i : container ) {
+                delete i;
         } // for
+}
 …
                 return ret;
         } // switch
+}
+/// Splice src onto the end of dst, clearing src
+template< typename T >
+void splice( std::vector< T > & dst, std::vector< T > & src ) {
+        dst.reserve( dst.size() + src.size() );
+        for ( T & x : src ) { dst.emplace_back( std::move( x ) ); }
+        src.clear();
+}
+/// Splice src onto the begining of dst, clearing src
+template< typename T >
+void spliceBegin( std::vector< T > & dst, std::vector< T > & src ) {
+        splice( src, dst );
+        dst.swap( src );
+}
 …
 } // ilog2
+// -----------------------------------------------------------------------------
+/// evaluates expr as a long long int. If second is false, expr could not be evaluated
+std::pair<long long int, bool> eval(const Expression * expr);
+namespace ast {
+        class Expr;
+}
+std::pair<long long int, bool> eval(const ast::Expr * expr);
+// -----------------------------------------------------------------------------
+/// Reorders the input range in-place so that the minimal-value elements according to the
+/// comparator are in front;
+/// returns the iterator after the last minimal-value element.
+template<typename Iter, typename Compare>
+Iter sort_mins( Iter begin, Iter end, Compare& lt ) {
+        if ( begin == end ) return end;
+        Iter min_pos = begin;
+        for ( Iter i = begin + 1; i != end; ++i ) {
+                if ( lt( *i, *min_pos ) ) {
+                        // new minimum cost; swap into first position
+                        min_pos = begin;
+                        std::iter_swap( min_pos, i );
+                } else if ( ! lt( *min_pos, *i ) ) {
+                        // duplicate minimum cost; swap into next minimum position
+                        ++min_pos;
+                        std::iter_swap( min_pos, i );
+                }
+        }
+        return ++min_pos;
+}
+template<typename Iter, typename Compare>
+inline Iter sort_mins( Iter begin, Iter end, Compare&& lt ) {
+        return sort_mins( begin, end, lt );
+}
+/// sort_mins defaulted to use std::less
+template<typename Iter>
+inline Iter sort_mins( Iter begin, Iter end ) {
+        return sort_mins( begin, end, std::less<typename std::iterator_traits<Iter>::value_type>{} );
+}
 // Local Variables: //

src/Concurrency/Keywords.cc

-              r7951100
+              rb067d9b
                         "__thrd",
                         "get_thread",
                         "thread keyword requires threads to be in scope, add #include <thread>",
+                        "thread keyword requires threads to be in scope, add #include <thread.hfa>",
                         true,
                         KeywordCastExpr::Thread
 …
                         "__cor",
                         "get_coroutine",
                         "coroutine keyword requires coroutines to be in scope, add #include <coroutine>",
+                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>",
                         true,
                         KeywordCastExpr::Coroutine
 …
                         "__mon",
                         "get_monitor",
                         "monitor keyword requires monitors to be in scope, add #include <monitor>",
+                        "monitor keyword requires monitors to be in scope, add #include <monitor.hfa>",
                         false,
                         KeywordCastExpr::Monitor
 …
                 // Do we have the required headers
                 if( !monitor_decl || !guard_decl || !dtor_guard_decl )
                         SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor>\n" );
+                        SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor.hfa>\n" );
                 // Instrument the body
 …
         void MutexKeyword::postvisit(StructDecl* decl) {
                 if( decl->name == "monitor_desc" ) {
+                if( decl->name == "monitor_desc" && decl->body ) {
                         assert( !monitor_decl );
                         monitor_decl = decl;
+                }
                 else if( decl->name == "monitor_guard_t" ) {
+                else if( decl->name == "monitor_guard_t" && decl->body ) {
                         assert( !guard_decl );
                         guard_decl = decl;
+                }
                 else if( decl->name == "monitor_dtor_guard_t" ) {
+                else if( decl->name == "monitor_dtor_guard_t" && decl->body ) {
                         assert( !dtor_guard_decl );
                         dtor_guard_decl = decl;
 …
                 //in reverse order :
                 // monitor_guard_t __guard = { __monitors, #, func };
+                // monitor_dtor_guard_t __guard = { __monitors, func };
                 body->push_front(
                         new DeclStmt( new ObjectDecl(
 …
                 assert(generic_func);
                 //in reverse order :
+                // in reverse order :
                 // monitor_guard_t __guard = { __monitors, #, func };
                 body->push_front(
 …
                 if( type && type->get_baseStruct()->is_thread() ) {
                         if( !thread_decl || !thread_ctor_seen ) {
                                 SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread>");
+                                SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread.hfa>");
+                        }

src/Concurrency/Waitfor.cc

-              r7951100
+              rb067d9b
 // Last Modified By :
 // Last Modified On :
 // Update Count     : 5
+// Update Count     : 7
 //
 …
 void foo() {
         while( true ) {
+                acceptable_t acceptables[3];
+                if( a < 1 ) {
+                        acceptables[0].func = f;
+                        acceptables[0].mon = a;
+                }
+                acceptables[1].func = g;
+                acceptables[1].mon = a;
+                acceptables[2].func = f;
+                acceptables[2].mon = a;
+                acceptables[2].is_dtor = true;
+                int ret = waitfor_internal( acceptables, swagl() );
+                switch( ret ) {
+                        case 0:
+                        {
+                                bar();
+                {
+                        acceptable_t acceptables[3];
+                        if( a < 1 ) {
+                                acceptables[0].func = f;
+                                acceptables[0].mon = a;
+                        }
+                        case 1:
+                        {
+                                baz();
+                        acceptables[1].func = g;
+                        acceptables[1].mon = a;
+                        acceptables[2].func = f;
+                        acceptables[2].mon = a;
+                        acceptables[2].is_dtor = true;
+                        int ret = waitfor_internal( acceptables, swagl() );
+                        switch( ret ) {
+                                case 0:
+                                {
+                                        bar();
+                                }
+                                case 1:
+                                {
+                                        baz();
+                                }
+                                case 2:
+                                        signal(a);
+                                        {
+                                                break;
+                                        }
+                        }
-                        case 2:
-                                signal(a);
+                                {
-                                        break;
+                                }
+                }
+        }
 …
         Statement * GenerateWaitForPass::postmutate( WaitForStmt * waitfor ) {
                 if( !decl_monitor || !decl_acceptable || !decl_mask )
                         SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor>" );
+                        SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor.hfa>" );
                 CompoundStmt * stmt = new CompoundStmt();
 …
                                         new ConstantExpr( Constant::from_ulong( i++ ) ),
+                                        {
+                                                clause.statement,
+                                                new BranchStmt(
+                                                        "",
+                                                        BranchStmt::Break
+                                                )
+                                                new CompoundStmt({
+                                                        clause.statement,
+                                                        new BranchStmt(
+                                                                "",
+                                                                BranchStmt::Break
+                                                        )
+                                                })
+                                        }
+                                )
 …
                                         new ConstantExpr( Constant::from_int( -2 ) ),
+                                        {
+                                                waitfor->timeout.statement,
+                                                new BranchStmt(
+                                                        "",
+                                                        BranchStmt::Break
+                                                )
+                                                new CompoundStmt({
+                                                        waitfor->timeout.statement,
+                                                        new BranchStmt(
+                                                                "",
+                                                                BranchStmt::Break
+                                                        )
+                                                })
+                                        }
+                                )
 …
                                         new ConstantExpr( Constant::from_int( -1 ) ),
+                                        {
+                                                waitfor->orelse.statement,
+                                                new BranchStmt(
+                                                        "",
+                                                        BranchStmt::Break
+                                                )
+                                                new CompoundStmt({
+                                                        waitfor->orelse.statement,
+                                                        new BranchStmt(
+                                                                "",
+                                                                BranchStmt::Break
+                                                        )
+                                                })
+                                        }
+                                )

src/Concurrency/module.mk

-              r7951100
+              rb067d9b
 ###############################################################################
 SRC += Concurrency/Keywords.cc \
        Concurrency/Waitfor.cc
+SRC += Concurrency/Keywords.cc Concurrency/Waitfor.cc
+SRCDEMANGLE += Concurrency/Keywords.cc

src/ControlStruct/ExceptTranslate.cc

-              r7951100
+              rb067d9b
 // Author           : Andrew Beach
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
 // Last Modified On : Thr Aug 17 17:19:00 2017
 // Update Count     : 9
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Feb 13 18:15:29 2019
+// Update Count     : 11
 //
 …
+                        }
                         block->push_back( handler->get_body() );
                         handler->set_body( nullptr );
+                        block->push_back( handler->body );
+                        handler->body = nullptr;
                         std::list<Statement *> caseBody
 …
                                 return create_terminate_rethrow( throwStmt );
                         } else {
                                 assertf(false, "Invalid throw in %s at %i\n",
+                                abort("Invalid throw in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
                                         throwStmt->location.first_line);
-                                return nullptr;
+                        }
                 } else {
 …
                                 return create_resume_rethrow( throwStmt );
                         } else {
                                 assertf(false, "Invalid throwResume in %s at %i\n",
+                                abort("Invalid throwResume in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
                                         throwStmt->location.first_line);
-                                return nullptr;
+                        }
+                }

src/ControlStruct/ForExprMutator.cc

-              r7951100
+              rb067d9b
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Aug 18 10:22:00 2017
 // Update Count     : 12
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar 11 22:26:52 2019
+// Update Count     : 14
 //
 …
 namespace ControlStruct {
         Statement *hoist( Statement *originalStmt, std::list<Statement *> &init ) {
+        Statement * hoist( Statement * originalStmt, std::list<Statement *> & init ) {
                 // If no hoisting is needed, skip:
                 if ( 0 == init.size() ) {
 …
                 // Create compound statement, move initializers outside,
                 // the resut of the original stays as is.
                 CompoundStmt *block = new CompoundStmt();
                 std::list<Statement *> &stmts = block->get_kids();
+                CompoundStmt * block = new CompoundStmt();
+                std::list<Statement *> & stmts = block->get_kids();
                 stmts.splice( stmts.end(), init );
 …
+        }
         Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) {
+        Statement * ForExprMutator::postmutate( IfStmt * ifStmt ) {
                 return hoist( ifStmt, ifStmt->initialization );
+        }
         Statement *ForExprMutator::postmutate( ForStmt *forStmt ) {
+        Statement * ForExprMutator::postmutate( ForStmt * forStmt ) {
                 // hoist any initializer declarations to make them C89 (rather than C99)
                 return hoist( forStmt, forStmt->initialization );
+        }
         Statement *ForExprMutator::postmutate( WhileStmt *whileStmt ) {
+        Statement * ForExprMutator::postmutate( WhileStmt * whileStmt ) {
                 return hoist( whileStmt, whileStmt->initialization );
+        }

src/ControlStruct/LabelFixer.cc

-              r7951100
+              rb067d9b
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Tue Jul 28 13:32:43 2015
 // Update Count     : 156
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar 11 22:26:02 2019
+// Update Count     : 159
 //
 …
+        }
         LabelFixer::LabelFixer( LabelGenerator *gen ) : generator ( gen ) {
+        LabelFixer::LabelFixer( LabelGenerator * gen ) : generator ( gen ) {
                 if ( generator == 0 )
                         generator = LabelGenerator::getGenerator();
 …
         // prune to at most one label definition for each statement
         void LabelFixer::previsit( Statement *stmt ) {
+        void LabelFixer::previsit( Statement * stmt ) {
                 std::list< Label > &labels = stmt->get_labels();
 …
+        }
         void LabelFixer::previsit( BranchStmt *branchStmt ) {
+        void LabelFixer::previsit( BranchStmt * branchStmt ) {
                 previsit( ( Statement *)branchStmt );
 …
         // sets the definition of the labelTable entry to be the provided
         // statement for every label in the list parameter. Happens for every kind of statement
         Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
+        // sets the definition of the labelTable entry to be the provided statement for every label in the list
+        // parameter. Happens for every kind of statement
+        Label LabelFixer::setLabelsDef( std::list< Label > & llabel, Statement * definition ) {
                 assert( definition != 0 );
                 assert( llabel.size() > 0 );
 …
                 } // for
+                // produce one of the labels attached to this statement to be
+                // temporarily used as the canonical label
+                // produce one of the labels attached to this statement to be temporarily used as the canonical label
                 return labelTable[ llabel.front() ]->get_label();
+        }
 …
         // Builds a table that maps a label to its defining statement.
         std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticErrorException ) {
+        std::map<Label, Statement * > * LabelFixer::resolveJumps() throw ( SemanticErrorException ) {
                 std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
                 for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {

src/ControlStruct/LabelGenerator.cc

-              r7951100
+              rb067d9b
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Thr Aug 14 14:14:00 2015
 // Update Count     : 14
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar 11 22:23:20 2019
+// Update Count     : 15
 //
 …
 namespace ControlStruct {
         LabelGenerator *LabelGenerator::labelGenerator = 0;
+        LabelGenerator * LabelGenerator::labelGenerator = 0;
         LabelGenerator *LabelGenerator::getGenerator() {
+        LabelGenerator * LabelGenerator::getGenerator() {
                 if ( LabelGenerator::labelGenerator == 0 )
                         LabelGenerator::labelGenerator = new LabelGenerator();
                 return labelGenerator;
+        }
 …
                 if ( stmt && ! stmt->get_labels().empty() ) {
                         os << "_" << stmt->get_labels().front() << "__";
+                }
+                } // if
                 std::string ret = os.str();
                 Label l( ret );

src/ControlStruct/MLEMutator.cc

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 17:08:25 2018
 // Update Count     : 219
+// Last Modified On : Tue Oct 22 17:22:44 2019
+// Update Count     : 220
 //
 …
+        }
+        void MLEMutator::premutate( TryStmt * tryStmt ) {
+                // generate a label for breaking out of a labeled if
+                bool labeledBlock = !(tryStmt->get_labels().empty());
+                if ( labeledBlock ) {
+                        Label brkLabel = generator->newLabel("blockBreak", tryStmt);
+                        enclosingControlStructures.push_back( Entry( tryStmt, brkLabel ) );
+                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
+                } // if
+        }
+        Statement * MLEMutator::postmutate( TryStmt * tryStmt ) {
+                bool labeledBlock = !(tryStmt->get_labels().empty());
+                if ( labeledBlock ) {
+                        if ( ! enclosingControlStructures.back().useBreakExit().empty() ) {
+                                set_breakLabel( enclosingControlStructures.back().useBreakExit() );
+                        } // if
+                } // if
+                return tryStmt;
+        }
         void MLEMutator::premutate( CaseStmt *caseStmt ) {
                 visit_children = false;

src/ControlStruct/MLEMutator.h

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 16:42:32 2018
 // Update Count     : 41
+// Last Modified On : Tue Oct 22 17:22:47 2019
+// Update Count     : 45
 //
 …
                 void premutate( SwitchStmt *switchStmt );
                 Statement * postmutate( SwitchStmt *switchStmt );
+                void premutate( TryStmt *tryStmt );
+                Statement * postmutate( TryStmt *tryStmt );
                 Statement *mutateLoop( Statement *bodyLoop, Entry &e );
 …
                         explicit Entry( SwitchStmt *stmt, Label breakExit, Label fallDefaultExit ) :
                                 stmt( stmt ), breakExit( breakExit ), fallDefaultExit( fallDefaultExit ) {}
+                        explicit Entry( TryStmt *stmt, Label breakExit ) :
+                                stmt( stmt ), breakExit( breakExit ) {}
                         bool operator==( const Statement *other ) { return stmt == other; }

src/ControlStruct/module.mk

-              r7951100
+              rb067d9b
 ###############################################################################
+SRC +=  ControlStruct/LabelGenerator.cc \
+SRC_CONTROLSTRUCT = \
+        ControlStruct/ForExprMutator.cc \
         ControlStruct/LabelFixer.cc \
+        ControlStruct/LabelGenerator.cc \
         ControlStruct/MLEMutator.cc \
+        ControlStruct/Mutate.cc \
+        ControlStruct/ForExprMutator.cc \
+        ControlStruct/ExceptTranslate.cc
+        ControlStruct/Mutate.cc
+SRC += $(SRC_CONTROLSTRUCT) ControlStruct/ExceptTranslate.cc
+SRCDEMANGLE += $(SRC_CONTROLSTRUCT)

src/GenPoly/Box.cc

-              r7951100
+              rb067d9b
                 /// Replaces polymorphic return types with out-parameters, replaces calls to polymorphic functions with adapter calls as needed, and adds appropriate type variables to the function call
                 class Pass1 final : public BoxPass, public WithTypeSubstitution, public WithStmtsToAdd, public WithGuards, public WithVisitorRef<Pass1>, public WithShortCircuiting {
+                class Pass1 final : public BoxPass, public WithConstTypeSubstitution, public WithStmtsToAdd, public WithGuards, public WithVisitorRef<Pass1>, public WithShortCircuiting {
                   public:
                         Pass1();
 …
                 /// * Calculates polymorphic offsetof expressions from offset array
                 /// * Inserts dynamic calculation of polymorphic type layouts where needed
                 class PolyGenericCalculator final : public BoxPass, public WithGuards, public WithVisitorRef<PolyGenericCalculator>, public WithStmtsToAdd, public WithDeclsToAdd, public WithTypeSubstitution {
+                class PolyGenericCalculator final : public BoxPass, public WithGuards, public WithVisitorRef<PolyGenericCalculator>, public WithStmtsToAdd, public WithDeclsToAdd, public WithConstTypeSubstitution {
                 public:
                         PolyGenericCalculator();
 …
                                 paramExpr = new AddressExpr( paramExpr );
                         } // if
                         arg = appExpr->get_args().insert( arg, paramExpr ); // add argument to function call
+                        arg = appExpr->args.insert( arg, paramExpr ); // add argument to function call
                         arg++;
                         // Build a comma expression to call the function and emulate a normal return.
                         CommaExpr *commaExpr = new CommaExpr( appExpr, retExpr );
                         commaExpr->set_env( appExpr->get_env() );
                         appExpr->set_env( 0 );
+                        commaExpr->env = appExpr->env;
+                        appExpr->env = nullptr;
                         return commaExpr;
+                }
 …
 //                      if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
                         if ( isDynRet( function, tyVars ) ) {
                                 ret = addRetParam( appExpr, function->get_returnVals().front()->get_type(), arg );
+                                ret = addRetParam( appExpr, function->returnVals.front()->get_type(), arg );
                         } // if
                         std::string mangleName = mangleAdapterName( function, tyVars );
 …
                         // cast adaptee to void (*)(), since it may have any type inside a polymorphic function
                         Type * adapteeType = new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
                         appExpr->get_args().push_front( new CastExpr( appExpr->get_function(), adapteeType ) );
+                        appExpr->get_args().push_front( new CastExpr( appExpr->function, adapteeType ) );
                         appExpr->set_function( new NameExpr( adapterName ) ); // xxx - result is never set on NameExpr
 …
                         if ( ! needsBoxing( param, arg->result, exprTyVars, env ) ) return;
                         if ( arg->result->get_lvalue() ) {
+                        if ( arg->get_lvalue() ) {
                                 // argument expression may be CFA lvalue, but not C lvalue -- apply generalizedLvalue transformations.
                                 // if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( arg ) ) {
 …
                         for ( Type::ForallList::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) {
                                 for ( std::list< DeclarationWithType *>::iterator assert = (*tyVar)->assertions.begin(); assert != (*tyVar)->assertions.end(); ++assert ) {
                                         InferredParams::const_iterator inferParam = appExpr->get_inferParams().find( (*assert)->get_uniqueId() );
                                         assertf( inferParam != appExpr->get_inferParams().end(), "addInferredParams missing inferred parameter: %s in: %s", toString( *assert ).c_str(), toString( appExpr ).c_str() );
+                                        InferredParams::const_iterator inferParam = appExpr->inferParams.find( (*assert)->get_uniqueId() );
+                                        assertf( inferParam != appExpr->inferParams.end(), "addInferredParams missing inferred parameter: %s in: %s", toString( *assert ).c_str(), toString( appExpr ).c_str() );
                                         Expression *newExpr = inferParam->second.expr->clone();
                                         addCast( newExpr, (*assert)->get_type(), tyVars );
 …
                                         deref->args.push_back( new CastExpr( new VariableExpr( param ), new PointerType( Type::Qualifiers(), arg->get_type()->clone() ) ) );
                                         deref->result = arg->get_type()->clone();
-                                        deref->result->set_lvalue( true );
                                         return deref;
                                 } // if
 …
                 Expression *PolyGenericCalculator::postmutate( SizeofExpr *sizeofExpr ) {
                         Type *ty = sizeofExpr->get_isType() ?
+                        Type *ty = sizeofExpr->get_isType() ?
                                 sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
                         Expression * gen = genSizeof( ty );
                         if ( gen ) {

src/GenPoly/GenPoly.cc

-              r7951100
+              rb067d9b
 #include <vector>                       // for vector
+#include "AST/Type.hpp"
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ResolvExpr/typeops.h"         // for flatten
 …
                 } else {
                         return dynamic_cast< FunctionType* >( ty ); // pointer if FunctionType, NULL otherwise
+                }
+        }
+        const ast::FunctionType * getFunctionType( const ast::Type * ty ) {
+                if ( auto pty = dynamic_cast< const ast::PointerType * >( ty ) ) {
+                        return pty->base.as< ast::FunctionType >();
+                } else {
+                        return dynamic_cast< const ast::FunctionType * >( ty );
+                }
+        }
 …
+        }
         bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, TypeSubstitution * env ) {
+        bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, const TypeSubstitution * env ) {
                 // is parameter is not polymorphic, don't need to box
                 if ( ! isPolyType( param, exprTyVars ) ) return false;
 …
+        }
         bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, TypeSubstitution * env ) {
+        bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, const TypeSubstitution * env ) {
                 FunctionType * function = getFunctionType( appExpr->function->result );
                 assertf( function, "ApplicationExpr has non-function type: %s", toString( appExpr->function->result ).c_str() );
 …
         void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap ) {
+                // xxx - should this actually be insert?
+                tyVarMap[ tyVar->get_name() ] = TypeDecl::Data{ tyVar };
+                tyVarMap.insert( tyVar->name, TypeDecl::Data{ tyVar } );
+        }

src/GenPoly/GenPoly.h

-              r7951100
+              rb067d9b
 #include "ErasableScopedMap.h"    // for ErasableScopedMap
+#include "AST/Fwd.hpp"
 #include "SymTab/Mangler.h"       // for Mangler
 #include "SynTree/Declaration.h"  // for TypeDecl::Data, AggregateDecl, Type...
 …
         /// Returns a pointer to the base FunctionType if ty is the type of a function (or pointer to one), NULL otherwise
         FunctionType *getFunctionType( Type *ty );
+        const ast::FunctionType * getFunctionType( const ast::Type * ty );
         /// If expr (after dereferencing N >= 0 pointers) is a variable expression, returns the variable expression, NULL otherwise;
 …
         /// true if arg requires boxing given exprTyVars
         bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, TypeSubstitution * env );
+        bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, const TypeSubstitution * env );
         /// true if arg requires boxing in the call to appExpr
         bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, TypeSubstitution * env );
+        bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, const TypeSubstitution * env );
         /// Adds the type variable `tyVar` to `tyVarMap`

src/GenPoly/InstantiateGeneric.cc

r7951100	rb067d9b
168	168
169	169	/// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately
170		struct GenericInstantiator final : public WithTypeSubstitution, public WithDeclsToAdd, public WithVisitorRef<GenericInstantiator>, public WithGuards {
	170	struct GenericInstantiator final : public WithConstTypeSubstitution, public WithDeclsToAdd, public WithVisitorRef<GenericInstantiator>, public WithGuards {
171	171	/// Map of (generic type, parameter list) pairs to concrete type instantiations
172	172	InstantiationMap< AggregateDecl, AggregateDecl > instantiations;

src/GenPoly/Lvalue.cc

-              r7951100
+              rb067d9b
 #include "Lvalue.h"
+#include "InitTweak/InitTweak.h"
 #include "Parser/LinkageSpec.h"          // for Spec, isBuiltin, Intrinsic
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
 #include "ResolvExpr/Unify.h"            // for unify
 #include "ResolvExpr/typeops.h"
-#include "SymTab/Autogen.h"
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for Declaration, FunctionDecl
 …
 #include "SynTree/Type.h"                // for PointerType, Type, FunctionType
 #include "SynTree/Visitor.h"             // for Visitor, acceptAll
+#include "Validate/FindSpecialDecls.h"   // for dereferenceOperator
 #if 0
 …
                 // TODO: fold this into the general createDeref function??
                 Expression * mkDeref( Expression * arg ) {
                         if ( SymTab::dereferenceOperator ) {
+                        if ( Validate::dereferenceOperator ) {
                                 // note: reference depth can be arbitrarily deep here, so peel off the outermost pointer/reference, not just pointer because they are effecitvely equivalent in this pass
                                 VariableExpr * deref = new VariableExpr( SymTab::dereferenceOperator );
+                                VariableExpr * deref = new VariableExpr( Validate::dereferenceOperator );
                                 deref->result = new PointerType( Type::Qualifiers(), deref->result );
                                 Type * base = InitTweak::getPointerBase( arg->result );
 …
                                 delete ret->result;
                                 ret->result = base->clone();
-                                ret->result->set_lvalue( true );
                                 return ret;
                         } else {
 …
         namespace {
                 // true for intrinsic function calls that return a reference
+                // true for intrinsic function calls that return an lvalue in C
                 bool isIntrinsicReference( Expression * expr ) {
+                        // known intrinsic-reference prelude functions
+                        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
                         if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * >( expr ) ) {
                                 std::string fname = InitTweak::getFunctionName( untyped );
+                                // known intrinsic-reference prelude functions
+                                return fname == "*?" || fname == "?[?]";
+                                return lvalueFunctions.count(fname);
                         } else if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * > ( expr ) ) {
                                 if ( DeclarationWithType * func = InitTweak::getFunction( appExpr ) ) {
+                                        // use type of return variable rather than expr result type, since it may have been changed to a pointer type
+                                        FunctionType * ftype = GenPoly::getFunctionType( func->get_type() );
+                                        Type * ret = ftype->returnVals.empty() ? nullptr : ftype->returnVals.front()->get_type();
+                                        return func->linkage == LinkageSpec::Intrinsic && dynamic_cast<ReferenceType *>( ret );
+                                        return func->linkage == LinkageSpec::Intrinsic && lvalueFunctions.count(func->name);
+                                }
+                        }
 …
                                 ReferenceType * result = strict_dynamic_cast< ReferenceType * >( appExpr->result );
                                 appExpr->result = result->base->clone();
-                                appExpr->result->set_lvalue( true );
                                 if ( ! inIntrinsic ) {
                                         // when not in an intrinsic function, add a cast to
 …
                                 unsigned int i = 0;
                                 const unsigned int end = ftype->parameters.size();
+                                /// The for loop may eagerly dereference the iterators and fail on empty lists
+                                if(i == end) { return appExpr; }
                                 for ( auto p : unsafe_group_iterate( appExpr->args, ftype->parameters ) ) {
-                                        if (i == end) break;
                                         Expression *& arg = std::get<0>( p );
                                         Type * formal = std::get<1>( p )->get_type();
 …
                                                 // TODO: it's likely that the second condition should be ... && ! isIntrinsicReference( arg ), but this requires investigation.
                                                 if ( function->get_linkage() != LinkageSpec::Intrinsic && isIntrinsicReference( arg ) ) {
+                                                if ( function->linkage != LinkageSpec::Intrinsic && isIntrinsicReference( arg ) ) {
                                                         // needed for definition of prelude functions, etc.
                                                         // if argument is dereference or array subscript, the result isn't REALLY a reference, but non-intrinsic functions expect a reference: take address
 …
                                                         arg = new AddressExpr( arg );
                                                 // } else if ( function->get_linkage() == LinkageSpec::Intrinsic && InitTweak::getPointerBase( arg->result ) ) {
                                                 } else if ( function->get_linkage() == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
+                                                } else if ( function->linkage == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
                                                         // argument is a 'real' reference, but function expects a C lvalue: add a dereference to the reference-typed argument
                                                         PRINT(
 …
+                                        }
                                         ++i;
+                                        if (i == end) break;
+                                }
+                        }
 …
                         Type * destType = castExpr->result;
                         Type * srcType = castExpr->arg->result;
+                        assertf( destType, "Cast to no type in: %s", toCString( castExpr ) );
+                        assertf( srcType, "Cast from no type in: %s", toCString( castExpr ) );
                         int depth1 = destType->referenceDepth();
                         int depth2 = srcType->referenceDepth();
                         int diff = depth1 - depth2;
                         if ( diff > 0 && ! srcType->get_lvalue() ) {
+                        if ( diff > 0 && ! castExpr->arg->get_lvalue() ) {
                                 // rvalue to reference conversion -- introduce temporary
                                 // know that reference depth of cast argument is 0, need to introduce n temporaries for reference depth of n, e.g.
 …
                                         ret = new AddressExpr( ret );
+                                }
                                 if ( srcType->get_lvalue() && ! ResolvExpr::typesCompatible( srcType, strict_dynamic_cast<ReferenceType *>( destType )->base, SymTab::Indexer() ) ) {
+                                if ( castExpr->arg->get_lvalue() && ! ResolvExpr::typesCompatible( srcType, strict_dynamic_cast<ReferenceType *>( destType )->base, SymTab::Indexer() ) ) {
                                         // must keep cast if cast-to type is different from the actual type
                                         castExpr->arg = ret;
 …
                                 delete ret->result;
                                 ret->result = castExpr->result;
                                 ret->result->set_lvalue( true ); // ensure result is lvalue
+                                assert( ret->get_lvalue() ); // ensure result is lvalue
                                 castExpr->env = nullptr;
                                 castExpr->arg = nullptr;

src/GenPoly/ScopedSet.h

-              r7951100
+              rb067d9b
                 typedef typename Scope::pointer pointer;
                 typedef typename Scope::const_pointer const_pointer;
                 class iterator : public std::iterator< std::bidirectional_iterator_tag,
                                                        value_type > {
 …
                                 return *this;
+                        }
                         reference operator* () { return *it; }
                         pointer operator-> () { return it.operator->(); }
 …
                         bool operator!= (const iterator &that) { return !( *this == that ); }
+                        size_type get_level() const { return i; }
                 private:
                         scope_list const *scopes;
 …
                         bool operator!= (const const_iterator &that) { return !( *this == that ); }
+                        size_type get_level() const { return i; }
                 private:
                         scope_list const *scopes;
 …
                         size_type i;
                 };
                 /// Starts a new scope
                 void beginScope() {
 …
                         return const_iterator( const_cast< ScopedSet< Value >* >(this)->find( key ) );
+                }
                 /// Finds the given key in the outermost scope inside the given scope where it occurs
                 iterator findNext( const_iterator &it, const Value &key ) {
 …
                         return std::make_pair( iterator(scopes, res.first, scopes.size()-1), res.second );
+                }
         };
 } // namespace GenPoly

src/GenPoly/ScrubTyVars.cc

r7951100	rb067d9b
50	50	delete typeInst;
51	51	return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
	52	default:
	53	assertf(false, "Unhandled tyvar kind: %d", tyVar->second.kind);
52	54	} // switch
53	55	} // if

src/GenPoly/Specialize.cc

-              r7951100
+              rb067d9b
 namespace GenPoly {
         struct Specialize final : public WithTypeSubstitution, public WithStmtsToAdd, public WithVisitorRef<Specialize> {
+        struct Specialize final : public WithConstTypeSubstitution, public WithStmtsToAdd, public WithVisitorRef<Specialize> {
                 Expression * postmutate( ApplicationExpr *applicationExpr );
                 Expression * postmutate( CastExpr *castExpr );
 …
         /// Looks up open variables in actual type, returning true if any of them are bound in the environment or formal type.
         bool needsPolySpecialization( Type *formalType, Type *actualType, TypeSubstitution *env ) {
+        bool needsPolySpecialization( Type *formalType, Type *actualType, const TypeSubstitution *env ) {
                 if ( env ) {
                         using namespace ResolvExpr;
 …
+        }
         bool needsSpecialization( Type *formalType, Type *actualType, TypeSubstitution *env ) {
+        bool needsSpecialization( Type *formalType, Type *actualType, const TypeSubstitution *env ) {
                 return needsPolySpecialization( formalType, actualType, env ) || needsTupleSpecialization( formalType, actualType );
+        }
 …
                 appExpr->env = TypeSubstitution::newFromExpr( appExpr, env );
                 if ( inferParams ) {
                         appExpr->get_inferParams() = *inferParams;
+                        appExpr->inferParams = *inferParams;
                 } // if
 …
                 std::list< Expression* >::iterator actual;
                 for ( formal = function->get_parameters().begin(), actual = appExpr->get_args().begin(); formal != function->get_parameters().end() && actual != appExpr->get_args().end(); ++formal, ++actual ) {
                         *actual = doSpecialization( (*formal)->get_type(), *actual, &appExpr->get_inferParams() );
+                        *actual = doSpecialization( (*formal)->get_type(), *actual, &appExpr->inferParams );
+                }
+        }
 …
                         // alternatively, if order starts to matter then copy appExpr's inferParams and pass them to handleExplicitParams.
                         handleExplicitParams( appExpr );
                         for ( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
                                 inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, inferParam->second.inferParams.get() );
+                        for ( InferredParams::iterator inferParam = appExpr->inferParams.begin(); inferParam != appExpr->inferParams.end(); ++inferParam ) {
+                                inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, &inferParam->second.expr->inferParams );
+                        }
+                }

src/GenPoly/module.mk

r7951100	rb067d9b
22	22	GenPoly/FindFunction.cc \
23	23	GenPoly/InstantiateGeneric.cc
	24
	25	SRCDEMANGLE += GenPoly/GenPoly.cc GenPoly/Lvalue.cc
	26

src/InitTweak/FixGlobalInit.cc

-              r7951100
+              rb067d9b
         class GlobalFixer : public WithShortCircuiting {
           public:
                 GlobalFixer( const std::string & name, bool inLibrary );
+                GlobalFixer( bool inLibrary );
                 void previsit( ObjectDecl *objDecl );
 …
         };
         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;
 …
+        }
+  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;
 …
                         // 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 ) );
+        }
 …
                 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

-              r7951100
+              rb067d9b
 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

-              r7951100
+              rb067d9b
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jun 21 17:35:05 2017
 // Update Count     : 74
+// Last Modified On : Wed Feb 13 18:15:56 2019
+// Update Count     : 76
 //
 #include "FixInit.h"
 …
 #include "SynTree/Type.h"              // for Type, Type::StorageClasses
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution, operator<<
+#include "SynTree/DeclReplacer.h"      // for DeclReplacer
 #include "SynTree/Visitor.h"           // for acceptAll, maybeAccept
+#include "Validate/FindSpecialDecls.h" // for dtorStmt, dtorStructDestroy
 bool ctordtorp = false; // print all debug
 …
 namespace InitTweak {
         namespace {
-                typedef std::unordered_map< int, int > UnqCount;
                 struct SelfAssignChecker {
                         void previsit( ApplicationExpr * appExpr );
                 };
+                struct InsertImplicitCalls : public WithTypeSubstitution {
+                struct StmtExprResult {
+                        static void link( std::list< Declaration * > & translationUnit );
+                        void previsit( StmtExpr * stmtExpr );
+                };
+                struct InsertImplicitCalls : public WithConstTypeSubstitution {
                         /// wrap function application expressions as ImplicitCopyCtorExpr nodes so that it is easy to identify which
                         /// function calls need their parameters to be copy constructed
 …
                 };
                 struct ResolveCopyCtors final : public WithIndexer, public WithShortCircuiting, public WithTypeSubstitution {
+                struct ResolveCopyCtors final : public WithStmtsToAdd, public WithIndexer, public WithShortCircuiting, public WithTypeSubstitution, public WithVisitorRef<ResolveCopyCtors> {
                         /// generate temporary ObjectDecls for each argument and return value of each ImplicitCopyCtorExpr,
                         /// generate/resolve copy construction expressions for each, and generate/resolve destructors for both
                         /// arguments and return value temporaries
+                        static void resolveImplicitCalls( std::list< Declaration * > & translationUnit, UnqCount & unqCount );
+                        ResolveCopyCtors( UnqCount & unqCount ) : unqCount( unqCount ) {}
+                        void postvisit( ImplicitCopyCtorExpr * impCpCtorExpr );
+                        void postvisit( StmtExpr * stmtExpr );
+                        void previsit( UniqueExpr * unqExpr );
+                        void postvisit( UniqueExpr * unqExpr );
+                        static void resolveImplicitCalls( std::list< Declaration * > & translationUnit );
+                        Expression * postmutate( ImplicitCopyCtorExpr * impCpCtorExpr );
+                        void premutate( StmtExpr * stmtExpr );
+                        void premutate( UniqueExpr * unqExpr );
                         /// create and resolve ctor/dtor expression: fname(var, [cpArg])
 …
                         bool skipCopyConstruct( Type * type );
                         void copyConstructArg( Expression *& arg, ImplicitCopyCtorExpr * impCpCtorExpr, Type * formal );
+                        void destructRet( ObjectDecl * ret, ImplicitCopyCtorExpr * impCpCtorExpr );
+                        UnqCount & unqCount; // count the number of times each unique expr ID appears
+                        std::unordered_set< int > vars;
+                        void destructRet( ObjectDecl * ret, ImplicitCopyCtorExpr * impCpCtorExpr, Expression *& arg );
                 };
 …
                         using Parent::previsit;
-                        void previsit( ObjectDecl * objDecl );
                         void previsit( FunctionDecl * funcDecl );
-                        void previsit( CompoundStmt * compoundStmt );
-                        void postvisit( CompoundStmt * compoundStmt );
-                        void previsit( ReturnStmt * returnStmt );
                         void previsit( BranchStmt * stmt );
                 private:
 …
                         std::list< Declaration * > staticDtorDecls;
-                };
-                class FixCopyCtors final : public WithStmtsToAdd, public WithShortCircuiting, public WithVisitorRef<FixCopyCtors>, public WithTypeSubstitution {
-                  public:
-                        FixCopyCtors( UnqCount & unqCount ) : unqCount( unqCount ){}
-                        /// expand ImplicitCopyCtorExpr nodes into the temporary declarations, copy constructors, call expression,
-                        /// and destructors
-                        static void fixCopyCtors( std::list< Declaration * > &translationUnit, UnqCount & unqCount );
-                        Expression * postmutate( ImplicitCopyCtorExpr * impCpCtorExpr );
-                        void premutate( StmtExpr * stmtExpr );
-                        void premutate( UniqueExpr * unqExpr );
-                        UnqCount & unqCount;
                 };
 …
                         Expression * postmutate( ConstructorExpr * ctorExpr );
                 };
+                struct SplitExpressions : public WithShortCircuiting, public WithTypeSubstitution, public WithStmtsToAdd {
+                        /// add CompoundStmts around top-level expressions so that temporaries are destroyed in the correct places.
+                        static void split( std::list< Declaration * > &translationUnit );
+                        Statement * postmutate( ExprStmt * stmt );
+                        void premutate( TupleAssignExpr * expr );
+                };
         } // 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 StmtExpr to properly link to their resulting expression
+                StmtExprResult::link( translationUnit );
                 // fixes ConstructorInit for global variables. should happen before fixInitializers.
+                InitTweak::fixGlobalInit( translationUnit, filename, inLibrary );
+                UnqCount unqCount;
+                InitTweak::fixGlobalInit( translationUnit, inLibrary );
+                // must happen before ResolveCopyCtors because temporaries have to be inserted into the correct scope
+                SplitExpressions::split( translationUnit );
                 InsertImplicitCalls::insert( translationUnit );
+                ResolveCopyCtors::resolveImplicitCalls( translationUnit, unqCount );
+                // Needs to happen before ResolveCopyCtors, because argument/return temporaries should not be considered in
+                // error checking branch statements
                 InsertDtors::insert( translationUnit );
+                ResolveCopyCtors::resolveImplicitCalls( translationUnit );
                 FixInit::fixInitializers( translationUnit );
-                // FixCopyCtors must happen after FixInit, so that destructors are placed correctly
-                FixCopyCtors::fixCopyCtors( translationUnit, unqCount );
                 GenStructMemberCalls::generate( translationUnit );
+                // xxx - ctor expansion currently has to be after FixCopyCtors, because there is currently a
+                // hack in the way untyped assignments are generated, where the first argument cannot have
+                // its address taken because of the way codegeneration handles UntypedExpr vs. ApplicationExpr.
+                // Thus such assignment exprs must never pushed through expression resolution (and thus should
+                // not go through the FixCopyCtors pass), otherwise they will fail -- guaranteed.
+                // Also needs to happen after GenStructMemberCalls, since otherwise member constructors exprs
+                // don't look right, and a member can be constructed more than once.
+                // Needs to happen after GenStructMemberCalls, since otherwise member constructors exprs
+                // don't have the correct form, and a member can be constructed more than once.
                 FixCtorExprs::fix( translationUnit );
+        }
         namespace {
+                /// find and return the destructor used in `input`. If `input` is not a simple destructor call, generate a thunk
+                /// that wraps the destructor, insert it into `stmtsToAdd` and return the new function declaration
+                DeclarationWithType * getDtorFunc( ObjectDecl * objDecl, Statement * input, std::list< Statement * > & stmtsToAdd ) {
+                        // unwrap implicit statement wrapper
+                        Statement * dtor = input;
+                        assert( dtor );
+                        std::list< Expression * > matches;
+                        collectCtorDtorCalls( dtor, matches );
+                        if ( dynamic_cast< ExprStmt * >( dtor ) ) {
+                                // only one destructor call in the expression
+                                if ( matches.size() == 1 ) {
+                                        DeclarationWithType * func = getFunction( matches.front() );
+                                        assertf( func, "getFunction failed to find function in %s", toString( matches.front() ).c_str() );
+                                        // cleanup argument must be a function, not an object (including function pointer)
+                                        if ( FunctionDecl * dtorFunc = dynamic_cast< FunctionDecl * > ( func ) ) {
+                                                if ( dtorFunc->type->forall.empty() ) {
+                                                        // simple case where the destructor is a monomorphic function call - can simply
+                                                        // use that function as the cleanup function.
+                                                        delete dtor;
+                                                        return func;
+                                                }
+                                        }
+                                }
+                        }
+                        // otherwise the cleanup is more complicated - need to build a single argument cleanup function that
+                        // wraps the more complicated code.
+                        static UniqueName dtorNamer( "__cleanup_dtor" );
+                        std::string name = dtorNamer.newName();
+                        FunctionDecl * dtorFunc = FunctionDecl::newFunction( name, SymTab::genDefaultType( objDecl->type->stripReferences(), false ), new CompoundStmt() );
+                        stmtsToAdd.push_back( new DeclStmt( dtorFunc ) );
+                        // the original code contains uses of objDecl - replace them with the newly generated 'this' parameter.
+                        ObjectDecl * thisParam = getParamThis( dtorFunc->type );
+                        Expression * replacement = new VariableExpr( thisParam );
+                        Type * base = replacement->result->stripReferences();
+                        if ( dynamic_cast< ArrayType * >( base ) || dynamic_cast< TupleType * > ( base ) ) {
+                                // need to cast away reference for array types, since the destructor is generated without the reference type,
+                                // and for tuple types since tuple indexing does not work directly on a reference
+                                replacement = new CastExpr( replacement, base->clone() );
+                        }
+                        DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
+                        dtorFunc->statements->push_back( strict_dynamic_cast<Statement *>( dtor ) );
+                        return dtorFunc;
+                }
+                void StmtExprResult::link( std::list< Declaration * > & translationUnit ) {
+                        PassVisitor<StmtExprResult> linker;
+                        acceptAll( translationUnit, linker );
+                }
+                void SplitExpressions::split( std::list< Declaration * > & translationUnit ) {
+                        PassVisitor<SplitExpressions> splitter;
+                        mutateAll( translationUnit, splitter );
+                }
                 void InsertImplicitCalls::insert( std::list< Declaration * > & translationUnit ) {
                         PassVisitor<InsertImplicitCalls> inserter;
 …
+                }
                 void ResolveCopyCtors::resolveImplicitCalls( std::list< Declaration * > & translationUnit, UnqCount & unqCount ) {
                         PassVisitor<ResolveCopyCtors> resolver( unqCount );
                         acceptAll( translationUnit, resolver );
+                void ResolveCopyCtors::resolveImplicitCalls( std::list< Declaration * > & translationUnit ) {
+                        PassVisitor<ResolveCopyCtors> resolver;
+                        mutateAll( translationUnit, resolver );
+                }
 …
+                }
-                void FixCopyCtors::fixCopyCtors( std::list< Declaration * > & translationUnit, UnqCount & unqCount ) {
-                        PassVisitor<FixCopyCtors> fixer( unqCount );
-                        mutateAll( translationUnit, fixer );
+                }
                 void GenStructMemberCalls::generate( std::list< Declaration * > & translationUnit ) {
                         PassVisitor<GenStructMemberCalls> warner;
 …
+                }
+                namespace {
+                        // Relatively simple structural comparison for expressions, needed to determine
+                        // if two expressions are "the same" (used to determine if self assignment occurs)
+                        struct StructuralChecker {
+                                Expression * stripCasts( Expression * expr ) {
+                                        // this might be too permissive. It's possible that only particular casts are relevant.
+                                        while ( CastExpr * cast = dynamic_cast< CastExpr * >( expr ) ) {
+                                                expr = cast->arg;
+                                        }
+                                        return expr;
+                                }
+                                void previsit( Expression * ) {
+                                        // anything else does not qualify
+                                        isSimilar = false;
+                                }
+                                template<typename T>
+                                T * cast( Expression * node ) {
+                                        // all expressions need to ignore casts, so this bit has been factored out
+                                        return dynamic_cast< T * >( stripCasts( node ) );
+                                }
+                                // ignore casts
+                                void previsit( CastExpr * ) {}
+                                void previsit( MemberExpr * memExpr ) {
+                                        if ( MemberExpr * otherMember = cast< MemberExpr >( other ) ) {
+                                                if ( otherMember->member == memExpr->member ) {
+                                                        other = otherMember->aggregate;
+                                                        return;
+                                                }
+                                        }
+                                        isSimilar = false;
+                                }
+                                void previsit( VariableExpr * varExpr ) {
+                                        if ( VariableExpr * otherVar = cast< VariableExpr >( other ) ) {
+                                                if ( otherVar->var == varExpr->var ) {
+                                                        return;
+                                                }
+                                        }
+                                        isSimilar = false;
+                                }
+                                void previsit( AddressExpr * ) {
+                                        if ( AddressExpr * addrExpr = cast< AddressExpr >( other ) ) {
+                                                other = addrExpr->arg;
+                void StmtExprResult::previsit( StmtExpr * stmtExpr ) {
+                        // we might loose the result expression here so add a pointer to trace back
+                        assert( stmtExpr->result );
+                        Type * result = stmtExpr->result;
+                        if ( ! result->isVoid() ) {
+                                CompoundStmt * body = stmtExpr->statements;
+                                assert( ! body->kids.empty() );
+                                stmtExpr->resultExpr = strict_dynamic_cast< ExprStmt * >( body->kids.back() );
+                        }
+                }
+                Statement * SplitExpressions::postmutate( ExprStmt * stmt ) {
+                        // wrap each top-level ExprStmt in a block so that destructors for argument and return temporaries are destroyed
+                        // in the correct places
+                        CompoundStmt * ret = new CompoundStmt( { stmt } );
+                        return ret;
+                }
+                void SplitExpressions::premutate( TupleAssignExpr * ) {
+                        // don't do this within TupleAssignExpr, since it is already broken up into multiple expressions
+                        visit_children = false;
+                }
+                // Relatively simple structural comparison for expressions, needed to determine
+                // if two expressions are "the same" (used to determine if self assignment occurs)
+                struct StructuralChecker {
+                        Expression * stripCasts( Expression * expr ) {
+                                // this might be too permissive. It's possible that only particular casts are relevant.
+                                while ( CastExpr * cast = dynamic_cast< CastExpr * >( expr ) ) {
+                                        expr = cast->arg;
+                                }
+                                return expr;
+                        }
+                        void previsit( Expression * ) {
+                                // anything else does not qualify
+                                isSimilar = false;
+                        }
+                        template<typename T>
+                        T * cast( Expression * node ) {
+                                // all expressions need to ignore casts, so this bit has been factored out
+                                return dynamic_cast< T * >( stripCasts( node ) );
+                        }
+                        // ignore casts
+                        void previsit( CastExpr * ) {}
+                        void previsit( MemberExpr * memExpr ) {
+                                if ( MemberExpr * otherMember = cast< MemberExpr >( other ) ) {
+                                        if ( otherMember->member == memExpr->member ) {
+                                                other = otherMember->aggregate;
                                                 return;
+                                        }
+                                        isSimilar = false;
+                                }
+                                Expression * other = nullptr;
+                                bool isSimilar = true;
+                        };
+                        bool structurallySimilar( Expression * e1, Expression * e2 ) {
+                                PassVisitor<StructuralChecker> checker;
+                                checker.pass.other = e2;
+                                e1->accept( checker );
+                                return checker.pass.isSimilar;
+                        }
+                                }
+                                isSimilar = false;
+                        }
+                        void previsit( VariableExpr * varExpr ) {
+                                if ( VariableExpr * otherVar = cast< VariableExpr >( other ) ) {
+                                        if ( otherVar->var == varExpr->var ) {
+                                                return;
+                                        }
+                                }
+                                isSimilar = false;
+                        }
+                        void previsit( AddressExpr * ) {
+                                if ( AddressExpr * addrExpr = cast< AddressExpr >( other ) ) {
+                                        other = addrExpr->arg;
+                                        return;
+                                }
+                                isSimilar = false;
+                        }
+                        Expression * other = nullptr;
+                        bool isSimilar = true;
+                };
+                bool structurallySimilar( Expression * e1, Expression * e2 ) {
+                        PassVisitor<StructuralChecker> checker;
+                        checker.pass.other = e2;
+                        e1->accept( checker );
+                        return checker.pass.isSimilar;
+                }
 …
                         if ( TupleAssignExpr * assign = dynamic_cast< TupleAssignExpr * >( resolved ) ) {
                                 // fix newly generated StmtExpr
                                 postvisit( assign->stmtExpr );
+                                premutate( assign->stmtExpr );
+                        }
                         return resolved;
 …
                                         // so that the object isn't changed inside of the polymorphic function
                                         if ( ! GenPoly::needsBoxing( formal, result, impCpCtorExpr->callExpr, env ) ) return;
+                                        // xxx - leaking tmp
+                                }
+                        }
 …
                         // replace argument to function call with temporary
+                        arg = new CommaExpr( cpCtor, new VariableExpr( tmp ) );
+                        impCpCtorExpr->tempDecls.push_back( tmp );
+                        impCpCtorExpr->dtors.push_front( makeCtorDtor( "^?{}", tmp ) );
+                }
+                void ResolveCopyCtors::destructRet( ObjectDecl * ret, ImplicitCopyCtorExpr * impCpCtorExpr ) {
+                        impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
+                }
+                void ResolveCopyCtors::postvisit( ImplicitCopyCtorExpr *impCpCtorExpr ) {
+                        stmtsToAddBefore.push_back( new DeclStmt( tmp ) );
+                        arg = cpCtor;
+                        destructRet( tmp, impCpCtorExpr, arg );
+                        // impCpCtorExpr->dtors.push_front( makeCtorDtor( "^?{}", tmp ) );
+                }
+                void ResolveCopyCtors::destructRet( ObjectDecl * ret, ImplicitCopyCtorExpr * /*impCpCtorExpr*/, Expression *& arg ) {
+                        // TODO: refactor code for generating cleanup attribute, since it's common and reused in ~3-4 places
+                        // check for existing cleanup attribute before adding another(?)
+                        // need to add __Destructor for _tmp_cp variables as well
+                        assertf( Validate::dtorStruct && Validate::dtorStruct->members.size() == 2, "Destructor generation requires __Destructor definition." );
+                        assertf( Validate::dtorStructDestroy, "Destructor generation requires __destroy_Destructor." );
+                        // generate a __Destructor for ret that calls the destructor
+                        Expression * dtor = makeCtorDtor( "^?{}", ret );
+                        // if the chosen destructor is intrinsic, elide the generated dtor handler
+                        if ( arg && isIntrinsicCallExpr( dtor ) ) {
+                                arg = new CommaExpr( arg, new VariableExpr( ret ) );
+                                return;
+                        }
+                        if ( ! dtor->env ) dtor->env = maybeClone( env );
+                        DeclarationWithType * dtorFunc = getDtorFunc( ret, new ExprStmt( dtor ), stmtsToAddBefore );
+                        StructInstType * dtorStructType = new StructInstType( Type::Qualifiers(), Validate::dtorStruct );
+                        dtorStructType->parameters.push_back( new TypeExpr( new VoidType( Type::Qualifiers() ) ) );
+                        // cast destructor pointer to void (*)(void *), to silence GCC incompatible pointer warnings
+                        FunctionType * dtorFtype = new FunctionType( Type::Qualifiers(), false );
+                        dtorFtype->parameters.push_back( ObjectDecl::newObject( "", new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), nullptr ) );
+                        Type * dtorType = new PointerType( Type::Qualifiers(), dtorFtype );
+                        static UniqueName namer( "_ret_dtor" );
+                        ObjectDecl * retDtor = ObjectDecl::newObject( namer.newName(), dtorStructType, new ListInit( { new SingleInit( new ConstantExpr( Constant::null() ) ), new SingleInit( new CastExpr( new VariableExpr( dtorFunc ), dtorType ) ) } ) );
+                        retDtor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( Validate::dtorStructDestroy ) } ) );
+                        stmtsToAddBefore.push_back( new DeclStmt( retDtor ) );
+                        if ( arg ) {
+                                Expression * member = new MemberExpr( strict_dynamic_cast<DeclarationWithType *>( Validate::dtorStruct->members.front() ), new VariableExpr( retDtor ) );
+                                Expression * object = new CastExpr( new AddressExpr( new VariableExpr( ret ) ), new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ) );
+                                Expression * assign = createBitwiseAssignment( member, object );
+                                arg = new CommaExpr( new CommaExpr( arg, assign ), new VariableExpr( ret ) );
+                        }
+                        // impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
+                }
+                Expression * ResolveCopyCtors::postmutate( ImplicitCopyCtorExpr *impCpCtorExpr ) {
                         CP_CTOR_PRINT( std::cerr << "ResolveCopyCtors: " << impCpCtorExpr << std::endl; )
                         ApplicationExpr * appExpr = impCpCtorExpr->callExpr;
+                        ObjectDecl * returnDecl = nullptr;
                         // take each argument and attempt to copy construct it.
 …
                         for ( Expression * & arg : appExpr->args ) {
                                 Type * formal = nullptr;
                                 if ( iter != params.end() ) {
+                                if ( iter != params.end() ) { // does not copy construct C-style variadic arguments
                                         DeclarationWithType * param = *iter++;
                                         formal = param->get_type();
 …
                                 ObjectDecl * ret = ObjectDecl::newObject( retNamer.newName(), result, nullptr );
                                 ret->type->set_const( false );
+                                impCpCtorExpr->returnDecls.push_back( ret );
+                                returnDecl = ret;
+                                stmtsToAddBefore.push_back( new DeclStmt( ret ) );
                                 CP_CTOR_PRINT( std::cerr << "makeCtorDtor for a return" << std::endl; )
+                        } // for
+                        CP_CTOR_PRINT( std::cerr << "after Resolving: " << impCpCtorExpr << std::endl; )
+                        // ------------------------------------------------------
+                        CP_CTOR_PRINT( std::cerr << "Coming out the back..." << impCpCtorExpr << std::endl; )
+                        // detach fields from wrapper node so that it can be deleted without deleting too much
+                        impCpCtorExpr->callExpr = nullptr;
+                        std::swap( impCpCtorExpr->env, appExpr->env );
+                        assert( impCpCtorExpr->env == nullptr );
+                        delete impCpCtorExpr;
+                        if ( returnDecl ) {
+                                Expression * assign = createBitwiseAssignment( new VariableExpr( returnDecl ), appExpr );
                                 if ( ! dynamic_cast< ReferenceType * >( result ) ) {
                                         // destructing reference returns is bad because it can cause multiple destructor calls to the same object - the returned object is not a temporary
+                                        destructRet( ret, impCpCtorExpr );
+                                }
+                                        destructRet( returnDecl, impCpCtorExpr, assign );
+                                } else {
+                                        assign = new CommaExpr( assign, new VariableExpr( returnDecl ) );
+                                }
+                                // move env from appExpr to retExpr
+                                std::swap( assign->env, appExpr->env );
+                                return assign;
+                        } else {
+                                return appExpr;
+                        } // if
+                }
+                void ResolveCopyCtors::premutate( StmtExpr * stmtExpr ) {
+                        // function call temporaries should be placed at statement-level, rather than nested inside of a new statement expression,
+                        // since temporaries can be shared across sub-expressions, e.g.
+                        //   [A, A] f();       // decl
+                        //   g([A] x, [A] y);  // decl
+                        //   g(f());           // call
+                        // f is executed once, so the return temporary is shared across the tuple constructors for x and y.
+                        // Explicitly mutating children instead of mutating the inner compound statement forces the temporaries to be added
+                        // to the outer context, rather than inside of the statement expression.
+                        visit_children = false;
+                        assert( env );
+                        indexer.enterScope();
+                        // visit all statements
+                        std::list< Statement * > & stmts = stmtExpr->statements->get_kids();
+                        for ( Statement *& stmt : stmts ) {
+                                stmt = stmt->acceptMutator( *visitor );
                         } // for
+                        CP_CTOR_PRINT( std::cerr << "after Resolving: " << impCpCtorExpr << std::endl; )
+                }
+                void ResolveCopyCtors::postvisit( StmtExpr * stmtExpr ) {
+                        assert( env );
+                        assert( stmtExpr->get_result() );
+                        Type * result = stmtExpr->get_result();
+                        indexer.leaveScope();
+                        assert( stmtExpr->result );
+                        Type * result = stmtExpr->result;
                         if ( ! result->isVoid() ) {
                                 static UniqueName retNamer("_tmp_stmtexpr_ret");
 …
                                 ObjectDecl * ret = ObjectDecl::newObject( retNamer.newName(), result, nullptr );
                                 ret->type->set_const( false );
+                                stmtExpr->returnDecls.push_front( ret );
+                                stmtsToAddBefore.push_back( new DeclStmt( ret ) );
+                                assertf(
+                                        stmtExpr->resultExpr,
+                                        "Statement-Expression should have a resulting expression at %s:%d",
+                                        stmtExpr->location.filename.c_str(),
+                                        stmtExpr->location.first_line
+                                );
+                                ExprStmt * last = stmtExpr->resultExpr;
+                                try {
+                                        last->expr = makeCtorDtor( "?{}", ret, last->expr );
+                                } catch(...) {
+                                        std::cerr << "*CFA internal error: ";
+                                        std::cerr << "can't resolve implicit constructor";
+                                        std::cerr << " at " << stmtExpr->location.filename;
+                                        std::cerr << ":" << stmtExpr->location.first_line << std::endl;
+                                        abort();
+                                }
+                                // add destructors after current statement
+                                stmtsToAddAfter.push_back( new ExprStmt( makeCtorDtor( "^?{}", ret ) ) );
                                 // must have a non-empty body, otherwise it wouldn't have a result
+                                CompoundStmt * body = stmtExpr->statements;
+                                assert( ! body->get_kids().empty() );
+                                // must be an ExprStmt, otherwise it wouldn't have a result
+                                ExprStmt * last = strict_dynamic_cast< ExprStmt * >( body->get_kids().back() );
+                                last->expr = makeCtorDtor( "?{}", ret, last->get_expr() );
+                                stmtExpr->dtors.push_front( makeCtorDtor( "^?{}", ret ) );
+                                assert( ! stmts.empty() );
+                                // if there is a return decl, add a use as the last statement; will not have return decl on non-constructable returns
+                                stmts.push_back( new ExprStmt( new VariableExpr( ret ) ) );
                         } // if
+                }
+                void ResolveCopyCtors::previsit( UniqueExpr * unqExpr ) {
+                        unqCount[ unqExpr->get_id() ]++;  // count the number of unique expressions for each ID
+                        if ( vars.count( unqExpr->get_id() ) ) {
+                                // xxx - hack to prevent double-handling of unique exprs, otherwise too many temporary variables and destructors are generated
+                                visit_children = false;
+                        }
+                        assert( stmtExpr->returnDecls.empty() );
+                        assert( stmtExpr->dtors.empty() );
+                }
 …
+                }
+                void ResolveCopyCtors::postvisit( UniqueExpr * unqExpr ) {
+                        if ( vars.count( unqExpr->get_id() ) ) {
+                                // xxx - hack to prevent double-handling of unique exprs, otherwise too many temporary variables and destructors are generated
+                                return;
+                        }
+                        // it should never be necessary to wrap a void-returning expression in a UniqueExpr - if this assumption changes, this needs to be rethought
+                        assert( unqExpr->get_result() );
+                        if ( ImplicitCopyCtorExpr * impCpCtorExpr = dynamic_cast<ImplicitCopyCtorExpr*>( unqExpr->get_expr() ) ) {
+                                // note the variable used as the result from the call
+                                assert( impCpCtorExpr->get_result() && impCpCtorExpr->get_returnDecls().size() == 1 );
+                                unqExpr->set_var( new VariableExpr( impCpCtorExpr->get_returnDecls().front() ) );
+                void ResolveCopyCtors::premutate( UniqueExpr * unqExpr ) {
+                        visit_children = false;
+                        // xxx - hack to prevent double-handling of unique exprs, otherwise too many temporary variables and destructors are generated
+                        static std::unordered_map< int, UniqueExpr * > unqMap;
+                        if ( ! unqMap.count( unqExpr->get_id() ) ) {
+                                // resolve expr and find its
+                                ImplicitCopyCtorExpr * impCpCtorExpr = dynamic_cast< ImplicitCopyCtorExpr * >( unqExpr->expr );
+                                // PassVisitor<ResolveCopyCtors> fixer;
+                                unqExpr->expr = unqExpr->expr->acceptMutator( *visitor );
+                                // it should never be necessary to wrap a void-returning expression in a UniqueExpr - if this assumption changes, this needs to be rethought
+                                assert( unqExpr->result );
+                                if ( impCpCtorExpr ) {
+                                        CommaExpr * comma = strict_dynamic_cast< CommaExpr * >( unqExpr->expr );
+                                        VariableExpr * var = strict_dynamic_cast<VariableExpr *>( comma->arg2 );
+                                        // note the variable used as the result from the call
+                                        unqExpr->var = var->clone();
+                                } else {
+                                        // expr isn't a call expr, so create a new temporary variable to use to hold the value of the unique expression
+                                        unqExpr->object = ObjectDecl::newObject( toString("_unq", unqExpr->get_id()), unqExpr->result->clone(), makeInit( unqExpr->result ) );
+                                        unqExpr->var = new VariableExpr( unqExpr->object );
+                                }
+                                // stmtsToAddBefore.splice( stmtsToAddBefore.end(), fixer.pass.stmtsToAddBefore );
+                                // stmtsToAddAfter.splice( stmtsToAddAfter.end(), fixer.pass.stmtsToAddAfter );
+                                unqMap[unqExpr->get_id()] = unqExpr;
                         } else {
-                                // expr isn't a call expr, so create a new temporary variable to use to hold the value of the unique expression
-                                unqExpr->set_object( ObjectDecl::newObject( toString("_unq", unqExpr->get_id()), unqExpr->get_result()->clone(), makeInit( unqExpr->get_result() ) ) );
-                                unqExpr->set_var( new VariableExpr( unqExpr->get_object() ) );
+                        }
-                        vars.insert( unqExpr->get_id() );
+                }
-                Expression * FixCopyCtors::postmutate( ImplicitCopyCtorExpr * impCpCtorExpr ) {
-                        CP_CTOR_PRINT( std::cerr << "FixCopyCtors: " << impCpCtorExpr << std::endl; )
-                        std::list< ObjectDecl * > & tempDecls = impCpCtorExpr->get_tempDecls();
-                        std::list< ObjectDecl * > & returnDecls = impCpCtorExpr->get_returnDecls();
-                        std::list< Expression * > & dtors = impCpCtorExpr->get_dtors();
-                        // add all temporary declarations and their constructors
-                        for ( ObjectDecl * obj : tempDecls ) {
-                                stmtsToAddBefore.push_back( new DeclStmt( obj ) );
-                        } // for
-                        for ( ObjectDecl * obj : returnDecls ) {
-                                stmtsToAddBefore.push_back( new DeclStmt( obj ) );
-                        } // for
-                        // add destructors after current statement
-                        for ( Expression * dtor : dtors ) {
-                                // take relevant bindings from environment
-                                assert( ! dtor->env );
-                                dtor->env =  maybeClone( env );
-                                stmtsToAddAfter.push_back( new ExprStmt( dtor ) );
-                        } // for
-                        ObjectDecl * returnDecl = returnDecls.empty() ? nullptr : returnDecls.front();
-                        Expression * callExpr = impCpCtorExpr->get_callExpr();
-                        CP_CTOR_PRINT( std::cerr << "Coming out the back..." << impCpCtorExpr << std::endl; )
-                        // detach fields from wrapper node so that it can be deleted without deleting too much
-                        dtors.clear();
-                        tempDecls.clear();
-                        returnDecls.clear();
-                        impCpCtorExpr->set_callExpr( nullptr );
-                        std::swap( impCpCtorExpr->env, callExpr->env );
-                        assert( impCpCtorExpr->env == nullptr );
-                        delete impCpCtorExpr;
-                        if ( returnDecl ) {
-                                ApplicationExpr * assign = createBitwiseAssignment( new VariableExpr( returnDecl ), callExpr );
-                                Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
-                                // move env from callExpr to retExpr
-                                std::swap( retExpr->env, callExpr->env );
-                                return retExpr;
-                        } else {
-                                return callExpr;
-                        } // if
+                }
-                void FixCopyCtors::premutate( StmtExpr * stmtExpr ) {
-                        // function call temporaries should be placed at statement-level, rather than nested inside of a new statement expression,
-                        // since temporaries can be shared across sub-expressions, e.g.
-                        //   [A, A] f();
-                        //   g([A] x, [A] y);
-                        //   g(f());
-                        // f is executed once, so the return temporary is shared across the tuple constructors for x and y.
-                        // Explicitly mutating children instead of mutating the inner compound statment forces the temporaries to be added
-                        // to the outer context, rather than inside of the statement expression.
-                        visit_children = false;
-                        std::list< Statement * > & stmts = stmtExpr->statements->get_kids();
-                        for ( Statement *& stmt : stmts ) {
-                                stmt = stmt->acceptMutator( *visitor );
-                        } // for
-                        assert( stmtExpr->result );
-                        Type * result = stmtExpr->result;
-                        if ( ! result->isVoid() ) {
-                                for ( ObjectDecl * obj : stmtExpr->returnDecls ) {
-                                        stmtsToAddBefore.push_back( new DeclStmt( obj ) );
-                                } // for
-                                // add destructors after current statement
-                                for ( Expression * dtor : stmtExpr->dtors ) {
-                                        stmtsToAddAfter.push_back( new ExprStmt( dtor ) );
-                                } // for
-                                // must have a non-empty body, otherwise it wouldn't have a result
-                                assert( ! stmts.empty() );
-                                assertf( ! stmtExpr->returnDecls.empty() || stmtExpr->dtors.empty(), "StmtExpr returns non-void, but no return decls: %s", toString( stmtExpr ).c_str() );
-                                // if there is a return decl, add a use as the last statement; will not have return decl on non-constructable returns
-                                if ( ! stmtExpr->returnDecls.empty() ) {
-                                        stmts.push_back( new ExprStmt( new VariableExpr( stmtExpr->returnDecls.front() ) ) );
+                                }
-                                stmtExpr->returnDecls.clear();
-                                stmtExpr->dtors.clear();
+                        }
-                        assert( stmtExpr->returnDecls.empty() );
-                        assert( stmtExpr->dtors.empty() );
+                }
-                void FixCopyCtors::premutate( UniqueExpr * unqExpr ) {
-                        visit_children = false;
-                        unqCount[ unqExpr->get_id() ]--;
-                        static std::unordered_map< int, std::list< Statement * > > dtors;
-                        static std::unordered_map< int, UniqueExpr * > unqMap;
-                        // has to be done to clean up ImplicitCopyCtorExpr nodes, even when this node was skipped in previous passes
-                        if ( unqMap.count( unqExpr->get_id() ) ) {
                                 // take data from other UniqueExpr to ensure consistency
                                 delete unqExpr->get_expr();
+                                unqExpr->set_expr( unqMap[unqExpr->get_id()]->get_expr()->clone() );
+                                delete unqExpr->get_result();
+                                unqExpr->set_result( maybeClone( unqExpr->get_expr()->get_result() ) );
+                                if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
+                                        stmtsToAddAfter.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
+                                }
+                                return;
+                        }
+                        PassVisitor<FixCopyCtors> fixer( unqCount );
+                        unqExpr->set_expr( unqExpr->get_expr()->acceptMutator( fixer ) ); // stmtexprs contained should not be separately fixed, so this must occur after the lookup
+                        stmtsToAddBefore.splice( stmtsToAddBefore.end(), fixer.pass.stmtsToAddBefore );
+                        unqMap[unqExpr->get_id()] = unqExpr;
+                        if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
+                                stmtsToAddAfter.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
+                        } else { // remember dtors for last instance of unique expr
+                                dtors[ unqExpr->get_id() ] = fixer.pass.stmtsToAddAfter;
+                        }
+                        return;
+                                unqExpr->expr = unqMap[unqExpr->get_id()]->expr->clone();
+                                delete unqExpr->result;
+                                unqExpr->result = maybeClone( unqExpr->expr->result );
+                        }
+                }
 …
                                                         ctorInit->ctor = nullptr;
+                                                }
+                                                Statement * dtor = ctorInit->dtor;
+                                                if ( dtor ) {
+                                                        ImplicitCtorDtorStmt * implicit = strict_dynamic_cast< ImplicitCtorDtorStmt * >( dtor );
+                                                        Statement * dtorStmt = implicit->callStmt;
+                                                        // don't need to call intrinsic dtor, because it does nothing, but
+                                                        // non-intrinsic dtors must be called
+                                                        if ( ! isIntrinsicSingleArgCallStmt( dtorStmt ) ) {
+                                                                // set dtor location to the object's location for error messages
+                                                                DeclarationWithType * dtorFunc = getDtorFunc( objDecl, dtorStmt, stmtsToAddBefore );
+                                                                objDecl->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorFunc ) } ) );
+                                                                ctorInit->dtor = nullptr;
+                                                        } // if
+                                                }
                                         } // if
                                 } else if ( Initializer * init = ctorInit->init ) {
 …
-                template<typename Iterator, typename OutputIterator>
-                void insertDtors( Iterator begin, Iterator end, OutputIterator out ) {
-                        for ( Iterator it = begin ; it != end ; ++it ) {
-                                // extract destructor statement from the object decl and insert it into the output. Note that this is
-                                // only called on lists of non-static objects with implicit non-intrinsic dtors, so if the user manually
-                                // calls an intrinsic dtor then the call must (and will) still be generated since the argument may
-                                // contain side effects.
-                                ObjectDecl * objDecl = *it;
-                                ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() );
-                                assert( ctorInit && ctorInit->get_dtor() );
-                                *out++ = ctorInit->get_dtor()->clone();
-                        } // for
+                }
-                void InsertDtors::previsit( ObjectDecl * objDecl ) {
-                        // remember non-static destructed objects so that their destructors can be inserted later
-                        if ( ! objDecl->get_storageClasses().is_static ) {
-                                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() );
-                                        Statement * dtor = ctorInit->get_dtor();
-                                        // don't need to call intrinsic dtor, because it does nothing, but
-                                        // non-intrinsic dtors must be called
-                                        if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {
-                                                // set dtor location to the object's location for error messages
-                                                ctorInit->dtor->location = objDecl->location;
-                                                reverseDeclOrder.front().push_front( objDecl );
-                                        } // if
-                                } // if
-                        } // if
+                }
                 void InsertDtors::previsit( FunctionDecl * funcDecl ) {
                         // each function needs to have its own set of labels
 …
+                }
-                void InsertDtors::previsit( CompoundStmt * compoundStmt ) {
-                        // visit statements - this will also populate reverseDeclOrder list.  don't want to dump all destructors
-                        // when block is left, just the destructors associated with variables defined in this block, so push a new
-                        // list to the top of the stack so that we can differentiate scopes
-                        reverseDeclOrder.push_front( OrderedDecls() );
-                        Parent::previsit( compoundStmt );
+                }
-                void InsertDtors::postvisit( CompoundStmt * compoundStmt ) {
-                        // add destructors for the current scope that we're exiting, unless the last statement is a return, which
-                        // causes unreachable code warnings
-                        std::list< Statement * > & statements = compoundStmt->get_kids();
-                        if ( ! statements.empty() && ! dynamic_cast< ReturnStmt * >( statements.back() ) ) {
-                                insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );
+                        }
-                        reverseDeclOrder.pop_front();
+                }
-                void InsertDtors::previsit( ReturnStmt * ) {
-                        // return exits all scopes, so dump destructors for all scopes
-                        for ( OrderedDecls & od : reverseDeclOrder ) {
-                                insertDtors( od.begin(), od.end(), back_inserter( stmtsToAddBefore ) );
-                        } // for
+                }
                 // Handle break/continue/goto in the same manner as C++.  Basic idea: any objects that are in scope at the
                 // BranchStmt but not at the labelled (target) statement must be destructed.  If there are any objects in scope
 …
                                 std::cerr << "S_L = " << printSet( lvars ) << std::endl;
+                        )
+                        // std::set_difference requires that the inputs be sorted.
+                        lvars.sort();
+                        curVars.sort();
                         ObjectSet diff;
 …
                         if ( ! diff.empty() ) {
                                 SemanticError( stmt, std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " " );
-                        } // if
-                        // S_G-S_L results in set of objects that must be destructed
-                        diff.clear();
-                        std::set_difference( curVars.begin(), curVars.end(), lvars.begin(), lvars.end(), std::inserter( diff, diff.end() ) );
-                        DTOR_PRINT(
-                                std::cerr << "S_G-S_L = " << printSet( diff ) << std::endl;
+                        )
-                        if ( ! diff.empty() ) {
-                                // create an auxilliary set for fast lookup -- can't make diff a set, because diff ordering should be consistent for error messages.
-                                std::unordered_set<ObjectDecl *> needsDestructor( diff.begin(), diff.end() );
-                                // go through decl ordered list of objectdecl. for each element that occurs in diff, output destructor
-                                OrderedDecls ordered;
-                                for ( OrderedDecls & rdo : reverseDeclOrder ) {
-                                        // add elements from reverseDeclOrder into ordered if they occur in diff - it is key that this happens in reverse declaration order.
-                                        copy_if( rdo.begin(), rdo.end(), back_inserter( ordered ), [&]( ObjectDecl * objDecl ) { return needsDestructor.count( objDecl ); } );
-                                } // for
-                                insertDtors( ordered.begin(), ordered.end(), back_inserter( stmtsToAddBefore ) );
                         } // if
+                }
 …
                                                 arg2 = new MemberExpr( field, new VariableExpr( params.back() ) );
+                                        }
                                         InitExpander srcParam( arg2 );
+                                        InitExpander_old srcParam( arg2 );
                                         // cast away reference type and construct field.
                                         Expression * thisExpr = new CastExpr( new VariableExpr( thisParam ), thisParam->get_type()->stripReferences()->clone() );
 …
                                                         callStmt->acceptMutator( *visitor );
                                                         if ( isCtor ) {
                                                                 function->get_statements()->push_front( callStmt );
                                                         } else {
+                                                                function->statements->push_front( callStmt );
+                                                        } else { // TODO: don't generate destructor function/object for intrinsic calls
                                                                 // destructor statements should be added at the end
+                                                                function->get_statements()->push_back( callStmt );
+                                                                // function->get_statements()->push_back( callStmt );
+                                                                // Optimization: do not need to call intrinsic destructors on members
+                                                                if ( isIntrinsicSingleArgCallStmt( callStmt ) ) continue;;
+                                                                // __Destructor _dtor0 = { (void *)&b.a1, (void (*)(void *)_destroy_A };
+                                                                std::list< Statement * > stmtsToAdd;
+                                                                static UniqueName memberDtorNamer = { "__memberDtor" };
+                                                                assertf( Validate::dtorStruct, "builtin __Destructor not found." );
+                                                                assertf( Validate::dtorStructDestroy, "builtin __destroy_Destructor not found." );
+                                                                Expression * thisExpr = new CastExpr( new AddressExpr( new VariableExpr( thisParam ) ), new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ) );
+                                                                Expression * dtorExpr = new VariableExpr( getDtorFunc( thisParam, callStmt, stmtsToAdd ) );
+                                                                // cast destructor pointer to void (*)(void *), to silence GCC incompatible pointer warnings
+                                                                FunctionType * dtorFtype = new FunctionType( Type::Qualifiers(), false );
+                                                                dtorFtype->parameters.push_back( ObjectDecl::newObject( "", new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), nullptr ) );
+                                                                Type * dtorType = new PointerType( Type::Qualifiers(), dtorFtype );
+                                                                ObjectDecl * destructor = ObjectDecl::newObject( memberDtorNamer.newName(), new StructInstType( Type::Qualifiers(), Validate::dtorStruct ), new ListInit( { new SingleInit( thisExpr ), new SingleInit( new CastExpr( dtorExpr, dtorType ) ) } ) );
+                                                                function->statements->push_front( new DeclStmt( destructor ) );
+                                                                destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( Validate::dtorStructDestroy ) } ) );
+                                                                function->statements->kids.splice( function->statements->kids.begin(), stmtsToAdd );
+                                                        }
                                                 } catch ( SemanticErrorException & error ) {
 …
                         std::string fname = getFunctionName( appExpr );
                         if ( fname == function->get_name() ) {
+                        if ( fname == function->name ) {
                                 // call to same kind of function
                                 Expression * firstParam = appExpr->get_args().front();
+                                Expression * firstParam = appExpr->args.front();
                                 if ( isThisExpression( firstParam, thisParam ) ) {
 …
                                         // if first parameter is a member expression on the this parameter,
                                         // then remove the member from unhandled set.
                                         if ( isThisExpression( memberExpr->get_aggregate(), thisParam ) ) {
                                                 unhandled.erase( memberExpr->get_member() );
+                                        if ( isThisExpression( memberExpr->aggregate, thisParam ) ) {
+                                                unhandled.erase( memberExpr->member );
+                                        }
+                                }

src/InitTweak/FixInit.h

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

src/InitTweak/GenInit.cc

-              r7951100
+              rb067d9b
 #include "GenInit.h"
+#include <stddef.h>                // for NULL
+#include <algorithm>               // for any_of
+#include <cassert>                 // for assert, strict_dynamic_cast, assertf
+#include <iterator>                // for back_inserter, inserter, back_inse...
+#include <list>                    // for _List_iterator, list
+#include <stddef.h>                    // for NULL
+#include <algorithm>                   // for any_of
+#include <cassert>                     // for assert, strict_dynamic_cast, assertf
+#include <deque>
+#include <iterator>                    // for back_inserter, inserter, back_inse...
+#include <list>                        // for _List_iterator, list
+#include "AST/Decl.hpp"
+#include "AST/Init.hpp"
+#include "AST/Node.hpp"
+#include "AST/Stmt.hpp"
 #include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"    // for PassVisitor, WithGuards, WithShort...
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
 #include "Common/utility.h"        // for ValueGuard, maybeClone
 #include "GenPoly/GenPoly.h"       // for getFunctionType, isPolyType
 #include "GenPoly/ScopedSet.h"     // for ScopedSet, ScopedSet<>::const_iter...
 #include "InitTweak.h"             // for isConstExpr, InitExpander, checkIn...
 #include "Parser/LinkageSpec.h"    // for isOverridable, C
+#include "Common/PassVisitor.h"        // for PassVisitor, WithGuards, WithShort...
+#include "Common/SemanticError.h"      // for SemanticError
+#include "Common/UniqueName.h"         // for UniqueName
+#include "Common/utility.h"            // for ValueGuard, maybeClone
+#include "GenPoly/GenPoly.h"           // for getFunctionType, isPolyType
+#include "GenPoly/ScopedSet.h"         // for ScopedSet, ScopedSet<>::const_iter...
+#include "InitTweak.h"                 // for isConstExpr, InitExpander, checkIn...
+#include "Parser/LinkageSpec.h"        // for isOverridable, C
 #include "ResolvExpr/Resolver.h"
+#include "SymTab/Autogen.h"        // for genImplicitCall, SizeType
+#include "SymTab/Mangler.h"        // for Mangler
+#include "SynTree/Declaration.h"   // for ObjectDecl, DeclarationWithType
+#include "SynTree/Expression.h"    // for VariableExpr, UntypedExpr, Address...
+#include "SynTree/Initializer.h"   // for ConstructorInit, SingleInit, Initi...
+#include "SynTree/Label.h"         // for Label
+#include "SynTree/Mutator.h"       // for mutateAll
+#include "SynTree/Statement.h"     // for CompoundStmt, ImplicitCtorDtorStmt
+#include "SynTree/Type.h"          // for Type, ArrayType, Type::Qualifiers
+#include "SynTree/Visitor.h"       // for acceptAll, maybeAccept
+#include "Tuples/Tuples.h"         // for maybeImpure
+#include "SymTab/Autogen.h"            // for genImplicitCall
+#include "SymTab/Mangler.h"            // for Mangler
+#include "SynTree/Declaration.h"       // for ObjectDecl, DeclarationWithType
+#include "SynTree/Expression.h"        // for VariableExpr, UntypedExpr, Address...
+#include "SynTree/Initializer.h"       // for ConstructorInit, SingleInit, Initi...
+#include "SynTree/Label.h"             // for Label
+#include "SynTree/Mutator.h"           // for mutateAll
+#include "SynTree/Statement.h"         // for CompoundStmt, ImplicitCtorDtorStmt
+#include "SynTree/Type.h"              // for Type, ArrayType, Type::Qualifiers
+#include "SynTree/Visitor.h"           // for acceptAll, maybeAccept
+#include "Tuples/Tuples.h"             // for maybeImpure
+#include "Validate/FindSpecialDecls.h" // for SizeType
 namespace InitTweak {
 …
                         // need to resolve array dimensions in order to accurately determine if constexpr
                         ResolvExpr::findSingleExpression( arrayType->dimension, SymTab::SizeType->clone(), indexer );
+                        ResolvExpr::findSingleExpression( arrayType->dimension, Validate::SizeType->clone(), indexer );
                         // array is variable-length when the dimension is not constexpr
                         arrayType->isVarLen = ! isConstExpr( arrayType->dimension );
 …
                         if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
                         ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
+                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, Validate::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
                         arrayDimension->get_type()->set_const( true );
 …
                 assertf( objDecl, "genCtorDtor passed null objDecl" );
                 std::list< Statement * > stmts;
                 InitExpander srcParam( maybeClone( arg ) );
+                InitExpander_old srcParam( maybeClone( arg ) );
                 SymTab::genImplicitCall( srcParam, new VariableExpr( objDecl ), fname, back_inserter( stmts ), objDecl );
                 assert( stmts.size() <= 1 );
 …
                 std::list< Statement * > dtor;
                 InitExpander srcParam( objDecl->get_init() );
                 InitExpander nullParam( (Initializer *)NULL );
+                InitExpander_old srcParam( objDecl->get_init() );
+                InitExpander_old nullParam( (Initializer *)NULL );
                 SymTab::genImplicitCall( srcParam, new VariableExpr( objDecl ), "?{}", back_inserter( ctor ), objDecl );
                 SymTab::genImplicitCall( nullParam, new VariableExpr( objDecl ), "^?{}", front_inserter( dtor ), objDecl, false );
 …
                 GuardScope( managedTypes );
+        }
+ast::ConstructorInit * genCtorInit( const CodeLocation & loc, const ast::ObjectDecl * objDecl ) {
+        // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor for each
+        // constructable object
+        InitExpander_new srcParam{ objDecl->init }, nullParam{ (const ast::Init *)nullptr };
+        ast::ptr< ast::Stmt > ctor = SymTab::genImplicitCall(
+                srcParam, new ast::VariableExpr{ loc, objDecl }, loc, "?{}", objDecl );
+        ast::ptr< ast::Stmt > dtor = SymTab::genImplicitCall(
+                nullParam, new ast::VariableExpr{ loc, objDecl }, loc, "^?{}", objDecl,
+                SymTab::LoopBackward );
+        // check that either both ctor and dtor are present, or neither
+        assert( (bool)ctor == (bool)dtor );
+        if ( ctor ) {
+                // need to remember init expression, in case no ctors exist. If ctor does exist, want to
+                // use ctor expression instead of init.
+                ctor.strict_as< ast::ImplicitCtorDtorStmt >();
+                dtor.strict_as< ast::ImplicitCtorDtorStmt >();
+                return new ast::ConstructorInit{ loc, ctor, dtor, objDecl->init };
+        }
+        return nullptr;
+}
 } // namespace InitTweak

src/InitTweak/GenInit.h

-              r7951100
+              rb067d9b
 #include <string>              // for string
+#include "AST/Fwd.hpp"
+#include "Common/CodeLocation.h"
+#include "GenPoly/ScopedSet.h" // for ScopedSet
 #include "SynTree/SynTree.h"   // for Visitor Nodes
-#include "GenPoly/ScopedSet.h" // for ScopedSet
 namespace InitTweak {
 …
         /// creates an appropriate ConstructorInit node which contains a constructor, destructor, and C-initializer
         ConstructorInit * genCtorInit( ObjectDecl * objDecl );
+        ast::ConstructorInit * genCtorInit( const CodeLocation & loc, const ast::ObjectDecl * objDecl );
         class ManagedTypes {

src/InitTweak/InitTweak.cc

-              r7951100
+              rb067d9b
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// InitTweak.cc --
+//
+// Author           : Rob Schluntz
+// Created On       : Fri May 13 11:26:36 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:21:48 2019
+// Update Count     : 7
+//
 #include <algorithm>               // for find, all_of
 #include <cassert>                 // for assertf, assert, strict_dynamic_cast
 …
 #include <iterator>                // for back_insert_iterator, back_inserter
 #include <memory>                  // for __shared_ptr
+#include <vector>
+#include "AST/Expr.hpp"
+#include "AST/Init.hpp"
+#include "AST/Node.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Stmt.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 …
 #include "Tuples/Tuples.h"         // for Tuples::isTtype
-class UntypedValofExpr;
 namespace InitTweak {
         namespace {
 …
                 };
                 struct InitFlattener : public WithShortCircuiting {
+                struct InitFlattener_old : public WithShortCircuiting {
                         void previsit( SingleInit * singleInit ) {
                                 visit_children = false;
 …
                 };
+        }
+                struct InitFlattener_new : public ast::WithShortCircuiting {
+                        std::vector< ast::ptr< ast::Expr > > argList;
+                        void previsit( const ast::SingleInit * singleInit ) {
+                                visit_children = false;
+                                argList.emplace_back( singleInit->value );
+                        }
+                };
+        } // anonymous namespace
         std::list< Expression * > makeInitList( Initializer * init ) {
                 PassVisitor<InitFlattener> flattener;
+                PassVisitor<InitFlattener_old> flattener;
                 maybeAccept( init, flattener );
                 return flattener.pass.argList;
 …
+        }
+        class InitExpander::ExpanderImpl {
+std::vector< ast::ptr< ast::Expr > > makeInitList( const ast::Init * init ) {
+        ast::Pass< InitFlattener_new > flattener;
+        maybe_accept( init, flattener );
+        return std::move( flattener.pass.argList );
+}
+        class InitExpander_old::ExpanderImpl {
         public:
                 virtual ~ExpanderImpl() = default;
 …
         };
         class InitImpl : public InitExpander::ExpanderImpl {
+        class InitImpl_old : public InitExpander_old::ExpanderImpl {
         public:
                 InitImpl( Initializer * init ) : init( init ) {}
                 virtual ~InitImpl() = default;
+                InitImpl_old( Initializer * init ) : init( init ) {}
+                virtual ~InitImpl_old() = default;
                 virtual std::list< Expression * > next( __attribute((unused)) std::list< Expression * > & indices ) {
 …
         };
         class ExprImpl : public InitExpander::ExpanderImpl {
+        class ExprImpl_old : public InitExpander_old::ExpanderImpl {
         public:
                 ExprImpl( Expression * expr ) : arg( expr ) {}
                 virtual ~ExprImpl() { delete arg; }
+                ExprImpl_old( Expression * expr ) : arg( expr ) {}
+                virtual ~ExprImpl_old() { delete arg; }
                 virtual std::list< Expression * > next( std::list< Expression * > & indices ) {
 …
         };
         InitExpander::InitExpander( Initializer * init ) : expander( new InitImpl( init ) ) {}
         InitExpander::InitExpander( Expression * expr ) : expander( new ExprImpl( expr ) ) {}
         std::list< Expression * > InitExpander::operator*() {
+        InitExpander_old::InitExpander_old( Initializer * init ) : expander( new InitImpl_old( init ) ) {}
+        InitExpander_old::InitExpander_old( Expression * expr ) : expander( new ExprImpl_old( expr ) ) {}
+        std::list< Expression * > InitExpander_old::operator*() {
                 return cur;
+        }
         InitExpander & InitExpander::operator++() {
+        InitExpander_old & InitExpander_old::operator++() {
                 cur = expander->next( indices );
                 return *this;
 …
         // use array indices list to build switch statement
         void InitExpander::addArrayIndex( Expression * index, Expression * dimension ) {
+        void InitExpander_old::addArrayIndex( Expression * index, Expression * dimension ) {
                 indices.push_back( index );
                 indices.push_back( dimension );
+        }
         void InitExpander::clearArrayIndices() {
+        void InitExpander_old::clearArrayIndices() {
                 deleteAll( indices );
                 indices.clear();
+        }
         bool InitExpander::addReference() {
+        bool InitExpander_old::addReference() {
                 bool added = false;
                 for ( Expression *& expr : cur ) {
 …
                 template< typename OutIterator >
                 void build( UntypedExpr * callExpr, InitExpander::IndexList::iterator idx, InitExpander::IndexList::iterator idxEnd, Initializer * init, OutIterator out ) {
+                void build( UntypedExpr * callExpr, InitExpander_old::IndexList::iterator idx, InitExpander_old::IndexList::iterator idxEnd, Initializer * init, OutIterator out ) {
                         if ( idx == idxEnd ) return;
                         Expression * index = *idx++;
 …
         // remaining elements.
         // To accomplish this, generate switch statement, consuming all of expander's elements
         Statement * InitImpl::buildListInit( UntypedExpr * dst, std::list< Expression * > & indices ) {
+        Statement * InitImpl_old::buildListInit( UntypedExpr * dst, std::list< Expression * > & indices ) {
                 if ( ! init ) return nullptr;
                 CompoundStmt * block = new CompoundStmt();
 …
+        }
         Statement * ExprImpl::buildListInit( UntypedExpr *, std::list< Expression * > & ) {
+        Statement * ExprImpl_old::buildListInit( UntypedExpr *, std::list< Expression * > & ) {
                 return nullptr;
+        }
         Statement * InitExpander::buildListInit( UntypedExpr * dst ) {
+        Statement * InitExpander_old::buildListInit( UntypedExpr * dst ) {
                 return expander->buildListInit( dst, indices );
+        }
+class InitExpander_new::ExpanderImpl {
+public:
+        virtual ~ExpanderImpl() = default;
+        virtual std::vector< ast::ptr< ast::Expr > > next( IndexList & indices ) = 0;
+        virtual ast::ptr< ast::Stmt > buildListInit(
+                ast::UntypedExpr * callExpr, IndexList & indices ) = 0;
+};
+namespace {
+        template< typename Out >
+        void buildCallExpr(
+                ast::UntypedExpr * callExpr, const ast::Expr * index, const ast::Expr * dimension,
+                const ast::Init * init, Out & out
+        ) {
+                const CodeLocation & loc = init->location;
+                auto cond = new ast::UntypedExpr{
+                        loc, new ast::NameExpr{ loc, "?<?" }, { index, dimension } };
+                std::vector< ast::ptr< ast::Expr > > args = makeInitList( init );
+                splice( callExpr->args, args );
+                out.emplace_back( new ast::IfStmt{ loc, cond, new ast::ExprStmt{ loc, callExpr } } );
+                out.emplace_back( new ast::ExprStmt{
+                        loc, new ast::UntypedExpr{ loc, new ast::NameExpr{ loc, "++?" }, { index } } } );
+        }
+        template< typename Out >
+        void build(
+                ast::UntypedExpr * callExpr, const InitExpander_new::IndexList & indices,
+                const ast::Init * init, Out & out
+        ) {
+                if ( indices.empty() ) return;
+                unsigned idx = 0;
+                const ast::Expr * index = indices[idx++];
+                assert( idx != indices.size() );
+                const ast::Expr * dimension = indices[idx++];
+                if ( idx == indices.size() ) {
+                        if ( auto listInit = dynamic_cast< const ast::ListInit * >( init ) ) {
+                                for ( const ast::Init * init : *listInit ) {
+                                        buildCallExpr( callExpr, index, dimension, init, out );
+                                }
+                        } else {
+                                buildCallExpr( callExpr, index, dimension, init, out );
+                        }
+                } else {
+                        const CodeLocation & loc = init->location;
+                        unsigned long cond = 0;
+                        auto listInit = dynamic_cast< const ast::ListInit * >( init );
+                        if ( ! listInit ) { SemanticError( loc, "unbalanced list initializers" ); }
+                        static UniqueName targetLabel( "L__autogen__" );
+                        ast::Label switchLabel{
+                                loc, targetLabel.newName(), { new ast::Attribute{ "unused" } } };
+                        std::vector< ast::ptr< ast::Stmt > > branches;
+                        for ( const ast::Init * init : *listInit ) {
+                                auto condition = ast::ConstantExpr::from_ulong( loc, cond );
+                                ++cond;
+                                std::vector< ast::ptr< ast::Stmt > > stmts;
+                                build( callExpr, indices, init, stmts );
+                                stmts.emplace_back(
+                                        new ast::BranchStmt{ loc, ast::BranchStmt::Break, switchLabel } );
+                                branches.emplace_back( new ast::CaseStmt{ loc, condition, std::move( stmts ) } );
+                        }
+                        out.emplace_back( new ast::SwitchStmt{ loc, index, std::move( branches ) } );
+                        out.emplace_back( new ast::NullStmt{ loc, { switchLabel } } );
+                }
+        }
+        class InitImpl_new final : public InitExpander_new::ExpanderImpl {
+                ast::ptr< ast::Init > init;
+        public:
+                InitImpl_new( const ast::Init * i ) : init( i ) {}
+                std::vector< ast::ptr< ast::Expr > > next( InitExpander_new::IndexList & ) override {
+                        return makeInitList( init );
+                }
+                ast::ptr< ast::Stmt > buildListInit(
+                        ast::UntypedExpr * callExpr, InitExpander_new::IndexList & indices
+                ) override {
+                        // If array came with an initializer list, initialize each element. We may have more
+                        // initializers than elements of the array; need to check at each index that we have
+                        // not exceeded size. We may have fewer initializers than elements in the array; need
+                        // to default-construct remaining elements. To accomplish this, generate switch
+                        // statement consuming all of expander's elements
+                        if ( ! init ) return {};
+                        std::list< ast::ptr< ast::Stmt > > stmts;
+                        build( callExpr, indices, init, stmts );
+                        if ( stmts.empty() ) {
+                                return {};
+                        } else {
+                                auto block = new ast::CompoundStmt{ init->location, std::move( stmts ) };
+                                init = nullptr;  // consumed in creating the list init
+                                return block;
+                        }
+                }
+        };
+        class ExprImpl_new final : public InitExpander_new::ExpanderImpl {
+                ast::ptr< ast::Expr > arg;
+        public:
+                ExprImpl_new( const ast::Expr * a ) : arg( a ) {}
+                std::vector< ast::ptr< ast::Expr > > next(
+                        InitExpander_new::IndexList & indices
+                ) override {
+                        if ( ! arg ) return {};
+                        const CodeLocation & loc = arg->location;
+                        const ast::Expr * expr = arg;
+                        for ( auto it = indices.rbegin(); it != indices.rend(); ++it ) {
+                                // go through indices and layer on subscript exprs ?[?]
+                                ++it;
+                                expr = new ast::UntypedExpr{
+                                        loc, new ast::NameExpr{ loc, "?[?]" }, { expr, *it } };
+                        }
+                        return { expr };
+                }
+                ast::ptr< ast::Stmt > buildListInit(
+                        ast::UntypedExpr *, InitExpander_new::IndexList &
+                ) override {
+                        return {};
+                }
+        };
+} // anonymous namespace
+InitExpander_new::InitExpander_new( const ast::Init * init )
+: expander( new InitImpl_new{ init } ), crnt(), indices() {}
+InitExpander_new::InitExpander_new( const ast::Expr * expr )
+: expander( new ExprImpl_new{ expr } ), crnt(), indices() {}
+std::vector< ast::ptr< ast::Expr > > InitExpander_new::operator* () { return crnt; }
+InitExpander_new & InitExpander_new::operator++ () {
+        crnt = expander->next( indices );
+        return *this;
+}
+/// builds statement which has the same semantics as a C-style list initializer (for array
+/// initializers) using callExpr as the base expression to perform initialization
+ast::ptr< ast::Stmt > InitExpander_new::buildListInit( ast::UntypedExpr * callExpr ) {
+        return expander->buildListInit( callExpr, indices );
+}
+void InitExpander_new::addArrayIndex( const ast::Expr * index, const ast::Expr * dimension ) {
+        indices.emplace_back( index );
+        indices.emplace_back( dimension );
+}
+void InitExpander_new::clearArrayIndices() { indices.clear(); }
+bool InitExpander_new::addReference() {
+        for ( ast::ptr< ast::Expr > & expr : crnt ) {
+                expr = new ast::AddressExpr{ expr };
+        }
+        return ! crnt.empty();
+}
         Type * getTypeofThis( FunctionType * ftype ) {
 …
+        }
         struct CallFinder {
                 CallFinder( const std::list< std::string > & names ) : names( names ) {}
+        struct CallFinder_old {
+                CallFinder_old( const std::list< std::string > & names ) : names( names ) {}
                 void postvisit( ApplicationExpr * appExpr ) {
 …
         };
+        struct CallFinder_new final {
+                std::vector< ast::ptr< ast::Expr > > matches;
+                const std::vector< std::string > names;
+                CallFinder_new( std::vector< std::string > && ns ) : matches(), names( std::move(ns) ) {}
+                void handleCallExpr( const ast::Expr * expr ) {
+                        std::string fname = getFunctionName( expr );
+                        if ( std::find( names.begin(), names.end(), fname ) != names.end() ) {
+                                matches.emplace_back( expr );
+                        }
+                }
+                void postvisit( const ast::ApplicationExpr * expr ) { handleCallExpr( expr ); }
+                void postvisit( const ast::UntypedExpr *     expr ) { handleCallExpr( expr ); }
+        };
         void collectCtorDtorCalls( Statement * stmt, std::list< Expression * > & matches ) {
                 static PassVisitor<CallFinder> finder( std::list< std::string >{ "?{}", "^?{}" } );
+                static PassVisitor<CallFinder_old> finder( std::list< std::string >{ "?{}", "^?{}" } );
                 finder.pass.matches = &matches;
                 maybeAccept( stmt, finder );
+        }
+        std::vector< ast::ptr< ast::Expr > > collectCtorDtorCalls( const ast::Stmt * stmt ) {
+                ast::Pass< CallFinder_new > finder{ std::vector< std::string >{ "?{}", "^?{}" } };
+                maybe_accept( stmt, finder );
+                return std::move( finder.pass.matches );
+        }
 …
                 std::list< Expression * > matches;
                 collectCtorDtorCalls( stmt, matches );
                 assert( matches.size() <= 1 );
+                assertf( matches.size() <= 1, "%zd constructor/destructors found in %s", matches.size(), toString( stmt ).c_str() );
                 return matches.size() == 1 ? matches.front() : nullptr;
+        }
 …
         namespace {
                 DeclarationWithType * getCalledFunction( Expression * expr );
+                const ast::DeclWithType * getCalledFunction( const ast::Expr * expr );
                 template<typename CallExpr>
 …
                         return getCalledFunction( expr->get_args().front() );
+                }
+                template<typename CallExpr>
+                const ast::DeclWithType * handleDerefCalledFunction( const CallExpr * expr ) {
+                        // (*f)(x) => should get "f"
+                        std::string name = getFunctionName( expr );
+                        assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
+                        assertf( ! expr->args.empty(), "Cannot get called function from dereference with no arguments" );
+                        return getCalledFunction( expr->args.front() );
+                }
                 DeclarationWithType * getCalledFunction( Expression * expr ) {
 …
                         return nullptr;
+                }
+                const ast::DeclWithType * getCalledFunction( const ast::Expr * expr ) {
+                        assert( expr );
+                        if ( const ast::VariableExpr * varExpr = dynamic_cast< const ast::VariableExpr * >( expr ) ) {
+                                return varExpr->var;
+                        } else if ( const ast::MemberExpr * memberExpr = dynamic_cast< const ast::MemberExpr * >( expr ) ) {
+                                return memberExpr->member;
+                        } else if ( const ast::CastExpr * castExpr = dynamic_cast< const ast::CastExpr * >( expr ) ) {
+                                return getCalledFunction( castExpr->arg );
+                        } else if ( const ast::UntypedExpr * untypedExpr = dynamic_cast< const ast::UntypedExpr * >( expr ) ) {
+                                return handleDerefCalledFunction( untypedExpr );
+                        } else if ( const ast::ApplicationExpr * appExpr = dynamic_cast< const ast::ApplicationExpr * > ( expr ) ) {
+                                return handleDerefCalledFunction( appExpr );
+                        } else if ( const ast::AddressExpr * addrExpr = dynamic_cast< const ast::AddressExpr * >( expr ) ) {
+                                return getCalledFunction( addrExpr->arg );
+                        } else if ( const ast::CommaExpr * commaExpr = dynamic_cast< const ast::CommaExpr * >( expr ) ) {
+                                return getCalledFunction( commaExpr->arg2 );
+                        }
+                        return nullptr;
+                }
+                DeclarationWithType * getFunctionCore( const Expression * expr ) {
+                        if ( const auto * appExpr = dynamic_cast< const ApplicationExpr * >( expr ) ) {
+                                return getCalledFunction( appExpr->function );
+                        } else if ( const auto * untyped = dynamic_cast< const UntypedExpr * >( expr ) ) {
+                                return getCalledFunction( untyped->function );
+                        }
+                        assertf( false, "getFunction with unknown expression: %s", toString( expr ).c_str() );
+                }
+        }
         DeclarationWithType * getFunction( Expression * expr ) {
+                if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
+                        return getCalledFunction( appExpr->get_function() );
+                } else if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * > ( expr ) ) {
+                        return getCalledFunction( untyped->get_function() );
+                return getFunctionCore( expr );
+        }
+        const DeclarationWithType * getFunction( const Expression * expr ) {
+                return getFunctionCore( expr );
+        }
+        const ast::DeclWithType * getFunction( const ast::Expr * expr ) {
+                if ( const ast::ApplicationExpr * appExpr = dynamic_cast< const ast::ApplicationExpr * >( expr ) ) {
+                        return getCalledFunction( appExpr->func );
+                } else if ( const ast::UntypedExpr * untyped = dynamic_cast< const ast::UntypedExpr * > ( expr ) ) {
+                        return getCalledFunction( untyped->func );
+                }
                 assertf( false, "getFunction received unknown expression: %s", toString( expr ).c_str() );
 …
+        }
+        const ast::ApplicationExpr * isIntrinsicCallExpr( const ast::Expr * expr ) {
+                auto appExpr = dynamic_cast< const ast::ApplicationExpr * >( expr );
+                if ( ! appExpr ) return nullptr;
+                const ast::DeclWithType * func = getCalledFunction( appExpr->func );
+                assertf( func,
+                        "getCalledFunction returned nullptr: %s", toString( appExpr->func ).c_str() );
+                // check for Intrinsic only -- don't want to remove all overridable ctor/dtor because
+                // autogenerated ctor/dtor will call all member dtors, and some members may have a
+                // user-defined dtor
+                return func->linkage == ast::Linkage::Intrinsic ? appExpr : nullptr;
+        }
         namespace {
                 template <typename Predicate>
 …
                         return std::all_of( callExprs.begin(), callExprs.end(), pred);
+                }
+                template <typename Predicate>
+                bool allofCtorDtor( const ast::Stmt * stmt, const Predicate & pred ) {
+                        std::vector< ast::ptr< ast::Expr > > callExprs = collectCtorDtorCalls( stmt );
+                        return std::all_of( callExprs.begin(), callExprs.end(), pred );
+                }
+        }
 …
                 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;
+                        }
+                        return false;
+                });
+        }
+        bool isIntrinsicSingleArgCallStmt( const ast::Stmt * stmt ) {
+                return allofCtorDtor( stmt, []( const ast::Expr * callExpr ){
+                        if ( const ast::ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
+                                const ast::FunctionType * funcType =
+                                        GenPoly::getFunctionType( appExpr->func->result );
+                                assert( funcType );
+                                return funcType->params.size() == 1;
+                        }
                         return false;
 …
                                 if ( pos == 0 ) return arg;
                                 pos--;
+                        }
+                        assert( false );
+                }
+                template<typename CallExpr>
+                const ast::Expr * callArg( const CallExpr * call, unsigned int pos ) {
+                        if( pos >= call->args.size() ) {
+                                assertf( false, "getCallArg for argument that doesn't exist: (%u); %s.",
+                                        pos, toString( call ).c_str() );
+                        }
+                        for ( const ast::Expr * arg : call->args ) {
+                                if ( pos == 0 ) return arg;
+                                --pos;
+                        }
                         assert( false );
 …
+        }
+        const ast::Expr * getCallArg( const ast::Expr * call, unsigned pos ) {
+                if ( auto app = dynamic_cast< const ast::ApplicationExpr * >( call ) ) {
+                        return callArg( app, pos );
+                } else if ( auto untyped = dynamic_cast< const ast::UntypedExpr * >( call ) ) {
+                        return callArg( untyped, pos );
+                } else if ( auto tupleAssn = dynamic_cast< const ast::TupleAssignExpr * >( call ) ) {
+                        const std::list<ast::ptr<ast::Stmt>>& stmts = tupleAssn->stmtExpr->stmts->kids;
+                        assertf( ! stmts.empty(), "TupleAssignExpr missing statements." );
+                        auto stmt  = strict_dynamic_cast< const ast::ExprStmt * >( stmts.back().get() );
+                        auto tuple = strict_dynamic_cast< const ast::TupleExpr * >( stmt->expr.get() );
+                        assertf( ! tuple->exprs.empty(), "TupleAssignExpr has empty tuple expr.");
+                        return getCallArg( tuple->exprs.front(), pos );
+                } else if ( auto ctor = dynamic_cast< const ast::ImplicitCopyCtorExpr * >( call ) ) {
+                        return getCallArg( ctor->callExpr, pos );
+                } else {
+                        assertf( false, "Unexpected expression type passed to getCallArg: %s",
+                                toString( call ).c_str() );
+                }
+        }
         namespace {
                 std::string funcName( Expression * func );
+                std::string funcName( const ast::Expr * func );
                 template<typename CallExpr>
 …
                         assertf( ! expr->get_args().empty(), "Cannot get function name from dereference with no arguments" );
                         return funcName( expr->get_args().front() );
+                }
+                template<typename CallExpr>
+                std::string handleDerefName( const CallExpr * expr ) {
+                        // (*f)(x) => should get name "f"
+                        std::string name = getFunctionName( expr );
+                        assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
+                        assertf( ! expr->args.empty(), "Cannot get function name from dereference with no arguments" );
+                        return funcName( expr->args.front() );
+                }
 …
+                        }
+                }
+                std::string funcName( const ast::Expr * func ) {
+                        if ( const ast::NameExpr * nameExpr = dynamic_cast< const ast::NameExpr * >( func ) ) {
+                                return nameExpr->name;
+                        } else if ( const ast::VariableExpr * varExpr = dynamic_cast< const ast::VariableExpr * >( func ) ) {
+                                return varExpr->var->name;
+                        }       else if ( const ast::CastExpr * castExpr = dynamic_cast< const ast::CastExpr * >( func ) ) {
+                                return funcName( castExpr->arg );
+                        } else if ( const ast::MemberExpr * memberExpr = dynamic_cast< const ast::MemberExpr * >( func ) ) {
+                                return memberExpr->member->name;
+                        } else if ( const ast::UntypedMemberExpr * memberExpr = dynamic_cast< const ast::UntypedMemberExpr * > ( func ) ) {
+                                return funcName( memberExpr->member );
+                        } else if ( const ast::UntypedExpr * untypedExpr = dynamic_cast< const ast::UntypedExpr * >( func ) ) {
+                                return handleDerefName( untypedExpr );
+                        } else if ( const ast::ApplicationExpr * appExpr = dynamic_cast< const ast::ApplicationExpr * >( func ) ) {
+                                return handleDerefName( appExpr );
+                        } else if ( const ast::ConstructorExpr * ctorExpr = dynamic_cast< const ast::ConstructorExpr * >( func ) ) {
+                                return funcName( getCallArg( ctorExpr->callExpr, 0 ) );
+                        } else {
+                                assertf( false, "Unexpected expression type being called as a function in call expression: %s", toString( func ).c_str() );
+                        }
+                }
+        }
 …
+        }
+        std::string getFunctionName( const ast::Expr * expr ) {
+                // there's some unforunate overlap here with getCalledFunction. Ideally this would be able to use getCalledFunction and
+                // return the name of the DeclarationWithType, but this needs to work for NameExpr and UntypedMemberExpr, where getCalledFunction
+                // can't possibly do anything reasonable.
+                if ( const ast::ApplicationExpr * appExpr = dynamic_cast< const ast::ApplicationExpr * >( expr ) ) {
+                        return funcName( appExpr->func );
+                } else if ( const ast::UntypedExpr * untypedExpr = dynamic_cast< const ast::UntypedExpr * > ( expr ) ) {
+                        return funcName( untypedExpr->func );
+                } else {
+                        std::cerr << expr << std::endl;
+                        assertf( false, "Unexpected expression type passed to getFunctionName" );
+                }
+        }
         Type * getPointerBase( Type * type ) {
                 if ( PointerType * ptrType = dynamic_cast< PointerType * >( type ) ) {
 …
+                }
+        }
+        const ast::Type* getPointerBase( const ast::Type* t ) {
+                if ( const auto * p = dynamic_cast< const ast::PointerType * >( t ) ) {
+                        return p->base;
+                } else if ( const auto * a = dynamic_cast< const ast::ArrayType * >( t ) ) {
+                        return a->base;
+                } else if ( const auto * r = dynamic_cast< const ast::ReferenceType * >( t ) ) {
+                        return r->base;
+                } else return nullptr;
+        }
         Type * isPointerType( Type * type ) {
 …
                 void previsit( OffsetofExpr * ) {}
                 void previsit( OffsetPackExpr * ) {}
-                void previsit( AttrExpr * ) {}
                 void previsit( CommaExpr * ) {}
                 void previsit( LogicalExpr * ) {}
 …
         bool isCtorDtorAssign( const std::string & str ) { return isCtorDtor( str ) || isAssignment( str ); }
         FunctionDecl * isCopyFunction( Declaration * decl, const std::string & fname ) {
                 FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl );
+        const FunctionDecl * isCopyFunction( const Declaration * decl, const std::string & fname ) {
+                const FunctionDecl * function = dynamic_cast< const FunctionDecl * >( decl );
                 if ( ! function ) return nullptr;
                 if ( function->name != fname ) return nullptr;
 …
+        }
+        FunctionDecl * isAssignment( Declaration * decl ) {
+        bool isCopyFunction( const ast::FunctionDecl * decl ) {
+                const ast::FunctionType * ftype = decl->type;
+                if ( ftype->params.size() != 2 ) return false;
+                const ast::Type * t1 = getPointerBase( ftype->params.front()->get_type() );
+                if ( ! t1 ) return false;
+                const ast::Type * t2 = ftype->params.back()->get_type();
+                return ResolvExpr::typesCompatibleIgnoreQualifiers( t1, t2, ast::SymbolTable{} );
+        }
+        const FunctionDecl * isAssignment( const Declaration * decl ) {
                 return isCopyFunction( decl, "?=?" );
+        }
         FunctionDecl * isDestructor( Declaration * decl ) {
                 if ( isDestructor( decl->get_name() ) ) {
                         return dynamic_cast< FunctionDecl * >( decl );
+        const FunctionDecl * isDestructor( const Declaration * decl ) {
+                if ( isDestructor( decl->name ) ) {
+                        return dynamic_cast< const FunctionDecl * >( decl );
+                }
                 return nullptr;
+        }
         FunctionDecl * isDefaultConstructor( Declaration * decl ) {
+        const FunctionDecl * isDefaultConstructor( const Declaration * decl ) {
                 if ( isConstructor( decl->name ) ) {
                         if ( FunctionDecl * func = dynamic_cast< FunctionDecl * >( decl ) ) {
+                        if ( const FunctionDecl * func = dynamic_cast< const FunctionDecl * >( decl ) ) {
                                 if ( func->type->parameters.size() == 1 ) {
                                         return func;
 …
                 return nullptr;
+        }
         FunctionDecl * isCopyConstructor( Declaration * decl ) {
+        const FunctionDecl * isCopyConstructor( const Declaration * decl ) {
                 return isCopyFunction( decl, "?{}" );
+        }

src/InitTweak/InitTweak.h

-              r7951100
+              rb067d9b
 // file "LICENCE" distributed with Cforall.
 //
 // RemoveInit.h --
+// InitTweak.h --
 //
 // Author           : Rob Schluntz
 // Created On       : Fri May 13 11:26:36 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:30:33 2017
 // Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jul 19 14:18:00 2019
+// Update Count     : 6
 //
 …
 #include <memory>             // for shared_ptr
 #include <string>             // for string, allocator
+#include <vector>
+#include "AST/Fwd.hpp"        // for AST nodes
 #include "SynTree/SynTree.h"  // for Visitor Nodes
 // helper functions for initialization
 namespace InitTweak {
+        FunctionDecl * isAssignment( Declaration * decl );
+        FunctionDecl * isDestructor( Declaration * decl );
+        FunctionDecl * isDefaultConstructor( Declaration * decl );
+        FunctionDecl * isCopyConstructor( Declaration * decl );
+        FunctionDecl * isCopyFunction( Declaration * decl, const std::string & fname );
+        const FunctionDecl * isAssignment( const Declaration * decl );
+        const FunctionDecl * isDestructor( const Declaration * decl );
+        const FunctionDecl * isDefaultConstructor( const Declaration * decl );
+        const FunctionDecl * isCopyConstructor( const Declaration * decl );
+        const FunctionDecl * isCopyFunction( const Declaration * decl, const std::string & fname );
+        bool isCopyFunction( const ast::FunctionDecl * decl );
         /// returns the base type of the first parameter to a constructor/destructor/assignment function
 …
         /// transform Initializer into an argument list that can be passed to a call expression
         std::list< Expression * > makeInitList( Initializer * init );
+        std::vector< ast::ptr< ast::Expr > > makeInitList( const ast::Init * init );
         /// True if the resolver should try to construct dwt
 …
         /// returns the declaration of the function called by the expr (must be ApplicationExpr or UntypedExpr)
         DeclarationWithType * getFunction( Expression * expr );
+        const DeclarationWithType * getFunction( const Expression * expr );
+        const ast::DeclWithType * getFunction( const ast::Expr * expr );
         /// Non-Null if expr is a call expression whose target function is intrinsic
         ApplicationExpr * isIntrinsicCallExpr( Expression * expr );
+        const ast::ApplicationExpr * isIntrinsicCallExpr( const ast::Expr * expr);
         /// True if stmt is a call statement where the function called is intrinsic and takes one parameter.
 …
         /// Currently has assertions that make it less than fully general.
         bool isIntrinsicSingleArgCallStmt( Statement * stmt );
+        bool isIntrinsicSingleArgCallStmt( const ast::Stmt * stmt );
         /// True if stmt is a call statement where the function called is intrinsic.
 …
         /// get all Ctor/Dtor call expressions from a Statement
         void collectCtorDtorCalls( Statement * stmt, std::list< Expression * > & matches );
+        std::vector< ast::ptr< ast::Expr > > collectCtorDtorCalls( const ast::Stmt * stmt );
         /// get the Ctor/Dtor call expression from a Statement that looks like a generated ctor/dtor call
 …
         /// returns the name of the function being called
         std::string getFunctionName( Expression * expr );
+        std::string getFunctionName( const ast::Expr * expr );
         /// returns the argument to a call expression in position N indexed from 0
         Expression *& getCallArg( Expression * callExpr, unsigned int pos );
+        const ast::Expr * getCallArg( const ast::Expr * call, unsigned pos );
         /// returns the base type of a PointerType or ArrayType, else returns NULL
         Type * getPointerBase( Type * );
+        const ast::Type* getPointerBase( const ast::Type* );
         /// returns the argument if it is a PointerType or ArrayType, else returns NULL
 …
         bool isConstExpr( Initializer * init );
         class InitExpander {
+        class InitExpander_old {
         public:
                 // expand by stepping through init to get each list of arguments
                 InitExpander( Initializer * init );
+                InitExpander_old( Initializer * init );
                 // always expand to expr
                 InitExpander( Expression * expr );
+                InitExpander_old( Expression * expr );
                 // iterator-like interface
                 std::list< Expression * > operator*();
                 InitExpander & operator++();
+                InitExpander_old & operator++();
                 // builds statement which has the same semantics as a C-style list initializer
 …
                 IndexList indices;
         };
+        class InitExpander_new {
+        public:
+                using IndexList = std::vector< ast::ptr< ast::Expr > >;
+                class ExpanderImpl;
+        private:
+                std::shared_ptr< ExpanderImpl > expander;
+                std::vector< ast::ptr< ast::Expr > > crnt;
+                // invariant: list of size 2N (elements come in pairs [index, dimension])
+                IndexList indices;
+        public:
+                /// Expand by stepping through init to get each list of arguments
+                InitExpander_new( const ast::Init * init );
+                /// Always expand to expression
+                InitExpander_new( const ast::Expr * expr );
+                std::vector< ast::ptr< ast::Expr > > operator* ();
+                InitExpander_new & operator++ ();
+                /// builds statement which has the same semantics as a C-style list initializer (for array
+                /// initializers) using callExpr as the base expression to perform initialization.
+                /// Mutates callExpr
+                ast::ptr< ast::Stmt > buildListInit( ast::UntypedExpr * callExpr );
+                void addArrayIndex( const ast::Expr * index, const ast::Expr * dimension );
+                void clearArrayIndices();
+                bool addReference();
+        };
 } // namespace

src/InitTweak/module.mk

r7951100	rb067d9b
20	20	InitTweak/InitTweak.cc
21	21
	22	SRCDEMANGLE += InitTweak/GenInit.cc \
	23	InitTweak/InitTweak.cc
	24

src/MakeLibCfa.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 10:33:33 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Fri Apr 22 13:54:15 2016
 // Update Count     : 40
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Feb 17 21:08:09 2019
+// Update Count     : 41
 //
 …
         } // namespace
 } // namespace LibCfa
+// Local Variables: //
+// tab-width: 4 //
+// End: //

src/Makefile.am

-              r7951100
+              rb067d9b
 ## Author           : Peter A. Buhr
 ## Created On       : Sun May 31 08:51:46 2015
 ## Last Modified By : Andrew Beach
 ## Last Modified On : Tus Jul 25 10:34:00 2017
 ## Update Count     : 76
+## Last Modified By : Peter A. Buhr
+## Last Modified On : Mon Aug  5 12:57:46 2019
+## Update Count     : 98
 ###############################################################################
 # create object files in directory with source files
+AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = foreign subdir-objects
+ACLOCAL_AMFLAGS  = -I automake
 SRC = main.cc \
+      MakeLibCfa.cc
+      MakeLibCfa.cc \
+      CompilationState.cc
+SRCDEMANGLE = CompilationState.cc
 MAINTAINERCLEANFILES =
+MOSTLYCLEANFILES =
+# Is there a way to use a variable for the directory names?
+if WITH_LIBPROFILER
+LIBPROFILER = -lprofiler
+endif
+if WITH_LIBTCMALLOC
+LIBTCMALLOC = -ltcmalloc
+TCMALLOCFLAG = -DTCMALLOC
+endif
+include AST/module.mk
 include CodeGen/module.mk
 include CodeTools/module.mk
 …
 include SynTree/module.mk
 include Tuples/module.mk
+include Validate/module.mk
 include Virtual/module.mk
+$(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/SynTree/Type.h
+$(srcdir)/AST/Type.hpp : BasicTypes-gen.cc
+        ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
+        @./BasicTypes-gen
+        @rm BasicTypes-gen
 # put into lib for now
+cfa_cpplibdir = ${CFA_LIBDIR}
+cfa_cpplib_PROGRAMS = driver/cfa-cpp
+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_LDFLAGS = -Xlinker -export-dynamic
+cfa_cpplibdir = $(CFA_LIBDIR)
+cfa_cpplib_PROGRAMS = ../driver/cfa-cpp $(DEMANGLER)
+EXTRA_PROGRAMS = demangler
+___driver_cfa_cpp_SOURCES = $(SRC)
+___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)
+AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
+ARFLAGS     = cr
+demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
+demangler_LDADD = libdemangle.a -ldl                    # yywrap
+noinst_LIBRARIES = $(LIBDEMANGLE)
+EXTRA_LIBRARIES = libdemangle.a
+libdemangle_a_SOURCES = $(SRCDEMANGLE)
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}

src/Makefile.in

-              r7951100
+              rb067d9b
 ###############################################################################
+######################### -*- Mode: Makefile-Gmake -*- ########################
+###############################################################################
 #SRC +=  ArgTweak/Rewriter.cc \
 #       ArgTweak/Mutate.cc
 …
 ######################### -*- Mode: Makefile-Gmake -*- ########################
 ###############################################################################
+######################### -*- Mode: Makefile-Gmake -*- ########################
+###############################################################################
 VPATH = @srcdir@
 …
 build_triplet = @build@
 host_triplet = @host@
+cfa_cpplib_PROGRAMS = driver/cfa-cpp$(EXEEXT)
+cfa_cpplib_PROGRAMS = ../driver/cfa-cpp$(EXEEXT) $(DEMANGLER)
+EXTRA_PROGRAMS = demangler$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
+        $(top_srcdir)/automake/ltoptions.m4 \
+        $(top_srcdir)/automake/ltsugar.m4 \
+        $(top_srcdir)/automake/ltversion.m4 \
+        $(top_srcdir)/automake/lt~obsolete.m4 \
+        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 …
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 =
+libdemangle_a_AR = $(AR) $(ARFLAGS)
+libdemangle_a_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_1 = AST/AssertAcyclic.$(OBJEXT) AST/Attribute.$(OBJEXT) \
+        AST/Convert.$(OBJEXT) AST/Decl.$(OBJEXT) \
+        AST/DeclReplacer.$(OBJEXT) AST/Expr.$(OBJEXT) \
+        AST/GenericSubstitution.$(OBJEXT) AST/Init.$(OBJEXT) \
+        AST/LinkageSpec.$(OBJEXT) AST/Node.$(OBJEXT) \
+        AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) AST/Stmt.$(OBJEXT) \
+        AST/SymbolTable.$(OBJEXT) AST/Type.$(OBJEXT) \
+        AST/TypeEnvironment.$(OBJEXT) AST/TypeSubstitution.$(OBJEXT)
+am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \
+        CodeGen/FixMain.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \
+        CodeGen/OperatorTable.$(OBJEXT)
+am__objects_3 = Common/Assert.$(OBJEXT) Common/Eval.$(OBJEXT) \
+        Common/PassVisitor.$(OBJEXT) Common/SemanticError.$(OBJEXT) \
+        Common/Stats/Counter.$(OBJEXT) Common/Stats/Heap.$(OBJEXT) \
+        Common/Stats/Stats.$(OBJEXT) Common/Stats/Time.$(OBJEXT) \
+        Common/UniqueName.$(OBJEXT)
+am__objects_4 = ControlStruct/ForExprMutator.$(OBJEXT) \
+        ControlStruct/LabelFixer.$(OBJEXT) \
+        ControlStruct/LabelGenerator.$(OBJEXT) \
+        ControlStruct/MLEMutator.$(OBJEXT) \
+        ControlStruct/Mutate.$(OBJEXT)
+am__objects_5 = ResolvExpr/AdjustExprType.$(OBJEXT) \
+        ResolvExpr/Alternative.$(OBJEXT) \
+        ResolvExpr/AlternativeFinder.$(OBJEXT) \
+        ResolvExpr/Candidate.$(OBJEXT) \
+        ResolvExpr/CandidateFinder.$(OBJEXT) \
+        ResolvExpr/CastCost.$(OBJEXT) ResolvExpr/CommonType.$(OBJEXT) \
+        ResolvExpr/ConversionCost.$(OBJEXT) \
+        ResolvExpr/CurrentObject.$(OBJEXT) \
+        ResolvExpr/ExplodedActual.$(OBJEXT) \
+        ResolvExpr/ExplodedArg.$(OBJEXT) \
+        ResolvExpr/FindOpenVars.$(OBJEXT) ResolvExpr/Occurs.$(OBJEXT) \
+        ResolvExpr/PolyCost.$(OBJEXT) \
+        ResolvExpr/PtrsAssignable.$(OBJEXT) \
+        ResolvExpr/PtrsCastable.$(OBJEXT) \
+        ResolvExpr/RenameVars.$(OBJEXT) \
+        ResolvExpr/ResolveAssertions.$(OBJEXT) \
+        ResolvExpr/Resolver.$(OBJEXT) \
+        ResolvExpr/ResolveTypeof.$(OBJEXT) \
+        ResolvExpr/SatisfyAssertions.$(OBJEXT) \
+        ResolvExpr/SpecCost.$(OBJEXT) \
+        ResolvExpr/TypeEnvironment.$(OBJEXT) \
+        ResolvExpr/Unify.$(OBJEXT)
+am__objects_6 = SymTab/Autogen.$(OBJEXT) SymTab/FixFunction.$(OBJEXT) \
+        SymTab/Indexer.$(OBJEXT) SymTab/Mangler.$(OBJEXT) \
+        SymTab/ManglerCommon.$(OBJEXT) SymTab/Validate.$(OBJEXT)
+am__objects_7 = SynTree/Type.$(OBJEXT) SynTree/VoidType.$(OBJEXT) \
+        SynTree/BasicType.$(OBJEXT) SynTree/PointerType.$(OBJEXT) \
+        SynTree/ArrayType.$(OBJEXT) SynTree/ReferenceType.$(OBJEXT) \
+        SynTree/FunctionType.$(OBJEXT) \
+        SynTree/ReferenceToType.$(OBJEXT) SynTree/TupleType.$(OBJEXT) \
+        SynTree/TypeofType.$(OBJEXT) SynTree/AttrType.$(OBJEXT) \
+        SynTree/VarArgsType.$(OBJEXT) SynTree/ZeroOneType.$(OBJEXT) \
+        SynTree/Constant.$(OBJEXT) SynTree/Expression.$(OBJEXT) \
+        SynTree/TupleExpr.$(OBJEXT) SynTree/CommaExpr.$(OBJEXT) \
+        SynTree/TypeExpr.$(OBJEXT) SynTree/ApplicationExpr.$(OBJEXT) \
+        SynTree/AddressExpr.$(OBJEXT) SynTree/Statement.$(OBJEXT) \
+        SynTree/CompoundStmt.$(OBJEXT) SynTree/DeclStmt.$(OBJEXT) \
+        SynTree/Declaration.$(OBJEXT) \
+        SynTree/DeclarationWithType.$(OBJEXT) \
+        SynTree/ObjectDecl.$(OBJEXT) SynTree/FunctionDecl.$(OBJEXT) \
+        SynTree/AggregateDecl.$(OBJEXT) \
+        SynTree/NamedTypeDecl.$(OBJEXT) SynTree/TypeDecl.$(OBJEXT) \
+        SynTree/Initializer.$(OBJEXT) \
+        SynTree/TypeSubstitution.$(OBJEXT) SynTree/Attribute.$(OBJEXT) \
+        SynTree/DeclReplacer.$(OBJEXT)
+am__objects_8 = CompilationState.$(OBJEXT) $(am__objects_1) \
+        $(am__objects_2) Concurrency/Keywords.$(OBJEXT) \
+        $(am__objects_3) $(am__objects_4) GenPoly/GenPoly.$(OBJEXT) \
+        GenPoly/Lvalue.$(OBJEXT) InitTweak/GenInit.$(OBJEXT) \
+        InitTweak/InitTweak.$(OBJEXT) Parser/LinkageSpec.$(OBJEXT) \
+        $(am__objects_5) $(am__objects_6) SymTab/Demangle.$(OBJEXT) \
+        $(am__objects_7) Tuples/TupleAssignment.$(OBJEXT) \
+        Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
+        Tuples/Tuples.$(OBJEXT) Validate/HandleAttributes.$(OBJEXT) \
+        Validate/FindSpecialDecls.$(OBJEXT)
+am_libdemangle_a_OBJECTS = $(am__objects_8)
+libdemangle_a_OBJECTS = $(am_libdemangle_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(cfa_cpplibdir)"
 PROGRAMS = $(cfa_cpplib_PROGRAMS)
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_1 = driver_cfa_cpp-main.$(OBJEXT) \
+        driver_cfa_cpp-MakeLibCfa.$(OBJEXT) \
+        CodeGen/driver_cfa_cpp-Generate.$(OBJEXT) \
+        CodeGen/driver_cfa_cpp-CodeGenerator.$(OBJEXT) \
+        CodeGen/driver_cfa_cpp-GenType.$(OBJEXT) \
+        CodeGen/driver_cfa_cpp-FixNames.$(OBJEXT) \
+        CodeGen/driver_cfa_cpp-FixMain.$(OBJEXT) \
+        CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT) \
+        CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT) \
+        CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT) \
+        Concurrency/driver_cfa_cpp-Keywords.$(OBJEXT) \
+        Concurrency/driver_cfa_cpp-Waitfor.$(OBJEXT) \
+        Common/driver_cfa_cpp-SemanticError.$(OBJEXT) \
+        Common/driver_cfa_cpp-UniqueName.$(OBJEXT) \
+        Common/driver_cfa_cpp-DebugMalloc.$(OBJEXT) \
+        Common/driver_cfa_cpp-Assert.$(OBJEXT) \
+        Common/driver_cfa_cpp-Heap.$(OBJEXT) \
+        ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT) \
+        ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT) \
+        ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT) \
+        ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT) \
+        ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) \
+        ControlStruct/driver_cfa_cpp-ExceptTranslate.$(OBJEXT) \
+        GenPoly/driver_cfa_cpp-Box.$(OBJEXT) \
+        GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT) \
+        GenPoly/driver_cfa_cpp-ScrubTyVars.$(OBJEXT) \
+        GenPoly/driver_cfa_cpp-Lvalue.$(OBJEXT) \
+        GenPoly/driver_cfa_cpp-Specialize.$(OBJEXT) \
+        GenPoly/driver_cfa_cpp-FindFunction.$(OBJEXT) \
+        GenPoly/driver_cfa_cpp-InstantiateGeneric.$(OBJEXT) \
+        InitTweak/driver_cfa_cpp-GenInit.$(OBJEXT) \
+        InitTweak/driver_cfa_cpp-FixInit.$(OBJEXT) \
+        InitTweak/driver_cfa_cpp-FixGlobalInit.$(OBJEXT) \
+        InitTweak/driver_cfa_cpp-InitTweak.$(OBJEXT) \
+        Parser/driver_cfa_cpp-parser.$(OBJEXT) \
+        Parser/driver_cfa_cpp-lex.$(OBJEXT) \
+        Parser/driver_cfa_cpp-TypedefTable.$(OBJEXT) \
+        Parser/driver_cfa_cpp-ParseNode.$(OBJEXT) \
+        Parser/driver_cfa_cpp-DeclarationNode.$(OBJEXT) \
+        Parser/driver_cfa_cpp-ExpressionNode.$(OBJEXT) \
+        Parser/driver_cfa_cpp-StatementNode.$(OBJEXT) \
+        Parser/driver_cfa_cpp-InitializerNode.$(OBJEXT) \
+        Parser/driver_cfa_cpp-TypeData.$(OBJEXT) \
+        Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT) \
+        Parser/driver_cfa_cpp-parserutility.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-AlternativeFinder.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-Alternative.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-Unify.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-PtrsAssignable.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-CommonType.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-ConversionCost.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-CastCost.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-PtrsCastable.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-AdjustExprType.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-AlternativePrinter.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-Resolver.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-ResolveTypeof.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-RenameVars.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-FindOpenVars.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-PolyCost.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-Occurs.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-TypeEnvironment.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-CurrentObject.$(OBJEXT) \
+        ResolvExpr/driver_cfa_cpp-ExplodedActual.$(OBJEXT) \
+        SymTab/driver_cfa_cpp-Indexer.$(OBJEXT) \
+        SymTab/driver_cfa_cpp-Mangler.$(OBJEXT) \
+        SymTab/driver_cfa_cpp-Validate.$(OBJEXT) \
+        SymTab/driver_cfa_cpp-FixFunction.$(OBJEXT) \
+        SymTab/driver_cfa_cpp-Autogen.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Type.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-VoidType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-BasicType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-PointerType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-ArrayType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-ReferenceType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-FunctionType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-ReferenceToType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-TupleType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-TypeofType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-AttrType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-VarArgsType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-ZeroOneType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Constant.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Expression.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-TupleExpr.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-CommaExpr.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-TypeExpr.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-ApplicationExpr.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-AddressExpr.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Statement.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-CompoundStmt.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-DeclStmt.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Declaration.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-DeclarationWithType.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-ObjectDecl.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-FunctionDecl.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-AggregateDecl.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-NamedTypeDecl.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-TypeDecl.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Initializer.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-DeclReplacer.$(OBJEXT) \
+        Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) \
+        Tuples/driver_cfa_cpp-TupleExpansion.$(OBJEXT) \
+        Tuples/driver_cfa_cpp-Explode.$(OBJEXT) \
+        Virtual/driver_cfa_cpp-ExpandCasts.$(OBJEXT)
+am_driver_cfa_cpp_OBJECTS = $(am__objects_1)
+driver_cfa_cpp_OBJECTS = $(am_driver_cfa_cpp_OBJECTS)
+driver_cfa_cpp_DEPENDENCIES =
+driver_cfa_cpp_LINK = $(CXXLD) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) \
+        $(driver_cfa_cpp_LDFLAGS) $(LDFLAGS) -o $@
+am__objects_9 = main.$(OBJEXT) MakeLibCfa.$(OBJEXT) \
+        CompilationState.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
+        CodeGen/Generate.$(OBJEXT) CodeGen/FixNames.$(OBJEXT) \
+        CodeTools/DeclStats.$(OBJEXT) \
+        CodeTools/ResolvProtoDump.$(OBJEXT) \
+        CodeTools/TrackLoc.$(OBJEXT) Concurrency/Keywords.$(OBJEXT) \
+        Concurrency/Waitfor.$(OBJEXT) $(am__objects_3) \
+        Common/DebugMalloc.$(OBJEXT) $(am__objects_4) \
+        ControlStruct/ExceptTranslate.$(OBJEXT) GenPoly/Box.$(OBJEXT) \
+        GenPoly/GenPoly.$(OBJEXT) GenPoly/ScrubTyVars.$(OBJEXT) \
+        GenPoly/Lvalue.$(OBJEXT) GenPoly/Specialize.$(OBJEXT) \
+        GenPoly/FindFunction.$(OBJEXT) \
+        GenPoly/InstantiateGeneric.$(OBJEXT) \
+        InitTweak/GenInit.$(OBJEXT) InitTweak/FixInit.$(OBJEXT) \
+        InitTweak/FixGlobalInit.$(OBJEXT) \
+        InitTweak/InitTweak.$(OBJEXT) Parser/parser.$(OBJEXT) \
+        Parser/lex.$(OBJEXT) Parser/TypedefTable.$(OBJEXT) \
+        Parser/ParseNode.$(OBJEXT) Parser/DeclarationNode.$(OBJEXT) \
+        Parser/ExpressionNode.$(OBJEXT) Parser/StatementNode.$(OBJEXT) \
+        Parser/InitializerNode.$(OBJEXT) Parser/TypeData.$(OBJEXT) \
+        Parser/LinkageSpec.$(OBJEXT) Parser/parserutility.$(OBJEXT) \
+        $(am__objects_5) ResolvExpr/AlternativePrinter.$(OBJEXT) \
+        $(am__objects_6) $(am__objects_7) \
+        Tuples/TupleAssignment.$(OBJEXT) \
+        Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
+        Tuples/Tuples.$(OBJEXT) Validate/HandleAttributes.$(OBJEXT) \
+        Validate/FindSpecialDecls.$(OBJEXT) \
+        Virtual/ExpandCasts.$(OBJEXT)
+am____driver_cfa_cpp_OBJECTS = $(am__objects_9)
+___driver_cfa_cpp_OBJECTS = $(am____driver_cfa_cpp_OBJECTS)
+am__DEPENDENCIES_1 =
+___driver_cfa_cpp_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+        $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+am_demangler_OBJECTS = SymTab/demangler.$(OBJEXT)
+demangler_OBJECTS = $(am_demangler_OBJECTS)
+demangler_DEPENDENCIES = libdemangle.a
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 …
 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 =
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 …
 am__v_CXX_1 =
 CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+        -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 =
-@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
 AM_V_LEX = $(am__v_LEX_@AM_V@)
 am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
 …
 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/
 YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
 AM_V_YACC = $(am__v_YACC_@AM_V@)
 am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
 …
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 …
 am__v_CC_1 =
 CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
+SOURCES = $(driver_cfa_cpp_SOURCES)
+DIST_SOURCES = $(driver_cfa_cpp_SOURCES)
+SOURCES = $(libdemangle_a_SOURCES) $(___driver_cfa_cpp_SOURCES) \
+        $(demangler_SOURCES)
+DIST_SOURCES = $(libdemangle_a_SOURCES) $(___driver_cfa_cpp_SOURCES) \
+        $(demangler_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
 …
     *) (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
 …
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/CodeGen/module.mk \
+am__DIST_COMMON = $(srcdir)/AST/module.mk $(srcdir)/CodeGen/module.mk \
         $(srcdir)/CodeTools/module.mk $(srcdir)/Common/module.mk \
         $(srcdir)/Concurrency/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 \
+        $(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@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @CC@
 CCAS = @CCAS@
 …
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 …
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
+HAS_DISTCC = @HAS_DISTCC@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 …
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MACHINE_TYPE = @MACHINE_TYPE@
+MAINT = @MAINT@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 …
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
 …
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 …
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
+SRC = main.cc MakeLibCfa.cc CodeGen/Generate.cc \
         CodeGen/CodeGenerator.cc CodeGen/GenType.cc \
         CodeGen/FixNames.cc CodeGen/FixMain.cc \
         CodeGen/OperatorTable.cc CodeTools/DeclStats.cc \
+AUTOMAKE_OPTIONS = foreign subdir-objects
+ACLOCAL_AMFLAGS = -I automake
+SRC = main.cc MakeLibCfa.cc CompilationState.cc $(SRC_AST) \
+        $(SRC_CODEGEN) CodeGen/Generate.cc CodeGen/FixNames.cc \
+        CodeTools/DeclStats.cc CodeTools/ResolvProtoDump.cc \
         CodeTools/TrackLoc.cc Concurrency/Keywords.cc \
+        Concurrency/Waitfor.cc Common/SemanticError.cc \
+        Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
+        Common/Heap.cc ControlStruct/LabelGenerator.cc \
+        ControlStruct/LabelFixer.cc ControlStruct/MLEMutator.cc \
+        ControlStruct/Mutate.cc ControlStruct/ForExprMutator.cc \
+        ControlStruct/ExceptTranslate.cc GenPoly/Box.cc \
+        GenPoly/GenPoly.cc GenPoly/ScrubTyVars.cc GenPoly/Lvalue.cc \
+        GenPoly/Specialize.cc GenPoly/FindFunction.cc \
+        GenPoly/InstantiateGeneric.cc InitTweak/GenInit.cc \
+        InitTweak/FixInit.cc InitTweak/FixGlobalInit.cc \
+        InitTweak/InitTweak.cc Parser/parser.yy Parser/lex.ll \
+        Parser/TypedefTable.cc Parser/ParseNode.cc \
+        Parser/DeclarationNode.cc Parser/ExpressionNode.cc \
+        Parser/StatementNode.cc Parser/InitializerNode.cc \
+        Parser/TypeData.cc Parser/LinkageSpec.cc \
+        Parser/parserutility.cc ResolvExpr/AlternativeFinder.cc \
+        ResolvExpr/Alternative.cc ResolvExpr/Unify.cc \
+        ResolvExpr/PtrsAssignable.cc ResolvExpr/CommonType.cc \
+        ResolvExpr/ConversionCost.cc ResolvExpr/CastCost.cc \
+        ResolvExpr/PtrsCastable.cc ResolvExpr/AdjustExprType.cc \
+        ResolvExpr/AlternativePrinter.cc ResolvExpr/Resolver.cc \
+        ResolvExpr/ResolveTypeof.cc ResolvExpr/RenameVars.cc \
+        ResolvExpr/FindOpenVars.cc ResolvExpr/PolyCost.cc \
+        ResolvExpr/Occurs.cc ResolvExpr/TypeEnvironment.cc \
+        ResolvExpr/CurrentObject.cc ResolvExpr/ExplodedActual.cc \
+        SymTab/Indexer.cc SymTab/Mangler.cc SymTab/Validate.cc \
+        SymTab/FixFunction.cc SymTab/Autogen.cc SynTree/Type.cc \
+        SynTree/VoidType.cc SynTree/BasicType.cc \
+        SynTree/PointerType.cc SynTree/ArrayType.cc \
+        SynTree/ReferenceType.cc SynTree/FunctionType.cc \
+        SynTree/ReferenceToType.cc SynTree/TupleType.cc \
+        SynTree/TypeofType.cc SynTree/AttrType.cc \
+        SynTree/VarArgsType.cc SynTree/ZeroOneType.cc \
+        SynTree/Constant.cc SynTree/Expression.cc SynTree/TupleExpr.cc \
+        SynTree/CommaExpr.cc SynTree/TypeExpr.cc \
+        SynTree/ApplicationExpr.cc SynTree/AddressExpr.cc \
+        SynTree/Statement.cc SynTree/CompoundStmt.cc \
+        SynTree/DeclStmt.cc SynTree/Declaration.cc \
+        SynTree/DeclarationWithType.cc SynTree/ObjectDecl.cc \
+        SynTree/FunctionDecl.cc SynTree/AggregateDecl.cc \
+        SynTree/NamedTypeDecl.cc SynTree/TypeDecl.cc \
+        SynTree/Initializer.cc SynTree/TypeSubstitution.cc \
+        SynTree/Attribute.cc SynTree/DeclReplacer.cc \
+        Concurrency/Waitfor.cc $(SRC_COMMON) Common/DebugMalloc.cc \
+        $(SRC_CONTROLSTRUCT) ControlStruct/ExceptTranslate.cc \
+        GenPoly/Box.cc GenPoly/GenPoly.cc GenPoly/ScrubTyVars.cc \
+        GenPoly/Lvalue.cc GenPoly/Specialize.cc \
+        GenPoly/FindFunction.cc GenPoly/InstantiateGeneric.cc \
+        InitTweak/GenInit.cc InitTweak/FixInit.cc \
+        InitTweak/FixGlobalInit.cc InitTweak/InitTweak.cc \
+        Parser/parser.yy Parser/lex.ll Parser/TypedefTable.cc \
+        Parser/ParseNode.cc Parser/DeclarationNode.cc \
+        Parser/ExpressionNode.cc Parser/StatementNode.cc \
+        Parser/InitializerNode.cc Parser/TypeData.cc \
+        Parser/LinkageSpec.cc Parser/parserutility.cc \
+        $(SRC_RESOLVEXPR) ResolvExpr/AlternativePrinter.cc \
+        $(SRC_SYMTAB) $(SRC_SYNTREE) Tuples/TupleAssignment.cc \
+        Tuples/TupleExpansion.cc Tuples/Explode.cc Tuples/Tuples.cc \
+        Validate/HandleAttributes.cc Validate/FindSpecialDecls.cc \
+        Virtual/ExpandCasts.cc
+SRCDEMANGLE = CompilationState.cc $(SRC_AST) $(SRC_CODEGEN) \
+        Concurrency/Keywords.cc $(SRC_COMMON) $(SRC_CONTROLSTRUCT) \
+        GenPoly/GenPoly.cc GenPoly/Lvalue.cc InitTweak/GenInit.cc \
+        InitTweak/InitTweak.cc Parser/LinkageSpec.cc $(SRC_RESOLVEXPR) \
+        $(SRC_SYMTAB) SymTab/Demangle.cc $(SRC_SYNTREE) \
         Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
+        Tuples/Explode.cc Virtual/ExpandCasts.cc
+MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
+        ${cfa_cpplib_PROGRAMS}}
+        Tuples/Explode.cc Tuples/Tuples.cc \
+        Validate/HandleAttributes.cc Validate/FindSpecialDecls.cc
+MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
+MOSTLYCLEANFILES = Parser/lex.cc Parser/parser.cc Parser/parser.hh \
+        Parser/parser.output
+@WITH_LIBPROFILER_TRUE@LIBPROFILER = -lprofiler
+@WITH_LIBTCMALLOC_TRUE@LIBTCMALLOC = -ltcmalloc
+@WITH_LIBTCMALLOC_TRUE@TCMALLOCFLAG = -DTCMALLOC
+SRC_AST = \
+        AST/AssertAcyclic.cpp \
+        AST/Attribute.cpp \
+        AST/Convert.cpp \
+        AST/Decl.cpp \
+        AST/DeclReplacer.cpp \
+        AST/Expr.cpp \
+        AST/GenericSubstitution.cpp \
+        AST/Init.cpp \
+        AST/LinkageSpec.cpp \
+        AST/Node.cpp \
+        AST/Pass.cpp \
+        AST/Print.cpp \
+        AST/Stmt.cpp \
+        AST/SymbolTable.cpp \
+        AST/Type.cpp \
+        AST/TypeEnvironment.cpp \
+        AST/TypeSubstitution.cpp
+SRC_CODEGEN = \
+        CodeGen/CodeGenerator.cc \
+        CodeGen/FixMain.cc \
+        CodeGen/GenType.cc \
+        CodeGen/OperatorTable.cc
+SRC_COMMON = \
+      Common/Assert.cc \
+      Common/Eval.cc \
+      Common/PassVisitor.cc \
+      Common/SemanticError.cc \
+      Common/Stats/Counter.cc \
+      Common/Stats/Heap.cc \
+      Common/Stats/Stats.cc \
+      Common/Stats/Time.cc \
+      Common/UniqueName.cc
+SRC_CONTROLSTRUCT = \
+        ControlStruct/ForExprMutator.cc \
+        ControlStruct/LabelFixer.cc \
+        ControlStruct/LabelGenerator.cc \
+        ControlStruct/MLEMutator.cc \
+        ControlStruct/Mutate.cc
 BUILT_SOURCES = Parser/parser.hh
 AM_YFLAGS = -d -t -v
+# Is there a way to use a variable for the directory names?
+SRC_RESOLVEXPR = \
+      ResolvExpr/AdjustExprType.cc \
+      ResolvExpr/Alternative.cc \
+      ResolvExpr/AlternativeFinder.cc \
+      ResolvExpr/Candidate.cpp \
+      ResolvExpr/CandidateFinder.cpp \
+      ResolvExpr/CastCost.cc \
+      ResolvExpr/CommonType.cc \
+      ResolvExpr/ConversionCost.cc \
+      ResolvExpr/CurrentObject.cc \
+      ResolvExpr/ExplodedActual.cc \
+      ResolvExpr/ExplodedArg.cpp \
+      ResolvExpr/FindOpenVars.cc \
+      ResolvExpr/Occurs.cc \
+      ResolvExpr/PolyCost.cc \
+      ResolvExpr/PtrsAssignable.cc \
+      ResolvExpr/PtrsCastable.cc \
+      ResolvExpr/RenameVars.cc \
+      ResolvExpr/ResolveAssertions.cc \
+      ResolvExpr/Resolver.cc \
+      ResolvExpr/ResolveTypeof.cc \
+      ResolvExpr/SatisfyAssertions.cpp \
+      ResolvExpr/SpecCost.cc \
+      ResolvExpr/TypeEnvironment.cc \
+      ResolvExpr/Unify.cc
+SRC_SYMTAB = \
+      SymTab/Autogen.cc \
+      SymTab/FixFunction.cc \
+      SymTab/Indexer.cc \
+      SymTab/Mangler.cc \
+      SymTab/ManglerCommon.cc \
+      SymTab/Validate.cc
+SRC_SYNTREE = \
+      SynTree/Type.cc \
+      SynTree/VoidType.cc \
+      SynTree/BasicType.cc \
+      SynTree/PointerType.cc \
+      SynTree/ArrayType.cc \
+      SynTree/ReferenceType.cc \
+      SynTree/FunctionType.cc \
+      SynTree/ReferenceToType.cc \
+      SynTree/TupleType.cc \
+      SynTree/TypeofType.cc \
+      SynTree/AttrType.cc \
+      SynTree/VarArgsType.cc \
+      SynTree/ZeroOneType.cc \
+      SynTree/Constant.cc \
+      SynTree/Expression.cc \
+      SynTree/TupleExpr.cc \
+      SynTree/CommaExpr.cc \
+      SynTree/TypeExpr.cc \
+      SynTree/ApplicationExpr.cc \
+      SynTree/AddressExpr.cc \
+      SynTree/Statement.cc \
+      SynTree/CompoundStmt.cc \
+      SynTree/DeclStmt.cc \
+      SynTree/Declaration.cc \
+      SynTree/DeclarationWithType.cc \
+      SynTree/ObjectDecl.cc \
+      SynTree/FunctionDecl.cc \
+      SynTree/AggregateDecl.cc \
+      SynTree/NamedTypeDecl.cc \
+      SynTree/TypeDecl.cc \
+      SynTree/Initializer.cc \
+      SynTree/TypeSubstitution.cc \
+      SynTree/Attribute.cc \
+      SynTree/DeclReplacer.cc
 # put into lib for now
+cfa_cpplibdir = ${CFA_LIBDIR}
+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_LDFLAGS = -Xlinker -export-dynamic
+cfa_cpplibdir = $(CFA_LIBDIR)
+___driver_cfa_cpp_SOURCES = $(SRC)
+___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)
+AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
+ARFLAGS = cr
+demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
+demangler_LDADD = libdemangle.a -ldl                    # yywrap
+noinst_LIBRARIES = $(LIBDEMANGLE)
+EXTRA_LIBRARIES = libdemangle.a
+libdemangle_a_SOURCES = $(SRCDEMANGLE)
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am
 .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)
+.SUFFIXES: .cc .cpp .ll .lo .o .obj .yy
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/AST/module.mk $(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 \
 …
             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)/AST/module.mk $(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):
+clean-noinstLIBRARIES:
+        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+AST/$(am__dirstamp):
+        @$(MKDIR_P) AST
+        @: > AST/$(am__dirstamp)
+AST/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) AST/$(DEPDIR)
+        @: > AST/$(DEPDIR)/$(am__dirstamp)
+AST/AssertAcyclic.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+AST/Attribute.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+AST/Convert.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+AST/Decl.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/DeclReplacer.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+AST/Expr.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/GenericSubstitution.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+AST/Init.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/LinkageSpec.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+AST/Node.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/Pass.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/Print.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/Stmt.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/SymbolTable.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+AST/Type.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/TypeEnvironment.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+AST/TypeSubstitution.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
+CodeGen/$(am__dirstamp):
+        @$(MKDIR_P) CodeGen
+        @: > CodeGen/$(am__dirstamp)
+CodeGen/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) CodeGen/$(DEPDIR)
+        @: > CodeGen/$(DEPDIR)/$(am__dirstamp)
+CodeGen/CodeGenerator.$(OBJEXT): CodeGen/$(am__dirstamp) \
+        CodeGen/$(DEPDIR)/$(am__dirstamp)
+CodeGen/FixMain.$(OBJEXT): CodeGen/$(am__dirstamp) \
+        CodeGen/$(DEPDIR)/$(am__dirstamp)
+CodeGen/GenType.$(OBJEXT): CodeGen/$(am__dirstamp) \
+        CodeGen/$(DEPDIR)/$(am__dirstamp)
+CodeGen/OperatorTable.$(OBJEXT): CodeGen/$(am__dirstamp) \
+        CodeGen/$(DEPDIR)/$(am__dirstamp)
+Concurrency/$(am__dirstamp):
+        @$(MKDIR_P) Concurrency
+        @: > Concurrency/$(am__dirstamp)
+Concurrency/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Concurrency/$(DEPDIR)
+        @: > Concurrency/$(DEPDIR)/$(am__dirstamp)
+Concurrency/Keywords.$(OBJEXT): Concurrency/$(am__dirstamp) \
+        Concurrency/$(DEPDIR)/$(am__dirstamp)
+Common/$(am__dirstamp):
+        @$(MKDIR_P) Common
+        @: > Common/$(am__dirstamp)
+Common/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Common/$(DEPDIR)
+        @: > Common/$(DEPDIR)/$(am__dirstamp)
+Common/Assert.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/Eval.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/PassVisitor.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/SemanticError.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/Stats/$(am__dirstamp):
+        @$(MKDIR_P) Common/Stats
+        @: > Common/Stats/$(am__dirstamp)
+Common/Stats/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Common/Stats/$(DEPDIR)
+        @: > Common/Stats/$(DEPDIR)/$(am__dirstamp)
+Common/Stats/Counter.$(OBJEXT): Common/Stats/$(am__dirstamp) \
+        Common/Stats/$(DEPDIR)/$(am__dirstamp)
+Common/Stats/Heap.$(OBJEXT): Common/Stats/$(am__dirstamp) \
+        Common/Stats/$(DEPDIR)/$(am__dirstamp)
+Common/Stats/Stats.$(OBJEXT): Common/Stats/$(am__dirstamp) \
+        Common/Stats/$(DEPDIR)/$(am__dirstamp)
+Common/Stats/Time.$(OBJEXT): Common/Stats/$(am__dirstamp) \
+        Common/Stats/$(DEPDIR)/$(am__dirstamp)
+Common/UniqueName.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/$(am__dirstamp):
+        @$(MKDIR_P) ControlStruct
+        @: > ControlStruct/$(am__dirstamp)
+ControlStruct/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) ControlStruct/$(DEPDIR)
+        @: > ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/ForExprMutator.$(OBJEXT): ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/LabelFixer.$(OBJEXT): ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/LabelGenerator.$(OBJEXT): ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/MLEMutator.$(OBJEXT): ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/Mutate.$(OBJEXT): ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+GenPoly/$(am__dirstamp):
+        @$(MKDIR_P) GenPoly
+        @: > GenPoly/$(am__dirstamp)
+GenPoly/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) GenPoly/$(DEPDIR)
+        @: > GenPoly/$(DEPDIR)/$(am__dirstamp)
+GenPoly/GenPoly.$(OBJEXT): GenPoly/$(am__dirstamp) \
+        GenPoly/$(DEPDIR)/$(am__dirstamp)
+GenPoly/Lvalue.$(OBJEXT): GenPoly/$(am__dirstamp) \
+        GenPoly/$(DEPDIR)/$(am__dirstamp)
+InitTweak/$(am__dirstamp):
+        @$(MKDIR_P) InitTweak
+        @: > InitTweak/$(am__dirstamp)
+InitTweak/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) InitTweak/$(DEPDIR)
+        @: > InitTweak/$(DEPDIR)/$(am__dirstamp)
+InitTweak/GenInit.$(OBJEXT): InitTweak/$(am__dirstamp) \
+        InitTweak/$(DEPDIR)/$(am__dirstamp)
+InitTweak/InitTweak.$(OBJEXT): InitTweak/$(am__dirstamp) \
+        InitTweak/$(DEPDIR)/$(am__dirstamp)
+Parser/$(am__dirstamp):
+        @$(MKDIR_P) Parser
+        @: > Parser/$(am__dirstamp)
+Parser/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Parser/$(DEPDIR)
+        @: > Parser/$(DEPDIR)/$(am__dirstamp)
+Parser/LinkageSpec.$(OBJEXT): Parser/$(am__dirstamp) \
+        Parser/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/$(am__dirstamp):
+        @$(MKDIR_P) ResolvExpr
+        @: > ResolvExpr/$(am__dirstamp)
+ResolvExpr/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) ResolvExpr/$(DEPDIR)
+        @: > ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/AdjustExprType.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/Alternative.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/AlternativeFinder.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/Candidate.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/CandidateFinder.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/CastCost.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/CommonType.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/ConversionCost.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/CurrentObject.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/ExplodedActual.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/ExplodedArg.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/FindOpenVars.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/Occurs.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/PolyCost.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/PtrsAssignable.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/PtrsCastable.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/RenameVars.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/ResolveAssertions.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/Resolver.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/ResolveTypeof.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/SatisfyAssertions.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/SpecCost.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/TypeEnvironment.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/Unify.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+SymTab/$(am__dirstamp):
+        @$(MKDIR_P) SymTab
+        @: > SymTab/$(am__dirstamp)
+SymTab/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) SymTab/$(DEPDIR)
+        @: > SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/Autogen.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/FixFunction.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/Indexer.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/Mangler.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/ManglerCommon.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/Validate.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/Demangle.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SynTree/$(am__dirstamp):
+        @$(MKDIR_P) SynTree
+        @: > SynTree/$(am__dirstamp)
+SynTree/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) SynTree/$(DEPDIR)
+        @: > SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/Type.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/VoidType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/BasicType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/PointerType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/ArrayType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/ReferenceType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/FunctionType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/ReferenceToType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/TupleType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/TypeofType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/AttrType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/VarArgsType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/ZeroOneType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/Constant.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/Expression.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/TupleExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/CommaExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/TypeExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/ApplicationExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/AddressExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/Statement.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/CompoundStmt.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/DeclStmt.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/Declaration.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/DeclarationWithType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/ObjectDecl.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/FunctionDecl.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/AggregateDecl.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/NamedTypeDecl.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/TypeDecl.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/Initializer.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/TypeSubstitution.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/Attribute.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/DeclReplacer.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+Tuples/$(am__dirstamp):
+        @$(MKDIR_P) Tuples
+        @: > Tuples/$(am__dirstamp)
+Tuples/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Tuples/$(DEPDIR)
+        @: > Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/TupleAssignment.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/TupleExpansion.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/Explode.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/Tuples.$(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/HandleAttributes.$(OBJEXT): Validate/$(am__dirstamp) \
+        Validate/$(DEPDIR)/$(am__dirstamp)
+Validate/FindSpecialDecls.$(OBJEXT): Validate/$(am__dirstamp) \
+        Validate/$(DEPDIR)/$(am__dirstamp)
+libdemangle.a: $(libdemangle_a_OBJECTS) $(libdemangle_a_DEPENDENCIES) $(EXTRA_libdemangle_a_DEPENDENCIES)
+        $(AM_V_at)-rm -f libdemangle.a
+        $(AM_V_AR)$(libdemangle_a_AR) libdemangle.a $(libdemangle_a_OBJECTS) $(libdemangle_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libdemangle.a
 install-cfa_cpplibPROGRAMS: $(cfa_cpplib_PROGRAMS)
         @$(NORMAL_INSTALL)
 …
         sed 's/$(EXEEXT)$$//' | \
         while read p p1; do if test -f $$p \
+         || test -f $$p1 \
           ; then echo "$$p"; echo "$$p"; else :; fi; \
         done | \
 …
             if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
             test -z "$$files" || { \
               echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cfa_cpplibdir)$$dir'"; \
               $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cfa_cpplibdir)$$dir" || exit $$?; \
+            echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cfa_cpplibdir)$$dir'"; \
+            $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cfa_cpplibdir)$$dir" || exit $$?; \
             } \
         ; done
 …
 clean-cfa_cpplibPROGRAMS:
         -test -z "$(cfa_cpplib_PROGRAMS)" || rm -f $(cfa_cpplib_PROGRAMS)
+CodeGen/$(am__dirstamp):
         @$(MKDIR_P) CodeGen
         @: > CodeGen/$(am__dirstamp)
+CodeGen/$(DEPDIR)/$(am__dirstamp):
         @$(MKDIR_P) CodeGen/$(DEPDIR)
         @: > CodeGen/$(DEPDIR)/$(am__dirstamp)
 CodeGen/driver_cfa_cpp-Generate.$(OBJEXT): CodeGen/$(am__dirstamp) \
+        @list='$(cfa_cpplib_PROGRAMS)'; test -n "$$list" || exit 0; \
+        echo " rm -f" $$list; \
+        rm -f $$list || exit $$?; \
+        test -n "$(EXEEXT)" || exit 0; \
+        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+        echo " rm -f" $$list; \
+        rm -f $$list
+CodeGen/Generate.$(OBJEXT): CodeGen/$(am__dirstamp) \
         CodeGen/$(DEPDIR)/$(am__dirstamp)
+CodeGen/driver_cfa_cpp-CodeGenerator.$(OBJEXT):  \
+        CodeGen/$(am__dirstamp) CodeGen/$(DEPDIR)/$(am__dirstamp)
+CodeGen/driver_cfa_cpp-GenType.$(OBJEXT): CodeGen/$(am__dirstamp) \
+CodeGen/FixNames.$(OBJEXT): CodeGen/$(am__dirstamp) \
         CodeGen/$(DEPDIR)/$(am__dirstamp)
-CodeGen/driver_cfa_cpp-FixNames.$(OBJEXT): CodeGen/$(am__dirstamp) \
-        CodeGen/$(DEPDIR)/$(am__dirstamp)
-CodeGen/driver_cfa_cpp-FixMain.$(OBJEXT): CodeGen/$(am__dirstamp) \
-        CodeGen/$(DEPDIR)/$(am__dirstamp)
-CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT):  \
-        CodeGen/$(am__dirstamp) CodeGen/$(DEPDIR)/$(am__dirstamp)
 CodeTools/$(am__dirstamp):
         @$(MKDIR_P) CodeTools
 …
         @$(MKDIR_P) CodeTools/$(DEPDIR)
         @: > CodeTools/$(DEPDIR)/$(am__dirstamp)
+CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT):  \
+        CodeTools/$(am__dirstamp) CodeTools/$(DEPDIR)/$(am__dirstamp)
+CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT):  \
+        CodeTools/$(am__dirstamp) CodeTools/$(DEPDIR)/$(am__dirstamp)
+Concurrency/$(am__dirstamp):
+        @$(MKDIR_P) Concurrency
+        @: > Concurrency/$(am__dirstamp)
+Concurrency/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Concurrency/$(DEPDIR)
+        @: > Concurrency/$(DEPDIR)/$(am__dirstamp)
+Concurrency/driver_cfa_cpp-Keywords.$(OBJEXT):  \
+        Concurrency/$(am__dirstamp) \
+CodeTools/DeclStats.$(OBJEXT): CodeTools/$(am__dirstamp) \
+        CodeTools/$(DEPDIR)/$(am__dirstamp)
+CodeTools/ResolvProtoDump.$(OBJEXT): CodeTools/$(am__dirstamp) \
+        CodeTools/$(DEPDIR)/$(am__dirstamp)
+CodeTools/TrackLoc.$(OBJEXT): CodeTools/$(am__dirstamp) \
+        CodeTools/$(DEPDIR)/$(am__dirstamp)
+Concurrency/Waitfor.$(OBJEXT): Concurrency/$(am__dirstamp) \
         Concurrency/$(DEPDIR)/$(am__dirstamp)
+Concurrency/driver_cfa_cpp-Waitfor.$(OBJEXT):  \
+        Concurrency/$(am__dirstamp) \
+        Concurrency/$(DEPDIR)/$(am__dirstamp)
+Common/$(am__dirstamp):
+        @$(MKDIR_P) Common
+        @: > Common/$(am__dirstamp)
+Common/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Common/$(DEPDIR)
+        @: > Common/$(DEPDIR)/$(am__dirstamp)
+Common/driver_cfa_cpp-SemanticError.$(OBJEXT): Common/$(am__dirstamp) \
+Common/DebugMalloc.$(OBJEXT): Common/$(am__dirstamp) \
         Common/$(DEPDIR)/$(am__dirstamp)
+Common/driver_cfa_cpp-UniqueName.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/driver_cfa_cpp-DebugMalloc.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/driver_cfa_cpp-Assert.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/driver_cfa_cpp-Heap.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/$(am__dirstamp):
+        @$(MKDIR_P) ControlStruct
+        @: > ControlStruct/$(am__dirstamp)
+ControlStruct/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) ControlStruct/$(DEPDIR)
+        @: > ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT):  \
+ControlStruct/ExceptTranslate.$(OBJEXT):  \
         ControlStruct/$(am__dirstamp) \
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT):  \
+        ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT):  \
+        ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT):  \
+        ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT):  \
+        ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/driver_cfa_cpp-ExceptTranslate.$(OBJEXT):  \
+        ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+GenPoly/$(am__dirstamp):
+        @$(MKDIR_P) GenPoly
+        @: > GenPoly/$(am__dirstamp)
+GenPoly/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) GenPoly/$(DEPDIR)
+        @: > GenPoly/$(DEPDIR)/$(am__dirstamp)
+GenPoly/driver_cfa_cpp-Box.$(OBJEXT): GenPoly/$(am__dirstamp) \
+GenPoly/Box.$(OBJEXT): GenPoly/$(am__dirstamp) \
         GenPoly/$(DEPDIR)/$(am__dirstamp)
 GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT): GenPoly/$(am__dirstamp) \
+GenPoly/ScrubTyVars.$(OBJEXT): GenPoly/$(am__dirstamp) \
         GenPoly/$(DEPDIR)/$(am__dirstamp)
 GenPoly/driver_cfa_cpp-ScrubTyVars.$(OBJEXT): GenPoly/$(am__dirstamp) \
+GenPoly/Specialize.$(OBJEXT): GenPoly/$(am__dirstamp) \
         GenPoly/$(DEPDIR)/$(am__dirstamp)
 GenPoly/driver_cfa_cpp-Lvalue.$(OBJEXT): GenPoly/$(am__dirstamp) \
+GenPoly/FindFunction.$(OBJEXT): GenPoly/$(am__dirstamp) \
         GenPoly/$(DEPDIR)/$(am__dirstamp)
 GenPoly/driver_cfa_cpp-Specialize.$(OBJEXT): GenPoly/$(am__dirstamp) \
+GenPoly/InstantiateGeneric.$(OBJEXT): GenPoly/$(am__dirstamp) \
         GenPoly/$(DEPDIR)/$(am__dirstamp)
+GenPoly/driver_cfa_cpp-FindFunction.$(OBJEXT):  \
+        GenPoly/$(am__dirstamp) GenPoly/$(DEPDIR)/$(am__dirstamp)
+GenPoly/driver_cfa_cpp-InstantiateGeneric.$(OBJEXT):  \
+        GenPoly/$(am__dirstamp) GenPoly/$(DEPDIR)/$(am__dirstamp)
+InitTweak/$(am__dirstamp):
+        @$(MKDIR_P) InitTweak
+        @: > InitTweak/$(am__dirstamp)
+InitTweak/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) InitTweak/$(DEPDIR)
+        @: > InitTweak/$(DEPDIR)/$(am__dirstamp)
+InitTweak/driver_cfa_cpp-GenInit.$(OBJEXT): InitTweak/$(am__dirstamp) \
+InitTweak/FixInit.$(OBJEXT): InitTweak/$(am__dirstamp) \
         InitTweak/$(DEPDIR)/$(am__dirstamp)
 InitTweak/driver_cfa_cpp-FixInit.$(OBJEXT): InitTweak/$(am__dirstamp) \
+InitTweak/FixGlobalInit.$(OBJEXT): InitTweak/$(am__dirstamp) \
         InitTweak/$(DEPDIR)/$(am__dirstamp)
-InitTweak/driver_cfa_cpp-FixGlobalInit.$(OBJEXT):  \
-        InitTweak/$(am__dirstamp) InitTweak/$(DEPDIR)/$(am__dirstamp)
-InitTweak/driver_cfa_cpp-InitTweak.$(OBJEXT):  \
-        InitTweak/$(am__dirstamp) InitTweak/$(DEPDIR)/$(am__dirstamp)
 Parser/parser.hh: Parser/parser.cc
         @if test ! -f $@; then rm -f Parser/parser.cc; else :; fi
         @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) Parser/parser.cc; else :; fi
+Parser/$(am__dirstamp):
+        @$(MKDIR_P) Parser
+        @: > Parser/$(am__dirstamp)
+Parser/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Parser/$(DEPDIR)
+        @: > Parser/$(DEPDIR)/$(am__dirstamp)
+Parser/driver_cfa_cpp-parser.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/parser.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
 Parser/driver_cfa_cpp-lex.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/lex.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
 Parser/driver_cfa_cpp-TypedefTable.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/TypedefTable.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
 Parser/driver_cfa_cpp-ParseNode.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/ParseNode.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
+Parser/driver_cfa_cpp-DeclarationNode.$(OBJEXT):  \
+        Parser/$(am__dirstamp) Parser/$(DEPDIR)/$(am__dirstamp)
+Parser/driver_cfa_cpp-ExpressionNode.$(OBJEXT):  \
+        Parser/$(am__dirstamp) Parser/$(DEPDIR)/$(am__dirstamp)
+Parser/driver_cfa_cpp-StatementNode.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/DeclarationNode.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
+Parser/driver_cfa_cpp-InitializerNode.$(OBJEXT):  \
+        Parser/$(am__dirstamp) Parser/$(DEPDIR)/$(am__dirstamp)
+Parser/driver_cfa_cpp-TypeData.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/ExpressionNode.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
 Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/StatementNode.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
 Parser/driver_cfa_cpp-parserutility.$(OBJEXT): Parser/$(am__dirstamp) \
+Parser/InitializerNode.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/$(am__dirstamp):
+        @$(MKDIR_P) ResolvExpr
+        @: > ResolvExpr/$(am__dirstamp)
+ResolvExpr/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) ResolvExpr/$(DEPDIR)
+        @: > ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-AlternativeFinder.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-Alternative.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-Unify.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-PtrsAssignable.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-CommonType.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-ConversionCost.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-CastCost.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-PtrsCastable.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-AdjustExprType.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-AlternativePrinter.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-Resolver.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-ResolveTypeof.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-RenameVars.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-FindOpenVars.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-PolyCost.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-Occurs.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-TypeEnvironment.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-CurrentObject.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/driver_cfa_cpp-ExplodedActual.$(OBJEXT):  \
+        ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+SymTab/$(am__dirstamp):
+        @$(MKDIR_P) SymTab
+        @: > SymTab/$(am__dirstamp)
+SymTab/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) SymTab/$(DEPDIR)
+        @: > SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/driver_cfa_cpp-Indexer.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/driver_cfa_cpp-Mangler.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/driver_cfa_cpp-Validate.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/driver_cfa_cpp-FixFunction.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/driver_cfa_cpp-Autogen.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SynTree/$(am__dirstamp):
+        @$(MKDIR_P) SynTree
+        @: > SynTree/$(am__dirstamp)
+SynTree/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) SynTree/$(DEPDIR)
+        @: > SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-Type.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-VoidType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-BasicType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-PointerType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-ArrayType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-ReferenceType.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-FunctionType.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-ReferenceToType.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-TupleType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-TypeofType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-AttrType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-VarArgsType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-ZeroOneType.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-Constant.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-Expression.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-TupleExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-CommaExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-TypeExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-ApplicationExpr.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-AddressExpr.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-Statement.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-CompoundStmt.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-DeclStmt.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-Declaration.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-DeclarationWithType.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-ObjectDecl.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-FunctionDecl.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-AggregateDecl.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-NamedTypeDecl.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-TypeDecl.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-Initializer.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-Attribute.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-DeclReplacer.$(OBJEXT):  \
+        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
+Tuples/$(am__dirstamp):
+        @$(MKDIR_P) Tuples
+        @: > Tuples/$(am__dirstamp)
+Tuples/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Tuples/$(DEPDIR)
+        @: > Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT):  \
+        Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/driver_cfa_cpp-TupleExpansion.$(OBJEXT):  \
+        Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/driver_cfa_cpp-Explode.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
+Parser/TypeData.$(OBJEXT): Parser/$(am__dirstamp) \
+        Parser/$(DEPDIR)/$(am__dirstamp)
+Parser/parserutility.$(OBJEXT): Parser/$(am__dirstamp) \
+        Parser/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/AlternativePrinter.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
 Virtual/$(am__dirstamp):
         @$(MKDIR_P) Virtual
 …
         @$(MKDIR_P) Virtual/$(DEPDIR)
         @: > Virtual/$(DEPDIR)/$(am__dirstamp)
 Virtual/driver_cfa_cpp-ExpandCasts.$(OBJEXT): Virtual/$(am__dirstamp) \
+Virtual/ExpandCasts.$(OBJEXT): Virtual/$(am__dirstamp) \
         Virtual/$(DEPDIR)/$(am__dirstamp)
+driver/$(am__dirstamp):
+        @$(MKDIR_P) driver
+        @: > driver/$(am__dirstamp)
+driver/cfa-cpp$(EXEEXT): $(driver_cfa_cpp_OBJECTS) $(driver_cfa_cpp_DEPENDENCIES) $(EXTRA_driver_cfa_cpp_DEPENDENCIES) driver/$(am__dirstamp)
+        @rm -f driver/cfa-cpp$(EXEEXT)
+        $(AM_V_CXXLD)$(driver_cfa_cpp_LINK) $(driver_cfa_cpp_OBJECTS) $(driver_cfa_cpp_LDADD) $(LIBS)
+../driver/$(am__dirstamp):
+        @$(MKDIR_P) ../driver
+        @: > ../driver/$(am__dirstamp)
+../driver/cfa-cpp$(EXEEXT): $(___driver_cfa_cpp_OBJECTS) $(___driver_cfa_cpp_DEPENDENCIES) $(EXTRA____driver_cfa_cpp_DEPENDENCIES) ../driver/$(am__dirstamp)
+        @rm -f ../driver/cfa-cpp$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(___driver_cfa_cpp_OBJECTS) $(___driver_cfa_cpp_LDADD) $(LIBS)
+SymTab/demangler.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+demangler$(EXEEXT): $(demangler_OBJECTS) $(demangler_DEPENDENCIES) $(EXTRA_demangler_DEPENDENCIES)
+        @rm -f demangler$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(demangler_OBJECTS) $(demangler_LDADD) $(LIBS)
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
+        -rm -f AST/*.$(OBJEXT)
         -rm -f CodeGen/*.$(OBJEXT)
         -rm -f CodeTools/*.$(OBJEXT)
         -rm -f Common/*.$(OBJEXT)
+        -rm -f Common/Stats/*.$(OBJEXT)
         -rm -f Concurrency/*.$(OBJEXT)
         -rm -f ControlStruct/*.$(OBJEXT)
 …
         -rm -f SynTree/*.$(OBJEXT)
         -rm -f Tuples/*.$(OBJEXT)
+        -rm -f Validate/*.$(OBJEXT)
         -rm -f Virtual/*.$(OBJEXT)
 …
         -rm -f *.tab.c
+@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@CodeGen/$(DEPDIR)/driver_cfa_cpp-CodeGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-FixMain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-FixNames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-GenType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po@am__quote@
+@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-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@Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-FindFunction.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-GenPoly.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-InstantiateGeneric.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-Lvalue.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-ScrubTyVars.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-Specialize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@InitTweak/$(DEPDIR)/driver_cfa_cpp-FixGlobalInit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@InitTweak/$(DEPDIR)/driver_cfa_cpp-FixInit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@InitTweak/$(DEPDIR)/driver_cfa_cpp-GenInit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@InitTweak/$(DEPDIR)/driver_cfa_cpp-InitTweak.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-DeclarationNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-ExpressionNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-InitializerNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-TypedefTable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-lex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AdjustExprType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Alternative.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativeFinder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativePrinter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CastCost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CommonType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ConversionCost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ExplodedActual.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-FindOpenVars.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Occurs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PolyCost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsAssignable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsCastable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-RenameVars.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ResolveTypeof.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Resolver.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-TypeEnvironment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Unify.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-FixFunction.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-ApplicationExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-ArrayType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AttrType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-BasicType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-CommaExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Constant.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-DeclStmt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Declaration.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-DeclarationWithType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Expression.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Initializer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-NamedTypeDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-ObjectDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-PointerType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceToType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Statement.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-TupleExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-TupleType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Type.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-TypeDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-TypeExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-TypeSubstitution.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-TypeofType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VarArgsType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-ZeroOneType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-Explode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Virtual/$(DEPDIR)/driver_cfa_cpp-ExpandCasts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CompilationState.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MakeLibCfa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/AssertAcyclic.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Attribute.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Convert.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Decl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/DeclReplacer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Expr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/GenericSubstitution.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/LinkageSpec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Node.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Pass.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Stmt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/SymbolTable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Type.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/TypeEnvironment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/TypeSubstitution.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/CodeGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/FixMain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/FixNames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/GenType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/Generate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/OperatorTable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/DeclStats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/ResolvProtoDump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/TrackLoc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/Assert.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/DebugMalloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/Eval.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/PassVisitor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/SemanticError.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/UniqueName.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/Stats/$(DEPDIR)/Counter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/Stats/$(DEPDIR)/Heap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/Stats/$(DEPDIR)/Stats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/Stats/$(DEPDIR)/Time.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Concurrency/$(DEPDIR)/Keywords.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Concurrency/$(DEPDIR)/Waitfor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/ExceptTranslate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/ForExprMutator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/LabelFixer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/LabelGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/MLEMutator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/Mutate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/Box.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/FindFunction.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/GenPoly.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/InstantiateGeneric.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/Lvalue.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/ScrubTyVars.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/Specialize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@InitTweak/$(DEPDIR)/FixGlobalInit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@InitTweak/$(DEPDIR)/FixInit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@InitTweak/$(DEPDIR)/GenInit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@InitTweak/$(DEPDIR)/InitTweak.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/DeclarationNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/ExpressionNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/InitializerNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/LinkageSpec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/ParseNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/StatementNode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/TypeData.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/TypedefTable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/lex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/parserutility.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/AdjustExprType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Alternative.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/AlternativeFinder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/AlternativePrinter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Candidate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/CandidateFinder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/CastCost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/CommonType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ConversionCost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/CurrentObject.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ExplodedActual.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ExplodedArg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/FindOpenVars.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Occurs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/PolyCost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/PtrsAssignable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/PtrsCastable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/RenameVars.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ResolveAssertions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ResolveTypeof.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Resolver.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/SatisfyAssertions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/SpecCost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/TypeEnvironment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Unify.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/Autogen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/Demangle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/FixFunction.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/Indexer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/Mangler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/ManglerCommon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/Validate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/demangler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/AddressExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/AggregateDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/ApplicationExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/ArrayType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/AttrType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/Attribute.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/BasicType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/CommaExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/CompoundStmt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/Constant.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/DeclReplacer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/DeclStmt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/Declaration.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/DeclarationWithType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/Expression.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/FunctionDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/FunctionType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/Initializer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/NamedTypeDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/ObjectDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/PointerType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/ReferenceToType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/ReferenceType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/Statement.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TupleExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TupleType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/Type.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TypeDecl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TypeExpr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TypeSubstitution.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TypeofType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/VarArgsType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/VoidType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/ZeroOneType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/Explode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleAssignment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleExpansion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/Tuples.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/FindSpecialDecls.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/HandleAttributes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Virtual/$(DEPDIR)/ExpandCasts.Po@am__quote@
 .cc.o:
 …
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+driver_cfa_cpp-main.o: main.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT driver_cfa_cpp-main.o -MD -MP -MF $(DEPDIR)/driver_cfa_cpp-main.Tpo -c -o driver_cfa_cpp-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/driver_cfa_cpp-main.Tpo $(DEPDIR)/driver_cfa_cpp-main.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='main.cc' object='driver_cfa_cpp-main.o' libtool=no @AMDEPBACKSLASH@
+.cc.lo:
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @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-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc
+driver_cfa_cpp-main.obj: main.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT driver_cfa_cpp-main.obj -MD -MP -MF $(DEPDIR)/driver_cfa_cpp-main.Tpo -c -o driver_cfa_cpp-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/driver_cfa_cpp-main.Tpo $(DEPDIR)/driver_cfa_cpp-main.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='main.cc' object='driver_cfa_cpp-main.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+.cpp.o:
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o driver_cfa_cpp-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi`
+driver_cfa_cpp-MakeLibCfa.o: MakeLibCfa.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT driver_cfa_cpp-MakeLibCfa.o -MD -MP -MF $(DEPDIR)/driver_cfa_cpp-MakeLibCfa.Tpo -c -o driver_cfa_cpp-MakeLibCfa.o `test -f 'MakeLibCfa.cc' || echo '$(srcdir)/'`MakeLibCfa.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/driver_cfa_cpp-MakeLibCfa.Tpo $(DEPDIR)/driver_cfa_cpp-MakeLibCfa.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='MakeLibCfa.cc' object='driver_cfa_cpp-MakeLibCfa.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+.cpp.obj:
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o driver_cfa_cpp-MakeLibCfa.o `test -f 'MakeLibCfa.cc' || echo '$(srcdir)/'`MakeLibCfa.cc
+driver_cfa_cpp-MakeLibCfa.obj: MakeLibCfa.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT driver_cfa_cpp-MakeLibCfa.obj -MD -MP -MF $(DEPDIR)/driver_cfa_cpp-MakeLibCfa.Tpo -c -o driver_cfa_cpp-MakeLibCfa.obj `if test -f 'MakeLibCfa.cc'; then $(CYGPATH_W) 'MakeLibCfa.cc'; else $(CYGPATH_W) '$(srcdir)/MakeLibCfa.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/driver_cfa_cpp-MakeLibCfa.Tpo $(DEPDIR)/driver_cfa_cpp-MakeLibCfa.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='MakeLibCfa.cc' object='driver_cfa_cpp-MakeLibCfa.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+.cpp.lo:
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @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-MakeLibCfa.obj `if test -f 'MakeLibCfa.cc'; then $(CYGPATH_W) 'MakeLibCfa.cc'; else $(CYGPATH_W) '$(srcdir)/MakeLibCfa.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
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/Generate.cc' object='CodeGen/driver_cfa_cpp-Generate.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 CodeGen/driver_cfa_cpp-Generate.o `test -f 'CodeGen/Generate.cc' || echo '$(srcdir)/'`CodeGen/Generate.cc
+CodeGen/driver_cfa_cpp-Generate.obj: 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.obj -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Tpo -c -o CodeGen/driver_cfa_cpp-Generate.obj `if test -f 'CodeGen/Generate.cc'; then $(CYGPATH_W) 'CodeGen/Generate.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/Generate.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/Generate.cc' object='CodeGen/driver_cfa_cpp-Generate.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 CodeGen/driver_cfa_cpp-Generate.obj `if test -f 'CodeGen/Generate.cc'; then $(CYGPATH_W) 'CodeGen/Generate.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/Generate.cc'; fi`
+CodeGen/driver_cfa_cpp-CodeGenerator.o: CodeGen/CodeGenerator.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-CodeGenerator.o -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-CodeGenerator.Tpo -c -o CodeGen/driver_cfa_cpp-CodeGenerator.o `test -f 'CodeGen/CodeGenerator.cc' || echo '$(srcdir)/'`CodeGen/CodeGenerator.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-CodeGenerator.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-CodeGenerator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/CodeGenerator.cc' object='CodeGen/driver_cfa_cpp-CodeGenerator.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 CodeGen/driver_cfa_cpp-CodeGenerator.o `test -f 'CodeGen/CodeGenerator.cc' || echo '$(srcdir)/'`CodeGen/CodeGenerator.cc
+CodeGen/driver_cfa_cpp-CodeGenerator.obj: CodeGen/CodeGenerator.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-CodeGenerator.obj -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-CodeGenerator.Tpo -c -o CodeGen/driver_cfa_cpp-CodeGenerator.obj `if test -f 'CodeGen/CodeGenerator.cc'; then $(CYGPATH_W) 'CodeGen/CodeGenerator.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/CodeGenerator.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-CodeGenerator.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-CodeGenerator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/CodeGenerator.cc' object='CodeGen/driver_cfa_cpp-CodeGenerator.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 CodeGen/driver_cfa_cpp-CodeGenerator.obj `if test -f 'CodeGen/CodeGenerator.cc'; then $(CYGPATH_W) 'CodeGen/CodeGenerator.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/CodeGenerator.cc'; fi`
+CodeGen/driver_cfa_cpp-GenType.o: CodeGen/GenType.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-GenType.o -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-GenType.Tpo -c -o CodeGen/driver_cfa_cpp-GenType.o `test -f 'CodeGen/GenType.cc' || echo '$(srcdir)/'`CodeGen/GenType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-GenType.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-GenType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/GenType.cc' object='CodeGen/driver_cfa_cpp-GenType.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 CodeGen/driver_cfa_cpp-GenType.o `test -f 'CodeGen/GenType.cc' || echo '$(srcdir)/'`CodeGen/GenType.cc
+CodeGen/driver_cfa_cpp-GenType.obj: CodeGen/GenType.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-GenType.obj -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-GenType.Tpo -c -o CodeGen/driver_cfa_cpp-GenType.obj `if test -f 'CodeGen/GenType.cc'; then $(CYGPATH_W) 'CodeGen/GenType.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/GenType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-GenType.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-GenType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/GenType.cc' object='CodeGen/driver_cfa_cpp-GenType.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 CodeGen/driver_cfa_cpp-GenType.obj `if test -f 'CodeGen/GenType.cc'; then $(CYGPATH_W) 'CodeGen/GenType.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/GenType.cc'; fi`
+CodeGen/driver_cfa_cpp-FixNames.o: CodeGen/FixNames.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-FixNames.o -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-FixNames.Tpo -c -o CodeGen/driver_cfa_cpp-FixNames.o `test -f 'CodeGen/FixNames.cc' || echo '$(srcdir)/'`CodeGen/FixNames.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-FixNames.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-FixNames.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/FixNames.cc' object='CodeGen/driver_cfa_cpp-FixNames.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 CodeGen/driver_cfa_cpp-FixNames.o `test -f 'CodeGen/FixNames.cc' || echo '$(srcdir)/'`CodeGen/FixNames.cc
+CodeGen/driver_cfa_cpp-FixNames.obj: CodeGen/FixNames.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-FixNames.obj -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-FixNames.Tpo -c -o CodeGen/driver_cfa_cpp-FixNames.obj `if test -f 'CodeGen/FixNames.cc'; then $(CYGPATH_W) 'CodeGen/FixNames.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/FixNames.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-FixNames.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-FixNames.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/FixNames.cc' object='CodeGen/driver_cfa_cpp-FixNames.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 CodeGen/driver_cfa_cpp-FixNames.obj `if test -f 'CodeGen/FixNames.cc'; then $(CYGPATH_W) 'CodeGen/FixNames.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/FixNames.cc'; fi`
+CodeGen/driver_cfa_cpp-FixMain.o: CodeGen/FixMain.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-FixMain.o -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-FixMain.Tpo -c -o CodeGen/driver_cfa_cpp-FixMain.o `test -f 'CodeGen/FixMain.cc' || echo '$(srcdir)/'`CodeGen/FixMain.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-FixMain.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-FixMain.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/FixMain.cc' object='CodeGen/driver_cfa_cpp-FixMain.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 CodeGen/driver_cfa_cpp-FixMain.o `test -f 'CodeGen/FixMain.cc' || echo '$(srcdir)/'`CodeGen/FixMain.cc
+CodeGen/driver_cfa_cpp-FixMain.obj: CodeGen/FixMain.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-FixMain.obj -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-FixMain.Tpo -c -o CodeGen/driver_cfa_cpp-FixMain.obj `if test -f 'CodeGen/FixMain.cc'; then $(CYGPATH_W) 'CodeGen/FixMain.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/FixMain.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-FixMain.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-FixMain.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/FixMain.cc' object='CodeGen/driver_cfa_cpp-FixMain.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 CodeGen/driver_cfa_cpp-FixMain.obj `if test -f 'CodeGen/FixMain.cc'; then $(CYGPATH_W) 'CodeGen/FixMain.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/FixMain.cc'; fi`
+CodeGen/driver_cfa_cpp-OperatorTable.o: CodeGen/OperatorTable.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-OperatorTable.o -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Tpo -c -o CodeGen/driver_cfa_cpp-OperatorTable.o `test -f 'CodeGen/OperatorTable.cc' || echo '$(srcdir)/'`CodeGen/OperatorTable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/OperatorTable.cc' object='CodeGen/driver_cfa_cpp-OperatorTable.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 CodeGen/driver_cfa_cpp-OperatorTable.o `test -f 'CodeGen/OperatorTable.cc' || echo '$(srcdir)/'`CodeGen/OperatorTable.cc
+CodeGen/driver_cfa_cpp-OperatorTable.obj: CodeGen/OperatorTable.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-OperatorTable.obj -MD -MP -MF CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Tpo -c -o CodeGen/driver_cfa_cpp-OperatorTable.obj `if test -f 'CodeGen/OperatorTable.cc'; then $(CYGPATH_W) 'CodeGen/OperatorTable.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/OperatorTable.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Tpo CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeGen/OperatorTable.cc' object='CodeGen/driver_cfa_cpp-OperatorTable.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 CodeGen/driver_cfa_cpp-OperatorTable.obj `if test -f 'CodeGen/OperatorTable.cc'; then $(CYGPATH_W) 'CodeGen/OperatorTable.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/OperatorTable.cc'; fi`
+CodeTools/driver_cfa_cpp-DeclStats.o: CodeTools/DeclStats.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeTools/driver_cfa_cpp-DeclStats.o -MD -MP -MF CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Tpo -c -o CodeTools/driver_cfa_cpp-DeclStats.o `test -f 'CodeTools/DeclStats.cc' || echo '$(srcdir)/'`CodeTools/DeclStats.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Tpo CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeTools/DeclStats.cc' object='CodeTools/driver_cfa_cpp-DeclStats.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 CodeTools/driver_cfa_cpp-DeclStats.o `test -f 'CodeTools/DeclStats.cc' || echo '$(srcdir)/'`CodeTools/DeclStats.cc
+CodeTools/driver_cfa_cpp-DeclStats.obj: CodeTools/DeclStats.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeTools/driver_cfa_cpp-DeclStats.obj -MD -MP -MF CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Tpo -c -o CodeTools/driver_cfa_cpp-DeclStats.obj `if test -f 'CodeTools/DeclStats.cc'; then $(CYGPATH_W) 'CodeTools/DeclStats.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/DeclStats.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Tpo CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeTools/DeclStats.cc' object='CodeTools/driver_cfa_cpp-DeclStats.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 CodeTools/driver_cfa_cpp-DeclStats.obj `if test -f 'CodeTools/DeclStats.cc'; then $(CYGPATH_W) 'CodeTools/DeclStats.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/DeclStats.cc'; fi`
+CodeTools/driver_cfa_cpp-TrackLoc.o: CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeTools/driver_cfa_cpp-TrackLoc.o -MD -MP -MF CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo -c -o CodeTools/driver_cfa_cpp-TrackLoc.o `test -f 'CodeTools/TrackLoc.cc' || echo '$(srcdir)/'`CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeTools/TrackLoc.cc' object='CodeTools/driver_cfa_cpp-TrackLoc.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 CodeTools/driver_cfa_cpp-TrackLoc.o `test -f 'CodeTools/TrackLoc.cc' || echo '$(srcdir)/'`CodeTools/TrackLoc.cc
+CodeTools/driver_cfa_cpp-TrackLoc.obj: CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeTools/driver_cfa_cpp-TrackLoc.obj -MD -MP -MF CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo -c -o CodeTools/driver_cfa_cpp-TrackLoc.obj `if test -f 'CodeTools/TrackLoc.cc'; then $(CYGPATH_W) 'CodeTools/TrackLoc.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/TrackLoc.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeTools/TrackLoc.cc' object='CodeTools/driver_cfa_cpp-TrackLoc.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 CodeTools/driver_cfa_cpp-TrackLoc.obj `if test -f 'CodeTools/TrackLoc.cc'; then $(CYGPATH_W) 'CodeTools/TrackLoc.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/TrackLoc.cc'; fi`
+Concurrency/driver_cfa_cpp-Keywords.o: Concurrency/Keywords.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Concurrency/driver_cfa_cpp-Keywords.o -MD -MP -MF Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Tpo -c -o Concurrency/driver_cfa_cpp-Keywords.o `test -f 'Concurrency/Keywords.cc' || echo '$(srcdir)/'`Concurrency/Keywords.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Tpo Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Concurrency/Keywords.cc' object='Concurrency/driver_cfa_cpp-Keywords.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 Concurrency/driver_cfa_cpp-Keywords.o `test -f 'Concurrency/Keywords.cc' || echo '$(srcdir)/'`Concurrency/Keywords.cc
+Concurrency/driver_cfa_cpp-Keywords.obj: Concurrency/Keywords.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Concurrency/driver_cfa_cpp-Keywords.obj -MD -MP -MF Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Tpo -c -o Concurrency/driver_cfa_cpp-Keywords.obj `if test -f 'Concurrency/Keywords.cc'; then $(CYGPATH_W) 'Concurrency/Keywords.cc'; else $(CYGPATH_W) '$(srcdir)/Concurrency/Keywords.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Tpo Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Concurrency/Keywords.cc' object='Concurrency/driver_cfa_cpp-Keywords.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 Concurrency/driver_cfa_cpp-Keywords.obj `if test -f 'Concurrency/Keywords.cc'; then $(CYGPATH_W) 'Concurrency/Keywords.cc'; else $(CYGPATH_W) '$(srcdir)/Concurrency/Keywords.cc'; fi`
+Concurrency/driver_cfa_cpp-Waitfor.o: Concurrency/Waitfor.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Concurrency/driver_cfa_cpp-Waitfor.o -MD -MP -MF Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Tpo -c -o Concurrency/driver_cfa_cpp-Waitfor.o `test -f 'Concurrency/Waitfor.cc' || echo '$(srcdir)/'`Concurrency/Waitfor.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Tpo Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Concurrency/Waitfor.cc' object='Concurrency/driver_cfa_cpp-Waitfor.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 Concurrency/driver_cfa_cpp-Waitfor.o `test -f 'Concurrency/Waitfor.cc' || echo '$(srcdir)/'`Concurrency/Waitfor.cc
+Concurrency/driver_cfa_cpp-Waitfor.obj: Concurrency/Waitfor.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Concurrency/driver_cfa_cpp-Waitfor.obj -MD -MP -MF Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Tpo -c -o Concurrency/driver_cfa_cpp-Waitfor.obj `if test -f 'Concurrency/Waitfor.cc'; then $(CYGPATH_W) 'Concurrency/Waitfor.cc'; else $(CYGPATH_W) '$(srcdir)/Concurrency/Waitfor.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Tpo Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Concurrency/Waitfor.cc' object='Concurrency/driver_cfa_cpp-Waitfor.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 Concurrency/driver_cfa_cpp-Waitfor.obj `if test -f 'Concurrency/Waitfor.cc'; then $(CYGPATH_W) 'Concurrency/Waitfor.cc'; else $(CYGPATH_W) '$(srcdir)/Concurrency/Waitfor.cc'; fi`
+Common/driver_cfa_cpp-SemanticError.o: Common/SemanticError.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-SemanticError.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Tpo -c -o Common/driver_cfa_cpp-SemanticError.o `test -f 'Common/SemanticError.cc' || echo '$(srcdir)/'`Common/SemanticError.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Tpo Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/SemanticError.cc' object='Common/driver_cfa_cpp-SemanticError.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-SemanticError.o `test -f 'Common/SemanticError.cc' || echo '$(srcdir)/'`Common/SemanticError.cc
+Common/driver_cfa_cpp-SemanticError.obj: Common/SemanticError.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-SemanticError.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Tpo -c -o Common/driver_cfa_cpp-SemanticError.obj `if test -f 'Common/SemanticError.cc'; then $(CYGPATH_W) 'Common/SemanticError.cc'; else $(CYGPATH_W) '$(srcdir)/Common/SemanticError.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Tpo Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/SemanticError.cc' object='Common/driver_cfa_cpp-SemanticError.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-SemanticError.obj `if test -f 'Common/SemanticError.cc'; then $(CYGPATH_W) 'Common/SemanticError.cc'; else $(CYGPATH_W) '$(srcdir)/Common/SemanticError.cc'; fi`
+Common/driver_cfa_cpp-UniqueName.o: Common/UniqueName.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-UniqueName.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Tpo -c -o Common/driver_cfa_cpp-UniqueName.o `test -f 'Common/UniqueName.cc' || echo '$(srcdir)/'`Common/UniqueName.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Tpo Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/UniqueName.cc' object='Common/driver_cfa_cpp-UniqueName.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-UniqueName.o `test -f 'Common/UniqueName.cc' || echo '$(srcdir)/'`Common/UniqueName.cc
+Common/driver_cfa_cpp-UniqueName.obj: Common/UniqueName.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-UniqueName.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Tpo -c -o Common/driver_cfa_cpp-UniqueName.obj `if test -f 'Common/UniqueName.cc'; then $(CYGPATH_W) 'Common/UniqueName.cc'; else $(CYGPATH_W) '$(srcdir)/Common/UniqueName.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Tpo Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/UniqueName.cc' object='Common/driver_cfa_cpp-UniqueName.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-UniqueName.obj `if test -f 'Common/UniqueName.cc'; then $(CYGPATH_W) 'Common/UniqueName.cc'; else $(CYGPATH_W) '$(srcdir)/Common/UniqueName.cc'; fi`
+Common/driver_cfa_cpp-DebugMalloc.o: Common/DebugMalloc.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-DebugMalloc.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Tpo -c -o Common/driver_cfa_cpp-DebugMalloc.o `test -f 'Common/DebugMalloc.cc' || echo '$(srcdir)/'`Common/DebugMalloc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Tpo Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/DebugMalloc.cc' object='Common/driver_cfa_cpp-DebugMalloc.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-DebugMalloc.o `test -f 'Common/DebugMalloc.cc' || echo '$(srcdir)/'`Common/DebugMalloc.cc
+Common/driver_cfa_cpp-DebugMalloc.obj: Common/DebugMalloc.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-DebugMalloc.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Tpo -c -o Common/driver_cfa_cpp-DebugMalloc.obj `if test -f 'Common/DebugMalloc.cc'; then $(CYGPATH_W) 'Common/DebugMalloc.cc'; else $(CYGPATH_W) '$(srcdir)/Common/DebugMalloc.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Tpo Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/DebugMalloc.cc' object='Common/driver_cfa_cpp-DebugMalloc.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-DebugMalloc.obj `if test -f 'Common/DebugMalloc.cc'; then $(CYGPATH_W) 'Common/DebugMalloc.cc'; else $(CYGPATH_W) '$(srcdir)/Common/DebugMalloc.cc'; fi`
+Common/driver_cfa_cpp-Assert.o: Common/Assert.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-Assert.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo -c -o Common/driver_cfa_cpp-Assert.o `test -f 'Common/Assert.cc' || echo '$(srcdir)/'`Common/Assert.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Assert.cc' object='Common/driver_cfa_cpp-Assert.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-Assert.o `test -f 'Common/Assert.cc' || echo '$(srcdir)/'`Common/Assert.cc
+Common/driver_cfa_cpp-Assert.obj: Common/Assert.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-Assert.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo -c -o Common/driver_cfa_cpp-Assert.obj `if test -f 'Common/Assert.cc'; then $(CYGPATH_W) 'Common/Assert.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Assert.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Assert.cc' object='Common/driver_cfa_cpp-Assert.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-Assert.obj `if test -f 'Common/Assert.cc'; then $(CYGPATH_W) 'Common/Assert.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Assert.cc'; fi`
+Common/driver_cfa_cpp-Heap.o: Common/Heap.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-Heap.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Heap.Tpo -c -o Common/driver_cfa_cpp-Heap.o `test -f 'Common/Heap.cc' || echo '$(srcdir)/'`Common/Heap.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Heap.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Heap.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Heap.cc' object='Common/driver_cfa_cpp-Heap.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-Heap.o `test -f 'Common/Heap.cc' || echo '$(srcdir)/'`Common/Heap.cc
+Common/driver_cfa_cpp-Heap.obj: Common/Heap.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-Heap.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Heap.Tpo -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`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Heap.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Heap.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Heap.cc' object='Common/driver_cfa_cpp-Heap.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-Heap.obj `if test -f 'Common/Heap.cc'; then $(CYGPATH_W) 'Common/Heap.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Heap.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
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/LabelGenerator.cc' object='ControlStruct/driver_cfa_cpp-LabelGenerator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-LabelGenerator.o `test -f 'ControlStruct/LabelGenerator.cc' || echo '$(srcdir)/'`ControlStruct/LabelGenerator.cc
+ControlStruct/driver_cfa_cpp-LabelGenerator.obj: 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.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelGenerator.obj `if test -f 'ControlStruct/LabelGenerator.cc'; then $(CYGPATH_W) 'ControlStruct/LabelGenerator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelGenerator.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/LabelGenerator.cc' object='ControlStruct/driver_cfa_cpp-LabelGenerator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-LabelGenerator.obj `if test -f 'ControlStruct/LabelGenerator.cc'; then $(CYGPATH_W) 'ControlStruct/LabelGenerator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelGenerator.cc'; fi`
+ControlStruct/driver_cfa_cpp-LabelFixer.o: ControlStruct/LabelFixer.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-LabelFixer.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelFixer.o `test -f 'ControlStruct/LabelFixer.cc' || echo '$(srcdir)/'`ControlStruct/LabelFixer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/LabelFixer.cc' object='ControlStruct/driver_cfa_cpp-LabelFixer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-LabelFixer.o `test -f 'ControlStruct/LabelFixer.cc' || echo '$(srcdir)/'`ControlStruct/LabelFixer.cc
+ControlStruct/driver_cfa_cpp-LabelFixer.obj: ControlStruct/LabelFixer.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-LabelFixer.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelFixer.obj `if test -f 'ControlStruct/LabelFixer.cc'; then $(CYGPATH_W) 'ControlStruct/LabelFixer.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelFixer.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/LabelFixer.cc' object='ControlStruct/driver_cfa_cpp-LabelFixer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-LabelFixer.obj `if test -f 'ControlStruct/LabelFixer.cc'; then $(CYGPATH_W) 'ControlStruct/LabelFixer.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelFixer.cc'; fi`
+ControlStruct/driver_cfa_cpp-MLEMutator.o: ControlStruct/MLEMutator.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-MLEMutator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-MLEMutator.o `test -f 'ControlStruct/MLEMutator.cc' || echo '$(srcdir)/'`ControlStruct/MLEMutator.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/MLEMutator.cc' object='ControlStruct/driver_cfa_cpp-MLEMutator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-MLEMutator.o `test -f 'ControlStruct/MLEMutator.cc' || echo '$(srcdir)/'`ControlStruct/MLEMutator.cc
+ControlStruct/driver_cfa_cpp-MLEMutator.obj: ControlStruct/MLEMutator.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-MLEMutator.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-MLEMutator.obj `if test -f 'ControlStruct/MLEMutator.cc'; then $(CYGPATH_W) 'ControlStruct/MLEMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/MLEMutator.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/MLEMutator.cc' object='ControlStruct/driver_cfa_cpp-MLEMutator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-MLEMutator.obj `if test -f 'ControlStruct/MLEMutator.cc'; then $(CYGPATH_W) 'ControlStruct/MLEMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/MLEMutator.cc'; fi`
+ControlStruct/driver_cfa_cpp-Mutate.o: ControlStruct/Mutate.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-Mutate.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo -c -o ControlStruct/driver_cfa_cpp-Mutate.o `test -f 'ControlStruct/Mutate.cc' || echo '$(srcdir)/'`ControlStruct/Mutate.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/Mutate.cc' object='ControlStruct/driver_cfa_cpp-Mutate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-Mutate.o `test -f 'ControlStruct/Mutate.cc' || echo '$(srcdir)/'`ControlStruct/Mutate.cc
+ControlStruct/driver_cfa_cpp-Mutate.obj: ControlStruct/Mutate.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-Mutate.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo -c -o ControlStruct/driver_cfa_cpp-Mutate.obj `if test -f 'ControlStruct/Mutate.cc'; then $(CYGPATH_W) 'ControlStruct/Mutate.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/Mutate.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/Mutate.cc' object='ControlStruct/driver_cfa_cpp-Mutate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-Mutate.obj `if test -f 'ControlStruct/Mutate.cc'; then $(CYGPATH_W) 'ControlStruct/Mutate.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/Mutate.cc'; fi`
+ControlStruct/driver_cfa_cpp-ForExprMutator.o: ControlStruct/ForExprMutator.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-ForExprMutator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-ForExprMutator.o `test -f 'ControlStruct/ForExprMutator.cc' || echo '$(srcdir)/'`ControlStruct/ForExprMutator.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/ForExprMutator.cc' object='ControlStruct/driver_cfa_cpp-ForExprMutator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ForExprMutator.o `test -f 'ControlStruct/ForExprMutator.cc' || echo '$(srcdir)/'`ControlStruct/ForExprMutator.cc
+ControlStruct/driver_cfa_cpp-ForExprMutator.obj: ControlStruct/ForExprMutator.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-ForExprMutator.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-ForExprMutator.obj `if test -f 'ControlStruct/ForExprMutator.cc'; then $(CYGPATH_W) 'ControlStruct/ForExprMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ForExprMutator.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/ForExprMutator.cc' object='ControlStruct/driver_cfa_cpp-ForExprMutator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ForExprMutator.obj `if test -f 'ControlStruct/ForExprMutator.cc'; then $(CYGPATH_W) 'ControlStruct/ForExprMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ForExprMutator.cc'; fi`
+ControlStruct/driver_cfa_cpp-ExceptTranslate.o: ControlStruct/ExceptTranslate.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-ExceptTranslate.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Tpo -c -o ControlStruct/driver_cfa_cpp-ExceptTranslate.o `test -f 'ControlStruct/ExceptTranslate.cc' || echo '$(srcdir)/'`ControlStruct/ExceptTranslate.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/ExceptTranslate.cc' object='ControlStruct/driver_cfa_cpp-ExceptTranslate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ExceptTranslate.o `test -f 'ControlStruct/ExceptTranslate.cc' || echo '$(srcdir)/'`ControlStruct/ExceptTranslate.cc
+ControlStruct/driver_cfa_cpp-ExceptTranslate.obj: ControlStruct/ExceptTranslate.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-ExceptTranslate.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Tpo -c -o ControlStruct/driver_cfa_cpp-ExceptTranslate.obj `if test -f 'ControlStruct/ExceptTranslate.cc'; then $(CYGPATH_W) 'ControlStruct/ExceptTranslate.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ExceptTranslate.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/ExceptTranslate.cc' object='ControlStruct/driver_cfa_cpp-ExceptTranslate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ExceptTranslate.obj `if test -f 'ControlStruct/ExceptTranslate.cc'; then $(CYGPATH_W) 'ControlStruct/ExceptTranslate.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ExceptTranslate.cc'; fi`
+GenPoly/driver_cfa_cpp-Box.o: GenPoly/Box.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Box.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo -c -o GenPoly/driver_cfa_cpp-Box.o `test -f 'GenPoly/Box.cc' || echo '$(srcdir)/'`GenPoly/Box.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/Box.cc' object='GenPoly/driver_cfa_cpp-Box.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 GenPoly/driver_cfa_cpp-Box.o `test -f 'GenPoly/Box.cc' || echo '$(srcdir)/'`GenPoly/Box.cc
+GenPoly/driver_cfa_cpp-Box.obj: GenPoly/Box.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Box.obj -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo -c -o GenPoly/driver_cfa_cpp-Box.obj `if test -f 'GenPoly/Box.cc'; then $(CYGPATH_W) 'GenPoly/Box.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/Box.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/Box.cc' object='GenPoly/driver_cfa_cpp-Box.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 GenPoly/driver_cfa_cpp-Box.obj `if test -f 'GenPoly/Box.cc'; then $(CYGPATH_W) 'GenPoly/Box.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/Box.cc'; fi`
+GenPoly/driver_cfa_cpp-GenPoly.o: GenPoly/GenPoly.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-GenPoly.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-GenPoly.Tpo -c -o GenPoly/driver_cfa_cpp-GenPoly.o `test -f 'GenPoly/GenPoly.cc' || echo '$(srcdir)/'`GenPoly/GenPoly.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-GenPoly.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-GenPoly.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/GenPoly.cc' object='GenPoly/driver_cfa_cpp-GenPoly.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 GenPoly/driver_cfa_cpp-GenPoly.o `test -f 'GenPoly/GenPoly.cc' || echo '$(srcdir)/'`GenPoly/GenPoly.cc
+GenPoly/driver_cfa_cpp-GenPoly.obj: GenPoly/GenPoly.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-GenPoly.obj -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-GenPoly.Tpo -c -o GenPoly/driver_cfa_cpp-GenPoly.obj `if test -f 'GenPoly/GenPoly.cc'; then $(CYGPATH_W) 'GenPoly/GenPoly.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/GenPoly.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-GenPoly.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-GenPoly.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/GenPoly.cc' object='GenPoly/driver_cfa_cpp-GenPoly.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 GenPoly/driver_cfa_cpp-GenPoly.obj `if test -f 'GenPoly/GenPoly.cc'; then $(CYGPATH_W) 'GenPoly/GenPoly.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/GenPoly.cc'; fi`
+GenPoly/driver_cfa_cpp-ScrubTyVars.o: GenPoly/ScrubTyVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-ScrubTyVars.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-ScrubTyVars.Tpo -c -o GenPoly/driver_cfa_cpp-ScrubTyVars.o `test -f 'GenPoly/ScrubTyVars.cc' || echo '$(srcdir)/'`GenPoly/ScrubTyVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-ScrubTyVars.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-ScrubTyVars.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/ScrubTyVars.cc' object='GenPoly/driver_cfa_cpp-ScrubTyVars.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 GenPoly/driver_cfa_cpp-ScrubTyVars.o `test -f 'GenPoly/ScrubTyVars.cc' || echo '$(srcdir)/'`GenPoly/ScrubTyVars.cc
+GenPoly/driver_cfa_cpp-ScrubTyVars.obj: GenPoly/ScrubTyVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-ScrubTyVars.obj -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-ScrubTyVars.Tpo -c -o GenPoly/driver_cfa_cpp-ScrubTyVars.obj `if test -f 'GenPoly/ScrubTyVars.cc'; then $(CYGPATH_W) 'GenPoly/ScrubTyVars.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/ScrubTyVars.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-ScrubTyVars.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-ScrubTyVars.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/ScrubTyVars.cc' object='GenPoly/driver_cfa_cpp-ScrubTyVars.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 GenPoly/driver_cfa_cpp-ScrubTyVars.obj `if test -f 'GenPoly/ScrubTyVars.cc'; then $(CYGPATH_W) 'GenPoly/ScrubTyVars.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/ScrubTyVars.cc'; fi`
+GenPoly/driver_cfa_cpp-Lvalue.o: GenPoly/Lvalue.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Lvalue.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Lvalue.Tpo -c -o GenPoly/driver_cfa_cpp-Lvalue.o `test -f 'GenPoly/Lvalue.cc' || echo '$(srcdir)/'`GenPoly/Lvalue.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-Lvalue.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-Lvalue.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/Lvalue.cc' object='GenPoly/driver_cfa_cpp-Lvalue.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 GenPoly/driver_cfa_cpp-Lvalue.o `test -f 'GenPoly/Lvalue.cc' || echo '$(srcdir)/'`GenPoly/Lvalue.cc
+GenPoly/driver_cfa_cpp-Lvalue.obj: GenPoly/Lvalue.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Lvalue.obj -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Lvalue.Tpo -c -o GenPoly/driver_cfa_cpp-Lvalue.obj `if test -f 'GenPoly/Lvalue.cc'; then $(CYGPATH_W) 'GenPoly/Lvalue.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/Lvalue.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-Lvalue.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-Lvalue.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/Lvalue.cc' object='GenPoly/driver_cfa_cpp-Lvalue.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 GenPoly/driver_cfa_cpp-Lvalue.obj `if test -f 'GenPoly/Lvalue.cc'; then $(CYGPATH_W) 'GenPoly/Lvalue.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/Lvalue.cc'; fi`
+GenPoly/driver_cfa_cpp-Specialize.o: GenPoly/Specialize.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Specialize.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Specialize.Tpo -c -o GenPoly/driver_cfa_cpp-Specialize.o `test -f 'GenPoly/Specialize.cc' || echo '$(srcdir)/'`GenPoly/Specialize.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-Specialize.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-Specialize.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/Specialize.cc' object='GenPoly/driver_cfa_cpp-Specialize.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 GenPoly/driver_cfa_cpp-Specialize.o `test -f 'GenPoly/Specialize.cc' || echo '$(srcdir)/'`GenPoly/Specialize.cc
+GenPoly/driver_cfa_cpp-Specialize.obj: GenPoly/Specialize.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Specialize.obj -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Specialize.Tpo -c -o GenPoly/driver_cfa_cpp-Specialize.obj `if test -f 'GenPoly/Specialize.cc'; then $(CYGPATH_W) 'GenPoly/Specialize.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/Specialize.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-Specialize.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-Specialize.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/Specialize.cc' object='GenPoly/driver_cfa_cpp-Specialize.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 GenPoly/driver_cfa_cpp-Specialize.obj `if test -f 'GenPoly/Specialize.cc'; then $(CYGPATH_W) 'GenPoly/Specialize.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/Specialize.cc'; fi`
+GenPoly/driver_cfa_cpp-FindFunction.o: GenPoly/FindFunction.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-FindFunction.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-FindFunction.Tpo -c -o GenPoly/driver_cfa_cpp-FindFunction.o `test -f 'GenPoly/FindFunction.cc' || echo '$(srcdir)/'`GenPoly/FindFunction.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-FindFunction.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-FindFunction.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/FindFunction.cc' object='GenPoly/driver_cfa_cpp-FindFunction.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 GenPoly/driver_cfa_cpp-FindFunction.o `test -f 'GenPoly/FindFunction.cc' || echo '$(srcdir)/'`GenPoly/FindFunction.cc
+GenPoly/driver_cfa_cpp-FindFunction.obj: GenPoly/FindFunction.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-FindFunction.obj -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-FindFunction.Tpo -c -o GenPoly/driver_cfa_cpp-FindFunction.obj `if test -f 'GenPoly/FindFunction.cc'; then $(CYGPATH_W) 'GenPoly/FindFunction.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/FindFunction.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-FindFunction.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-FindFunction.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/FindFunction.cc' object='GenPoly/driver_cfa_cpp-FindFunction.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 GenPoly/driver_cfa_cpp-FindFunction.obj `if test -f 'GenPoly/FindFunction.cc'; then $(CYGPATH_W) 'GenPoly/FindFunction.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/FindFunction.cc'; fi`
+GenPoly/driver_cfa_cpp-InstantiateGeneric.o: GenPoly/InstantiateGeneric.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-InstantiateGeneric.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-InstantiateGeneric.Tpo -c -o GenPoly/driver_cfa_cpp-InstantiateGeneric.o `test -f 'GenPoly/InstantiateGeneric.cc' || echo '$(srcdir)/'`GenPoly/InstantiateGeneric.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-InstantiateGeneric.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-InstantiateGeneric.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/InstantiateGeneric.cc' object='GenPoly/driver_cfa_cpp-InstantiateGeneric.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 GenPoly/driver_cfa_cpp-InstantiateGeneric.o `test -f 'GenPoly/InstantiateGeneric.cc' || echo '$(srcdir)/'`GenPoly/InstantiateGeneric.cc
+GenPoly/driver_cfa_cpp-InstantiateGeneric.obj: GenPoly/InstantiateGeneric.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-InstantiateGeneric.obj -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-InstantiateGeneric.Tpo -c -o GenPoly/driver_cfa_cpp-InstantiateGeneric.obj `if test -f 'GenPoly/InstantiateGeneric.cc'; then $(CYGPATH_W) 'GenPoly/InstantiateGeneric.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/InstantiateGeneric.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) GenPoly/$(DEPDIR)/driver_cfa_cpp-InstantiateGeneric.Tpo GenPoly/$(DEPDIR)/driver_cfa_cpp-InstantiateGeneric.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='GenPoly/InstantiateGeneric.cc' object='GenPoly/driver_cfa_cpp-InstantiateGeneric.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 GenPoly/driver_cfa_cpp-InstantiateGeneric.obj `if test -f 'GenPoly/InstantiateGeneric.cc'; then $(CYGPATH_W) 'GenPoly/InstantiateGeneric.cc'; else $(CYGPATH_W) '$(srcdir)/GenPoly/InstantiateGeneric.cc'; fi`
+InitTweak/driver_cfa_cpp-GenInit.o: InitTweak/GenInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/driver_cfa_cpp-GenInit.o -MD -MP -MF InitTweak/$(DEPDIR)/driver_cfa_cpp-GenInit.Tpo -c -o InitTweak/driver_cfa_cpp-GenInit.o `test -f 'InitTweak/GenInit.cc' || echo '$(srcdir)/'`InitTweak/GenInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) InitTweak/$(DEPDIR)/driver_cfa_cpp-GenInit.Tpo InitTweak/$(DEPDIR)/driver_cfa_cpp-GenInit.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='InitTweak/GenInit.cc' object='InitTweak/driver_cfa_cpp-GenInit.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 InitTweak/driver_cfa_cpp-GenInit.o `test -f 'InitTweak/GenInit.cc' || echo '$(srcdir)/'`InitTweak/GenInit.cc
+InitTweak/driver_cfa_cpp-GenInit.obj: InitTweak/GenInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/driver_cfa_cpp-GenInit.obj -MD -MP -MF InitTweak/$(DEPDIR)/driver_cfa_cpp-GenInit.Tpo -c -o InitTweak/driver_cfa_cpp-GenInit.obj `if test -f 'InitTweak/GenInit.cc'; then $(CYGPATH_W) 'InitTweak/GenInit.cc'; else $(CYGPATH_W) '$(srcdir)/InitTweak/GenInit.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) InitTweak/$(DEPDIR)/driver_cfa_cpp-GenInit.Tpo InitTweak/$(DEPDIR)/driver_cfa_cpp-GenInit.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='InitTweak/GenInit.cc' object='InitTweak/driver_cfa_cpp-GenInit.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 InitTweak/driver_cfa_cpp-GenInit.obj `if test -f 'InitTweak/GenInit.cc'; then $(CYGPATH_W) 'InitTweak/GenInit.cc'; else $(CYGPATH_W) '$(srcdir)/InitTweak/GenInit.cc'; fi`
+InitTweak/driver_cfa_cpp-FixInit.o: InitTweak/FixInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/driver_cfa_cpp-FixInit.o -MD -MP -MF InitTweak/$(DEPDIR)/driver_cfa_cpp-FixInit.Tpo -c -o InitTweak/driver_cfa_cpp-FixInit.o `test -f 'InitTweak/FixInit.cc' || echo '$(srcdir)/'`InitTweak/FixInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) InitTweak/$(DEPDIR)/driver_cfa_cpp-FixInit.Tpo InitTweak/$(DEPDIR)/driver_cfa_cpp-FixInit.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='InitTweak/FixInit.cc' object='InitTweak/driver_cfa_cpp-FixInit.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 InitTweak/driver_cfa_cpp-FixInit.o `test -f 'InitTweak/FixInit.cc' || echo '$(srcdir)/'`InitTweak/FixInit.cc
+InitTweak/driver_cfa_cpp-FixInit.obj: InitTweak/FixInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/driver_cfa_cpp-FixInit.obj -MD -MP -MF InitTweak/$(DEPDIR)/driver_cfa_cpp-FixInit.Tpo -c -o InitTweak/driver_cfa_cpp-FixInit.obj `if test -f 'InitTweak/FixInit.cc'; then $(CYGPATH_W) 'InitTweak/FixInit.cc'; else $(CYGPATH_W) '$(srcdir)/InitTweak/FixInit.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) InitTweak/$(DEPDIR)/driver_cfa_cpp-FixInit.Tpo InitTweak/$(DEPDIR)/driver_cfa_cpp-FixInit.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='InitTweak/FixInit.cc' object='InitTweak/driver_cfa_cpp-FixInit.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 InitTweak/driver_cfa_cpp-FixInit.obj `if test -f 'InitTweak/FixInit.cc'; then $(CYGPATH_W) 'InitTweak/FixInit.cc'; else $(CYGPATH_W) '$(srcdir)/InitTweak/FixInit.cc'; fi`
+InitTweak/driver_cfa_cpp-FixGlobalInit.o: InitTweak/FixGlobalInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/driver_cfa_cpp-FixGlobalInit.o -MD -MP -MF InitTweak/$(DEPDIR)/driver_cfa_cpp-FixGlobalInit.Tpo -c -o InitTweak/driver_cfa_cpp-FixGlobalInit.o `test -f 'InitTweak/FixGlobalInit.cc' || echo '$(srcdir)/'`InitTweak/FixGlobalInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) InitTweak/$(DEPDIR)/driver_cfa_cpp-FixGlobalInit.Tpo InitTweak/$(DEPDIR)/driver_cfa_cpp-FixGlobalInit.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='InitTweak/FixGlobalInit.cc' object='InitTweak/driver_cfa_cpp-FixGlobalInit.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 InitTweak/driver_cfa_cpp-FixGlobalInit.o `test -f 'InitTweak/FixGlobalInit.cc' || echo '$(srcdir)/'`InitTweak/FixGlobalInit.cc
+InitTweak/driver_cfa_cpp-FixGlobalInit.obj: InitTweak/FixGlobalInit.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/driver_cfa_cpp-FixGlobalInit.obj -MD -MP -MF InitTweak/$(DEPDIR)/driver_cfa_cpp-FixGlobalInit.Tpo -c -o InitTweak/driver_cfa_cpp-FixGlobalInit.obj `if test -f 'InitTweak/FixGlobalInit.cc'; then $(CYGPATH_W) 'InitTweak/FixGlobalInit.cc'; else $(CYGPATH_W) '$(srcdir)/InitTweak/FixGlobalInit.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) InitTweak/$(DEPDIR)/driver_cfa_cpp-FixGlobalInit.Tpo InitTweak/$(DEPDIR)/driver_cfa_cpp-FixGlobalInit.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='InitTweak/FixGlobalInit.cc' object='InitTweak/driver_cfa_cpp-FixGlobalInit.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 InitTweak/driver_cfa_cpp-FixGlobalInit.obj `if test -f 'InitTweak/FixGlobalInit.cc'; then $(CYGPATH_W) 'InitTweak/FixGlobalInit.cc'; else $(CYGPATH_W) '$(srcdir)/InitTweak/FixGlobalInit.cc'; fi`
+InitTweak/driver_cfa_cpp-InitTweak.o: InitTweak/InitTweak.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/driver_cfa_cpp-InitTweak.o -MD -MP -MF InitTweak/$(DEPDIR)/driver_cfa_cpp-InitTweak.Tpo -c -o InitTweak/driver_cfa_cpp-InitTweak.o `test -f 'InitTweak/InitTweak.cc' || echo '$(srcdir)/'`InitTweak/InitTweak.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) InitTweak/$(DEPDIR)/driver_cfa_cpp-InitTweak.Tpo InitTweak/$(DEPDIR)/driver_cfa_cpp-InitTweak.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='InitTweak/InitTweak.cc' object='InitTweak/driver_cfa_cpp-InitTweak.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 InitTweak/driver_cfa_cpp-InitTweak.o `test -f 'InitTweak/InitTweak.cc' || echo '$(srcdir)/'`InitTweak/InitTweak.cc
+InitTweak/driver_cfa_cpp-InitTweak.obj: InitTweak/InitTweak.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT InitTweak/driver_cfa_cpp-InitTweak.obj -MD -MP -MF InitTweak/$(DEPDIR)/driver_cfa_cpp-InitTweak.Tpo -c -o InitTweak/driver_cfa_cpp-InitTweak.obj `if test -f 'InitTweak/InitTweak.cc'; then $(CYGPATH_W) 'InitTweak/InitTweak.cc'; else $(CYGPATH_W) '$(srcdir)/InitTweak/InitTweak.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) InitTweak/$(DEPDIR)/driver_cfa_cpp-InitTweak.Tpo InitTweak/$(DEPDIR)/driver_cfa_cpp-InitTweak.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='InitTweak/InitTweak.cc' object='InitTweak/driver_cfa_cpp-InitTweak.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 InitTweak/driver_cfa_cpp-InitTweak.obj `if test -f 'InitTweak/InitTweak.cc'; then $(CYGPATH_W) 'InitTweak/InitTweak.cc'; else $(CYGPATH_W) '$(srcdir)/InitTweak/InitTweak.cc'; fi`
+Parser/driver_cfa_cpp-parser.o: Parser/parser.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-parser.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-parser.Tpo -c -o Parser/driver_cfa_cpp-parser.o `test -f 'Parser/parser.cc' || echo '$(srcdir)/'`Parser/parser.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-parser.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-parser.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/parser.cc' object='Parser/driver_cfa_cpp-parser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parser.o `test -f 'Parser/parser.cc' || echo '$(srcdir)/'`Parser/parser.cc
+Parser/driver_cfa_cpp-parser.obj: Parser/parser.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-parser.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-parser.Tpo -c -o Parser/driver_cfa_cpp-parser.obj `if test -f 'Parser/parser.cc'; then $(CYGPATH_W) 'Parser/parser.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parser.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-parser.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-parser.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/parser.cc' object='Parser/driver_cfa_cpp-parser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parser.obj `if test -f 'Parser/parser.cc'; then $(CYGPATH_W) 'Parser/parser.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parser.cc'; fi`
+Parser/driver_cfa_cpp-lex.o: Parser/lex.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-lex.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-lex.Tpo -c -o Parser/driver_cfa_cpp-lex.o `test -f 'Parser/lex.cc' || echo '$(srcdir)/'`Parser/lex.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-lex.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-lex.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/lex.cc' object='Parser/driver_cfa_cpp-lex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-lex.o `test -f 'Parser/lex.cc' || echo '$(srcdir)/'`Parser/lex.cc
+Parser/driver_cfa_cpp-lex.obj: Parser/lex.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-lex.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-lex.Tpo -c -o Parser/driver_cfa_cpp-lex.obj `if test -f 'Parser/lex.cc'; then $(CYGPATH_W) 'Parser/lex.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/lex.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-lex.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-lex.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/lex.cc' object='Parser/driver_cfa_cpp-lex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-lex.obj `if test -f 'Parser/lex.cc'; then $(CYGPATH_W) 'Parser/lex.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/lex.cc'; fi`
+Parser/driver_cfa_cpp-TypedefTable.o: Parser/TypedefTable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-TypedefTable.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-TypedefTable.Tpo -c -o Parser/driver_cfa_cpp-TypedefTable.o `test -f 'Parser/TypedefTable.cc' || echo '$(srcdir)/'`Parser/TypedefTable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-TypedefTable.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-TypedefTable.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/TypedefTable.cc' object='Parser/driver_cfa_cpp-TypedefTable.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-TypedefTable.o `test -f 'Parser/TypedefTable.cc' || echo '$(srcdir)/'`Parser/TypedefTable.cc
+Parser/driver_cfa_cpp-TypedefTable.obj: Parser/TypedefTable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-TypedefTable.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-TypedefTable.Tpo -c -o Parser/driver_cfa_cpp-TypedefTable.obj `if test -f 'Parser/TypedefTable.cc'; then $(CYGPATH_W) 'Parser/TypedefTable.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/TypedefTable.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-TypedefTable.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-TypedefTable.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/TypedefTable.cc' object='Parser/driver_cfa_cpp-TypedefTable.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-TypedefTable.obj `if test -f 'Parser/TypedefTable.cc'; then $(CYGPATH_W) 'Parser/TypedefTable.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/TypedefTable.cc'; fi`
+Parser/driver_cfa_cpp-ParseNode.o: Parser/ParseNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-ParseNode.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Tpo -c -o Parser/driver_cfa_cpp-ParseNode.o `test -f 'Parser/ParseNode.cc' || echo '$(srcdir)/'`Parser/ParseNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/ParseNode.cc' object='Parser/driver_cfa_cpp-ParseNode.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-ParseNode.o `test -f 'Parser/ParseNode.cc' || echo '$(srcdir)/'`Parser/ParseNode.cc
+Parser/driver_cfa_cpp-ParseNode.obj: Parser/ParseNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-ParseNode.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Tpo -c -o Parser/driver_cfa_cpp-ParseNode.obj `if test -f 'Parser/ParseNode.cc'; then $(CYGPATH_W) 'Parser/ParseNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/ParseNode.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/ParseNode.cc' object='Parser/driver_cfa_cpp-ParseNode.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-ParseNode.obj `if test -f 'Parser/ParseNode.cc'; then $(CYGPATH_W) 'Parser/ParseNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/ParseNode.cc'; fi`
+Parser/driver_cfa_cpp-DeclarationNode.o: Parser/DeclarationNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-DeclarationNode.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-DeclarationNode.Tpo -c -o Parser/driver_cfa_cpp-DeclarationNode.o `test -f 'Parser/DeclarationNode.cc' || echo '$(srcdir)/'`Parser/DeclarationNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-DeclarationNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-DeclarationNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/DeclarationNode.cc' object='Parser/driver_cfa_cpp-DeclarationNode.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-DeclarationNode.o `test -f 'Parser/DeclarationNode.cc' || echo '$(srcdir)/'`Parser/DeclarationNode.cc
+Parser/driver_cfa_cpp-DeclarationNode.obj: Parser/DeclarationNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-DeclarationNode.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-DeclarationNode.Tpo -c -o Parser/driver_cfa_cpp-DeclarationNode.obj `if test -f 'Parser/DeclarationNode.cc'; then $(CYGPATH_W) 'Parser/DeclarationNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/DeclarationNode.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-DeclarationNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-DeclarationNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/DeclarationNode.cc' object='Parser/driver_cfa_cpp-DeclarationNode.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-DeclarationNode.obj `if test -f 'Parser/DeclarationNode.cc'; then $(CYGPATH_W) 'Parser/DeclarationNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/DeclarationNode.cc'; fi`
+Parser/driver_cfa_cpp-ExpressionNode.o: Parser/ExpressionNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-ExpressionNode.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-ExpressionNode.Tpo -c -o Parser/driver_cfa_cpp-ExpressionNode.o `test -f 'Parser/ExpressionNode.cc' || echo '$(srcdir)/'`Parser/ExpressionNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-ExpressionNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-ExpressionNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/ExpressionNode.cc' object='Parser/driver_cfa_cpp-ExpressionNode.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-ExpressionNode.o `test -f 'Parser/ExpressionNode.cc' || echo '$(srcdir)/'`Parser/ExpressionNode.cc
+Parser/driver_cfa_cpp-ExpressionNode.obj: Parser/ExpressionNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-ExpressionNode.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-ExpressionNode.Tpo -c -o Parser/driver_cfa_cpp-ExpressionNode.obj `if test -f 'Parser/ExpressionNode.cc'; then $(CYGPATH_W) 'Parser/ExpressionNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/ExpressionNode.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-ExpressionNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-ExpressionNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/ExpressionNode.cc' object='Parser/driver_cfa_cpp-ExpressionNode.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-ExpressionNode.obj `if test -f 'Parser/ExpressionNode.cc'; then $(CYGPATH_W) 'Parser/ExpressionNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/ExpressionNode.cc'; fi`
+Parser/driver_cfa_cpp-StatementNode.o: Parser/StatementNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-StatementNode.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Tpo -c -o Parser/driver_cfa_cpp-StatementNode.o `test -f 'Parser/StatementNode.cc' || echo '$(srcdir)/'`Parser/StatementNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/StatementNode.cc' object='Parser/driver_cfa_cpp-StatementNode.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-StatementNode.o `test -f 'Parser/StatementNode.cc' || echo '$(srcdir)/'`Parser/StatementNode.cc
+Parser/driver_cfa_cpp-StatementNode.obj: Parser/StatementNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-StatementNode.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Tpo -c -o Parser/driver_cfa_cpp-StatementNode.obj `if test -f 'Parser/StatementNode.cc'; then $(CYGPATH_W) 'Parser/StatementNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/StatementNode.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/StatementNode.cc' object='Parser/driver_cfa_cpp-StatementNode.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-StatementNode.obj `if test -f 'Parser/StatementNode.cc'; then $(CYGPATH_W) 'Parser/StatementNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/StatementNode.cc'; fi`
+Parser/driver_cfa_cpp-InitializerNode.o: Parser/InitializerNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-InitializerNode.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-InitializerNode.Tpo -c -o Parser/driver_cfa_cpp-InitializerNode.o `test -f 'Parser/InitializerNode.cc' || echo '$(srcdir)/'`Parser/InitializerNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-InitializerNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-InitializerNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/InitializerNode.cc' object='Parser/driver_cfa_cpp-InitializerNode.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-InitializerNode.o `test -f 'Parser/InitializerNode.cc' || echo '$(srcdir)/'`Parser/InitializerNode.cc
+Parser/driver_cfa_cpp-InitializerNode.obj: Parser/InitializerNode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-InitializerNode.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-InitializerNode.Tpo -c -o Parser/driver_cfa_cpp-InitializerNode.obj `if test -f 'Parser/InitializerNode.cc'; then $(CYGPATH_W) 'Parser/InitializerNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/InitializerNode.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-InitializerNode.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-InitializerNode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/InitializerNode.cc' object='Parser/driver_cfa_cpp-InitializerNode.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-InitializerNode.obj `if test -f 'Parser/InitializerNode.cc'; then $(CYGPATH_W) 'Parser/InitializerNode.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/InitializerNode.cc'; fi`
+Parser/driver_cfa_cpp-TypeData.o: Parser/TypeData.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-TypeData.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Tpo -c -o Parser/driver_cfa_cpp-TypeData.o `test -f 'Parser/TypeData.cc' || echo '$(srcdir)/'`Parser/TypeData.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/TypeData.cc' object='Parser/driver_cfa_cpp-TypeData.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-TypeData.o `test -f 'Parser/TypeData.cc' || echo '$(srcdir)/'`Parser/TypeData.cc
+Parser/driver_cfa_cpp-TypeData.obj: Parser/TypeData.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-TypeData.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Tpo -c -o Parser/driver_cfa_cpp-TypeData.obj `if test -f 'Parser/TypeData.cc'; then $(CYGPATH_W) 'Parser/TypeData.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/TypeData.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/TypeData.cc' object='Parser/driver_cfa_cpp-TypeData.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-TypeData.obj `if test -f 'Parser/TypeData.cc'; then $(CYGPATH_W) 'Parser/TypeData.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/TypeData.cc'; fi`
+Parser/driver_cfa_cpp-LinkageSpec.o: Parser/LinkageSpec.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-LinkageSpec.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Tpo -c -o Parser/driver_cfa_cpp-LinkageSpec.o `test -f 'Parser/LinkageSpec.cc' || echo '$(srcdir)/'`Parser/LinkageSpec.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/LinkageSpec.cc' object='Parser/driver_cfa_cpp-LinkageSpec.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-LinkageSpec.o `test -f 'Parser/LinkageSpec.cc' || echo '$(srcdir)/'`Parser/LinkageSpec.cc
+Parser/driver_cfa_cpp-LinkageSpec.obj: Parser/LinkageSpec.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-LinkageSpec.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Tpo -c -o Parser/driver_cfa_cpp-LinkageSpec.obj `if test -f 'Parser/LinkageSpec.cc'; then $(CYGPATH_W) 'Parser/LinkageSpec.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/LinkageSpec.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/LinkageSpec.cc' object='Parser/driver_cfa_cpp-LinkageSpec.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-LinkageSpec.obj `if test -f 'Parser/LinkageSpec.cc'; then $(CYGPATH_W) 'Parser/LinkageSpec.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/LinkageSpec.cc'; fi`
+Parser/driver_cfa_cpp-parserutility.o: Parser/parserutility.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-parserutility.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Tpo -c -o Parser/driver_cfa_cpp-parserutility.o `test -f 'Parser/parserutility.cc' || echo '$(srcdir)/'`Parser/parserutility.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/parserutility.cc' object='Parser/driver_cfa_cpp-parserutility.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parserutility.o `test -f 'Parser/parserutility.cc' || echo '$(srcdir)/'`Parser/parserutility.cc
+Parser/driver_cfa_cpp-parserutility.obj: Parser/parserutility.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-parserutility.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Tpo -c -o Parser/driver_cfa_cpp-parserutility.obj `if test -f 'Parser/parserutility.cc'; then $(CYGPATH_W) 'Parser/parserutility.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parserutility.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-parserutility.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/parserutility.cc' object='Parser/driver_cfa_cpp-parserutility.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parserutility.obj `if test -f 'Parser/parserutility.cc'; then $(CYGPATH_W) 'Parser/parserutility.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parserutility.cc'; fi`
+ResolvExpr/driver_cfa_cpp-AlternativeFinder.o: ResolvExpr/AlternativeFinder.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-AlternativeFinder.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativeFinder.Tpo -c -o ResolvExpr/driver_cfa_cpp-AlternativeFinder.o `test -f 'ResolvExpr/AlternativeFinder.cc' || echo '$(srcdir)/'`ResolvExpr/AlternativeFinder.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativeFinder.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativeFinder.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/AlternativeFinder.cc' object='ResolvExpr/driver_cfa_cpp-AlternativeFinder.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-AlternativeFinder.o `test -f 'ResolvExpr/AlternativeFinder.cc' || echo '$(srcdir)/'`ResolvExpr/AlternativeFinder.cc
+ResolvExpr/driver_cfa_cpp-AlternativeFinder.obj: ResolvExpr/AlternativeFinder.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-AlternativeFinder.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativeFinder.Tpo -c -o ResolvExpr/driver_cfa_cpp-AlternativeFinder.obj `if test -f 'ResolvExpr/AlternativeFinder.cc'; then $(CYGPATH_W) 'ResolvExpr/AlternativeFinder.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/AlternativeFinder.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativeFinder.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativeFinder.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/AlternativeFinder.cc' object='ResolvExpr/driver_cfa_cpp-AlternativeFinder.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-AlternativeFinder.obj `if test -f 'ResolvExpr/AlternativeFinder.cc'; then $(CYGPATH_W) 'ResolvExpr/AlternativeFinder.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/AlternativeFinder.cc'; fi`
+ResolvExpr/driver_cfa_cpp-Alternative.o: ResolvExpr/Alternative.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-Alternative.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Alternative.Tpo -c -o ResolvExpr/driver_cfa_cpp-Alternative.o `test -f 'ResolvExpr/Alternative.cc' || echo '$(srcdir)/'`ResolvExpr/Alternative.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Alternative.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Alternative.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/Alternative.cc' object='ResolvExpr/driver_cfa_cpp-Alternative.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-Alternative.o `test -f 'ResolvExpr/Alternative.cc' || echo '$(srcdir)/'`ResolvExpr/Alternative.cc
+ResolvExpr/driver_cfa_cpp-Alternative.obj: ResolvExpr/Alternative.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-Alternative.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Alternative.Tpo -c -o ResolvExpr/driver_cfa_cpp-Alternative.obj `if test -f 'ResolvExpr/Alternative.cc'; then $(CYGPATH_W) 'ResolvExpr/Alternative.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/Alternative.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Alternative.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Alternative.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/Alternative.cc' object='ResolvExpr/driver_cfa_cpp-Alternative.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-Alternative.obj `if test -f 'ResolvExpr/Alternative.cc'; then $(CYGPATH_W) 'ResolvExpr/Alternative.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/Alternative.cc'; fi`
+ResolvExpr/driver_cfa_cpp-Unify.o: ResolvExpr/Unify.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-Unify.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Unify.Tpo -c -o ResolvExpr/driver_cfa_cpp-Unify.o `test -f 'ResolvExpr/Unify.cc' || echo '$(srcdir)/'`ResolvExpr/Unify.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Unify.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Unify.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/Unify.cc' object='ResolvExpr/driver_cfa_cpp-Unify.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-Unify.o `test -f 'ResolvExpr/Unify.cc' || echo '$(srcdir)/'`ResolvExpr/Unify.cc
+ResolvExpr/driver_cfa_cpp-Unify.obj: ResolvExpr/Unify.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-Unify.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Unify.Tpo -c -o ResolvExpr/driver_cfa_cpp-Unify.obj `if test -f 'ResolvExpr/Unify.cc'; then $(CYGPATH_W) 'ResolvExpr/Unify.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/Unify.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Unify.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Unify.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/Unify.cc' object='ResolvExpr/driver_cfa_cpp-Unify.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-Unify.obj `if test -f 'ResolvExpr/Unify.cc'; then $(CYGPATH_W) 'ResolvExpr/Unify.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/Unify.cc'; fi`
+ResolvExpr/driver_cfa_cpp-PtrsAssignable.o: ResolvExpr/PtrsAssignable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-PtrsAssignable.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsAssignable.Tpo -c -o ResolvExpr/driver_cfa_cpp-PtrsAssignable.o `test -f 'ResolvExpr/PtrsAssignable.cc' || echo '$(srcdir)/'`ResolvExpr/PtrsAssignable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsAssignable.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsAssignable.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/PtrsAssignable.cc' object='ResolvExpr/driver_cfa_cpp-PtrsAssignable.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-PtrsAssignable.o `test -f 'ResolvExpr/PtrsAssignable.cc' || echo '$(srcdir)/'`ResolvExpr/PtrsAssignable.cc
+ResolvExpr/driver_cfa_cpp-PtrsAssignable.obj: ResolvExpr/PtrsAssignable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-PtrsAssignable.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsAssignable.Tpo -c -o ResolvExpr/driver_cfa_cpp-PtrsAssignable.obj `if test -f 'ResolvExpr/PtrsAssignable.cc'; then $(CYGPATH_W) 'ResolvExpr/PtrsAssignable.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/PtrsAssignable.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsAssignable.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsAssignable.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/PtrsAssignable.cc' object='ResolvExpr/driver_cfa_cpp-PtrsAssignable.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-PtrsAssignable.obj `if test -f 'ResolvExpr/PtrsAssignable.cc'; then $(CYGPATH_W) 'ResolvExpr/PtrsAssignable.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/PtrsAssignable.cc'; fi`
+ResolvExpr/driver_cfa_cpp-CommonType.o: ResolvExpr/CommonType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-CommonType.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CommonType.Tpo -c -o ResolvExpr/driver_cfa_cpp-CommonType.o `test -f 'ResolvExpr/CommonType.cc' || echo '$(srcdir)/'`ResolvExpr/CommonType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CommonType.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CommonType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/CommonType.cc' object='ResolvExpr/driver_cfa_cpp-CommonType.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-CommonType.o `test -f 'ResolvExpr/CommonType.cc' || echo '$(srcdir)/'`ResolvExpr/CommonType.cc
+ResolvExpr/driver_cfa_cpp-CommonType.obj: ResolvExpr/CommonType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-CommonType.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CommonType.Tpo -c -o ResolvExpr/driver_cfa_cpp-CommonType.obj `if test -f 'ResolvExpr/CommonType.cc'; then $(CYGPATH_W) 'ResolvExpr/CommonType.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/CommonType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CommonType.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CommonType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/CommonType.cc' object='ResolvExpr/driver_cfa_cpp-CommonType.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-CommonType.obj `if test -f 'ResolvExpr/CommonType.cc'; then $(CYGPATH_W) 'ResolvExpr/CommonType.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/CommonType.cc'; fi`
+ResolvExpr/driver_cfa_cpp-ConversionCost.o: ResolvExpr/ConversionCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-ConversionCost.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ConversionCost.Tpo -c -o ResolvExpr/driver_cfa_cpp-ConversionCost.o `test -f 'ResolvExpr/ConversionCost.cc' || echo '$(srcdir)/'`ResolvExpr/ConversionCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ConversionCost.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ConversionCost.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/ConversionCost.cc' object='ResolvExpr/driver_cfa_cpp-ConversionCost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-ConversionCost.o `test -f 'ResolvExpr/ConversionCost.cc' || echo '$(srcdir)/'`ResolvExpr/ConversionCost.cc
+ResolvExpr/driver_cfa_cpp-ConversionCost.obj: ResolvExpr/ConversionCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-ConversionCost.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ConversionCost.Tpo -c -o ResolvExpr/driver_cfa_cpp-ConversionCost.obj `if test -f 'ResolvExpr/ConversionCost.cc'; then $(CYGPATH_W) 'ResolvExpr/ConversionCost.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/ConversionCost.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ConversionCost.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ConversionCost.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/ConversionCost.cc' object='ResolvExpr/driver_cfa_cpp-ConversionCost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-ConversionCost.obj `if test -f 'ResolvExpr/ConversionCost.cc'; then $(CYGPATH_W) 'ResolvExpr/ConversionCost.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/ConversionCost.cc'; fi`
+ResolvExpr/driver_cfa_cpp-CastCost.o: ResolvExpr/CastCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-CastCost.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CastCost.Tpo -c -o ResolvExpr/driver_cfa_cpp-CastCost.o `test -f 'ResolvExpr/CastCost.cc' || echo '$(srcdir)/'`ResolvExpr/CastCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CastCost.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CastCost.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/CastCost.cc' object='ResolvExpr/driver_cfa_cpp-CastCost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-CastCost.o `test -f 'ResolvExpr/CastCost.cc' || echo '$(srcdir)/'`ResolvExpr/CastCost.cc
+ResolvExpr/driver_cfa_cpp-CastCost.obj: ResolvExpr/CastCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-CastCost.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CastCost.Tpo -c -o ResolvExpr/driver_cfa_cpp-CastCost.obj `if test -f 'ResolvExpr/CastCost.cc'; then $(CYGPATH_W) 'ResolvExpr/CastCost.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/CastCost.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CastCost.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CastCost.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/CastCost.cc' object='ResolvExpr/driver_cfa_cpp-CastCost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-CastCost.obj `if test -f 'ResolvExpr/CastCost.cc'; then $(CYGPATH_W) 'ResolvExpr/CastCost.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/CastCost.cc'; fi`
+ResolvExpr/driver_cfa_cpp-PtrsCastable.o: ResolvExpr/PtrsCastable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-PtrsCastable.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsCastable.Tpo -c -o ResolvExpr/driver_cfa_cpp-PtrsCastable.o `test -f 'ResolvExpr/PtrsCastable.cc' || echo '$(srcdir)/'`ResolvExpr/PtrsCastable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsCastable.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsCastable.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/PtrsCastable.cc' object='ResolvExpr/driver_cfa_cpp-PtrsCastable.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-PtrsCastable.o `test -f 'ResolvExpr/PtrsCastable.cc' || echo '$(srcdir)/'`ResolvExpr/PtrsCastable.cc
+ResolvExpr/driver_cfa_cpp-PtrsCastable.obj: ResolvExpr/PtrsCastable.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-PtrsCastable.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsCastable.Tpo -c -o ResolvExpr/driver_cfa_cpp-PtrsCastable.obj `if test -f 'ResolvExpr/PtrsCastable.cc'; then $(CYGPATH_W) 'ResolvExpr/PtrsCastable.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/PtrsCastable.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsCastable.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PtrsCastable.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/PtrsCastable.cc' object='ResolvExpr/driver_cfa_cpp-PtrsCastable.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-PtrsCastable.obj `if test -f 'ResolvExpr/PtrsCastable.cc'; then $(CYGPATH_W) 'ResolvExpr/PtrsCastable.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/PtrsCastable.cc'; fi`
+ResolvExpr/driver_cfa_cpp-AdjustExprType.o: ResolvExpr/AdjustExprType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-AdjustExprType.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AdjustExprType.Tpo -c -o ResolvExpr/driver_cfa_cpp-AdjustExprType.o `test -f 'ResolvExpr/AdjustExprType.cc' || echo '$(srcdir)/'`ResolvExpr/AdjustExprType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AdjustExprType.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AdjustExprType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/AdjustExprType.cc' object='ResolvExpr/driver_cfa_cpp-AdjustExprType.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-AdjustExprType.o `test -f 'ResolvExpr/AdjustExprType.cc' || echo '$(srcdir)/'`ResolvExpr/AdjustExprType.cc
+ResolvExpr/driver_cfa_cpp-AdjustExprType.obj: ResolvExpr/AdjustExprType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-AdjustExprType.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AdjustExprType.Tpo -c -o ResolvExpr/driver_cfa_cpp-AdjustExprType.obj `if test -f 'ResolvExpr/AdjustExprType.cc'; then $(CYGPATH_W) 'ResolvExpr/AdjustExprType.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/AdjustExprType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AdjustExprType.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AdjustExprType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/AdjustExprType.cc' object='ResolvExpr/driver_cfa_cpp-AdjustExprType.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-AdjustExprType.obj `if test -f 'ResolvExpr/AdjustExprType.cc'; then $(CYGPATH_W) 'ResolvExpr/AdjustExprType.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/AdjustExprType.cc'; fi`
+ResolvExpr/driver_cfa_cpp-AlternativePrinter.o: ResolvExpr/AlternativePrinter.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-AlternativePrinter.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativePrinter.Tpo -c -o ResolvExpr/driver_cfa_cpp-AlternativePrinter.o `test -f 'ResolvExpr/AlternativePrinter.cc' || echo '$(srcdir)/'`ResolvExpr/AlternativePrinter.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativePrinter.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativePrinter.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/AlternativePrinter.cc' object='ResolvExpr/driver_cfa_cpp-AlternativePrinter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-AlternativePrinter.o `test -f 'ResolvExpr/AlternativePrinter.cc' || echo '$(srcdir)/'`ResolvExpr/AlternativePrinter.cc
+ResolvExpr/driver_cfa_cpp-AlternativePrinter.obj: ResolvExpr/AlternativePrinter.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-AlternativePrinter.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativePrinter.Tpo -c -o ResolvExpr/driver_cfa_cpp-AlternativePrinter.obj `if test -f 'ResolvExpr/AlternativePrinter.cc'; then $(CYGPATH_W) 'ResolvExpr/AlternativePrinter.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/AlternativePrinter.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativePrinter.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-AlternativePrinter.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/AlternativePrinter.cc' object='ResolvExpr/driver_cfa_cpp-AlternativePrinter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-AlternativePrinter.obj `if test -f 'ResolvExpr/AlternativePrinter.cc'; then $(CYGPATH_W) 'ResolvExpr/AlternativePrinter.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/AlternativePrinter.cc'; fi`
+ResolvExpr/driver_cfa_cpp-Resolver.o: ResolvExpr/Resolver.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-Resolver.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Resolver.Tpo -c -o ResolvExpr/driver_cfa_cpp-Resolver.o `test -f 'ResolvExpr/Resolver.cc' || echo '$(srcdir)/'`ResolvExpr/Resolver.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Resolver.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Resolver.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/Resolver.cc' object='ResolvExpr/driver_cfa_cpp-Resolver.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-Resolver.o `test -f 'ResolvExpr/Resolver.cc' || echo '$(srcdir)/'`ResolvExpr/Resolver.cc
+ResolvExpr/driver_cfa_cpp-Resolver.obj: ResolvExpr/Resolver.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-Resolver.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Resolver.Tpo -c -o ResolvExpr/driver_cfa_cpp-Resolver.obj `if test -f 'ResolvExpr/Resolver.cc'; then $(CYGPATH_W) 'ResolvExpr/Resolver.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/Resolver.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Resolver.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Resolver.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/Resolver.cc' object='ResolvExpr/driver_cfa_cpp-Resolver.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-Resolver.obj `if test -f 'ResolvExpr/Resolver.cc'; then $(CYGPATH_W) 'ResolvExpr/Resolver.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/Resolver.cc'; fi`
+ResolvExpr/driver_cfa_cpp-ResolveTypeof.o: ResolvExpr/ResolveTypeof.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-ResolveTypeof.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ResolveTypeof.Tpo -c -o ResolvExpr/driver_cfa_cpp-ResolveTypeof.o `test -f 'ResolvExpr/ResolveTypeof.cc' || echo '$(srcdir)/'`ResolvExpr/ResolveTypeof.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ResolveTypeof.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ResolveTypeof.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/ResolveTypeof.cc' object='ResolvExpr/driver_cfa_cpp-ResolveTypeof.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-ResolveTypeof.o `test -f 'ResolvExpr/ResolveTypeof.cc' || echo '$(srcdir)/'`ResolvExpr/ResolveTypeof.cc
+ResolvExpr/driver_cfa_cpp-ResolveTypeof.obj: ResolvExpr/ResolveTypeof.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-ResolveTypeof.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ResolveTypeof.Tpo -c -o ResolvExpr/driver_cfa_cpp-ResolveTypeof.obj `if test -f 'ResolvExpr/ResolveTypeof.cc'; then $(CYGPATH_W) 'ResolvExpr/ResolveTypeof.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/ResolveTypeof.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ResolveTypeof.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ResolveTypeof.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/ResolveTypeof.cc' object='ResolvExpr/driver_cfa_cpp-ResolveTypeof.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-ResolveTypeof.obj `if test -f 'ResolvExpr/ResolveTypeof.cc'; then $(CYGPATH_W) 'ResolvExpr/ResolveTypeof.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/ResolveTypeof.cc'; fi`
+ResolvExpr/driver_cfa_cpp-RenameVars.o: ResolvExpr/RenameVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-RenameVars.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-RenameVars.Tpo -c -o ResolvExpr/driver_cfa_cpp-RenameVars.o `test -f 'ResolvExpr/RenameVars.cc' || echo '$(srcdir)/'`ResolvExpr/RenameVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-RenameVars.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-RenameVars.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/RenameVars.cc' object='ResolvExpr/driver_cfa_cpp-RenameVars.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-RenameVars.o `test -f 'ResolvExpr/RenameVars.cc' || echo '$(srcdir)/'`ResolvExpr/RenameVars.cc
+ResolvExpr/driver_cfa_cpp-RenameVars.obj: ResolvExpr/RenameVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-RenameVars.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-RenameVars.Tpo -c -o ResolvExpr/driver_cfa_cpp-RenameVars.obj `if test -f 'ResolvExpr/RenameVars.cc'; then $(CYGPATH_W) 'ResolvExpr/RenameVars.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/RenameVars.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-RenameVars.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-RenameVars.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/RenameVars.cc' object='ResolvExpr/driver_cfa_cpp-RenameVars.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-RenameVars.obj `if test -f 'ResolvExpr/RenameVars.cc'; then $(CYGPATH_W) 'ResolvExpr/RenameVars.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/RenameVars.cc'; fi`
+ResolvExpr/driver_cfa_cpp-FindOpenVars.o: ResolvExpr/FindOpenVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-FindOpenVars.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-FindOpenVars.Tpo -c -o ResolvExpr/driver_cfa_cpp-FindOpenVars.o `test -f 'ResolvExpr/FindOpenVars.cc' || echo '$(srcdir)/'`ResolvExpr/FindOpenVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-FindOpenVars.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-FindOpenVars.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/FindOpenVars.cc' object='ResolvExpr/driver_cfa_cpp-FindOpenVars.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-FindOpenVars.o `test -f 'ResolvExpr/FindOpenVars.cc' || echo '$(srcdir)/'`ResolvExpr/FindOpenVars.cc
+ResolvExpr/driver_cfa_cpp-FindOpenVars.obj: ResolvExpr/FindOpenVars.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-FindOpenVars.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-FindOpenVars.Tpo -c -o ResolvExpr/driver_cfa_cpp-FindOpenVars.obj `if test -f 'ResolvExpr/FindOpenVars.cc'; then $(CYGPATH_W) 'ResolvExpr/FindOpenVars.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/FindOpenVars.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-FindOpenVars.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-FindOpenVars.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/FindOpenVars.cc' object='ResolvExpr/driver_cfa_cpp-FindOpenVars.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-FindOpenVars.obj `if test -f 'ResolvExpr/FindOpenVars.cc'; then $(CYGPATH_W) 'ResolvExpr/FindOpenVars.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/FindOpenVars.cc'; fi`
+ResolvExpr/driver_cfa_cpp-PolyCost.o: ResolvExpr/PolyCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-PolyCost.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PolyCost.Tpo -c -o ResolvExpr/driver_cfa_cpp-PolyCost.o `test -f 'ResolvExpr/PolyCost.cc' || echo '$(srcdir)/'`ResolvExpr/PolyCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PolyCost.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PolyCost.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/PolyCost.cc' object='ResolvExpr/driver_cfa_cpp-PolyCost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-PolyCost.o `test -f 'ResolvExpr/PolyCost.cc' || echo '$(srcdir)/'`ResolvExpr/PolyCost.cc
+ResolvExpr/driver_cfa_cpp-PolyCost.obj: ResolvExpr/PolyCost.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-PolyCost.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PolyCost.Tpo -c -o ResolvExpr/driver_cfa_cpp-PolyCost.obj `if test -f 'ResolvExpr/PolyCost.cc'; then $(CYGPATH_W) 'ResolvExpr/PolyCost.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/PolyCost.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PolyCost.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-PolyCost.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/PolyCost.cc' object='ResolvExpr/driver_cfa_cpp-PolyCost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-PolyCost.obj `if test -f 'ResolvExpr/PolyCost.cc'; then $(CYGPATH_W) 'ResolvExpr/PolyCost.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/PolyCost.cc'; fi`
+ResolvExpr/driver_cfa_cpp-Occurs.o: ResolvExpr/Occurs.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-Occurs.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Occurs.Tpo -c -o ResolvExpr/driver_cfa_cpp-Occurs.o `test -f 'ResolvExpr/Occurs.cc' || echo '$(srcdir)/'`ResolvExpr/Occurs.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Occurs.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Occurs.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/Occurs.cc' object='ResolvExpr/driver_cfa_cpp-Occurs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-Occurs.o `test -f 'ResolvExpr/Occurs.cc' || echo '$(srcdir)/'`ResolvExpr/Occurs.cc
+ResolvExpr/driver_cfa_cpp-Occurs.obj: ResolvExpr/Occurs.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-Occurs.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Occurs.Tpo -c -o ResolvExpr/driver_cfa_cpp-Occurs.obj `if test -f 'ResolvExpr/Occurs.cc'; then $(CYGPATH_W) 'ResolvExpr/Occurs.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/Occurs.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Occurs.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-Occurs.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/Occurs.cc' object='ResolvExpr/driver_cfa_cpp-Occurs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-Occurs.obj `if test -f 'ResolvExpr/Occurs.cc'; then $(CYGPATH_W) 'ResolvExpr/Occurs.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/Occurs.cc'; fi`
+ResolvExpr/driver_cfa_cpp-TypeEnvironment.o: ResolvExpr/TypeEnvironment.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-TypeEnvironment.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-TypeEnvironment.Tpo -c -o ResolvExpr/driver_cfa_cpp-TypeEnvironment.o `test -f 'ResolvExpr/TypeEnvironment.cc' || echo '$(srcdir)/'`ResolvExpr/TypeEnvironment.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-TypeEnvironment.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-TypeEnvironment.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/TypeEnvironment.cc' object='ResolvExpr/driver_cfa_cpp-TypeEnvironment.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-TypeEnvironment.o `test -f 'ResolvExpr/TypeEnvironment.cc' || echo '$(srcdir)/'`ResolvExpr/TypeEnvironment.cc
+ResolvExpr/driver_cfa_cpp-TypeEnvironment.obj: ResolvExpr/TypeEnvironment.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-TypeEnvironment.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-TypeEnvironment.Tpo -c -o ResolvExpr/driver_cfa_cpp-TypeEnvironment.obj `if test -f 'ResolvExpr/TypeEnvironment.cc'; then $(CYGPATH_W) 'ResolvExpr/TypeEnvironment.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/TypeEnvironment.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-TypeEnvironment.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-TypeEnvironment.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/TypeEnvironment.cc' object='ResolvExpr/driver_cfa_cpp-TypeEnvironment.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-TypeEnvironment.obj `if test -f 'ResolvExpr/TypeEnvironment.cc'; then $(CYGPATH_W) 'ResolvExpr/TypeEnvironment.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/TypeEnvironment.cc'; fi`
+ResolvExpr/driver_cfa_cpp-CurrentObject.o: ResolvExpr/CurrentObject.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-CurrentObject.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Tpo -c -o ResolvExpr/driver_cfa_cpp-CurrentObject.o `test -f 'ResolvExpr/CurrentObject.cc' || echo '$(srcdir)/'`ResolvExpr/CurrentObject.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/CurrentObject.cc' object='ResolvExpr/driver_cfa_cpp-CurrentObject.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-CurrentObject.o `test -f 'ResolvExpr/CurrentObject.cc' || echo '$(srcdir)/'`ResolvExpr/CurrentObject.cc
+ResolvExpr/driver_cfa_cpp-CurrentObject.obj: ResolvExpr/CurrentObject.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-CurrentObject.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Tpo -c -o ResolvExpr/driver_cfa_cpp-CurrentObject.obj `if test -f 'ResolvExpr/CurrentObject.cc'; then $(CYGPATH_W) 'ResolvExpr/CurrentObject.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/CurrentObject.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-CurrentObject.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/CurrentObject.cc' object='ResolvExpr/driver_cfa_cpp-CurrentObject.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-CurrentObject.obj `if test -f 'ResolvExpr/CurrentObject.cc'; then $(CYGPATH_W) 'ResolvExpr/CurrentObject.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/CurrentObject.cc'; fi`
+ResolvExpr/driver_cfa_cpp-ExplodedActual.o: ResolvExpr/ExplodedActual.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-ExplodedActual.o -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ExplodedActual.Tpo -c -o ResolvExpr/driver_cfa_cpp-ExplodedActual.o `test -f 'ResolvExpr/ExplodedActual.cc' || echo '$(srcdir)/'`ResolvExpr/ExplodedActual.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ExplodedActual.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ExplodedActual.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/ExplodedActual.cc' object='ResolvExpr/driver_cfa_cpp-ExplodedActual.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-ExplodedActual.o `test -f 'ResolvExpr/ExplodedActual.cc' || echo '$(srcdir)/'`ResolvExpr/ExplodedActual.cc
+ResolvExpr/driver_cfa_cpp-ExplodedActual.obj: ResolvExpr/ExplodedActual.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ResolvExpr/driver_cfa_cpp-ExplodedActual.obj -MD -MP -MF ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ExplodedActual.Tpo -c -o ResolvExpr/driver_cfa_cpp-ExplodedActual.obj `if test -f 'ResolvExpr/ExplodedActual.cc'; then $(CYGPATH_W) 'ResolvExpr/ExplodedActual.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/ExplodedActual.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ExplodedActual.Tpo ResolvExpr/$(DEPDIR)/driver_cfa_cpp-ExplodedActual.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ResolvExpr/ExplodedActual.cc' object='ResolvExpr/driver_cfa_cpp-ExplodedActual.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ResolvExpr/driver_cfa_cpp-ExplodedActual.obj `if test -f 'ResolvExpr/ExplodedActual.cc'; then $(CYGPATH_W) 'ResolvExpr/ExplodedActual.cc'; else $(CYGPATH_W) '$(srcdir)/ResolvExpr/ExplodedActual.cc'; fi`
+SymTab/driver_cfa_cpp-Indexer.o: SymTab/Indexer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Indexer.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Tpo -c -o SymTab/driver_cfa_cpp-Indexer.o `test -f 'SymTab/Indexer.cc' || echo '$(srcdir)/'`SymTab/Indexer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/Indexer.cc' object='SymTab/driver_cfa_cpp-Indexer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Indexer.o `test -f 'SymTab/Indexer.cc' || echo '$(srcdir)/'`SymTab/Indexer.cc
+SymTab/driver_cfa_cpp-Indexer.obj: SymTab/Indexer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Indexer.obj -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Tpo -c -o SymTab/driver_cfa_cpp-Indexer.obj `if test -f 'SymTab/Indexer.cc'; then $(CYGPATH_W) 'SymTab/Indexer.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Indexer.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/Indexer.cc' object='SymTab/driver_cfa_cpp-Indexer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Indexer.obj `if test -f 'SymTab/Indexer.cc'; then $(CYGPATH_W) 'SymTab/Indexer.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Indexer.cc'; fi`
+SymTab/driver_cfa_cpp-Mangler.o: SymTab/Mangler.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Mangler.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Tpo -c -o SymTab/driver_cfa_cpp-Mangler.o `test -f 'SymTab/Mangler.cc' || echo '$(srcdir)/'`SymTab/Mangler.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/Mangler.cc' object='SymTab/driver_cfa_cpp-Mangler.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Mangler.o `test -f 'SymTab/Mangler.cc' || echo '$(srcdir)/'`SymTab/Mangler.cc
+SymTab/driver_cfa_cpp-Mangler.obj: SymTab/Mangler.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Mangler.obj -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Tpo -c -o SymTab/driver_cfa_cpp-Mangler.obj `if test -f 'SymTab/Mangler.cc'; then $(CYGPATH_W) 'SymTab/Mangler.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Mangler.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/Mangler.cc' object='SymTab/driver_cfa_cpp-Mangler.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Mangler.obj `if test -f 'SymTab/Mangler.cc'; then $(CYGPATH_W) 'SymTab/Mangler.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Mangler.cc'; fi`
+SymTab/driver_cfa_cpp-Validate.o: SymTab/Validate.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Validate.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Tpo -c -o SymTab/driver_cfa_cpp-Validate.o `test -f 'SymTab/Validate.cc' || echo '$(srcdir)/'`SymTab/Validate.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/Validate.cc' object='SymTab/driver_cfa_cpp-Validate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Validate.o `test -f 'SymTab/Validate.cc' || echo '$(srcdir)/'`SymTab/Validate.cc
+SymTab/driver_cfa_cpp-Validate.obj: SymTab/Validate.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Validate.obj -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Tpo -c -o SymTab/driver_cfa_cpp-Validate.obj `if test -f 'SymTab/Validate.cc'; then $(CYGPATH_W) 'SymTab/Validate.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Validate.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/Validate.cc' object='SymTab/driver_cfa_cpp-Validate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Validate.obj `if test -f 'SymTab/Validate.cc'; then $(CYGPATH_W) 'SymTab/Validate.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Validate.cc'; fi`
+SymTab/driver_cfa_cpp-FixFunction.o: SymTab/FixFunction.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-FixFunction.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-FixFunction.Tpo -c -o SymTab/driver_cfa_cpp-FixFunction.o `test -f 'SymTab/FixFunction.cc' || echo '$(srcdir)/'`SymTab/FixFunction.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-FixFunction.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-FixFunction.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/FixFunction.cc' object='SymTab/driver_cfa_cpp-FixFunction.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-FixFunction.o `test -f 'SymTab/FixFunction.cc' || echo '$(srcdir)/'`SymTab/FixFunction.cc
+SymTab/driver_cfa_cpp-FixFunction.obj: SymTab/FixFunction.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-FixFunction.obj -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-FixFunction.Tpo -c -o SymTab/driver_cfa_cpp-FixFunction.obj `if test -f 'SymTab/FixFunction.cc'; then $(CYGPATH_W) 'SymTab/FixFunction.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/FixFunction.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-FixFunction.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-FixFunction.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/FixFunction.cc' object='SymTab/driver_cfa_cpp-FixFunction.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-FixFunction.obj `if test -f 'SymTab/FixFunction.cc'; then $(CYGPATH_W) 'SymTab/FixFunction.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/FixFunction.cc'; fi`
+SymTab/driver_cfa_cpp-Autogen.o: SymTab/Autogen.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Autogen.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Tpo -c -o SymTab/driver_cfa_cpp-Autogen.o `test -f 'SymTab/Autogen.cc' || echo '$(srcdir)/'`SymTab/Autogen.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/Autogen.cc' object='SymTab/driver_cfa_cpp-Autogen.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Autogen.o `test -f 'SymTab/Autogen.cc' || echo '$(srcdir)/'`SymTab/Autogen.cc
+SymTab/driver_cfa_cpp-Autogen.obj: SymTab/Autogen.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-Autogen.obj -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Tpo -c -o SymTab/driver_cfa_cpp-Autogen.obj `if test -f 'SymTab/Autogen.cc'; then $(CYGPATH_W) 'SymTab/Autogen.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Autogen.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SymTab/Autogen.cc' object='SymTab/driver_cfa_cpp-Autogen.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SymTab/driver_cfa_cpp-Autogen.obj `if test -f 'SymTab/Autogen.cc'; then $(CYGPATH_W) 'SymTab/Autogen.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/Autogen.cc'; fi`
+SynTree/driver_cfa_cpp-Type.o: SynTree/Type.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Type.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Type.Tpo -c -o SynTree/driver_cfa_cpp-Type.o `test -f 'SynTree/Type.cc' || echo '$(srcdir)/'`SynTree/Type.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Type.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Type.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Type.cc' object='SynTree/driver_cfa_cpp-Type.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 SynTree/driver_cfa_cpp-Type.o `test -f 'SynTree/Type.cc' || echo '$(srcdir)/'`SynTree/Type.cc
+SynTree/driver_cfa_cpp-Type.obj: SynTree/Type.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Type.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Type.Tpo -c -o SynTree/driver_cfa_cpp-Type.obj `if test -f 'SynTree/Type.cc'; then $(CYGPATH_W) 'SynTree/Type.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Type.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Type.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Type.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Type.cc' object='SynTree/driver_cfa_cpp-Type.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 SynTree/driver_cfa_cpp-Type.obj `if test -f 'SynTree/Type.cc'; then $(CYGPATH_W) 'SynTree/Type.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Type.cc'; fi`
+SynTree/driver_cfa_cpp-VoidType.o: SynTree/VoidType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-VoidType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Tpo -c -o SynTree/driver_cfa_cpp-VoidType.o `test -f 'SynTree/VoidType.cc' || echo '$(srcdir)/'`SynTree/VoidType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/VoidType.cc' object='SynTree/driver_cfa_cpp-VoidType.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 SynTree/driver_cfa_cpp-VoidType.o `test -f 'SynTree/VoidType.cc' || echo '$(srcdir)/'`SynTree/VoidType.cc
+SynTree/driver_cfa_cpp-VoidType.obj: SynTree/VoidType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-VoidType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Tpo -c -o SynTree/driver_cfa_cpp-VoidType.obj `if test -f 'SynTree/VoidType.cc'; then $(CYGPATH_W) 'SynTree/VoidType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/VoidType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/VoidType.cc' object='SynTree/driver_cfa_cpp-VoidType.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 SynTree/driver_cfa_cpp-VoidType.obj `if test -f 'SynTree/VoidType.cc'; then $(CYGPATH_W) 'SynTree/VoidType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/VoidType.cc'; fi`
+SynTree/driver_cfa_cpp-BasicType.o: SynTree/BasicType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-BasicType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-BasicType.Tpo -c -o SynTree/driver_cfa_cpp-BasicType.o `test -f 'SynTree/BasicType.cc' || echo '$(srcdir)/'`SynTree/BasicType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-BasicType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-BasicType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/BasicType.cc' object='SynTree/driver_cfa_cpp-BasicType.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 SynTree/driver_cfa_cpp-BasicType.o `test -f 'SynTree/BasicType.cc' || echo '$(srcdir)/'`SynTree/BasicType.cc
+SynTree/driver_cfa_cpp-BasicType.obj: SynTree/BasicType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-BasicType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-BasicType.Tpo -c -o SynTree/driver_cfa_cpp-BasicType.obj `if test -f 'SynTree/BasicType.cc'; then $(CYGPATH_W) 'SynTree/BasicType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/BasicType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-BasicType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-BasicType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/BasicType.cc' object='SynTree/driver_cfa_cpp-BasicType.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 SynTree/driver_cfa_cpp-BasicType.obj `if test -f 'SynTree/BasicType.cc'; then $(CYGPATH_W) 'SynTree/BasicType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/BasicType.cc'; fi`
+SynTree/driver_cfa_cpp-PointerType.o: SynTree/PointerType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-PointerType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-PointerType.Tpo -c -o SynTree/driver_cfa_cpp-PointerType.o `test -f 'SynTree/PointerType.cc' || echo '$(srcdir)/'`SynTree/PointerType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-PointerType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-PointerType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/PointerType.cc' object='SynTree/driver_cfa_cpp-PointerType.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 SynTree/driver_cfa_cpp-PointerType.o `test -f 'SynTree/PointerType.cc' || echo '$(srcdir)/'`SynTree/PointerType.cc
+SynTree/driver_cfa_cpp-PointerType.obj: SynTree/PointerType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-PointerType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-PointerType.Tpo -c -o SynTree/driver_cfa_cpp-PointerType.obj `if test -f 'SynTree/PointerType.cc'; then $(CYGPATH_W) 'SynTree/PointerType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/PointerType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-PointerType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-PointerType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/PointerType.cc' object='SynTree/driver_cfa_cpp-PointerType.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 SynTree/driver_cfa_cpp-PointerType.obj `if test -f 'SynTree/PointerType.cc'; then $(CYGPATH_W) 'SynTree/PointerType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/PointerType.cc'; fi`
+SynTree/driver_cfa_cpp-ArrayType.o: SynTree/ArrayType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ArrayType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ArrayType.Tpo -c -o SynTree/driver_cfa_cpp-ArrayType.o `test -f 'SynTree/ArrayType.cc' || echo '$(srcdir)/'`SynTree/ArrayType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ArrayType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ArrayType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ArrayType.cc' object='SynTree/driver_cfa_cpp-ArrayType.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 SynTree/driver_cfa_cpp-ArrayType.o `test -f 'SynTree/ArrayType.cc' || echo '$(srcdir)/'`SynTree/ArrayType.cc
+SynTree/driver_cfa_cpp-ArrayType.obj: SynTree/ArrayType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ArrayType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ArrayType.Tpo -c -o SynTree/driver_cfa_cpp-ArrayType.obj `if test -f 'SynTree/ArrayType.cc'; then $(CYGPATH_W) 'SynTree/ArrayType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ArrayType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ArrayType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ArrayType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ArrayType.cc' object='SynTree/driver_cfa_cpp-ArrayType.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 SynTree/driver_cfa_cpp-ArrayType.obj `if test -f 'SynTree/ArrayType.cc'; then $(CYGPATH_W) 'SynTree/ArrayType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ArrayType.cc'; fi`
+SynTree/driver_cfa_cpp-ReferenceType.o: SynTree/ReferenceType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ReferenceType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceType.Tpo -c -o SynTree/driver_cfa_cpp-ReferenceType.o `test -f 'SynTree/ReferenceType.cc' || echo '$(srcdir)/'`SynTree/ReferenceType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ReferenceType.cc' object='SynTree/driver_cfa_cpp-ReferenceType.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 SynTree/driver_cfa_cpp-ReferenceType.o `test -f 'SynTree/ReferenceType.cc' || echo '$(srcdir)/'`SynTree/ReferenceType.cc
+SynTree/driver_cfa_cpp-ReferenceType.obj: SynTree/ReferenceType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ReferenceType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceType.Tpo -c -o SynTree/driver_cfa_cpp-ReferenceType.obj `if test -f 'SynTree/ReferenceType.cc'; then $(CYGPATH_W) 'SynTree/ReferenceType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ReferenceType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ReferenceType.cc' object='SynTree/driver_cfa_cpp-ReferenceType.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 SynTree/driver_cfa_cpp-ReferenceType.obj `if test -f 'SynTree/ReferenceType.cc'; then $(CYGPATH_W) 'SynTree/ReferenceType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ReferenceType.cc'; fi`
+SynTree/driver_cfa_cpp-FunctionType.o: SynTree/FunctionType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-FunctionType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionType.Tpo -c -o SynTree/driver_cfa_cpp-FunctionType.o `test -f 'SynTree/FunctionType.cc' || echo '$(srcdir)/'`SynTree/FunctionType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/FunctionType.cc' object='SynTree/driver_cfa_cpp-FunctionType.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 SynTree/driver_cfa_cpp-FunctionType.o `test -f 'SynTree/FunctionType.cc' || echo '$(srcdir)/'`SynTree/FunctionType.cc
+SynTree/driver_cfa_cpp-FunctionType.obj: SynTree/FunctionType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-FunctionType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionType.Tpo -c -o SynTree/driver_cfa_cpp-FunctionType.obj `if test -f 'SynTree/FunctionType.cc'; then $(CYGPATH_W) 'SynTree/FunctionType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/FunctionType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/FunctionType.cc' object='SynTree/driver_cfa_cpp-FunctionType.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 SynTree/driver_cfa_cpp-FunctionType.obj `if test -f 'SynTree/FunctionType.cc'; then $(CYGPATH_W) 'SynTree/FunctionType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/FunctionType.cc'; fi`
+SynTree/driver_cfa_cpp-ReferenceToType.o: SynTree/ReferenceToType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ReferenceToType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceToType.Tpo -c -o SynTree/driver_cfa_cpp-ReferenceToType.o `test -f 'SynTree/ReferenceToType.cc' || echo '$(srcdir)/'`SynTree/ReferenceToType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceToType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceToType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ReferenceToType.cc' object='SynTree/driver_cfa_cpp-ReferenceToType.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 SynTree/driver_cfa_cpp-ReferenceToType.o `test -f 'SynTree/ReferenceToType.cc' || echo '$(srcdir)/'`SynTree/ReferenceToType.cc
+SynTree/driver_cfa_cpp-ReferenceToType.obj: SynTree/ReferenceToType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ReferenceToType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceToType.Tpo -c -o SynTree/driver_cfa_cpp-ReferenceToType.obj `if test -f 'SynTree/ReferenceToType.cc'; then $(CYGPATH_W) 'SynTree/ReferenceToType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ReferenceToType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceToType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ReferenceToType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ReferenceToType.cc' object='SynTree/driver_cfa_cpp-ReferenceToType.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 SynTree/driver_cfa_cpp-ReferenceToType.obj `if test -f 'SynTree/ReferenceToType.cc'; then $(CYGPATH_W) 'SynTree/ReferenceToType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ReferenceToType.cc'; fi`
+SynTree/driver_cfa_cpp-TupleType.o: SynTree/TupleType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TupleType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TupleType.Tpo -c -o SynTree/driver_cfa_cpp-TupleType.o `test -f 'SynTree/TupleType.cc' || echo '$(srcdir)/'`SynTree/TupleType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TupleType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TupleType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TupleType.cc' object='SynTree/driver_cfa_cpp-TupleType.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 SynTree/driver_cfa_cpp-TupleType.o `test -f 'SynTree/TupleType.cc' || echo '$(srcdir)/'`SynTree/TupleType.cc
+SynTree/driver_cfa_cpp-TupleType.obj: SynTree/TupleType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TupleType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TupleType.Tpo -c -o SynTree/driver_cfa_cpp-TupleType.obj `if test -f 'SynTree/TupleType.cc'; then $(CYGPATH_W) 'SynTree/TupleType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TupleType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TupleType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TupleType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TupleType.cc' object='SynTree/driver_cfa_cpp-TupleType.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 SynTree/driver_cfa_cpp-TupleType.obj `if test -f 'SynTree/TupleType.cc'; then $(CYGPATH_W) 'SynTree/TupleType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TupleType.cc'; fi`
+SynTree/driver_cfa_cpp-TypeofType.o: SynTree/TypeofType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TypeofType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TypeofType.Tpo -c -o SynTree/driver_cfa_cpp-TypeofType.o `test -f 'SynTree/TypeofType.cc' || echo '$(srcdir)/'`SynTree/TypeofType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TypeofType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TypeofType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TypeofType.cc' object='SynTree/driver_cfa_cpp-TypeofType.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 SynTree/driver_cfa_cpp-TypeofType.o `test -f 'SynTree/TypeofType.cc' || echo '$(srcdir)/'`SynTree/TypeofType.cc
+SynTree/driver_cfa_cpp-TypeofType.obj: SynTree/TypeofType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TypeofType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TypeofType.Tpo -c -o SynTree/driver_cfa_cpp-TypeofType.obj `if test -f 'SynTree/TypeofType.cc'; then $(CYGPATH_W) 'SynTree/TypeofType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TypeofType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TypeofType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TypeofType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TypeofType.cc' object='SynTree/driver_cfa_cpp-TypeofType.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 SynTree/driver_cfa_cpp-TypeofType.obj `if test -f 'SynTree/TypeofType.cc'; then $(CYGPATH_W) 'SynTree/TypeofType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TypeofType.cc'; fi`
+SynTree/driver_cfa_cpp-AttrType.o: SynTree/AttrType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AttrType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AttrType.Tpo -c -o SynTree/driver_cfa_cpp-AttrType.o `test -f 'SynTree/AttrType.cc' || echo '$(srcdir)/'`SynTree/AttrType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AttrType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AttrType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/AttrType.cc' object='SynTree/driver_cfa_cpp-AttrType.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 SynTree/driver_cfa_cpp-AttrType.o `test -f 'SynTree/AttrType.cc' || echo '$(srcdir)/'`SynTree/AttrType.cc
+SynTree/driver_cfa_cpp-AttrType.obj: SynTree/AttrType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AttrType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AttrType.Tpo -c -o SynTree/driver_cfa_cpp-AttrType.obj `if test -f 'SynTree/AttrType.cc'; then $(CYGPATH_W) 'SynTree/AttrType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AttrType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AttrType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AttrType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/AttrType.cc' object='SynTree/driver_cfa_cpp-AttrType.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 SynTree/driver_cfa_cpp-AttrType.obj `if test -f 'SynTree/AttrType.cc'; then $(CYGPATH_W) 'SynTree/AttrType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AttrType.cc'; fi`
+SynTree/driver_cfa_cpp-VarArgsType.o: SynTree/VarArgsType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-VarArgsType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-VarArgsType.Tpo -c -o SynTree/driver_cfa_cpp-VarArgsType.o `test -f 'SynTree/VarArgsType.cc' || echo '$(srcdir)/'`SynTree/VarArgsType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-VarArgsType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-VarArgsType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/VarArgsType.cc' object='SynTree/driver_cfa_cpp-VarArgsType.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 SynTree/driver_cfa_cpp-VarArgsType.o `test -f 'SynTree/VarArgsType.cc' || echo '$(srcdir)/'`SynTree/VarArgsType.cc
+SynTree/driver_cfa_cpp-VarArgsType.obj: SynTree/VarArgsType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-VarArgsType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-VarArgsType.Tpo -c -o SynTree/driver_cfa_cpp-VarArgsType.obj `if test -f 'SynTree/VarArgsType.cc'; then $(CYGPATH_W) 'SynTree/VarArgsType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/VarArgsType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-VarArgsType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-VarArgsType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/VarArgsType.cc' object='SynTree/driver_cfa_cpp-VarArgsType.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 SynTree/driver_cfa_cpp-VarArgsType.obj `if test -f 'SynTree/VarArgsType.cc'; then $(CYGPATH_W) 'SynTree/VarArgsType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/VarArgsType.cc'; fi`
+SynTree/driver_cfa_cpp-ZeroOneType.o: SynTree/ZeroOneType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ZeroOneType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ZeroOneType.Tpo -c -o SynTree/driver_cfa_cpp-ZeroOneType.o `test -f 'SynTree/ZeroOneType.cc' || echo '$(srcdir)/'`SynTree/ZeroOneType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ZeroOneType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ZeroOneType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ZeroOneType.cc' object='SynTree/driver_cfa_cpp-ZeroOneType.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 SynTree/driver_cfa_cpp-ZeroOneType.o `test -f 'SynTree/ZeroOneType.cc' || echo '$(srcdir)/'`SynTree/ZeroOneType.cc
+SynTree/driver_cfa_cpp-ZeroOneType.obj: SynTree/ZeroOneType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ZeroOneType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ZeroOneType.Tpo -c -o SynTree/driver_cfa_cpp-ZeroOneType.obj `if test -f 'SynTree/ZeroOneType.cc'; then $(CYGPATH_W) 'SynTree/ZeroOneType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ZeroOneType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ZeroOneType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ZeroOneType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ZeroOneType.cc' object='SynTree/driver_cfa_cpp-ZeroOneType.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 SynTree/driver_cfa_cpp-ZeroOneType.obj `if test -f 'SynTree/ZeroOneType.cc'; then $(CYGPATH_W) 'SynTree/ZeroOneType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ZeroOneType.cc'; fi`
+SynTree/driver_cfa_cpp-Constant.o: SynTree/Constant.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Constant.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Constant.Tpo -c -o SynTree/driver_cfa_cpp-Constant.o `test -f 'SynTree/Constant.cc' || echo '$(srcdir)/'`SynTree/Constant.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Constant.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Constant.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Constant.cc' object='SynTree/driver_cfa_cpp-Constant.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 SynTree/driver_cfa_cpp-Constant.o `test -f 'SynTree/Constant.cc' || echo '$(srcdir)/'`SynTree/Constant.cc
+SynTree/driver_cfa_cpp-Constant.obj: SynTree/Constant.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Constant.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Constant.Tpo -c -o SynTree/driver_cfa_cpp-Constant.obj `if test -f 'SynTree/Constant.cc'; then $(CYGPATH_W) 'SynTree/Constant.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Constant.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Constant.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Constant.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Constant.cc' object='SynTree/driver_cfa_cpp-Constant.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 SynTree/driver_cfa_cpp-Constant.obj `if test -f 'SynTree/Constant.cc'; then $(CYGPATH_W) 'SynTree/Constant.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Constant.cc'; fi`
+SynTree/driver_cfa_cpp-Expression.o: SynTree/Expression.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Expression.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Expression.Tpo -c -o SynTree/driver_cfa_cpp-Expression.o `test -f 'SynTree/Expression.cc' || echo '$(srcdir)/'`SynTree/Expression.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Expression.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Expression.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Expression.cc' object='SynTree/driver_cfa_cpp-Expression.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 SynTree/driver_cfa_cpp-Expression.o `test -f 'SynTree/Expression.cc' || echo '$(srcdir)/'`SynTree/Expression.cc
+SynTree/driver_cfa_cpp-Expression.obj: SynTree/Expression.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Expression.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Expression.Tpo -c -o SynTree/driver_cfa_cpp-Expression.obj `if test -f 'SynTree/Expression.cc'; then $(CYGPATH_W) 'SynTree/Expression.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Expression.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Expression.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Expression.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Expression.cc' object='SynTree/driver_cfa_cpp-Expression.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 SynTree/driver_cfa_cpp-Expression.obj `if test -f 'SynTree/Expression.cc'; then $(CYGPATH_W) 'SynTree/Expression.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Expression.cc'; fi`
+SynTree/driver_cfa_cpp-TupleExpr.o: SynTree/TupleExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TupleExpr.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TupleExpr.Tpo -c -o SynTree/driver_cfa_cpp-TupleExpr.o `test -f 'SynTree/TupleExpr.cc' || echo '$(srcdir)/'`SynTree/TupleExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TupleExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TupleExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TupleExpr.cc' object='SynTree/driver_cfa_cpp-TupleExpr.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 SynTree/driver_cfa_cpp-TupleExpr.o `test -f 'SynTree/TupleExpr.cc' || echo '$(srcdir)/'`SynTree/TupleExpr.cc
+SynTree/driver_cfa_cpp-TupleExpr.obj: SynTree/TupleExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TupleExpr.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TupleExpr.Tpo -c -o SynTree/driver_cfa_cpp-TupleExpr.obj `if test -f 'SynTree/TupleExpr.cc'; then $(CYGPATH_W) 'SynTree/TupleExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TupleExpr.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TupleExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TupleExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TupleExpr.cc' object='SynTree/driver_cfa_cpp-TupleExpr.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 SynTree/driver_cfa_cpp-TupleExpr.obj `if test -f 'SynTree/TupleExpr.cc'; then $(CYGPATH_W) 'SynTree/TupleExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TupleExpr.cc'; fi`
+SynTree/driver_cfa_cpp-CommaExpr.o: SynTree/CommaExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-CommaExpr.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-CommaExpr.Tpo -c -o SynTree/driver_cfa_cpp-CommaExpr.o `test -f 'SynTree/CommaExpr.cc' || echo '$(srcdir)/'`SynTree/CommaExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-CommaExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-CommaExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/CommaExpr.cc' object='SynTree/driver_cfa_cpp-CommaExpr.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 SynTree/driver_cfa_cpp-CommaExpr.o `test -f 'SynTree/CommaExpr.cc' || echo '$(srcdir)/'`SynTree/CommaExpr.cc
+SynTree/driver_cfa_cpp-CommaExpr.obj: SynTree/CommaExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-CommaExpr.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-CommaExpr.Tpo -c -o SynTree/driver_cfa_cpp-CommaExpr.obj `if test -f 'SynTree/CommaExpr.cc'; then $(CYGPATH_W) 'SynTree/CommaExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/CommaExpr.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-CommaExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-CommaExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/CommaExpr.cc' object='SynTree/driver_cfa_cpp-CommaExpr.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 SynTree/driver_cfa_cpp-CommaExpr.obj `if test -f 'SynTree/CommaExpr.cc'; then $(CYGPATH_W) 'SynTree/CommaExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/CommaExpr.cc'; fi`
+SynTree/driver_cfa_cpp-TypeExpr.o: SynTree/TypeExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TypeExpr.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TypeExpr.Tpo -c -o SynTree/driver_cfa_cpp-TypeExpr.o `test -f 'SynTree/TypeExpr.cc' || echo '$(srcdir)/'`SynTree/TypeExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TypeExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TypeExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TypeExpr.cc' object='SynTree/driver_cfa_cpp-TypeExpr.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 SynTree/driver_cfa_cpp-TypeExpr.o `test -f 'SynTree/TypeExpr.cc' || echo '$(srcdir)/'`SynTree/TypeExpr.cc
+SynTree/driver_cfa_cpp-TypeExpr.obj: SynTree/TypeExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TypeExpr.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TypeExpr.Tpo -c -o SynTree/driver_cfa_cpp-TypeExpr.obj `if test -f 'SynTree/TypeExpr.cc'; then $(CYGPATH_W) 'SynTree/TypeExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TypeExpr.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TypeExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TypeExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TypeExpr.cc' object='SynTree/driver_cfa_cpp-TypeExpr.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 SynTree/driver_cfa_cpp-TypeExpr.obj `if test -f 'SynTree/TypeExpr.cc'; then $(CYGPATH_W) 'SynTree/TypeExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TypeExpr.cc'; fi`
+SynTree/driver_cfa_cpp-ApplicationExpr.o: SynTree/ApplicationExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ApplicationExpr.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ApplicationExpr.Tpo -c -o SynTree/driver_cfa_cpp-ApplicationExpr.o `test -f 'SynTree/ApplicationExpr.cc' || echo '$(srcdir)/'`SynTree/ApplicationExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ApplicationExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ApplicationExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ApplicationExpr.cc' object='SynTree/driver_cfa_cpp-ApplicationExpr.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 SynTree/driver_cfa_cpp-ApplicationExpr.o `test -f 'SynTree/ApplicationExpr.cc' || echo '$(srcdir)/'`SynTree/ApplicationExpr.cc
+SynTree/driver_cfa_cpp-ApplicationExpr.obj: SynTree/ApplicationExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ApplicationExpr.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ApplicationExpr.Tpo -c -o SynTree/driver_cfa_cpp-ApplicationExpr.obj `if test -f 'SynTree/ApplicationExpr.cc'; then $(CYGPATH_W) 'SynTree/ApplicationExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ApplicationExpr.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ApplicationExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ApplicationExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ApplicationExpr.cc' object='SynTree/driver_cfa_cpp-ApplicationExpr.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 SynTree/driver_cfa_cpp-ApplicationExpr.obj `if test -f 'SynTree/ApplicationExpr.cc'; then $(CYGPATH_W) 'SynTree/ApplicationExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ApplicationExpr.cc'; fi`
+SynTree/driver_cfa_cpp-AddressExpr.o: SynTree/AddressExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AddressExpr.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Tpo -c -o SynTree/driver_cfa_cpp-AddressExpr.o `test -f 'SynTree/AddressExpr.cc' || echo '$(srcdir)/'`SynTree/AddressExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/AddressExpr.cc' object='SynTree/driver_cfa_cpp-AddressExpr.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 SynTree/driver_cfa_cpp-AddressExpr.o `test -f 'SynTree/AddressExpr.cc' || echo '$(srcdir)/'`SynTree/AddressExpr.cc
+SynTree/driver_cfa_cpp-AddressExpr.obj: SynTree/AddressExpr.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AddressExpr.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Tpo -c -o SynTree/driver_cfa_cpp-AddressExpr.obj `if test -f 'SynTree/AddressExpr.cc'; then $(CYGPATH_W) 'SynTree/AddressExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AddressExpr.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/AddressExpr.cc' object='SynTree/driver_cfa_cpp-AddressExpr.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 SynTree/driver_cfa_cpp-AddressExpr.obj `if test -f 'SynTree/AddressExpr.cc'; then $(CYGPATH_W) 'SynTree/AddressExpr.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AddressExpr.cc'; fi`
+SynTree/driver_cfa_cpp-Statement.o: SynTree/Statement.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Statement.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Statement.Tpo -c -o SynTree/driver_cfa_cpp-Statement.o `test -f 'SynTree/Statement.cc' || echo '$(srcdir)/'`SynTree/Statement.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Statement.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Statement.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Statement.cc' object='SynTree/driver_cfa_cpp-Statement.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 SynTree/driver_cfa_cpp-Statement.o `test -f 'SynTree/Statement.cc' || echo '$(srcdir)/'`SynTree/Statement.cc
+SynTree/driver_cfa_cpp-Statement.obj: SynTree/Statement.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Statement.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Statement.Tpo -c -o SynTree/driver_cfa_cpp-Statement.obj `if test -f 'SynTree/Statement.cc'; then $(CYGPATH_W) 'SynTree/Statement.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Statement.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Statement.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Statement.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Statement.cc' object='SynTree/driver_cfa_cpp-Statement.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 SynTree/driver_cfa_cpp-Statement.obj `if test -f 'SynTree/Statement.cc'; then $(CYGPATH_W) 'SynTree/Statement.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Statement.cc'; fi`
+SynTree/driver_cfa_cpp-CompoundStmt.o: SynTree/CompoundStmt.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-CompoundStmt.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Tpo -c -o SynTree/driver_cfa_cpp-CompoundStmt.o `test -f 'SynTree/CompoundStmt.cc' || echo '$(srcdir)/'`SynTree/CompoundStmt.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/CompoundStmt.cc' object='SynTree/driver_cfa_cpp-CompoundStmt.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 SynTree/driver_cfa_cpp-CompoundStmt.o `test -f 'SynTree/CompoundStmt.cc' || echo '$(srcdir)/'`SynTree/CompoundStmt.cc
+SynTree/driver_cfa_cpp-CompoundStmt.obj: SynTree/CompoundStmt.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-CompoundStmt.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Tpo -c -o SynTree/driver_cfa_cpp-CompoundStmt.obj `if test -f 'SynTree/CompoundStmt.cc'; then $(CYGPATH_W) 'SynTree/CompoundStmt.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/CompoundStmt.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/CompoundStmt.cc' object='SynTree/driver_cfa_cpp-CompoundStmt.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 SynTree/driver_cfa_cpp-CompoundStmt.obj `if test -f 'SynTree/CompoundStmt.cc'; then $(CYGPATH_W) 'SynTree/CompoundStmt.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/CompoundStmt.cc'; fi`
+SynTree/driver_cfa_cpp-DeclStmt.o: SynTree/DeclStmt.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-DeclStmt.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-DeclStmt.Tpo -c -o SynTree/driver_cfa_cpp-DeclStmt.o `test -f 'SynTree/DeclStmt.cc' || echo '$(srcdir)/'`SynTree/DeclStmt.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-DeclStmt.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-DeclStmt.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/DeclStmt.cc' object='SynTree/driver_cfa_cpp-DeclStmt.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 SynTree/driver_cfa_cpp-DeclStmt.o `test -f 'SynTree/DeclStmt.cc' || echo '$(srcdir)/'`SynTree/DeclStmt.cc
+SynTree/driver_cfa_cpp-DeclStmt.obj: SynTree/DeclStmt.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-DeclStmt.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-DeclStmt.Tpo -c -o SynTree/driver_cfa_cpp-DeclStmt.obj `if test -f 'SynTree/DeclStmt.cc'; then $(CYGPATH_W) 'SynTree/DeclStmt.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclStmt.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-DeclStmt.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-DeclStmt.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/DeclStmt.cc' object='SynTree/driver_cfa_cpp-DeclStmt.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 SynTree/driver_cfa_cpp-DeclStmt.obj `if test -f 'SynTree/DeclStmt.cc'; then $(CYGPATH_W) 'SynTree/DeclStmt.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclStmt.cc'; fi`
+SynTree/driver_cfa_cpp-Declaration.o: SynTree/Declaration.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Declaration.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Declaration.Tpo -c -o SynTree/driver_cfa_cpp-Declaration.o `test -f 'SynTree/Declaration.cc' || echo '$(srcdir)/'`SynTree/Declaration.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Declaration.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Declaration.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Declaration.cc' object='SynTree/driver_cfa_cpp-Declaration.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 SynTree/driver_cfa_cpp-Declaration.o `test -f 'SynTree/Declaration.cc' || echo '$(srcdir)/'`SynTree/Declaration.cc
+SynTree/driver_cfa_cpp-Declaration.obj: SynTree/Declaration.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Declaration.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Declaration.Tpo -c -o SynTree/driver_cfa_cpp-Declaration.obj `if test -f 'SynTree/Declaration.cc'; then $(CYGPATH_W) 'SynTree/Declaration.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Declaration.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Declaration.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Declaration.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Declaration.cc' object='SynTree/driver_cfa_cpp-Declaration.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 SynTree/driver_cfa_cpp-Declaration.obj `if test -f 'SynTree/Declaration.cc'; then $(CYGPATH_W) 'SynTree/Declaration.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Declaration.cc'; fi`
+SynTree/driver_cfa_cpp-DeclarationWithType.o: SynTree/DeclarationWithType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-DeclarationWithType.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-DeclarationWithType.Tpo -c -o SynTree/driver_cfa_cpp-DeclarationWithType.o `test -f 'SynTree/DeclarationWithType.cc' || echo '$(srcdir)/'`SynTree/DeclarationWithType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-DeclarationWithType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-DeclarationWithType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/DeclarationWithType.cc' object='SynTree/driver_cfa_cpp-DeclarationWithType.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 SynTree/driver_cfa_cpp-DeclarationWithType.o `test -f 'SynTree/DeclarationWithType.cc' || echo '$(srcdir)/'`SynTree/DeclarationWithType.cc
+SynTree/driver_cfa_cpp-DeclarationWithType.obj: SynTree/DeclarationWithType.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-DeclarationWithType.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-DeclarationWithType.Tpo -c -o SynTree/driver_cfa_cpp-DeclarationWithType.obj `if test -f 'SynTree/DeclarationWithType.cc'; then $(CYGPATH_W) 'SynTree/DeclarationWithType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclarationWithType.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-DeclarationWithType.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-DeclarationWithType.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/DeclarationWithType.cc' object='SynTree/driver_cfa_cpp-DeclarationWithType.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 SynTree/driver_cfa_cpp-DeclarationWithType.obj `if test -f 'SynTree/DeclarationWithType.cc'; then $(CYGPATH_W) 'SynTree/DeclarationWithType.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclarationWithType.cc'; fi`
+SynTree/driver_cfa_cpp-ObjectDecl.o: SynTree/ObjectDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ObjectDecl.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ObjectDecl.Tpo -c -o SynTree/driver_cfa_cpp-ObjectDecl.o `test -f 'SynTree/ObjectDecl.cc' || echo '$(srcdir)/'`SynTree/ObjectDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ObjectDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ObjectDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ObjectDecl.cc' object='SynTree/driver_cfa_cpp-ObjectDecl.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 SynTree/driver_cfa_cpp-ObjectDecl.o `test -f 'SynTree/ObjectDecl.cc' || echo '$(srcdir)/'`SynTree/ObjectDecl.cc
+SynTree/driver_cfa_cpp-ObjectDecl.obj: SynTree/ObjectDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-ObjectDecl.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-ObjectDecl.Tpo -c -o SynTree/driver_cfa_cpp-ObjectDecl.obj `if test -f 'SynTree/ObjectDecl.cc'; then $(CYGPATH_W) 'SynTree/ObjectDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ObjectDecl.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-ObjectDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-ObjectDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/ObjectDecl.cc' object='SynTree/driver_cfa_cpp-ObjectDecl.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 SynTree/driver_cfa_cpp-ObjectDecl.obj `if test -f 'SynTree/ObjectDecl.cc'; then $(CYGPATH_W) 'SynTree/ObjectDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/ObjectDecl.cc'; fi`
+SynTree/driver_cfa_cpp-FunctionDecl.o: SynTree/FunctionDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-FunctionDecl.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionDecl.Tpo -c -o SynTree/driver_cfa_cpp-FunctionDecl.o `test -f 'SynTree/FunctionDecl.cc' || echo '$(srcdir)/'`SynTree/FunctionDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/FunctionDecl.cc' object='SynTree/driver_cfa_cpp-FunctionDecl.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 SynTree/driver_cfa_cpp-FunctionDecl.o `test -f 'SynTree/FunctionDecl.cc' || echo '$(srcdir)/'`SynTree/FunctionDecl.cc
+SynTree/driver_cfa_cpp-FunctionDecl.obj: SynTree/FunctionDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-FunctionDecl.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionDecl.Tpo -c -o SynTree/driver_cfa_cpp-FunctionDecl.obj `if test -f 'SynTree/FunctionDecl.cc'; then $(CYGPATH_W) 'SynTree/FunctionDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/FunctionDecl.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-FunctionDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/FunctionDecl.cc' object='SynTree/driver_cfa_cpp-FunctionDecl.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 SynTree/driver_cfa_cpp-FunctionDecl.obj `if test -f 'SynTree/FunctionDecl.cc'; then $(CYGPATH_W) 'SynTree/FunctionDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/FunctionDecl.cc'; fi`
+SynTree/driver_cfa_cpp-AggregateDecl.o: SynTree/AggregateDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AggregateDecl.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Tpo -c -o SynTree/driver_cfa_cpp-AggregateDecl.o `test -f 'SynTree/AggregateDecl.cc' || echo '$(srcdir)/'`SynTree/AggregateDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/AggregateDecl.cc' object='SynTree/driver_cfa_cpp-AggregateDecl.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 SynTree/driver_cfa_cpp-AggregateDecl.o `test -f 'SynTree/AggregateDecl.cc' || echo '$(srcdir)/'`SynTree/AggregateDecl.cc
+SynTree/driver_cfa_cpp-AggregateDecl.obj: SynTree/AggregateDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AggregateDecl.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Tpo -c -o SynTree/driver_cfa_cpp-AggregateDecl.obj `if test -f 'SynTree/AggregateDecl.cc'; then $(CYGPATH_W) 'SynTree/AggregateDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AggregateDecl.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/AggregateDecl.cc' object='SynTree/driver_cfa_cpp-AggregateDecl.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 SynTree/driver_cfa_cpp-AggregateDecl.obj `if test -f 'SynTree/AggregateDecl.cc'; then $(CYGPATH_W) 'SynTree/AggregateDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AggregateDecl.cc'; fi`
+SynTree/driver_cfa_cpp-NamedTypeDecl.o: SynTree/NamedTypeDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-NamedTypeDecl.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-NamedTypeDecl.Tpo -c -o SynTree/driver_cfa_cpp-NamedTypeDecl.o `test -f 'SynTree/NamedTypeDecl.cc' || echo '$(srcdir)/'`SynTree/NamedTypeDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-NamedTypeDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-NamedTypeDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/NamedTypeDecl.cc' object='SynTree/driver_cfa_cpp-NamedTypeDecl.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 SynTree/driver_cfa_cpp-NamedTypeDecl.o `test -f 'SynTree/NamedTypeDecl.cc' || echo '$(srcdir)/'`SynTree/NamedTypeDecl.cc
+SynTree/driver_cfa_cpp-NamedTypeDecl.obj: SynTree/NamedTypeDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-NamedTypeDecl.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-NamedTypeDecl.Tpo -c -o SynTree/driver_cfa_cpp-NamedTypeDecl.obj `if test -f 'SynTree/NamedTypeDecl.cc'; then $(CYGPATH_W) 'SynTree/NamedTypeDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/NamedTypeDecl.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-NamedTypeDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-NamedTypeDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/NamedTypeDecl.cc' object='SynTree/driver_cfa_cpp-NamedTypeDecl.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 SynTree/driver_cfa_cpp-NamedTypeDecl.obj `if test -f 'SynTree/NamedTypeDecl.cc'; then $(CYGPATH_W) 'SynTree/NamedTypeDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/NamedTypeDecl.cc'; fi`
+SynTree/driver_cfa_cpp-TypeDecl.o: SynTree/TypeDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TypeDecl.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TypeDecl.Tpo -c -o SynTree/driver_cfa_cpp-TypeDecl.o `test -f 'SynTree/TypeDecl.cc' || echo '$(srcdir)/'`SynTree/TypeDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TypeDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TypeDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TypeDecl.cc' object='SynTree/driver_cfa_cpp-TypeDecl.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 SynTree/driver_cfa_cpp-TypeDecl.o `test -f 'SynTree/TypeDecl.cc' || echo '$(srcdir)/'`SynTree/TypeDecl.cc
+SynTree/driver_cfa_cpp-TypeDecl.obj: SynTree/TypeDecl.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TypeDecl.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TypeDecl.Tpo -c -o SynTree/driver_cfa_cpp-TypeDecl.obj `if test -f 'SynTree/TypeDecl.cc'; then $(CYGPATH_W) 'SynTree/TypeDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TypeDecl.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TypeDecl.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TypeDecl.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TypeDecl.cc' object='SynTree/driver_cfa_cpp-TypeDecl.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 SynTree/driver_cfa_cpp-TypeDecl.obj `if test -f 'SynTree/TypeDecl.cc'; then $(CYGPATH_W) 'SynTree/TypeDecl.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TypeDecl.cc'; fi`
+SynTree/driver_cfa_cpp-Initializer.o: SynTree/Initializer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Initializer.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Initializer.Tpo -c -o SynTree/driver_cfa_cpp-Initializer.o `test -f 'SynTree/Initializer.cc' || echo '$(srcdir)/'`SynTree/Initializer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Initializer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Initializer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Initializer.cc' object='SynTree/driver_cfa_cpp-Initializer.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 SynTree/driver_cfa_cpp-Initializer.o `test -f 'SynTree/Initializer.cc' || echo '$(srcdir)/'`SynTree/Initializer.cc
+SynTree/driver_cfa_cpp-Initializer.obj: SynTree/Initializer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Initializer.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Initializer.Tpo -c -o SynTree/driver_cfa_cpp-Initializer.obj `if test -f 'SynTree/Initializer.cc'; then $(CYGPATH_W) 'SynTree/Initializer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Initializer.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Initializer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Initializer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Initializer.cc' object='SynTree/driver_cfa_cpp-Initializer.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 SynTree/driver_cfa_cpp-Initializer.obj `if test -f 'SynTree/Initializer.cc'; then $(CYGPATH_W) 'SynTree/Initializer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Initializer.cc'; fi`
+SynTree/driver_cfa_cpp-TypeSubstitution.o: SynTree/TypeSubstitution.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TypeSubstitution.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TypeSubstitution.Tpo -c -o SynTree/driver_cfa_cpp-TypeSubstitution.o `test -f 'SynTree/TypeSubstitution.cc' || echo '$(srcdir)/'`SynTree/TypeSubstitution.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TypeSubstitution.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TypeSubstitution.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TypeSubstitution.cc' object='SynTree/driver_cfa_cpp-TypeSubstitution.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 SynTree/driver_cfa_cpp-TypeSubstitution.o `test -f 'SynTree/TypeSubstitution.cc' || echo '$(srcdir)/'`SynTree/TypeSubstitution.cc
+SynTree/driver_cfa_cpp-TypeSubstitution.obj: SynTree/TypeSubstitution.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-TypeSubstitution.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-TypeSubstitution.Tpo -c -o SynTree/driver_cfa_cpp-TypeSubstitution.obj `if test -f 'SynTree/TypeSubstitution.cc'; then $(CYGPATH_W) 'SynTree/TypeSubstitution.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TypeSubstitution.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-TypeSubstitution.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-TypeSubstitution.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/TypeSubstitution.cc' object='SynTree/driver_cfa_cpp-TypeSubstitution.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 SynTree/driver_cfa_cpp-TypeSubstitution.obj `if test -f 'SynTree/TypeSubstitution.cc'; then $(CYGPATH_W) 'SynTree/TypeSubstitution.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/TypeSubstitution.cc'; fi`
+SynTree/driver_cfa_cpp-Attribute.o: SynTree/Attribute.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Attribute.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Tpo -c -o SynTree/driver_cfa_cpp-Attribute.o `test -f 'SynTree/Attribute.cc' || echo '$(srcdir)/'`SynTree/Attribute.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Attribute.cc' object='SynTree/driver_cfa_cpp-Attribute.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 SynTree/driver_cfa_cpp-Attribute.o `test -f 'SynTree/Attribute.cc' || echo '$(srcdir)/'`SynTree/Attribute.cc
+SynTree/driver_cfa_cpp-Attribute.obj: SynTree/Attribute.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-Attribute.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Tpo -c -o SynTree/driver_cfa_cpp-Attribute.obj `if test -f 'SynTree/Attribute.cc'; then $(CYGPATH_W) 'SynTree/Attribute.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Attribute.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Attribute.cc' object='SynTree/driver_cfa_cpp-Attribute.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 SynTree/driver_cfa_cpp-Attribute.obj `if test -f 'SynTree/Attribute.cc'; then $(CYGPATH_W) 'SynTree/Attribute.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Attribute.cc'; fi`
+SynTree/driver_cfa_cpp-DeclReplacer.o: SynTree/DeclReplacer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-DeclReplacer.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Tpo -c -o SynTree/driver_cfa_cpp-DeclReplacer.o `test -f 'SynTree/DeclReplacer.cc' || echo '$(srcdir)/'`SynTree/DeclReplacer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/DeclReplacer.cc' object='SynTree/driver_cfa_cpp-DeclReplacer.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 SynTree/driver_cfa_cpp-DeclReplacer.o `test -f 'SynTree/DeclReplacer.cc' || echo '$(srcdir)/'`SynTree/DeclReplacer.cc
+SynTree/driver_cfa_cpp-DeclReplacer.obj: SynTree/DeclReplacer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-DeclReplacer.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Tpo -c -o SynTree/driver_cfa_cpp-DeclReplacer.obj `if test -f 'SynTree/DeclReplacer.cc'; then $(CYGPATH_W) 'SynTree/DeclReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclReplacer.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/DeclReplacer.cc' object='SynTree/driver_cfa_cpp-DeclReplacer.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 SynTree/driver_cfa_cpp-DeclReplacer.obj `if test -f 'SynTree/DeclReplacer.cc'; then $(CYGPATH_W) 'SynTree/DeclReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclReplacer.cc'; fi`
+Tuples/driver_cfa_cpp-TupleAssignment.o: Tuples/TupleAssignment.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-TupleAssignment.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Tpo -c -o Tuples/driver_cfa_cpp-TupleAssignment.o `test -f 'Tuples/TupleAssignment.cc' || echo '$(srcdir)/'`Tuples/TupleAssignment.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/TupleAssignment.cc' object='Tuples/driver_cfa_cpp-TupleAssignment.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 Tuples/driver_cfa_cpp-TupleAssignment.o `test -f 'Tuples/TupleAssignment.cc' || echo '$(srcdir)/'`Tuples/TupleAssignment.cc
+Tuples/driver_cfa_cpp-TupleAssignment.obj: Tuples/TupleAssignment.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-TupleAssignment.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Tpo -c -o Tuples/driver_cfa_cpp-TupleAssignment.obj `if test -f 'Tuples/TupleAssignment.cc'; then $(CYGPATH_W) 'Tuples/TupleAssignment.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleAssignment.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/TupleAssignment.cc' object='Tuples/driver_cfa_cpp-TupleAssignment.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 Tuples/driver_cfa_cpp-TupleAssignment.obj `if test -f 'Tuples/TupleAssignment.cc'; then $(CYGPATH_W) 'Tuples/TupleAssignment.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleAssignment.cc'; fi`
+Tuples/driver_cfa_cpp-TupleExpansion.o: Tuples/TupleExpansion.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-TupleExpansion.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Tpo -c -o Tuples/driver_cfa_cpp-TupleExpansion.o `test -f 'Tuples/TupleExpansion.cc' || echo '$(srcdir)/'`Tuples/TupleExpansion.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/TupleExpansion.cc' object='Tuples/driver_cfa_cpp-TupleExpansion.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 Tuples/driver_cfa_cpp-TupleExpansion.o `test -f 'Tuples/TupleExpansion.cc' || echo '$(srcdir)/'`Tuples/TupleExpansion.cc
+Tuples/driver_cfa_cpp-TupleExpansion.obj: Tuples/TupleExpansion.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-TupleExpansion.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Tpo -c -o Tuples/driver_cfa_cpp-TupleExpansion.obj `if test -f 'Tuples/TupleExpansion.cc'; then $(CYGPATH_W) 'Tuples/TupleExpansion.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleExpansion.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/TupleExpansion.cc' object='Tuples/driver_cfa_cpp-TupleExpansion.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 Tuples/driver_cfa_cpp-TupleExpansion.obj `if test -f 'Tuples/TupleExpansion.cc'; then $(CYGPATH_W) 'Tuples/TupleExpansion.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleExpansion.cc'; fi`
+Tuples/driver_cfa_cpp-Explode.o: Tuples/Explode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-Explode.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-Explode.Tpo -c -o Tuples/driver_cfa_cpp-Explode.o `test -f 'Tuples/Explode.cc' || echo '$(srcdir)/'`Tuples/Explode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-Explode.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-Explode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/Explode.cc' object='Tuples/driver_cfa_cpp-Explode.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 Tuples/driver_cfa_cpp-Explode.o `test -f 'Tuples/Explode.cc' || echo '$(srcdir)/'`Tuples/Explode.cc
+Tuples/driver_cfa_cpp-Explode.obj: Tuples/Explode.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-Explode.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-Explode.Tpo -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`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-Explode.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-Explode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/Explode.cc' object='Tuples/driver_cfa_cpp-Explode.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 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`
+Virtual/driver_cfa_cpp-ExpandCasts.o: Virtual/ExpandCasts.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Virtual/driver_cfa_cpp-ExpandCasts.o -MD -MP -MF Virtual/$(DEPDIR)/driver_cfa_cpp-ExpandCasts.Tpo -c -o Virtual/driver_cfa_cpp-ExpandCasts.o `test -f 'Virtual/ExpandCasts.cc' || echo '$(srcdir)/'`Virtual/ExpandCasts.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Virtual/$(DEPDIR)/driver_cfa_cpp-ExpandCasts.Tpo Virtual/$(DEPDIR)/driver_cfa_cpp-ExpandCasts.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Virtual/ExpandCasts.cc' object='Virtual/driver_cfa_cpp-ExpandCasts.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 Virtual/driver_cfa_cpp-ExpandCasts.o `test -f 'Virtual/ExpandCasts.cc' || echo '$(srcdir)/'`Virtual/ExpandCasts.cc
+Virtual/driver_cfa_cpp-ExpandCasts.obj: Virtual/ExpandCasts.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Virtual/driver_cfa_cpp-ExpandCasts.obj -MD -MP -MF Virtual/$(DEPDIR)/driver_cfa_cpp-ExpandCasts.Tpo -c -o Virtual/driver_cfa_cpp-ExpandCasts.obj `if test -f 'Virtual/ExpandCasts.cc'; then $(CYGPATH_W) 'Virtual/ExpandCasts.cc'; else $(CYGPATH_W) '$(srcdir)/Virtual/ExpandCasts.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Virtual/$(DEPDIR)/driver_cfa_cpp-ExpandCasts.Tpo Virtual/$(DEPDIR)/driver_cfa_cpp-ExpandCasts.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Virtual/ExpandCasts.cc' object='Virtual/driver_cfa_cpp-ExpandCasts.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 Virtual/driver_cfa_cpp-ExpandCasts.obj `if test -f 'Virtual/ExpandCasts.cc'; then $(CYGPATH_W) 'Virtual/ExpandCasts.cc'; else $(CYGPATH_W) '$(srcdir)/Virtual/ExpandCasts.cc'; fi`
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 .ll.cc:
 …
 .yy.cc:
         $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+mostlyclean-libtool:
+        -rm -f *.lo
+clean-libtool:
+        -rm -rf .libs _libs
+        -rm -rf ../driver/.libs ../driver/_libs
 ID: $(am__tagged_files)
 …
 check: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(LIBRARIES) $(PROGRAMS)
 installdirs:
         for dir in "$(DESTDIR)$(cfa_cpplibdir)"; do \
 …
         fi
 mostlyclean-generic:
+        -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 clean-generic:
 …
         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
         -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+        -rm -f ../driver/$(am__dirstamp)
+        -rm -f AST/$(DEPDIR)/$(am__dirstamp)
+        -rm -f AST/$(am__dirstamp)
         -rm -f CodeGen/$(DEPDIR)/$(am__dirstamp)
         -rm -f CodeGen/$(am__dirstamp)
 …
         -rm -f Common/$(DEPDIR)/$(am__dirstamp)
         -rm -f Common/$(am__dirstamp)
+        -rm -f Common/Stats/$(DEPDIR)/$(am__dirstamp)
+        -rm -f Common/Stats/$(am__dirstamp)
         -rm -f Concurrency/$(DEPDIR)/$(am__dirstamp)
         -rm -f Concurrency/$(am__dirstamp)
 …
         -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)
-        -rm -f driver/$(am__dirstamp)
 maintainer-clean-generic:
 …
 clean: clean-am
+clean-am: clean-cfa_cpplibPROGRAMS clean-generic mostlyclean-am
+clean-am: clean-cfa_cpplibPROGRAMS clean-generic clean-libtool \
+        clean-noinstLIBRARIES mostlyclean-am
 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) AST/$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Common/Stats/$(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 \
 …
 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) AST/$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Common/Stats/$(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
 …
 mostlyclean: mostlyclean-am
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool
 pdf: pdf-am
 …
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+        clean-cfa_cpplibPROGRAMS clean-generic cscopelist-am ctags \
+        ctags-am distclean distclean-compile distclean-generic \
+        clean-cfa_cpplibPROGRAMS clean-generic clean-libtool \
+        clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
+        distclean-compile distclean-generic distclean-libtool \
         distclean-tags distdir dvi dvi-am html html-am info info-am \
         install install-am install-cfa_cpplibPROGRAMS install-data \
 …
         installcheck-am installdirs maintainer-clean \
         maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+        uninstall-am uninstall-cfa_cpplibPROGRAMS
+        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+        tags tags-am uninstall uninstall-am \
+        uninstall-cfa_cpplibPROGRAMS
 .PRECIOUS: Makefile
+$(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/SynTree/Type.h
+$(srcdir)/AST/Type.hpp : BasicTypes-gen.cc
+        ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
+        @./BasicTypes-gen
+        @rm BasicTypes-gen
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/Parser/DeclarationNode.cc

-              r7951100
+              rb067d9b
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun  7 12:08:55 2018
 // Update Count     : 1079
+// Last Modified On : Thu Jul 25 22:17:10 2019
+// Update Count     : 1116
 //
 …
 // These must harmonize with the corresponding DeclarationNode enumerations.
+const char * DeclarationNode::basicTypeNames[] = { "void", "_Bool", "char", "int", "float", "double", "long double", "int128", "float80", "float128", "NoBasicTypeNames" };
+const char * DeclarationNode::complexTypeNames[] = { "_Complex", "_Imaginary", "NoComplexTypeNames" };
+const char * DeclarationNode::basicTypeNames[] = { "void", "_Bool", "char", "int", "int128",
+                                                                                                   "float", "double", "long double", "float80", "float128",
+                                                                                                   "_float16", "_float32", "_float32x", "_float64", "_float64x", "_float128", "_float128x", "NoBasicTypeNames" };
+const char * DeclarationNode::complexTypeNames[] = { "_Complex", "NoComplexTypeNames", "_Imaginary" }; // Imaginary unsupported => parse, but make invisible and print error message
 const char * DeclarationNode::signednessNames[] = { "signed", "unsigned", "NoSignednessNames" };
 const char * DeclarationNode::lengthNames[] = { "short", "long", "long long", "NoLengthNames" };
 const char * DeclarationNode::aggregateNames[] = { "struct", "union", "trait", "coroutine", "monitor", "thread", "NoAggregateNames" };
 const char * DeclarationNode::typeClassNames[] = { "otype", "dtype", "ftype", "NoTypeClassNames" };
 const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "zero_t", "one_t", "NoBuiltinTypeNames" };
+const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "__auto_type", "zero_t", "one_t", "NoBuiltinTypeNames" };
 UniqueName DeclarationNode::anonymous( "__anonymous" );
 …
 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;
 …
         newnode->builtin = NoBuiltinType;
         newnode->type = maybeClone( type );
+        newnode->inLine = inLine;
         newnode->storageClasses = storageClasses;
         newnode->funcSpecs = funcSpecs;
 …
 } // 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 ) {
 …
+}
 void DeclarationNode::printList( std::ostream &os, int indent ) const {
+void DeclarationNode::printList( std::ostream & os, int indent ) const {
         ParseNode::printList( os, indent );
         if ( hasEllipsis ) {
 …
 } // DeclarationNode::newFromTypedef
+DeclarationNode * DeclarationNode::newFromGlobalScope() {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::GlobalScope );
+        return newnode;
+}
+DeclarationNode * DeclarationNode::newQualifiedType( DeclarationNode * parent, DeclarationNode * child) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::Qualified );
+        newnode->type->qualified.parent = parent->type;
+        newnode->type->qualified.child = child->type;
+        parent->type = nullptr;
+        child->type = nullptr;
+        delete parent;
+        delete child;
+        return newnode;
+}
 DeclarationNode * DeclarationNode::newAggregate( Aggregate kind, const string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
-        assert( name );
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Aggregate );
         newnode->type->aggregate.kind = kind;
         newnode->type->aggregate.name = name;
+        newnode->type->aggregate.name =  name == nullptr ? new string( DeclarationNode::anonymous.newName() ) : name;
         newnode->type->aggregate.actuals = actuals;
         newnode->type->aggregate.fields = fields;
 …
         newnode->type->aggregate.tagged = false;
         newnode->type->aggregate.parent = nullptr;
+        newnode->type->aggregate.anon = name == nullptr;
         return newnode;
 } // DeclarationNode::newAggregate
 DeclarationNode * DeclarationNode::newEnum( const string * name, DeclarationNode * constants, bool body ) {
-        assert( name );
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Enum );
         newnode->type->enumeration.name = name;
+        newnode->type->enumeration.name = name == nullptr ? new string( DeclarationNode::anonymous.newName() ) : name;
         newnode->type->enumeration.constants = constants;
         newnode->type->enumeration.body = body;
+        newnode->type->enumeration.anon = name == nullptr;
         return newnode;
 } // DeclarationNode::newEnum
 …
+}
 DeclarationNode * DeclarationNode::newTypeof( ExpressionNode * expr ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Typeof );
+DeclarationNode * DeclarationNode::newTypeof( ExpressionNode * expr, bool basetypeof ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( basetypeof ? TypeData::Basetypeof : TypeData::Typeof );
         newnode->type->typeexpr = expr;
         return newnode;
 …
         return newnode;
 } // DeclarationNode::newBuiltinType
-DeclarationNode * DeclarationNode::newAttr( const string * name, ExpressionNode * expr ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = nullptr;
-//      newnode->attr.name = name;
-        newnode->name = name;
-        newnode->attr.expr = expr;
-        return newnode;
+}
-DeclarationNode * DeclarationNode::newAttr( const string * name, DeclarationNode * type ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = nullptr;
-//      newnode->attr.name = name;
-        newnode->name = name;
-        newnode->attr.type = type;
-        return newnode;
+}
 DeclarationNode * DeclarationNode::newAttribute( const string * name, ExpressionNode * expr ) {
 …
 } // DeclarationNode::copySpecifiers
+static void addQualifiersToType( TypeData *&src, TypeData * dst ) {
+        if ( src->forall && dst->kind == TypeData::Function ) {
+                if ( dst->forall ) {
+                        dst->forall->appendList( src->forall );
+                } else {
+                        dst->forall = src->forall;
+                } // if
+                src->forall = nullptr;
+        } // if
+static void addQualifiersToType( TypeData *& src, TypeData * dst ) {
         if ( dst->base ) {
                 addQualifiersToType( src, dst->base );
 …
 } // 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 ) {
 …
+}
 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 );
 …
         for ( const DeclarationNode * cur = firstNode; cur; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ) ) {
                 try {
+                        bool extracted = false;
+                        bool anon = false;
                         if ( DeclarationNode * extr = cur->extractAggregate() ) {
                                 // handle the case where a structure declaration is contained within an object or type declaration
                                 Declaration * decl = extr->build();
                                 if ( decl ) {
+                                        // hoist the structure declaration
                                         decl->location = cur->location;
                                         * out++ = decl;
+                                        // need to remember the cases where a declaration contains an anonymous aggregate definition
+                                        extracted = true;
+                                        assert( extr->type );
+                                        if ( extr->type->kind == TypeData::Aggregate ) {
+                                                anon = extr->type->aggregate.anon;
+                                        } else if ( extr->type->kind == TypeData::Enum ) {
+                                                // xxx - is it useful to have an implicit anonymous enum member?
+                                                anon = extr->type->enumeration.anon;
+                                        }
                                 } // if
                                 delete extr;
 …
                         Declaration * decl = cur->build();
                         if ( decl ) {
+                                decl->location = cur->location;
+                                * out++ = decl;
+                                // don't include anonymous declaration for named aggregates, but do include them for anonymous aggregates, e.g.:
+                                // struct S {
+                                //   struct T { int x; }; // no anonymous member
+                                //   struct { int y; };   // anonymous member
+                                //   struct T;            // anonymous member
+                                // };
+                                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 ) {
+                                                                        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;
+                                } // if
                         } // if
                 } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
         } // while
+        } // for
         if ( ! errors.isEmpty() ) {
 …
 } // buildList
+void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > &outputList ) {
+// currently only builds assertions, function parameters, and return values
+void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > & outputList ) {
         SemanticErrorException errors;
         std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList );
 …
                 try {
                         Declaration * decl = cur->build();
+                        if ( decl ) {
+                                if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                        dwt->location = cur->location;
+                                        * out++ = dwt;
+                                } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
+                                        StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
+                                        auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                        obj->location = cur->location;
+                                        * out++ = obj;
+                                        delete agg;
+                                } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
+                                        UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
+                                        auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                        obj->location = cur->location;
+                                        * out++ = obj;
+                                } // if
+                        assert( decl );
+                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                dwt->location = cur->location;
+                                * out++ = dwt;
+                        } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
+                                // e.g., int foo(struct S) {}
+                                StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->name );
+                                auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                obj->location = cur->location;
+                                * out++ = obj;
+                                delete agg;
+                        } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
+                                // e.g., int foo(union U) {}
+                                UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->name );
+                                auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                obj->location = cur->location;
+                                * out++ = obj;
+                        } else if ( EnumDecl * agg = dynamic_cast< EnumDecl * >( decl ) ) {
+                                // e.g., int foo(enum E) {}
+                                EnumInstType * inst = new EnumInstType( Type::Qualifiers(), agg->name );
+                                auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                obj->location = cur->location;
+                                * out++ = obj;
                         } // if
                 } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
 …
 } // 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 );
 …
                 try {
                         * out++ = cur->buildType();
                 } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
 …
                 if ( type->kind != TypeData::Function && funcSpecs.any() ) {
                         SemanticError( this, "invalid function specifier for " );
+                } // if
+                // Forall qualifier can only appear on a function/aggregate definition/declaration.
+                //
+                //    forall int f();                                   // allowed
+                //    forall int g( int i );                    // allowed
+                //    forall int i;                                             // disallowed
+                if ( type->kind != TypeData::Function && type->forall ) {
+                        SemanticError( this, "invalid type qualifier for " );
                 } // if
                 bool isDelete = initializer && initializer->get_isDelete();

src/Parser/ExpressionNode.cc

-              r7951100
+              rb067d9b
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Jun  4 21:24:45 2018
 // Update Count     : 802
+// Last Modified On : Sun Aug  4 20:57:55 2019
+// Update Count     : 978
 //
 …
 extern const Type::Qualifiers noQualifiers;                             // no qualifiers on constants
+static inline bool checkH( char c ) { return c == 'h' || c == 'H'; }
+static inline bool checkL( char c ) { return c == 'l' || c == 'L'; }
+static inline bool checkZ( char c ) { return c == 'z' || c == 'Z'; }
+static inline bool checkU( char c ) { return c == 'u' || c == 'U'; }
+// static inline bool checkH( char c ) { return c == 'h' || c == 'H'; }
+// static inline bool checkZ( char c ) { return c == 'z' || c == 'Z'; }
+// static inline bool checkU( char c ) { return c == 'u' || c == 'U'; }
 static inline bool checkF( char c ) { return c == 'f' || c == 'F'; }
 static inline bool checkD( char c ) { return c == 'd' || c == 'D'; }
+static inline bool checkF80( char c ) { return c == 'w' || c == 'W'; }
+static inline bool checkF128( char c ) { return c == 'q' || c == 'Q'; }
+static inline bool checkL( char c ) { return c == 'l' || c == 'L'; }
 static inline bool checkI( char c ) { return c == 'i' || c == 'I'; }
 static inline bool checkB( char c ) { return c == 'b' || c == 'B'; }
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
+static const char * lnthsInt[2][6] = {
+        { "int8_t", "int16_t", "int32_t", "int64_t", "size_t", },
+        { "uint8_t", "uint16_t", "uint32_t", "uint64_t", "size_t", }
+}; // lnthsInt
+static inline void checkLNInt( string & str, int & lnth, int & size ) {
+        string::size_type posn = str.find_first_of( "lL" ), start = posn;
+  if ( posn == string::npos ) return;
+        size = 4;                                                                                       // assume largest size
+        posn += 1;                                                                                      // advance to size
+        if ( str[posn] == '8' ) {                                                       // 8
+                lnth = 0;
+        } else if ( str[posn] == '1' ) {
+                posn += 1;
+                if ( str[posn] == '6' ) {                                               // 16
+                        lnth = 1;
+// static inline bool checkN( char c ) { return c == 'n' || c == 'N'; }
+void lnthSuffix( string & str, int & type, int & ltype ) {
+        string::size_type posn = str.find_last_of( "lL" );
+        if ( posn == string::npos ) return;                                     // no suffix
+        if ( posn == str.length() - 1 ) { type = 3; return; } // no length => long
+        string::size_type next = posn + 1;                                      // advance to length
+        if ( str[next] == '3' ) {                                                       // 32
+                type = ltype = 2;
+        } else if ( str[next] == '6' ) {                                        // 64
+                type = ltype = 3;
+        } else if ( str[next] == '8' ) {                                        // 8
+                type = ltype = 1;
+        } else if ( str[next] == '1' ) {
+                if ( str[next + 1] == '6' ) {                                   // 16
+                        type = ltype = 0;
                 } else {                                                                                // 128
+                        posn += 1;
+                        lnth = 5;
+                } // if
+        } else {
+                if ( str[posn] == '3' ) {                                               // 32
+                        lnth = 2;
+                } else if ( str[posn] == '6' ) {                                // 64
+                        lnth = 3;
+                } else {
+                        assertf( false, "internal error, bad integral length %s", str.c_str() );
+                } // if
+                posn += 1;
+        } // if
+        str.erase( start, posn - start + 1 );                           // remove length suffix
+} // checkLNInt
+                        type = 5; ltype = 6;
+                } // if
+        } // if
+        // remove "lL" for these cases because it may not imply long
+        str.erase( posn );                                                                      // remove length
+} // lnthSuffix
+void valueToType( unsigned long long int & v, bool dec, int & type, bool & Unsigned ) {
+        // use value to determine type
+        if ( v <= INT_MAX ) {                                                           // signed int
+                type = 2;
+        } else if ( v <= UINT_MAX && ! dec ) {                          // unsigned int
+                type = 2;
+                Unsigned = true;                                                                // unsigned
+        } else if ( v <= LONG_MAX ) {                                           // signed long int
+                type = 3;
+        } else if ( v <= ULONG_MAX && ( ! dec || LONG_MAX == LLONG_MAX ) ) { // signed long int
+                type = 3;
+                Unsigned = true;                                                                // unsigned long int
+        } else if ( v <= LLONG_MAX ) {                                          // signed long long int
+                type = 4;
+        } else {                                                                                        // unsigned long long int
+                type = 4;
+                Unsigned = true;                                                                // unsigned long long int
+        } // if
+} // valueToType
 Expression * build_constantInteger( string & str ) {
         static const BasicType::Kind kind[2][6] = {
                 // short (h) must be before char (hh)
+                // short (h) must be before char (hh) because shorter type has the longer suffix
                 { BasicType::ShortSignedInt, BasicType::SignedChar, BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt, BasicType::SignedInt128, },
                 { BasicType::ShortUnsignedInt, BasicType::UnsignedChar, BasicType::UnsignedInt, BasicType::LongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::UnsignedInt128, },
         };
+        bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
+        int size;                                                                                       // 0 => short, 1 => char, 2 => int, 3 => long int, 4 => long long int, 5 => int128
+        int lnth = -1;                                                                          // literal length
+        static const char * lnthsInt[2][6] = {
+                { "int16_t",  "int8_t",  "int32_t",  "int64_t",  "size_t",  "uintptr_t", },
+                { "uint16_t", "uint8_t", "uint32_t", "uint64_t", "size_t",  "uintptr_t", },
+        }; // lnthsInt
         unsigned long long int v;                                                       // converted integral value
         size_t last = str.length() - 1;                                         // last subscript of constant
         Expression * ret;
+        //string fred( str );
+        int type = -1;                                                                          // 0 => short, 1 => char, 2 => int, 3 => long int, 4 => long long int, 5 => int128
+        int ltype = -1;                                                                         // 0 => 16 bits, 1 => 8 bits, 2 => 32 bits, 3 => 64 bits, 4 => size_t, 5 => intptr, 6 => pointer
+        bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
         // special constants
 …
         } // if
         // Cannot be "0"
+        // Cannot be just "0"/"1"; sscanf stops at the suffix, if any; value goes over the wall => always generate
         if ( str[0] == '0' ) {                                                          // radix character ?
 …
                         //printf( "%llx %llu\n", v, v );
                 } else if ( checkB( str[1] ) ) {                                // binary constant ?
                         v = 0;
                         for ( unsigned int i = 2;; i += 1 ) {           // compute value
+                        v = 0;                                                                          // compute value
+                        for ( unsigned int i = 2;; ) {                          // ignore prefix
                                 if ( str[i] == '1' ) v |= 1;
+                          if ( i == last ) break;
+                                i += 1;
+                          if ( i == last - 1 || (str[i] != '0' && str[i] != '1') ) break;
                                 v <<= 1;
                         } // for
                         //printf( "%llx %llu\n", v, v );
+                        //printf( "%#llx %llu\n", v, v );
                 } else {                                                                                // octal constant
                         sscanf( (char *)str.c_str(), "%llo", &v );
                         //printf( "%llo %llu\n", v, v );
+                        //printf( "%#llo %llu\n", v, v );
                 } // if
         } else {                                                                                        // decimal constant ?
                 sscanf( (char *)str.c_str(), "%llu", &v );
+                //printf( "%llu %llu\n", v, v );
+        } // if
+        if ( v <= INT_MAX ) {                                                           // signed int
+                size = 2;
+        } else if ( v <= UINT_MAX && ! dec ) {                          // unsigned int
+                size = 2;
+                Unsigned = true;                                                                // unsigned
+        } else if ( v <= LONG_MAX ) {                                           // signed long int
+                size = 3;
+        } else if ( v <= ULONG_MAX && ( ! dec || LONG_MAX == LLONG_MAX ) ) { // signed long int
+                size = 3;
+                Unsigned = true;                                                                // unsigned long int
+        } else if ( v <= LLONG_MAX ) {                                          // signed long long int
+                size = 4;
+        } else {                                                                                        // unsigned long long int
+                size = 4;
+                Unsigned = true;                                                                // unsigned long long int
+        } // if
+        // At least one digit in integer constant, so safe to backup while looking for suffix.
+        if ( checkU( str[last] ) ) {                                            // suffix 'u' ?
+                Unsigned = true;
+                if ( checkL( str[last - 1] ) ) {                                // suffix 'l' ?
+                        size = 3;
+                        if ( checkL( str[last - 2] ) ) {                        // suffix "ll" ?
+                                size = 4;
+                //printf( "%llu\n", v );
+        } // if
+        string::size_type posn;
+        if ( isdigit( str[last] ) ) {                                           // no suffix ?
+                lnthSuffix( str, type, ltype );                                 // could have length suffix
+                if ( type == -1 ) {                                                             // no suffix
+                        valueToType( v, dec, type, Unsigned );
+                } // if
+        } else {
+                // At least one digit in integer constant, so safe to backup while looking for suffix.
+                posn = str.find_last_of( "pP" );
+                if ( posn != string::npos ) { valueToType( v, dec, type, Unsigned ); ltype = 5; str.erase( posn, 1 ); goto FINI; }
+                posn = str.find_last_of( "zZ" );
+                if ( posn != string::npos ) { Unsigned = true; type = 2; ltype = 4; str.erase( posn, 1 ); goto FINI; }
+                // 'u' can appear before or after length suffix
+                if ( str.find_last_of( "uU" ) != string::npos ) Unsigned = true;
+                posn = str.rfind( "hh" );
+                if ( posn != string::npos ) { type = 1; str.erase( posn, 2 ); goto FINI; }
+                posn = str.rfind( "HH" );
+                if ( posn != string::npos ) { type = 1; str.erase( posn, 2 ); goto FINI; }
+                posn = str.find_last_of( "hH" );
+                if ( posn != string::npos ) { type = 0; str.erase( posn, 1 ); goto FINI; }
+                posn = str.find_last_of( "nN" );
+                if ( posn != string::npos ) { type = 2; str.erase( posn, 1 ); goto FINI; }
+                if ( str.rfind( "ll" ) != string::npos || str.rfind( "LL" ) != string::npos ) { type = 4; goto FINI; }
+                lnthSuffix( str, type, ltype );                                 // must be after check for "ll"
+                if ( type == -1 ) {                                                             // only 'u' suffix ?
+                        valueToType( v, dec, type, Unsigned );
+                } // if
+          FINI: ;
+        } // if
+        //if ( !( 0 <= type && type <= 6 ) ) { printf( "%s %lu %d %s\n", fred.c_str(), fred.length(), type, str.c_str() ); }
+        assert( 0 <= type && type <= 6 );
+        // Constant type is correct for overload resolving.
+        ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][type] ), str, v ) );
+        if ( Unsigned && type < 2 ) {                                           // hh or h, less than int ?
+                // int i = -1uh => 65535 not -1, so cast is necessary for unsigned, which unfortunately eliminates warnings for large values.
+                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][type] ), false );
+        } else if ( ltype != -1 ) {                                                     // explicit length ?
+                if ( ltype == 6 ) {                                                             // int128, (int128)constant
+                        ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][type] ), false );
+                } else {                                                                                // explicit length, (length_type)constant
+                        ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][ltype], false ), false );
+                        if ( ltype == 5 ) {                                                     // pointer, intptr( (uintptr_t)constant )
+                                ret = build_func( new ExpressionNode( build_varref( new string( "intptr" ) ) ), new ExpressionNode( ret ) );
                         } // if
+                } else if ( checkH( str[last - 1] ) ) {                 // suffix 'h' ?
+                        size = 0;
+                        if ( checkH( str[last - 2] ) ) {                        // suffix "hh" ?
+                                size = 1;
+                        } // if
+                        str.erase( last - size - 1, size + 1 );         // remove 'h'/"hh"
+                } else {                                                                                // suffix "ln" ?
+                        checkLNInt( str, lnth, size );
+                } // if
+        } else if ( checkL( str[ last ] ) ) {                           // suffix 'l' ?
+                size = 3;
+                if ( checkL( str[last - 1] ) ) {                                // suffix 'll' ?
+                        size = 4;
+                        if ( checkU( str[last - 2] ) ) {                        // suffix 'u' ?
+                                Unsigned = true;
+                        } // if
+                } else if ( checkU( str[last - 1] ) ) {                 // suffix 'u' ?
+                        Unsigned = true;
+                } // if
+        } else if ( checkH( str[ last ] ) ) {                           // suffix 'h' ?
+                size = 0;
+                if ( checkH( str[last - 1] ) ) {                                // suffix "hh" ?
+                        size = 1;
+                        if ( checkU( str[last - 2] ) ) {                        // suffix 'u' ?
+                                Unsigned = true;
+                        } // if
+                } else if ( checkU( str[last - 1] ) ) {                 // suffix 'u' ?
+                        Unsigned = true;
+                } // if
+                str.erase( last - size, size + 1 );                             // remove 'h'/"hh"
+        } else if ( checkZ( str[last] ) ) {                                     // suffix 'z' ?
+                lnth = 4;
+                str.erase( last, 1 );                                                   // remove 'z'
+        } else {                                                                                        // suffix "ln" ?
+                checkLNInt( str, lnth, size );
+        } // if
+        assert( 0 <= size && size < 6 );
+        // Constant type is correct for overload resolving.
+        ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
+        if ( Unsigned && size < 2 ) {                                           // hh or h, less than int ?
+                // int i = -1uh => 65535 not -1, so cast is necessary for unsigned, which unfortunately eliminates warnings for large values.
+                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ), false );
+        } else if ( lnth != -1 ) {                                                      // explicit length ?
+                if ( lnth == 5 ) {                                                              // int128 ?
+                        size = 5;
+                        ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ), false );
+                } else {
+                        ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][lnth], false ), false );
+                } // if
+        } // if
+  CLEANUP:
+                } // if
+        } // if
+  CLEANUP: ;
         delete &str;                                                                            // created by lex
         return ret;
 …
+static inline void checkLNFloat( string & str, int & lnth, int & size ) {
+        string::size_type posn = str.find_first_of( "lL" ), start = posn;
+static inline void checkFnxFloat( string & str, size_t last, bool & explnth, int & type ) {
+        string::size_type posn;
+        // floating-point constant has minimum of 2 characters, 1. or .1, so safe to look ahead
+        if ( str[1] == 'x' ) {                                                          // hex ?
+                posn = str.find_last_of( "pP" );                                // back for exponent (must have)
+                posn = str.find_first_of( "fF", posn + 1 );             // forward for size (fF allowed in hex constant)
+        } else {
+                posn = str.find_last_of( "fF" );                                // back for size (fF not allowed)
+        } // if
   if ( posn == string::npos ) return;
+        size = 2;                                                                                       // assume largest size
+        lnth = 0;
+        explnth = true;
         posn += 1;                                                                                      // advance to size
         if ( str[posn] == '3' ) {                                                       // 32
+                size = 0;
+                if ( str[last] != 'x' ) type = 6;
+                else type = 7;
         } else if ( str[posn] == '6' ) {                                        // 64
+                size = 1;
+        } else if ( str[posn] == '8' || str[posn] == '1' ) { // 80, 128
+                size = 2;
+                if ( str[posn] == '1' ) posn += 1;
+                if ( str[last] != 'x' ) type = 8;
+                else type = 9;
+        } else if ( str[posn] == '8' ) {                                        // 80
+                type = 3;
+        } else if ( str[posn] == '1' ) {                                        // 16/128
+                if ( str[posn + 1] == '6' ) {                                   // 16
+                        type = 5;
+                } else {                                                                                // 128
+                        if ( str[last] != 'x' ) type = 10;
+                        else type = 11;
+                } // if
         } else {
                 assertf( false, "internal error, bad floating point length %s", str.c_str() );
         } // if
+        posn += 1;
+        str.erase( start, posn - start + 1 );                           // remove length suffix
+} // checkLNFloat
+} // checkFnxFloat
 Expression * build_constantFloat( string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::Float, BasicType::Double, BasicType::LongDouble },
                 { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex },
+        static const BasicType::Kind kind[2][12] = {
+                { BasicType::Float, BasicType::Double, BasicType::LongDouble, BasicType::uuFloat80, BasicType::uuFloat128, BasicType::uFloat16, BasicType::uFloat32, BasicType::uFloat32x, BasicType::uFloat64, BasicType::uFloat64x, BasicType::uFloat128, BasicType::uFloat128x },
+                { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex, (BasicType::Kind)-1, (BasicType::Kind)-1, BasicType::uFloat16Complex, BasicType::uFloat32Complex, BasicType::uFloat32xComplex, BasicType::uFloat64Complex, BasicType::uFloat64xComplex, BasicType::uFloat128Complex, BasicType::uFloat128xComplex },
         };
+        bool complx = false;                                                            // real, complex
+        int size = 1;                                                                           // 0 => float, 1 => double, 2 => long double
+        int lnth = -1;                                                                          // literal length
+        // floating-point constant has minimum of 2 characters: 1. or .1
+        // floating-point constant has minimum of 2 characters 1. or .1
         size_t last = str.length() - 1;
         double v;
+        int type;                                                                                       // 0 => float, 1 => double, 3 => long double, ...
+        bool complx = false;                                                            // real, complex
+        bool explnth = false;                                                           // explicit literal length
         sscanf( str.c_str(), "%lg", &v );
 …
         if ( checkF( str[last] ) ) {                                            // float ?
                 size = 0;
+                type = 0;
         } else if ( checkD( str[last] ) ) {                                     // double ?
                 size = 1;
+                type = 1;
         } else if ( checkL( str[last] ) ) {                                     // long double ?
+                size = 2;
+                type = 2;
+        } else if ( checkF80( str[last] ) ) {                           // __float80 ?
+                type = 3;
+        } else if ( checkF128( str[last] ) ) {                          // __float128 ?
+                type = 4;
         } else {
+                size = 1;                                                                               // double (default)
+                checkLNFloat( str, lnth, size );
+        } // if
+                type = 1;                                                                               // double (default if no suffix)
+                checkFnxFloat( str, last, explnth, type );
+        } // if
         if ( ! complx && checkI( str[last - 1] ) ) {            // imaginary ?
                 complx = true;
         } // if
         assert( 0 <= size && size < 3 );
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
         if ( lnth != -1 ) {                                                                     // explicit length ?
                 ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][size] ), false );
+        assert( 0 <= type && type < 12 );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][type] ), str, v ) );
+        if ( explnth ) {                                                                        // explicit length ?
+                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][type] ), false );
         } // if
 …
                                                                         new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ), // +1 for '\0' and -2 for '"'
                                                                         false, false );
         Expression * ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) ); // constant 0 is ignored for pure string value
+        Expression * ret = new ConstantExpr( Constant( at, str, std::nullopt ) );
         if ( units.length() != 0 ) {
                 ret = new UntypedExpr( new NameExpr( units ), { ret } );

src/Parser/LinkageSpec.cc

-              r7951100
+              rb067d9b
 // Created On       : Sat May 16 13:22:09 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul  7 11:11:00 2017
 // Update Count     : 25
+// Last Modified On : Thr Spt 12 15:59:00 2018
+// Update Count     : 26
 //
 …
 namespace LinkageSpec {
-Spec linkageCheck( CodeLocation location, const string * spec ) {
-        assert( spec );
-        unique_ptr<const string> guard( spec ); // allocated by lexer
-        if ( *spec == "\"Cforall\"" ) {
-                return Cforall;
-        } else if ( *spec == "\"C\"" ) {
-                return C;
-        } else if ( *spec == "\"BuiltinC\"" ) {
-                return BuiltinC;
-        } else {
-                SemanticError( location, "Invalid linkage specifier " + *spec );
-        } // if
+}
 Spec linkageUpdate( CodeLocation location, Spec old_spec, const string * cmd ) {

src/Parser/LinkageSpec.h

-              r7951100
+              rb067d9b
 // Created On       : Sat May 16 13:24:28 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:32:16 2017
 // Update Count     : 14
+// Last Modified On : Wed Jul 10 16:02:34 2019
+// Update Count     : 18
 //
 …
 namespace LinkageSpec {
         // All linkage specs are some combination of these flags:
+        enum {
+                Mangle = 1 << 0,
+                Generate = 1 << 1,
+                Overrideable = 1 << 2,
+                Builtin = 1 << 3,
+                GccBuiltin = 1 << 4,
+                NoOfSpecs = 1 << 5,
+        };
+        enum { Mangle = 1 << 0, Generate = 1 << 1, Overrideable = 1 << 2, Builtin = 1 << 3, GccBuiltin = 1 << 4, NoOfSpecs = 1 << 5, };
         union Spec {
 …
                 };
                 constexpr Spec( unsigned int val ) : val( val ) {}
+                constexpr Spec( Spec const &other ) : val( other.val ) {}
+                constexpr Spec( Spec const & other ) : val( other.val ) {}
+                constexpr Spec & operator=( const Spec & ) = default;
                 // Operators may go here.
                 // Supports == and !=
                 constexpr operator unsigned int () const { return val; }
+                constexpr operator unsigned int() const { return val; }
         };
-        Spec linkageCheck( CodeLocation location, const std::string * );
-        // Returns the Spec with the given name (limited to C, Cforall & BuiltinC)
         Spec linkageUpdate( CodeLocation location, Spec old_spec, const std::string * cmd );
         /* If cmd = "C" returns a Spec that is old_spec with is_mangled = false

src/Parser/ParseNode.h

-              r7951100
+              rb067d9b
 // 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 : Thu Jul 25 22:17:10 2019
+// Update Count     : 876
 //
 …
+        }
         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 );
 …
         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;
 …
         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>
 …
         Expression * build() const { return const_cast<ExpressionNode *>(this)->expr.release(); }
+        std::unique_ptr<Expression> expr;                                       // public because of lifetime implications
   private:
         bool extension = false;
-        std::unique_ptr<Expression> expr;
 }; // ExpressionNode
 …
 class DeclarationNode : public ParseNode {
   public:
+        // These enumerations must harmonize with their names.
+        enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, Int128, Float80, Float128, NoBasicType };
+        // These enumerations must harmonize with their names in DeclarationNode.cc.
+        enum BasicType { Void, Bool, Char, Int, Int128,
+                                         Float, Double, LongDouble, uuFloat80, uuFloat128,
+                                         uFloat16, uFloat32, uFloat32x, uFloat64, uFloat64x, uFloat128, uFloat128x, NoBasicType };
         static const char * basicTypeNames[];
         enum ComplexType { Complex, Imaginary, NoComplexType };
+        enum ComplexType { Complex, NoComplexType, Imaginary }; // Imaginary unsupported => parse, but make invisible and print error message
         static const char * complexTypeNames[];
         enum Signedness { Signed, Unsigned, NoSignedness };
 …
         enum TypeClass { Otype, Dtype, Ftype, Ttype, NoTypeClass };
         static const char * typeClassNames[];
         enum BuiltinType { Valist, Zero, One, NoBuiltinType };
+        enum BuiltinType { Valist, AutoType, Zero, One, NoBuiltinType };
         static const char * builtinTypeNames[];
 …
         static DeclarationNode * newForall( DeclarationNode * );
         static DeclarationNode * newFromTypedef( const std::string * );
+        static DeclarationNode * newFromGlobalScope();
+        static DeclarationNode * newQualifiedType( DeclarationNode *, DeclarationNode * );
         static DeclarationNode * newFunction( const std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body );
         static DeclarationNode * newAggregate( Aggregate kind, const std::string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body );
 …
         static DeclarationNode * newBitfield( ExpressionNode * size );
         static DeclarationNode * newTuple( DeclarationNode * members );
+        static DeclarationNode * newTypeof( ExpressionNode * expr );
+        static DeclarationNode * newAttr( const std::string *, ExpressionNode * expr ); // @ attributes
+        static DeclarationNode * newAttr( const std::string *, DeclarationNode * type ); // @ attributes
+        static DeclarationNode * newTypeof( ExpressionNode * expr, bool basetypeof = false );
         static DeclarationNode * newAttribute( const std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
 …
+        }
         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;
 …
         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(); }
 …
         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;
 …
         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;
+        }
 …
 Statement * build_expr( ExpressionNode * ctl );
 struct IfCtl {
         IfCtl( DeclarationNode * decl, ExpressionNode * condition ) :
+struct IfCtrl {
+        IfCtrl( DeclarationNode * decl, ExpressionNode * condition ) :
                 init( decl ? new StatementNode( decl ) : nullptr ), condition( condition ) {}
 …
 };
 struct ForCtl {
         ForCtl( ExpressionNode * expr, ExpressionNode * condition, ExpressionNode * change ) :
+struct ForCtrl {
+        ForCtrl( ExpressionNode * expr, ExpressionNode * condition, ExpressionNode * change ) :
                 init( new StatementNode( build_expr( expr ) ) ), condition( condition ), change( change ) {}
         ForCtl( DeclarationNode * decl, ExpressionNode * condition, ExpressionNode * change ) :
+        ForCtrl( DeclarationNode * decl, ExpressionNode * condition, ExpressionNode * change ) :
                 init( new StatementNode( decl ) ), condition( condition ), change( change ) {}
 …
 };
 Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init );
 Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
+Expression * build_if_control( IfCtrl * ctl, std::list< Statement * > & init );
+Statement * build_if( IfCtrl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
 Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_case( ExpressionNode * ctl );
 Statement * build_default();
 Statement * build_while( IfCtl * ctl, StatementNode * stmt );
+Statement * build_while( IfCtrl * ctl, StatementNode * stmt );
 Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_for( ForCtl * forctl, StatementNode * stmt );
+Statement * build_for( ForCtrl * forctl, StatementNode * stmt );
 Statement * build_branch( BranchStmt::Type kind );
 Statement * build_branch( std::string * identifier, BranchStmt::Type kind );
 …
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when, StatementNode * else_stmt, ExpressionNode * else_when );
 WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt );
+Statement * build_with( ExpressionNode * exprs, StatementNode * stmt );
 //##############################################################################
 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 );
 …
                                 assertf(false, "buildList unknown type");
                         } // if
                 } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
 …
 // 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/StatementNode.cc

-              r7951100
+              rb067d9b
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Jun  5 08:58:34 2018
 // Update Count     : 362
+// Last Modified On : Sat Aug  4 09:39:25 2018
+// Update Count     : 363
 //
 …
 } // build_expr
 Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init ) {
+Expression * build_if_control( IfCtrl * ctl, std::list< Statement * > & init ) {
         if ( ctl->init != 0 ) {
                 buildMoveList( ctl->init, init );
 …
 } // build_if_control
 Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
+Statement * build_if( IfCtrl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
         Statement * thenb, * elseb = nullptr;
         std::list< Statement * > branches;
 …
 } // build_default
 Statement * build_while( IfCtl * ctl, StatementNode * stmt ) {
+Statement * build_while( IfCtrl * ctl, StatementNode * stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
 …
 } // build_do_while
 Statement * build_for( ForCtl * forctl, StatementNode * stmt ) {
+Statement * build_for( ForCtrl * forctl, StatementNode * stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
 …
 } // build_waitfor_timeout
 WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
+Statement * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
         std::list< Expression * > e;
         buildMoveList( exprs, e );
         Statement * s = maybeMoveBuild<Statement>( stmt );
         return new WithStmt( e, s );
+        return new DeclStmt( new WithStmt( e, s ) );
 } // build_with

src/Parser/TypeData.cc

-              r7951100
+              rb067d9b
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jun  6 17:40:33 2018
 // Update Count     : 604
+// Last Modified On : Wed Feb 13 18:16:23 2019
+// Update Count     : 649
 //
 …
           case Reference:
           case EnumConstant:
+          case GlobalScope:
                 // nothing else to initialize
                 break;
 …
                 enumeration.constants = nullptr;
                 enumeration.body = false;
+                enumeration.anon = false;
                 break;
           case Aggregate:
 …
                 aggregate.tagged = false;
                 aggregate.parent = nullptr;
+                aggregate.anon = false;
                 break;
           case AggregateInst:
 …
                 aggInst.aggregate = nullptr;
                 aggInst.params = nullptr;
                 aggInst.hoistType = false;;
+                aggInst.hoistType = false;
                 break;
           case Symbolic:
 …
                 break;
           case Typeof:
+          case Basetypeof:
                 // typeexpr = new Typeof_t;
                 typeexpr = nullptr;
 …
           case Builtin:
                 // builtin = new Builtin_t;
+                case Qualified:
+                qualified.parent = nullptr;
+                qualified.child = nullptr;
                 break;
         } // switch
 …
           case Reference:
           case EnumConstant:
+          case GlobalScope:
                 // nothing to destroy
                 break;
 …
                 break;
           case Typeof:
+          case Basetypeof:
                 // delete typeexpr->expr;
                 delete typeexpr;
 …
                 // delete builtin;
                 break;
+          case Qualified:
+                delete qualified.parent;
+                delete qualified.child;
         } // switch
 } // TypeData::~TypeData
 …
           case Pointer:
           case Reference:
+          case GlobalScope:
                 // nothing else to copy
                 break;
 …
                 newtype->aggregate.fields = maybeClone( aggregate.fields );
                 newtype->aggregate.body = aggregate.body;
+                newtype->aggregate.anon = aggregate.anon;
                 newtype->aggregate.tagged = aggregate.tagged;
                 newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr;
 …
                 newtype->enumeration.constants = maybeClone( enumeration.constants );
                 newtype->enumeration.body = enumeration.body;
+                newtype->enumeration.anon = enumeration.anon;
                 break;
           case Symbolic:
 …
                 break;
           case Typeof:
+          case Basetypeof:
                 newtype->typeexpr = maybeClone( typeexpr );
                 break;
 …
                 assert( builtintype == DeclarationNode::Zero || builtintype == DeclarationNode::One );
                 newtype->builtintype = builtintype;
+                break;
+                case Qualified:
+                newtype->qualified.parent = maybeClone( qualified.parent );
+                newtype->qualified.child = maybeClone( qualified.child );
                 break;
         } // switch
 …
         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:
 …
                 } // 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:
 …
                         function.params->printList( os, indent + 4 );
                 } else {
                         os << string( indent + 2, ' ' ) << "with no parameters " << endl;
+                        os << string( indent + 2, ' ' ) << "with no parameters" << endl;
                 } // if
                 if ( function.idList ) {
 …
                 os << DeclarationNode::aggregateNames[ aggregate.kind ] << ' ' << *aggregate.name << endl;
                 if ( aggregate.params ) {
                         os << string( indent + 2, ' ' ) << "with type parameters " << endl;
+                        os << string( indent + 2, ' ' ) << "with type parameters" << endl;
                         aggregate.params->printList( os, indent + 4 );
                 } // if
                 if ( aggregate.actuals ) {
                         os << string( indent + 2, ' ' ) << "instantiated with actual parameters " << endl;
+                        os << string( indent + 2, ' ' ) << "instantiated with actual parameters" << endl;
                         aggregate.actuals->printList( os, indent + 4 );
                 } // if
                 if ( aggregate.fields ) {
                         os << string( indent + 2, ' ' ) << "with members " << endl;
+                        os << string( indent + 2, ' ' ) << "with members" << endl;
                         aggregate.fields->printList( os, indent + 4 );
                 } // if
                 if ( aggregate.body ) {
                         os << string( indent + 2, ' ' ) << " with body " << endl;
+                        os << string( indent + 2, ' ' ) << " with body" << endl;
                 } // if
                 break;
 …
                 } // if
                 if ( aggInst.params ) {
                         os << string( indent + 2, ' ' ) << "with parameters " << endl;
+                        os << string( indent + 2, ' ' ) << "with parameters" << endl;
                         aggInst.params->printList( os, indent + 2 );
                 } // if
 …
                 } // if
                 if ( enumeration.body ) {
+                        os << string( indent + 2, ' ' ) << " with body " << endl;
+                } // if
+                break;
+          case SymbolicInst:
+                os << "instance of type " << *symbolic.name;
+                if ( symbolic.actuals ) {
+                        os << " with parameters" << endl;
+                        symbolic.actuals->printList( os, indent + 2 );
+                } // if
+                        os << string( indent + 2, ' ' ) << " with body" << endl;
+                } // if
+                break;
+          case EnumConstant:
+                os << "enumeration constant ";
                 break;
           case Symbolic:
 …
                 } // if
                 break;
+          case SymbolicInst:
+                os << *symbolic.name;
+                if ( symbolic.actuals ) {
+                        os << "(";
+                        symbolic.actuals->printList( os, indent + 2 );
+                        os << ")";
+                } // if
+                break;
           case Tuple:
                 os << "tuple ";
                 if ( tuple ) {
                         os << "with members " << endl;
+                        os << "with members" << endl;
                         tuple->printList( os, indent + 2 );
                 } // if
                 break;
+          case Basetypeof:
+                os << "base-";
+                #if defined(__GNUC__) && __GNUC__ >= 7
+                        __attribute__((fallthrough));
+                #endif
           case Typeof:
                 os << "type-of expression ";
 …
           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:
 …
         } // switch
 } // TypeData::print
+const std::string * TypeData::leafName() const {
+        switch ( kind ) {
+          case Unknown:
+          case Pointer:
+          case Reference:
+          case EnumConstant:
+          case GlobalScope:
+          case Array:
+          case Basic:
+          case Function:
+          case AggregateInst:
+          case Tuple:
+          case Typeof:
+          case Basetypeof:
+          case Builtin:
+                assertf(false, "Tried to get leaf name from kind without a name: %d", kind);
+                break;
+          case Aggregate:
+                return aggregate.name;
+          case Enum:
+                return enumeration.name;
+          case Symbolic:
+          case SymbolicInst:
+                return symbolic.name;
+          case Qualified:
+                return qualified.child->leafName();
+        } // switch
+        assert(false);
+}
 …
         switch ( td->kind ) {
           case TypeData::Unknown:
                 // fill in implicit int
                 return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
+                        // fill in implicit int
+                        return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
           case TypeData::Basic:
                 return buildBasicType( td );
+                        return buildBasicType( td );
           case TypeData::Pointer:
                 return buildPointer( td );
+                        return buildPointer( td );
           case TypeData::Array:
                 return buildArray( td );
+                        return buildArray( td );
           case TypeData::Reference:
                 return buildReference( td );
+                        return buildReference( td );
           case TypeData::Function:
                 return buildFunction( td );
+                        return buildFunction( td );
           case TypeData::AggregateInst:
                 return buildAggInst( td );
+                        return buildAggInst( td );
           case TypeData::EnumConstant:
                 // the name gets filled in later -- by SymTab::Validate
                 return new EnumInstType( buildQualifiers( td ), "" );
+                        // the name gets filled in later -- by SymTab::Validate
+                        return new EnumInstType( buildQualifiers( td ), "" );
           case TypeData::SymbolicInst:
                 return buildSymbolicInst( td );;
+                        return buildSymbolicInst( td );
           case TypeData::Tuple:
                 return buildTuple( td );
+                        return buildTuple( td );
           case TypeData::Typeof:
+                return buildTypeof( td );
+          case TypeData::Basetypeof:
+                        return buildTypeof( td );
           case TypeData::Builtin:
+                if(td->builtintype == DeclarationNode::Zero) {
+                        return new ZeroType( noQualifiers );
+                }
+                else if(td->builtintype == DeclarationNode::One) {
+                        return new OneType( noQualifiers );
+                }
+                else {
+                        return new VarArgsType( buildQualifiers( td ) );
+                }
+                        if (td->builtintype == DeclarationNode::Zero) {
+                                return new ZeroType( noQualifiers );
+                        }
+                        else if (td->builtintype == DeclarationNode::One) {
+                                return new OneType( noQualifiers );
+                        }
+                        else {
+                                return new VarArgsType( buildQualifiers( td ) );
+                        }
+          case TypeData::GlobalScope:
+                        return new GlobalScopeType();
+                case TypeData::Qualified:
+                        return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
           case TypeData::Symbolic:
           case TypeData::Enum:
           case TypeData::Aggregate:
                 assert( false );
+                        assert( false );
         } // switch
         return nullptr;
 } // typebuild
 …
           case DeclarationNode::Float:
-          case DeclarationNode::Float80:
-          case DeclarationNode::Float128:
           case DeclarationNode::Double:
           case DeclarationNode::LongDouble:                                     // not set until below
+                static BasicType::Kind floattype[3][3] = {
+                        { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex },
+                        { BasicType::FloatImaginary, BasicType::DoubleImaginary, BasicType::LongDoubleImaginary },
+                        { BasicType::Float, BasicType::Double, BasicType::LongDouble },
+          case DeclarationNode::uuFloat80:
+          case DeclarationNode::uuFloat128:
+          case DeclarationNode::uFloat16:
+          case DeclarationNode::uFloat32:
+          case DeclarationNode::uFloat32x:
+          case DeclarationNode::uFloat64:
+          case DeclarationNode::uFloat64x:
+          case DeclarationNode::uFloat128:
+          case DeclarationNode::uFloat128x:
+                static BasicType::Kind floattype[2][12] = {
+                        { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex, (BasicType::Kind)-1, (BasicType::Kind)-1, BasicType::uFloat16Complex, BasicType::uFloat32Complex, BasicType::uFloat32xComplex, BasicType::uFloat64Complex, BasicType::uFloat64xComplex, BasicType::uFloat128Complex, BasicType::uFloat128xComplex, },
+                        { BasicType::Float, BasicType::Double, BasicType::LongDouble, BasicType::uuFloat80, BasicType::uuFloat128, BasicType::uFloat16, BasicType::uFloat32, BasicType::uFloat32x, BasicType::uFloat64, BasicType::uFloat64x, BasicType::uFloat128, BasicType::uFloat128x, },
                 };
 …
                         genTSError( DeclarationNode::lengthNames[ td->length ], td->basictype );
                 } // if
+                if ( td->complextype == DeclarationNode::Imaginary ) {
+                        genTSError( DeclarationNode::complexTypeNames[ td->complextype ], td->basictype );
+                } // if
+                if ( (td->basictype == DeclarationNode::uuFloat80 || td->basictype == DeclarationNode::uuFloat128) && td->complextype == DeclarationNode::Complex ) { // gcc unsupported
+                        genTSError( DeclarationNode::complexTypeNames[ td->complextype ], td->basictype );
+                } // if
                 if ( td->length == DeclarationNode::Long ) {
                         const_cast<TypeData *>(td)->basictype = DeclarationNode::LongDouble;
                 } // if
-                if ( td->basictype == DeclarationNode::Float80 || td->basictype == DeclarationNode::Float128 ) {
-                        // if ( td->complextype != DeclarationNode::NoComplexType ) {
-                        //      genTSError( DeclarationNode::complexTypeNames[ td->complextype ], td->basictype );
-                        // }
-                        if ( td->basictype == DeclarationNode::Float80 ) ret = BasicType::Float80;
-                        else ret = BasicType::Float128;
-                        break;
+                }
                 ret = floattype[ td->complextype ][ td->basictype - DeclarationNode::Float ];
+                //printf( "XXXX %d %d %d %d\n", td->complextype, td->basictype, DeclarationNode::Float, ret );
                 break;
 …
 TypeofType * buildTypeof( const TypeData * td ) {
         assert( td->kind == TypeData::Typeof );
+        assert( td->kind == TypeData::Typeof || td->kind == TypeData::Basetypeof );
         assert( td->typeexpr );
         // assert( td->typeexpr->expr );
+        return new TypeofType( buildQualifiers( td ), td->typeexpr->build() );
+        return new TypeofType{
+                buildQualifiers( td ), td->typeexpr->build(), td->kind == TypeData::Basetypeof };
 } // buildTypeof
 …
         assert( td->kind == TypeData::Function );
         FunctionType * ft = new FunctionType( buildQualifiers( td ), ! td->function.params || td->function.params->hasEllipsis );
         buildList( td->function.params, ft->get_parameters() );
         buildForall( td->forall, ft->get_forall() );
+        buildList( td->function.params, ft->parameters );
+        buildForall( td->forall, ft->forall );
         if ( td->base ) {
                 switch ( td->base->kind ) {
                   case TypeData::Tuple:
                         buildList( td->base->tuple, ft->get_returnVals() );
+                        buildList( td->base->tuple, ft->returnVals );
                         break;
                   default:

src/Parser/TypeData.h

-              r7951100
+              rb067d9b
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Feb 22 15:21:23 2018
 // Update Count     : 191
+// Last Modified On : Thu Nov  1 20:56:46 2018
+// Update Count     : 196
 //
 …
 struct TypeData {
         enum Kind { Basic, Pointer, Array, Reference, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
                                 SymbolicInst, Tuple, Typeof, Builtin, Unknown };
+        enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
+                                SymbolicInst, Tuple, Typeof, Basetypeof, Builtin, GlobalScope, Qualified, Unknown };
         struct Aggregate_t {
                 DeclarationNode::Aggregate kind;
                 const std::string * name;
                 DeclarationNode * params;
                 ExpressionNode * actuals;                                               // holds actual parameters later applied to AggInst
                 DeclarationNode * fields;
+                const std::string * name = nullptr;
+                DeclarationNode * params = nullptr;
+                ExpressionNode * actuals = nullptr;                                             // holds actual parameters later applied to AggInst
+                DeclarationNode * fields = nullptr;
                 bool body;
+                bool anon;
                 bool tagged;
                 const std::string * parent;
+                const std::string * parent = nullptr;
         };
         struct AggInst_t {
                 TypeData * aggregate;
                 ExpressionNode * params;
+                TypeData * aggregate = nullptr;
+                ExpressionNode * params = nullptr;
                 bool hoistType;
         };
         struct Array_t {
                 ExpressionNode * dimension;
+                ExpressionNode * dimension = nullptr;
                 bool isVarLen;
                 bool isStatic;
 …
         struct Enumeration_t {
                 const std::string * name;
                 DeclarationNode * constants;
+                const std::string * name = nullptr;
+                DeclarationNode * constants = nullptr;
                 bool body;
+                bool anon;
         };
         struct Function_t {
                 mutable DeclarationNode * params;                               // mutables modified in buildKRFunction
                 mutable DeclarationNode * idList;                               // old-style
                 mutable DeclarationNode * oldDeclList;
                 StatementNode * body;
                 ExpressionNode * withExprs;             // expressions from function's with_clause
+                mutable DeclarationNode * params = nullptr;                             // mutables modified in buildKRFunction
+                mutable DeclarationNode * idList = nullptr;                             // old-style
+                mutable DeclarationNode * oldDeclList = nullptr;
+                StatementNode * body = nullptr;
+                ExpressionNode * withExprs = nullptr;                                           // expressions from function's with_clause
         };
         struct Symbolic_t {
                 const std::string * name;
+                const std::string * name = nullptr;
                 bool isTypedef;                                                                 // false => TYPEGENname, true => TYPEDEFname
+                DeclarationNode * params;
+                ExpressionNode * actuals;
+                DeclarationNode * assertions;
+                DeclarationNode * params = nullptr;
+                ExpressionNode * actuals = nullptr;
+                DeclarationNode * assertions = nullptr;
+        };
+        struct Qualified_t {                                                            // qualified type S.T
+                TypeData * parent = nullptr;
+                TypeData * child = nullptr;
         };
 …
         Type::Qualifiers qualifiers;
         DeclarationNode * forall;
+        DeclarationNode * forall = nullptr;
-        // Basic_t basic;
         Aggregate_t aggregate;
         AggInst_t aggInst;
         Array_t array;
         Enumeration_t enumeration;
-        // Variable_t variable;
         Function_t function;
         Symbolic_t symbolic;
+        DeclarationNode * tuple;
+        ExpressionNode * typeexpr;
+        Qualified_t qualified;
+        DeclarationNode * tuple = nullptr;
+        ExpressionNode * typeexpr = nullptr;
         TypeData( Kind k = Unknown );
 …
         void print( std::ostream &, int indent = 0 ) const;
         TypeData * clone() const;
+        const std::string * leafName() const;
 };
 …
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
+Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
+Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName,
+                                                 Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );

src/Parser/TypedefTable.cc

-              r7951100
+              rb067d9b
 // file "LICENCE" distributed with Cforall.
 //
 // TypedefTable.cc --
+// TypedefTable.cc --
 //
 // Author           : Peter A. Buhr
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun  7 13:17:56 2018
 // Update Count     : 192
+// Last Modified On : Wed Jul 25 15:32:35 2018
+// Update Count     : 258
 //
 …
 } // TypedefTable::exists
+bool TypedefTable::existsCurr( const string & identifier ) {
+        return kindTable.findAt( kindTable.currentScope() - 1, identifier ) != kindTable.end();
+} // TypedefTable::exists
 int TypedefTable::isKind( const string & identifier ) const {
         KindTable::const_iterator posn = kindTable.find( identifier );
 …
         auto scope = kindTable.currentScope();
         debugPrint( cerr << "Adding current at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << endl );
+        auto ret = kindTable.insertAt( scope, identifier, kind );
+        if ( ! ret.second ) ret.first->second = kind;           // exists => update
+        kindTable.insertAt( scope, identifier, kind );
 } // TypedefTable::addToScope
 void TypedefTable::addToEnclosingScope( const string & identifier, int kind, const char * locn __attribute__((unused)) ) {
         assert( kindTable.currentScope() >= 1 );
         auto scope = kindTable.currentScope() - 1;
         debugPrint( cerr << "Adding enclosing at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << endl );
+        auto scope = kindTable.currentScope() - 1 - kindTable.getNote( kindTable.currentScope() - 1 ).level;
+//      auto scope = level - kindTable.getNote( kindTable.currentScope() - 1 ).level;
+        debugPrint( cerr << "Adding enclosing at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << " level " << level << " note " << kindTable.getNote( kindTable.currentScope() - 1 ).level << endl );
         auto ret = kindTable.insertAt( scope, identifier, kind );
         if ( ! ret.second ) ret.first->second = kind;           // exists => update
+        if ( ! ret.second ) ret.first->second = kind;   // exists => update
 } // TypedefTable::addToEnclosingScope
 void TypedefTable::enterScope() {
+        kindTable.beginScope();
+        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << endl );
+        debugPrint( print() );
+        kindTable.beginScope( (Note){ 0, false } );
+        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << " level " << level << endl; print() );
 } // TypedefTable::enterScope
 void TypedefTable::leaveScope() {
+        debugPrint( cerr << "Leaving scope " << kindTable.currentScope() << endl );
+        debugPrint( print() );
+        debugPrint( cerr << "Leaving scope " << kindTable.currentScope() << endl; print() );
         kindTable.endScope();
 } // TypedefTable::leaveScope
+void TypedefTable::up( bool forall ) {
+        level += 1;
+        kindTable.getNote( kindTable.currentScope() ) = (Note){ level, forall || getEnclForall() };
+        debugPrint( cerr << "Up " << " level " << level << " note " << kindTable.getNote( level ).level << ", " << kindTable.getNote( level ).forall << endl; );
+} // TypedefTable::up
+void TypedefTable::down() {
+        level -= 1;
+        debugPrint( cerr << "Down " << " level " << level << " note " << kindTable.getNote( level ).level << endl; );
+} // TypedefTable::down
 void TypedefTable::print( void ) const {
         KindTable::size_type scope = kindTable.currentScope();
         debugPrint( cerr << "[" << scope << "]" );
+        debugPrint( cerr << "[" << scope << "] " << kindTable.getNote( scope ).level << ", " << kindTable.getNote( scope ).forall << ":" );
         for ( KindTable::const_iterator i = kindTable.begin(); i != kindTable.end(); i++ ) {
                 while ( i.get_level() != scope ) {
                         --scope;
                         debugPrint( cerr << endl << "[" << scope << "]" );
+                        debugPrint( cerr << endl << "[" << scope << "] " << kindTable.getNote( scope ).level << ", " << kindTable.getNote( scope ).forall << ":" );
                 } // while
                 debugPrint( cerr << " " << (*i).first << ":" << kindName( (*i).second ) );
 …
         while ( scope > 0 ) {
                 --scope;
                 debugPrint( cerr << endl << "[" << scope << "]" );
+        }
+                debugPrint( cerr << endl << "[" << scope << "] " << kindTable.getNote( scope ).level << ", " << kindTable.getNote( scope ).forall << ":" );
+        } // while
         debugPrint( cerr << endl );
+}
+} // TypedefTable::print
 // Local Variables: //

src/Parser/TypedefTable.h

-              r7951100
+              rb067d9b
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun  7 12:10:17 2018
 // Update Count     : 85
+// Last Modified On : Wed Jul 25 15:33:55 2018
+// Update Count     : 114
 //
 …
 class TypedefTable {
+        typedef ScopedMap< std::string, int > KindTable;
+        struct Note { size_t level; bool forall; };
+        typedef ScopedMap< std::string, int, Note > KindTable;
         KindTable kindTable;
+        unsigned int level = 0;
   public:
         ~TypedefTable();
         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 );
         void addToScope( const std::string & identifier, int kind, const char * );
         void addToEnclosingScope( const std::string & identifier, int kind, const char * );
+        bool getEnclForall() { return kindTable.getNote( kindTable.currentScope() -  1 ).forall; }
         void enterScope();
         void leaveScope();
+        void up( bool );
+        void down();
         void print( void ) const;

src/Parser/lex.ll

-              r7951100
+              rb067d9b
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
  * Last Modified On : Thu Jun  7 08:27:40 2018
  * Update Count     : 679
+ * Last Modified On : Sun Aug  4 20:53:47 2019
+ * Update Count     : 719
  */
 …
 //**************************** Includes and Defines ****************************
+// trigger before each matching rule's action
+#define YY_USER_ACTION \
+        yylloc.first_line = yylineno; \
+        yylloc.first_column = column; \
+        column += yyleng; \
+        yylloc.last_column = column; \
+        yylloc.last_line = yylineno; \
+        yylloc.filename = yyfilename ? yyfilename : "";
 unsigned int column = 0;                                                                // position of the end of the last token parsed
-#define YY_USER_ACTION yylloc.first_line = yylineno; yylloc.first_column = column; column += yyleng; yylloc.last_column = column; yylloc.last_line = yylineno; yylloc.filename = yyfilename ? yyfilename : "";                          // trigger before each matching rule's action
 #include <string>
 …
 using namespace std;
+#include "config.h"                                                                             // configure info
 #include "ParseNode.h"
 #include "TypedefTable.h"
 …
 #define NUMERIC_RETURN(x)       rm_underscore(); RETURN_VAL( x ) // numeric constant
 #define KEYWORD_RETURN(x)       RETURN_CHAR( x )                        // keyword
 #define QKEYWORD_RETURN(x)      typedefTable.isKind( yytext ); RETURN_VAL(x); // quasi-keyword
+#define QKEYWORD_RETURN(x)      RETURN_VAL(x);                          // quasi-keyword
 #define IDENTIFIER_RETURN()     RETURN_VAL( typedefTable.isKind( yytext ) )
+#define ATTRIBUTE_RETURN()      RETURN_VAL( ATTR_IDENTIFIER )
+#ifdef HAVE_KEYWORDS_FLOATXX                                                            // GCC >= 7 => keyword, otherwise typedef
+#define FLOATXX(v) KEYWORD_RETURN(v);
+#else
+#define FLOATXX(v) IDENTIFIER_RETURN();
+#endif // HAVE_KEYWORDS_FLOATXX
 void rm_underscore() {
 …
 identifier ([a-zA-Z_$]|{universal_char})([0-9a-zA-Z_$]|{universal_char})*
-                                // attribute identifier, GCC: $ in identifier
-attr_identifier "@"{identifier}
                                 // numeric constants, CFA: '_' in constant
 hex_quad {hex}("_"?{hex}){3}
 size_opt (8|16|32|64|128)?
+length ("ll"|"LL"|[lL]{size_opt})|("hh"|"HH"|[hH])
+integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))?
+                                // CFA: explicit l8/l16/l32/l64/l128, char 'hh', short 'h', int 'n'
+length ("ll"|"LL"|[lL]{size_opt})|("hh"|"HH"|[hHnN])
+                                // CFA: size_t 'z', pointer 'p', which define a sign and length
+integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]|[pP]))?
 octal_digits ({octal})|({octal}({octal}|"_")*{octal})
 …
                                 // GCC: D (double) and iI (imaginary) suffixes, and DL (long double)
 exponent "_"?[eE]"_"?[+-]?{decimal_digits}
 floating_size 32|64|80|128
 floating_length ([fFdDlL]|[lL]{floating_size})
+floating_size 16|32|32x|64|64x|80|128|128x
+floating_length ([fFdDlLwWqQ]|[fF]{floating_size})
 floating_suffix ({floating_length}?[iI]?)|([iI]{floating_length})
 floating_suffix_opt ("_"?({floating_suffix}|"DL"))?
 …
 __attribute__   { KEYWORD_RETURN(ATTRIBUTE); }                  // GCC
 auto                    { KEYWORD_RETURN(AUTO); }
+__auto_type             { KEYWORD_RETURN(AUTO_TYPE); }
+basetypeof              { KEYWORD_RETURN(BASETYPEOF); }                 // CFA
 _Bool                   { KEYWORD_RETURN(BOOL); }                               // C99
 break                   { KEYWORD_RETURN(BREAK); }
 …
 char                    { KEYWORD_RETURN(CHAR); }
 choose                  { KEYWORD_RETURN(CHOOSE); }                             // CFA
+coerce                  { KEYWORD_RETURN(COERCE); }                             // CFA
 _Complex                { KEYWORD_RETURN(COMPLEX); }                    // C99
 __complex               { KEYWORD_RETURN(COMPLEX); }                    // GCC
 …
 finally                 { KEYWORD_RETURN(FINALLY); }                    // CFA
 float                   { KEYWORD_RETURN(FLOAT); }
+_Float32                { KEYWORD_RETURN(FLOAT); }                              // GCC
+_Float32x               { KEYWORD_RETURN(FLOAT); }                              // GCC
+_Float64                { KEYWORD_RETURN(DOUBLE); }                             // GCC
+_Float64x               { KEYWORD_RETURN(DOUBLE); }                             // GCC
+__float80               { KEYWORD_RETURN(FLOAT80); }                    // GCC
+float80                 { KEYWORD_RETURN(FLOAT80); }                    // GCC
+_Float128               { KEYWORD_RETURN(FLOAT128); }                   // GCC
+_Float128x              { KEYWORD_RETURN(FLOAT128); }                   // GCC
+__float128              { KEYWORD_RETURN(FLOAT128); }                   // GCC
+float128                { KEYWORD_RETURN(FLOAT128); }                   // GCC
+__float80               { KEYWORD_RETURN(uuFLOAT80); }                  // GCC
+float80                 { KEYWORD_RETURN(uuFLOAT80); }                  // GCC
+__float128              { KEYWORD_RETURN(uuFLOAT128); }                 // GCC
+float128                { KEYWORD_RETURN(uuFLOAT128); }                 // GCC
+_Float16                { FLOATXX(uFLOAT16); }                                  // GCC
+_Float32                { FLOATXX(uFLOAT32); }                                  // GCC
+_Float32x               { FLOATXX(uFLOAT32X); }                                 // GCC
+_Float64                { FLOATXX(uFLOAT64); }                                  // GCC
+_Float64x               { FLOATXX(uFLOAT64X); }                                 // GCC
+_Float128               { FLOATXX(uFLOAT128); }                                 // GCC
+_Float128x              { FLOATXX(uFLOAT128); }                                 // GCC
 for                             { KEYWORD_RETURN(FOR); }
 forall                  { KEYWORD_RETURN(FORALL); }                             // CFA
 fortran                 { KEYWORD_RETURN(FORTRAN); }
 ftype                   { KEYWORD_RETURN(FTYPE); }                              // CFA
+generator               { KEYWORD_RETURN(GENERATOR); }                  // CFA
 _Generic                { KEYWORD_RETURN(GENERIC); }                    // C11
 goto                    { KEYWORD_RETURN(GOTO); }
 …
 __inline__              { KEYWORD_RETURN(INLINE); }                             // GCC
 int                             { KEYWORD_RETURN(INT); }
+int128                  { KEYWORD_RETURN(INT128); }                             // CFA
 __int128                { KEYWORD_RETURN(INT128); }                             // GCC
 int128                  { KEYWORD_RETURN(INT128); }                             // GCC
+__int128_t              { KEYWORD_RETURN(INT128); }                             // GCC
 __label__               { KEYWORD_RETURN(LABEL); }                              // GCC
 long                    { KEYWORD_RETURN(LONG); }
 …
 __restrict__    { KEYWORD_RETURN(RESTRICT); }                   // GCC
 return                  { KEYWORD_RETURN(RETURN); }
+        /* resume                       { KEYWORD_RETURN(RESUME); }                             // CFA */
 short                   { KEYWORD_RETURN(SHORT); }
 signed                  { KEYWORD_RETURN(SIGNED); }
 …
 _Static_assert  { KEYWORD_RETURN(STATICASSERT); }               // C11
 struct                  { KEYWORD_RETURN(STRUCT); }
+        /* suspend                      { KEYWORD_RETURN(SUSPEND); }                    // CFA */
 switch                  { KEYWORD_RETURN(SWITCH); }
 thread                  { KEYWORD_RETURN(THREAD); }                             // C11
 …
 __typeof__              { KEYWORD_RETURN(TYPEOF); }                             // GCC
 union                   { KEYWORD_RETURN(UNION); }
+__uint128_t             { KEYWORD_RETURN(UINT128); }                    // GCC
 unsigned                { KEYWORD_RETURN(UNSIGNED); }
 __builtin_va_list { KEYWORD_RETURN(VALIST); }                   // GCC
 …
         IDENTIFIER_RETURN();
+}
-{attr_identifier} { ATTRIBUTE_RETURN(); }
                                 /* numeric constants */
 …
 "@="                    { NAMEDOP_RETURN(ATassign); }                   // CFA
+"~="                    { NAMEDOP_RETURN(ErangeUpEq); }                 // CFA
+"-~"                    { NAMEDOP_RETURN(ErangeDown); }                 // CFA
+"-~="                   { NAMEDOP_RETURN(ErangeDownEq); }               // CFA
                                 /* CFA, operator identifier */
 …
 void yyerror( const char * errmsg ) {
         SemanticErrorThrow = true;
         cout << (yyfilename ? yyfilename : "*unknown file*") << ':' << yylineno << ':' << column - yyleng + 1
+        cerr << (yyfilename ? yyfilename : "*unknown file*") << ':' << yylineno << ':' << column - yyleng + 1
                  << ": " << ErrorHelpers::error_str() << errmsg << " at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << '"' << endl;
+}

src/Parser/module.mk

-              r7951100
+              rb067d9b
 ## file "LICENCE" distributed with Cforall.
 ##
 ## module.mk --
+## module.mk --
 ##
 ## Author           : Peter A. Buhr
 …
        Parser/parserutility.cc
+MAINTAINERCLEANFILES += Parser/parser.output
+SRCDEMANGLE += \
+        Parser/LinkageSpec.cc
+MOSTLYCLEANFILES += Parser/lex.cc Parser/parser.cc Parser/parser.hh Parser/parser.output

src/Parser/parser.yy

-              r7951100
+              rb067d9b
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun  7 10:07:12 2018
 // Update Count     : 3527
+// Last Modified On : Sun Aug  4 21:48:23 2019
+// Update Count     : 4364
 //
 …
         // distribute declaration_specifier across all declared variables, e.g., static, const, __attribute__.
         DeclarationNode * cur = declList, * cl = (new DeclarationNode)->addType( specifier );
+        //cur->addType( specifier );
+        for ( cur = dynamic_cast< DeclarationNode * >( cur->get_next() ); cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ) ) {
+        for ( cur = dynamic_cast<DeclarationNode *>( cur->get_next() ); cur != nullptr; cur = dynamic_cast<DeclarationNode *>( cur->get_next() ) ) {
                 cl->cloneBaseType( cur );
         } // for
         declList->addType( cl );
-//      delete cl;
         return declList;
 } // distAttr
 …
         } // 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 ) {
+        // distribute qualifiers across all non-variable declarations in a distribution statemement
+        for ( DeclarationNode * iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
+                // SKULLDUGGERY: Distributions are parsed inside out, so qualifiers are added to declarations inside out. Since
+                // addQualifiers appends to the back of the list, the forall clauses are in the wrong order (right to left). To
+                // get the qualifiers in the correct order and still use addQualifiers (otherwise, 90% of addQualifiers has to
+                // be copied to add to front), the appropriate forall pointers are interchanged before calling addQualifiers.
+                DeclarationNode * clone = qualifiers->clone();
+                if ( qualifiers->type ) {                                               // forall clause ? (handles SC)
+                        if ( iter->type->kind == TypeData::Aggregate ) { // struct/union ?
+                                swap( clone->type->forall, iter->type->aggregate.params );
+                                iter->addQualifiers( clone );
+                        } else if ( iter->type->kind == TypeData::AggregateInst && iter->type->aggInst.aggregate->aggregate.body ) { // struct/union ?
+                                // Create temporary node to hold aggregate, call addQualifiers as above, then put nodes back together.
+                                DeclarationNode newnode;
+                                swap( newnode.type, iter->type->aggInst.aggregate );
+                                swap( clone->type->forall, newnode.type->aggregate.params );
+                                newnode.addQualifiers( clone );
+                                swap( newnode.type, iter->type->aggInst.aggregate );
+                        } else if ( iter->type->kind == TypeData::Function ) { // routines ?
+                                swap( clone->type->forall, iter->type->forall );
+                                iter->addQualifiers( clone );
+                        } // if
+                } else {                                                                                // just SC qualifiers
+                        iter->addQualifiers( clone );
+                } // if
+        } // for
+        delete qualifiers;
+} // distQual
 // There is an ambiguity for inline generic-routine return-types and generic routines.
 …
 } // build_postfix_name
+bool forall = false, xxx = false;                                               // aggregate have one or more forall qualifiers ?
+DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) {
+        if ( ! fieldList ) {                                                            // field declarator ?
+                if ( ! ( typeSpec->type && (typeSpec->type->kind == TypeData::Aggregate || typeSpec->type->kind == TypeData::Enum) ) ) {
+                        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
+ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
+        ConstantExpr * constant = dynamic_cast<ConstantExpr *>(type->expr.get());
+        if ( constant && (constant->get_constant()->get_value() == "0" || constant->get_constant()->get_value() == "1") ) {
+        type = new ExpressionNode( new CastExpr( maybeMoveBuild< Expression >(type), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ) );
+        } // if
+        return new ForCtrl(
+                distAttr( DeclarationNode::newTypeof( type, true ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
+                // NULL comp/inc => leave blank
+                comp ? new ExpressionNode( build_binary_val( compop, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ) : 0,
+                inc ? new ExpressionNode( build_binary_val( compop == OperKinds::LThan || compop == OperKinds::LEThan ? // choose += or -= for upto/downto
+                                                        OperKinds::PlusAssn : OperKinds::MinusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) : 0 );
+} // forCtrl
+ForCtrl * forCtrl( ExpressionNode * type, ExpressionNode * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
+        if ( NameExpr * identifier = dynamic_cast<NameExpr *>(index->expr.get()) ) {
+                return forCtrl( type, new string( identifier->name ), start, compop, comp, inc );
+        } else if ( CommaExpr * commaExpr = dynamic_cast<CommaExpr *>(index->expr.get()) ) {
+                if ( NameExpr * identifier = dynamic_cast<NameExpr *>(commaExpr->arg1 ) ) {
+                        return forCtrl( type, new string( identifier->name ), start, compop, comp, inc );
+                } else {
+                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); return nullptr;
+                } // if
+        } else {
+                SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); return nullptr;
+        } // if
+} // forCtrl
+bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
 // https://www.gnu.org/software/bison/manual/bison.html#Location-Type
 …
 // Types declaration for productions
+%union
+{
+%union {
         Token tok;
         ParseNode * pn;
 …
         WaitForStmt * wfs;
         Expression * constant;
+        IfCtl * ifctl;
+        ForCtl * fctl;
+        IfCtrl * ifctl;
+        ForCtrl * fctl;
+        enum OperKinds compop;
         LabelNode * label;
         InitializerNode * in;
 …
 %token RESTRICT                                                                                 // C99
 %token ATOMIC                                                                                   // C11
 %token FORALL MUTEX VIRTUAL                                                             // CFA
+%token FORALL MUTEX VIRTUAL COERCE                                              // CFA
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
 %token BOOL COMPLEX IMAGINARY                                                   // C99
+%token INT128 FLOAT80 FLOAT128                                                  // GCC
+%token INT128 UINT128 uuFLOAT80 uuFLOAT128                              // GCC
+%token uFLOAT16 uFLOAT32 uFLOAT32X uFLOAT64 uFLOAT64X uFLOAT128 // GCC
 %token ZERO_T ONE_T                                                                             // CFA
 %token VALIST                                                                                   // GCC
+%token TYPEOF LABEL                                                                             // GCC
+%token AUTO_TYPE                                                                                // GCC
+%token TYPEOF BASETYPEOF LABEL                                                  // GCC
 %token ENUM STRUCT UNION
 %token EXCEPTION                                                                                // CFA
 %token COROUTINE MONITOR THREAD                                                 // CFA
+%token GENERATOR COROUTINE MONITOR THREAD                               // CFA
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
 %token SIZEOF OFFSETOF
+// %token SUSPEND RESUME                                                                        // CFA
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
 …
 %token<tok> IDENTIFIER                  QUOTED_IDENTIFIER               TYPEDEFname                             TYPEGENname
 %token<tok> TIMEOUT                             WOR
-%token<tok> ATTR_IDENTIFIER             ATTR_TYPEDEFname                ATTR_TYPEGENname
 %token<tok> INTEGERconstant             CHARACTERconstant               STRINGliteral
 %token<tok> DIRECTIVE
 …
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
+%token ErangeUpEq       ErangeDown      ErangeDownEq                    // ~=   -~      -~=
 %token ATassign                                                                                 // @=
 %type<tok> identifier  no_attr_identifier
 %type<tok> identifier_or_type_name  no_attr_identifier_or_type_name  attr_name
+%type<tok> identifier
+%type<tok> identifier_or_type_name  attr_name
 %type<tok> quasi_keyword
 %type<constant> string_literal
 …
 %type<en> argument_expression_list              argument_expression                     default_initialize_opt
 %type<ifctl> if_control_expression
+%type<fctl> for_control_expression
+%type<fctl> for_control_expression              for_control_expression_list
+%type<compop> inclexcl
 %type<en> subrange
 %type<decl> asm_name_opt
 %type<en> asm_operands_opt asm_operands_list asm_operand
+%type<en> asm_operands_opt                              asm_operands_list                       asm_operand
 %type<label> label_list
 %type<en> asm_clobbers_list_opt
 %type<flag> asm_volatile_opt
 %type<en> handler_predicate_opt
 %type<genexpr> generic_association generic_assoc_list
+%type<genexpr> generic_association              generic_assoc_list
 // statements
 …
 %type<en> enumerator_value_opt
+%type<decl> exception_declaration external_definition external_definition_list external_definition_list_no_pop_push external_definition_list_opt
+%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> external_definition external_definition_list external_definition_list_opt
+%type<decl> exception_declaration
+%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
 …
 %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
 …
 %type<decl> type_parameter type_parameter_list type_initializer_opt
 %type<en> type_list
+%type<en> type_parameters_opt type_list
 %type<decl> type_qualifier type_qualifier_name forall type_qualifier_list_opt type_qualifier_list
 …
 //   Foo ( *fp )( int );
 //   `---'                                              matches start of TYPEGENname '('
 // Must be:
+// must be:
 //   Foo( int ) ( *fp )( int );
+// The same problem occurs here:
+//   forall( otype T ) struct Foo { T v; } ( *fp )( int );
+// must be:
+//   forall( otype T ) struct Foo { T v; } ( int ) ( *fp )( int );
 // Order of these lines matters (low-to-high precedence).
 %precedence TYPEGENname
+%precedence '}'
 %precedence '('
+// %precedence RESUME
+// %precedence '{'
+// %precedence ')'
 %locations                                                                                              // support location tracking for error messages
 …
 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; }
+        ;
 …
         | '(' comma_expression ')' '`' IDENTIFIER                       // CFA, postfix call
                 { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $5 ) ), $2 ) ); }
+        | type_name '.' no_attr_identifier                                      // CFA, nested type
+                // { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                { $$ = nullptr; }
+        | type_name '.' '[' field_list ']'                                      // CFA, nested type / tuple field selector
+                // { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                { $$ = nullptr; }
+        | type_name '.' identifier                                                      // CFA, nested type
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+        | 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
+                {
 …
                         $$ = new ExpressionNode( $5 );
+                }
+        // | RESUME '(' comma_expression ')'
+        //      { SemanticError( yylloc, "Resume expression is currently unimplemented." ); $$ = nullptr; }
+        // | RESUME '(' comma_expression ')' compound_statement
+        //      { SemanticError( yylloc, "Resume expression is currently unimplemented." ); $$ = nullptr; }
+        ;
 …
         | postfix_expression '(' argument_expression_list ')'
                 { $$ = new ExpressionNode( build_func( $1, $3 ) ); }
         | postfix_expression '.' no_attr_identifier
+        | postfix_expression '.' identifier
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression '.' INTEGERconstant                        // CFA, tuple index
 …
         | 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
+                {
+                        $$ = new ExpressionNode( build_pfieldSel( $1, *$3 == "0" || *$3 == "1" ? build_constantInteger( *$3 ) : build_varref( $3 ) ) );
+                }
+        | postfix_expression ARROW identifier
+                { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
         | 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
 …
 argument_expression_list:
+        argument_expression
+        // empty
+                { $$ = nullptr; }
+        | argument_expression
         | argument_expression_list ',' argument_expression
                 { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
 …
 argument_expression:
+        // 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 ); }
+        ;
 …
         | 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 ) ) ); }
+        ;
 …
         | FLOATINGconstant fraction_constants_opt
                 { $$ = new ExpressionNode( build_field_name_fraction_constants( build_field_name_FLOATINGconstant( *$1 ), $2 ) ); }
         | no_attr_identifier fraction_constants_opt
+        | identifier fraction_constants_opt
+                {
                         $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) );
 …
         | ALIGNOF '(' type_no_function ')'                                      // GCC, type alignment
                 { $$ = new ExpressionNode( new AlignofExpr( maybeMoveBuildType( $3 ) ) ); }
         | OFFSETOF '(' type_no_function ',' no_attr_identifier ')'
+        | OFFSETOF '(' type_no_function ',' identifier ')'
                 { $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) ); }
-        | ATTR_IDENTIFIER
-                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuild< Expression >( (ExpressionNode *)nullptr ) ) ); }
-        | ATTR_IDENTIFIER '(' argument_expression ')'
-                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuild< Expression >( $3 ) ) ); }
-        | ATTR_IDENTIFIER '(' type ')'
-                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuildType( $3 ) ) ); }
+        ;
 …
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
+                // keyword cast cannot be grouped because of reduction in aggregate_key
+        | '(' GENERATOR '&' ')' cast_expression                         // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
         | '(' COROUTINE '&' ')' cast_expression                         // CFA
                 { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
 …
         | '(' VIRTUAL type_no_function ')' cast_expression      // CFA
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $5 ), maybeMoveBuildType( $3 ) ) ); }
+        | '(' RETURN type_no_function ')' cast_expression       // CFA
+                { SemanticError( yylloc, "Return cast is currently unimplemented." ); $$ = nullptr; }
+        | '(' COERCE type_no_function ')' cast_expression       // CFA
+                { SemanticError( yylloc, "Coerce cast is currently unimplemented." ); $$ = nullptr; }
+        | '(' qualifier_cast_list ')' cast_expression           // CFA
+                { SemanticError( yylloc, "Qualifier cast is currently unimplemented." ); $$ = nullptr; }
 //      | '(' type_no_function ')' tuple
 //              { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
+        ;
+qualifier_cast_list:
+        cast_modifier type_qualifier_name
+        | cast_modifier MUTEX
+        | qualifier_cast_list cast_modifier type_qualifier_name
+        | qualifier_cast_list cast_modifier MUTEX
+        ;
+cast_modifier:
+        '-'
+        | '+'
+        ;
 …
 labeled_statement:
                 // labels cannot be identifiers 0 or 1 or ATTR_IDENTIFIER
+                // labels cannot be identifiers 0 or 1
         identifier_or_type_name ':' attribute_list_opt statement
+                {
+                        $$ = $4->add_label( $1, $3 );
+                }
+                { $$ = $4->add_label( $1, $3 ); }
+        ;
 …
         statement_decl
         | statement_decl_list statement_decl
                 { if ( $1 != 0 ) { $1->set_last( $2 ); $$ = $1; } }
+                { assert( $1 ); $1->set_last( $2 ); $$ = $1; }
+        ;
 …
                 { $$ = new StatementNode( $1 ); }
         | EXTENSION declaration                                                         // GCC
+                {
+                        distExt( $2 );
+                        $$ = new StatementNode( $2 );
+                }
+                { distExt( $2 ); $$ = new StatementNode( $2 ); }
         | function_definition
                 { $$ = new StatementNode( $1 ); }
         | EXTENSION function_definition                                         // GCC
+                {
+                        distExt( $2 );
+                        $$ = new StatementNode( $2 );
+                }
+                { distExt( $2 ); $$ = new StatementNode( $2 ); }
         | statement
+        ;
 …
         statement
         | statement_list_nodecl statement
                 { if ( $1 != 0 ) { $1->set_last( $2 ); $$ = $1; } }
+                { assert( $1 ); $1->set_last( $2 ); $$ = $1; }
+        ;
 …
 if_control_expression:
         comma_expression
                 { $$ = new IfCtl( nullptr, $1 ); }
+                { $$ = new IfCtrl( nullptr, $1 ); }
         | c_declaration                                                                         // no semi-colon
                 { $$ = new IfCtl( $1, nullptr ); }
+                { $$ = new IfCtrl( $1, nullptr ); }
         | cfa_declaration                                                                       // no semi-colon
                 { $$ = new IfCtl( $1, nullptr ); }
+                { $$ = new IfCtrl( $1, nullptr ); }
         | declaration comma_expression                                          // semi-colon separated
                 { $$ = new IfCtl( $1, $2 ); }
+                { $$ = new IfCtrl( $1, $2 ); }
+        ;
 …
         WHILE '(' push if_control_expression ')' statement pop
                 { $$ = new StatementNode( build_while( $4, $6 ) ); }
+        | WHILE '(' ')' statement                                                       // CFA => while ( 1 )
+                { $$ = new StatementNode( build_while( new IfCtrl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), $4 ) ); }
         | DO statement WHILE '(' comma_expression ')' ';'
                 { $$ = new StatementNode( build_do_while( $5, $2 ) ); }
+        | FOR '(' push for_control_expression ')' statement pop
+        | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )
+                { $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), $2 ) ); }
+        | FOR '(' push for_control_expression_list ')' statement pop
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }
+        | FOR '(' ')' statement                                                         // CFA => for ( ;; )
+                { $$ = new StatementNode( build_for( new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr ), $4 ) ); }
+        ;
+for_control_expression_list:
+        for_control_expression
+        | for_control_expression_list ':' for_control_expression
+                // ForCtrl + ForCtrl:
+                //    init + init => multiple declaration statements that are hoisted
+                //    condition + condition => (expression) && (expression)
+                //    change + change => (expression), (expression)
+                {
+                        $1->init->set_last( $3->init );
+                        if ( $1->condition ) {
+                                if ( $3->condition ) {
+                                        $1->condition->expr.reset( new LogicalExpr( $1->condition->expr.release(), $3->condition->expr.release(), true ) );
+                                } // if
+                        } else $1->condition = $3->condition;
+                        if ( $1->change ) {
+                                if ( $3->change ) {
+                                        $1->change->expr.reset( new CommaExpr( $1->change->expr.release(), $3->change->expr.release() ) );
+                                } // if
+                        } else $1->change = $3->change;
+                        $$ = $1;
+                }
+        ;
 for_control_expression:
+        comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
+                { $$ = new ForCtl( $1, $3, $5 ); }
+        | declaration comma_expression_opt ';' comma_expression_opt // C99
+                { $$ = new ForCtl( $1, $2, $4 ); }
+        ';' comma_expression_opt ';' comma_expression_opt
+                { $$ = new ForCtrl( (ExpressionNode * )nullptr, $2, $4 ); }
+        | comma_expression ';' comma_expression_opt ';' comma_expression_opt
+                { $$ = new ForCtrl( $1, $3, $5 ); }
+        | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
+                { $$ = new ForCtrl( $1, $2, $4 ); }
+        | comma_expression                                                                      // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
+                                                OperKinds::LThan, $1->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | comma_expression inclexcl comma_expression            // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | comma_expression inclexcl comma_expression '~' comma_expression // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
+        | comma_expression ';' comma_expression                         // CFA
+                { $$ = forCtrl( $3, $1, new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
+                                                OperKinds::LThan, $3->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | comma_expression ';' comma_expression inclexcl comma_expression // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | comma_expression ';' comma_expression inclexcl comma_expression '~' comma_expression // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, $7 ); }
+                // There is a S/R conflicit if ~ and -~ are factored out.
+        | comma_expression ';' comma_expression '~' '@'         // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | comma_expression ';' comma_expression ErangeDown '@' // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::GThan, nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | comma_expression ';' comma_expression '~' '@' '~' comma_expression // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, $7 ); }
+        | comma_expression ';' comma_expression ErangeDown '@' '~' comma_expression // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::GThan, nullptr, $7 ); }
+        | comma_expression ';' comma_expression '~' '@' '~' '@' // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, nullptr ); }
+        ;
+inclexcl:
+        '~'
+                { $$ = OperKinds::LThan; }
+        | ErangeUpEq
+                { $$ = OperKinds::LEThan; }
+        | ErangeDown
+                { $$ = OperKinds::GThan; }
+        | ErangeDownEq
+                { $$ = OperKinds::GEThan; }
+        ;
 …
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
         | RETURN '{' initializer_list_opt comma_opt '}'
+        | RETURN '{' initializer_list_opt comma_opt '}' ';'
                 { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; }
+        // | SUSPEND ';'
+        //      { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
+        // | SUSPEND compound_statement ';'
+        //      { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
 …
 waitfor:
+        WAITFOR '(' identifier ')'
+                {
+                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
+                        delete $3;
+                }
+        | WAITFOR '(' identifier ',' argument_expression_list ')'
+                {
+                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
+                        $$->set_last( $5 );
+                        delete $3;
+                }
+        WAITFOR '(' cast_expression ')'
+                { $$ = $3; }
+        | WAITFOR '(' cast_expression ',' argument_expression_list ')'
+                { $$ = (ExpressionNode *)$3->set_last( $5 ); }
+        ;
 …
                 { $$ = build_waitfor_timeout( nullptr, $3, $1 ); }
                 // "else" must be conditional after timeout or timeout is never triggered (i.e., it is meaningless)
+        | when_clause_opt timeout statement WOR ELSE statement
+                { SemanticError( yylloc, "else clause must be conditional after timeout or timeout never triggered." ); $$ = nullptr; }
         | when_clause_opt timeout statement WOR when_clause ELSE statement
                 { $$ = build_waitfor_timeout( $2, $3, $1, $7, $5 ); }
 …
 handler_clause:
         handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
                 { $$ = new StatementNode( build_catch( $1, $4, $6, $8 ) ); }
         | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $5, $7, $9 ) ) ); }
+        ;
 …
         | type_specifier_nobody variable_abstract_declarator
                 { $$ = $2->addType( $1 ); }
         | cfa_abstract_declarator_tuple no_attr_identifier      // CFA
+        | cfa_abstract_declarator_tuple identifier                      // CFA
                 { $$ = $1->addName( $2 ); }
         | cfa_abstract_declarator_tuple                                         // CFA
 …
 label_list:
         no_attr_identifier
+        identifier
+                {
                         $$ = new LabelNode(); $$->labels.push_back( *$1 );
                         delete $1;                                                                      // allocated by lexer
+                }
         | label_list ',' no_attr_identifier
+        | label_list ',' identifier
+                {
                         $$ = $1; $1->labels.push_back( *$3 );
 …
 local_label_list:                                                                               // GCC, local label
         no_attr_identifier_or_type_name
         | local_label_list ',' no_attr_identifier_or_type_name
+        identifier_or_type_name
+        | local_label_list ',' identifier_or_type_name
+        ;
 …
                         $$ = $2->addTypedef();
+                }
         | cfa_typedef_declaration pop ',' push no_attr_identifier
+        | cfa_typedef_declaration pop ',' push identifier
+                {
                         typedefTable.addToEnclosingScope( *$5, TYPEDEFname, "3" );
 …
 typedef_expression:
                 // GCC, naming expression type: typedef name = exp; gives a name to the type of an expression
         TYPEDEF no_attr_identifier '=' assignment_expression
+        TYPEDEF identifier '=' assignment_expression
+                {
                         // $$ = DeclarationNode::newName( 0 );                  // unimplemented
                         SemanticError( yylloc, "Typedef expression is currently unimplemented." ); $$ = nullptr;
+                }
         | typedef_expression pop ',' push no_attr_identifier '=' assignment_expression
+        | typedef_expression pop ',' push identifier '=' assignment_expression
+                {
                         // $$ = DeclarationNode::newName( 0 );                  // unimplemented
 …
         | INT128
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Int128 ); }
+        | UINT128
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Int128 )->addType( DeclarationNode::newSignedNess( DeclarationNode::Unsigned ) ); }
         | FLOAT
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Float ); }
-        | FLOAT80
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Float80 ); }
-        | FLOAT128
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Float128 ); }
         | DOUBLE
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Double ); }
+        | uuFLOAT80
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::uuFloat80 ); }
+        | uuFLOAT128
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::uuFloat128 ); }
+        | uFLOAT16
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat16 ); }
+        | uFLOAT32
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat32 ); }
+        | uFLOAT32X
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat32x ); }
+        | uFLOAT64
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat64 ); }
+        | uFLOAT64X
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat64x ); }
+        | uFLOAT128
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat128 ); }
         | COMPLEX                                                                                       // C99
                 { $$ = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
 …
         | VALIST                                                                                        // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
+        | AUTO_TYPE
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::AutoType ); }
+        ;
 …
 indirect_type:
         TYPEOF '(' type ')'                                                                     // GCC: typeof(x) y;
+        TYPEOF '(' type ')'                                                                     // GCC: typeof( x ) y;
                 { $$ = $3; }
         | TYPEOF '(' comma_expression ')'                                       // GCC: typeof(a+b) y;
+        | TYPEOF '(' comma_expression ')'                                       // GCC: typeof( a+b ) y;
                 { $$ = DeclarationNode::newTypeof( $3 ); }
         | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type(x) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
         | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type(a+b) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
+        | BASETYPEOF '(' type ')'                                                       // CFA: basetypeof( x ) y;
+                { $$ = DeclarationNode::newTypeof( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ), true ); }
+        | BASETYPEOF '(' comma_expression ')'                           // CFA: basetypeof( a+b ) y;
+                { $$ = DeclarationNode::newTypeof( $3, true ); }
         | ZERO_T                                                                                        // CFA
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
 …
                 { $$ = $3->addQualifiers( $1 ); }
         | sue_type_specifier type_qualifier
+                { $$ = $1->addQualifiers( $2 ); }
+                {
+                        if ( $2->type != nullptr && $2->type->forall ) forall = true; // remember generic type
+                        $$ = $1->addQualifiers( $2 );
+                }
+        ;
 …
                 { $$ = DeclarationNode::newFromTypedef( $1 ); }
         | '.' TYPEDEFname
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                { $$ = DeclarationNode::newQualifiedType( DeclarationNode::newFromGlobalScope(), DeclarationNode::newFromTypedef( $2 ) ); }
         | type_name '.' TYPEDEFname
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                { $$ = DeclarationNode::newQualifiedType( $1, DeclarationNode::newFromTypedef( $3 ) ); }
         | typegen_name
         | '.' typegen_name
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                { $$ = DeclarationNode::newQualifiedType( DeclarationNode::newFromGlobalScope(), $2 ); }
         | type_name '.' typegen_name
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                { $$ = DeclarationNode::newQualifiedType( $1, $3 ); }
+        ;
 …
+        ;
+fred:
+        // empty
+                { yyy = false; }
+        ;
 aggregate_type:                                                                                 // struct, union
+        aggregate_key attribute_list_opt '{' field_declaration_list_opt '}'
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), nullptr, $4, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt no_attr_identifier
+                {
+                        typedefTable.makeTypedef( *$3, forall ? TYPEGENname : TYPEDEFname ); // create typedef
+                        //if ( forall ) typedefTable.changeKind( *$3, TYPEGENname ); // possibly update
+        aggregate_key attribute_list_opt
+                { forall = false; }                                                             // reset
+          '{' field_declaration_list_opt '}' type_parameters_opt
+                { $$ = DeclarationNode::newAggregate( $1, nullptr, $7, $5, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt identifier fred
+                {
+                        typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
                         forall = false;                                                         // reset
+                }
           '{' field_declaration_list_opt '}'
                 { $$ = DeclarationNode::newAggregate( $1, $3, nullptr, $6, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt type_name
+                {
                         typedefTable.makeTypedef( *$3->type->symbolic.name, forall ? TYPEGENname : TYPEDEFname ); // create typedef
                         //if ( forall ) typedefTable.changeKind( *$3->type->symbolic.name, TYPEGENname ); // possibly update
+          '{' field_declaration_list_opt '}' type_parameters_opt
+                { $$ = DeclarationNode::newAggregate( $1, $3, $9, $7, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt type_name fred
+                {
+                        // for type_name can be a qualified type name S.T, in which case only the last name in the chain needs a typedef (other names in the chain should already have one)
+                        typedefTable.makeTypedef( *$3->type->leafName(), forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
                         forall = false;                                                         // reset
+                }
+          '{' field_declaration_list_opt '}'
+                { $$ = DeclarationNode::newAggregate( $1, $3->type->symbolic.name, nullptr, $6, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt '(' type_list ')' '{' field_declaration_list_opt '}' // CFA
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), $4, $7, false )->addQualifiers( $2 ); }
+          '{' field_declaration_list_opt '}' type_parameters_opt
+                { $$ = DeclarationNode::newAggregate( $1, $3->type->symbolic.name, $9, $7, true )->addQualifiers( $2 ); }
         | aggregate_type_nobody
+        ;
+type_parameters_opt:
+        // empty
+                { $$ = nullptr; }                                                               %prec '}'
+        | '(' type_list ')'
+                { $$ = $2; }
+        ;
 aggregate_type_nobody:                                                                  // struct, union - {...}
+        aggregate_key attribute_list_opt no_attr_identifier
+                {
+                        typedefTable.makeTypedef( *$3, forall ? TYPEGENname : TYPEDEFname );
+                        //if ( forall ) typedefTable.changeKind( *$3, TYPEGENname ); // possibly update
+        aggregate_key attribute_list_opt identifier fred
+                {
+                        typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname );
                         forall = false;                                                         // reset
                         $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
+                }
+        | aggregate_key attribute_list_opt type_name
+                {
+        | aggregate_key attribute_list_opt type_name fred
+                {
+                        forall = false;                                                         // reset
                         // Create new generic declaration with same name as previous forward declaration, where the IDENTIFIER is
                         // switched to a TYPEGENname. Link any generic arguments from typegen_name to new generic declaration and
 …
 aggregate_key:
         STRUCT
                 { $$ = DeclarationNode::Struct; }
+                { yyy = true; $$ = DeclarationNode::Struct; }
         | UNION
                 { $$ = DeclarationNode::Union; }
+                { yyy = true; $$ = DeclarationNode::Union; }
         | EXCEPTION
+                { $$ = DeclarationNode::Exception; }
+                { yyy = true; $$ = DeclarationNode::Exception; }
+        | GENERATOR
+                { yyy = true; $$ = DeclarationNode::Coroutine; }
         | COROUTINE
                 { $$ = DeclarationNode::Coroutine; }
+                { yyy = true; $$ = DeclarationNode::Coroutine; }
         | MONITOR
                 { $$ = DeclarationNode::Monitor; }
+                { yyy = true; $$ = DeclarationNode::Monitor; }
         | THREAD
                 { $$ = DeclarationNode::Thread; }
+                { yyy = true; $$ = DeclarationNode::Thread; }
+        ;
 …
 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
+        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
-                { SemanticError( yylloc, "Typedef in aggregate is currently unimplemented." ); $$ = nullptr; }
         | cfa_field_declaring_list ';'                                          // CFA, new style field declaration
         | 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
-                { SemanticError( yylloc, "Typedef in aggregate is currently unimplemented." ); $$ = nullptr; }
         | static_assert                                                                         // C11
+        ;
+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
+                { $$ = $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
+                { $$ = $1->appendList( $1->cloneType( 0 ) ); }
+        ;
+field_declaring_list:
+        field_declarator_opt
+        | field_declaring_list ',' attribute_list_opt field_declarator_opt
+field_declaring_list_opt:
+        // empty
+                { $$ = nullptr; }
+        | field_declarator
+        | field_declaring_list_opt ',' attribute_list_opt field_declarator
                 { $$ = $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
+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 base type int.
+                // 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 base type int.
+                // A semantic check is required to ensure bit_subrange only appears on integral types.
                 { $$ = $1->addBitfield( $2 ); }
+        | variable_abstract_declarator                                          // CFA, no field name
+        ;
+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
+        // bit-fields are handled by C declarations
+        cfa_abstract_declarator_tuple identifier_or_type_name
+                { $$ = $1->addName( $2 ); }
+        | cfa_field_declaring_list ',' identifier_or_type_name
+                { $$ = $1->appendList( $1->cloneType( $3 ) ); }
+        ;
+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 ) ); }
+        ;
 …
 bit_subrange_size:
         ':' constant_expression
+        ':' assignment_expression
                 { $$ = $2; }
+        ;
 …
 enum_type:                                                                                              // enum
         ENUM attribute_list_opt '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( new string( DeclarationNode::anonymous.newName() ), $4, true )->addQualifiers( $2 ); }
         | ENUM attribute_list_opt no_attr_identifier
+                { $$ = DeclarationNode::newEnum( nullptr, $4, true )->addQualifiers( $2 ); }
+        | ENUM attribute_list_opt identifier
                 { typedefTable.makeTypedef( *$3 ); }
           '{' enumerator_list comma_opt '}'
 …
 enum_type_nobody:                                                                               // enum - {...}
         ENUM attribute_list_opt no_attr_identifier
+        ENUM attribute_list_opt identifier
+                {
                         typedefTable.makeTypedef( *$3 );
 …
 enumerator_list:
         no_attr_identifier_or_type_name enumerator_value_opt
+        identifier_or_type_name enumerator_value_opt
                 { $$ = DeclarationNode::newEnumConstant( $1, $2 ); }
         | enumerator_list ',' no_attr_identifier_or_type_name enumerator_value_opt
+        | enumerator_list ',' identifier_or_type_name enumerator_value_opt
                 { $$ = $1->appendList( DeclarationNode::newEnumConstant( $3, $4 ) ); }
+        ;
 …
 identifier_list:                                                                                // K&R-style parameter list => no types
         no_attr_identifier
+        identifier
                 { $$ = DeclarationNode::newName( $1 ); }
         | identifier_list ',' no_attr_identifier
+        | identifier_list ',' identifier
                 { $$ = $1->appendList( DeclarationNode::newName( $3 ) ); }
+        ;
 …
 identifier_or_type_name:
         identifier
-        | TYPEDEFname
-        | TYPEGENname
+        ;
-no_attr_identifier_or_type_name:
-        no_attr_identifier
         | TYPEDEFname
         | TYPEGENname
 …
 designation:
         designator_list ':'                                                                     // C99, CFA uses ":" instead of "="
         | no_attr_identifier ':'                                                        // GCC, field name
+        | identifier ':'                                                                        // GCC, field name
                 { $$ = new ExpressionNode( build_varref( $1 ) ); }
+        ;
 …
 designator:
         '.' no_attr_identifier                                                          // C99, field name
+        '.' identifier                                                                          // C99, field name
                 { $$ = new ExpressionNode( build_varref( $2 ) ); }
         | '[' push assignment_expression pop ']'                        // C99, single array element
 …
         | '[' 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; }
+        ;
 …
 type_parameter:                                                                                 // CFA
         type_class no_attr_identifier_or_type_name
+        type_class identifier_or_type_name
                 { typedefTable.addToScope( *$2, TYPEDEFname, "9" ); }
           type_initializer_opt assertion_list_opt
 …
 assertion:                                                                                              // CFA
         '|' no_attr_identifier_or_type_name '(' type_list ')'
+        '|' identifier_or_type_name '(' type_list ')'
                 { $$ = DeclarationNode::newTraitUse( $2, $4 ); }
         | '|' '{' push trait_declaration_list pop '}'
 …
                 { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( $1 ) ) ); }
         | assignment_expression
+                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $1->build()) ); $$ = nullptr; }
         | type_list ',' type
                 { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) ) ); }
         | type_list ',' assignment_expression
+                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
+                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $3->build()) ); $$ = nullptr; }
+                // { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
+        ;
 …
 type_declarator_name:                                                                   // CFA
         no_attr_identifier_or_type_name
+        identifier_or_type_name
+                {
                         typedefTable.addToEnclosingScope( *$1, TYPEDEFname, "10" );
                         $$ = DeclarationNode::newTypeDecl( $1, 0 );
+                }
         | no_attr_identifier_or_type_name '(' type_parameter_list ')'
+        | identifier_or_type_name '(' type_parameter_list ')'
+                {
                         typedefTable.addToEnclosingScope( *$1, TYPEGENname, "11" );
 …
 trait_specifier:                                                                                // CFA
         TRAIT no_attr_identifier_or_type_name '(' type_parameter_list ')' '{' '}'
+        TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' '}'
                 { $$ = DeclarationNode::newTrait( $2, $4, 0 ); }
         | TRAIT no_attr_identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
+        | TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
                 { $$ = DeclarationNode::newTrait( $2, $4, $8 ); }
+        ;
 …
 translation_unit:
+        // empty
+                {}                                                                                              // empty input file
+        // empty, input file
         | external_definition_list
                 { parseTree = parseTree ? parseTree->appendList( $1 ) : $1;     }
 …
         push external_definition pop
                 { $$ = $2; }
+        | external_definition_list
+                { forall = xxx; }
+          push external_definition pop
+                { $$ = $1 ? $1->appendList( $4 ) : $4; }
+        ;
+        // SKULLDUGGERY: Declarations in extern "X" and distribution need to be added to the current lexical scope.
+        // However, external_definition_list creates a new scope around each external_definition, but the pop loses all the
+        // types in the extern "X" and distribution at the end of the block. This version of external_definition_list does
+        // not do push/pop for declarations at the level of the extern "X" and distribution block. Any recursive uses of
+        // external_definition_list within the extern "X" and distribution block correctly pushes/pops for that scope level.
+external_definition_list_no_pop_push:
+        external_definition
+        | external_definition_list_no_pop_push
+                { forall = xxx; }
+          external_definition
+        | external_definition_list push external_definition pop
                 { $$ = $1 ? $1->appendList( $3 ) : $3; }
+        ;
 …
         // empty
                 { $$ = nullptr; }
+        | external_definition_list_no_pop_push
+        | external_definition_list
+        ;
+up:
+                { typedefTable.up( forall ); forall = false; }
+        ;
+down:
+                { typedefTable.down(); }
+        ;
 …
                         linkage = LinkageSpec::linkageUpdate( yylloc, linkage, $2 );
+                }
           '{' external_definition_list_opt '}'
+          '{' up external_definition_list_opt down '}'
+                {
                         linkage = linkageStack.top();
                         linkageStack.pop();
+                        $$ = $6;
+                }
+        | type_qualifier_list
+                {
+                        if ( $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( $1->type->forall ) forall = true;          // remember generic type
+                }
+          '{' up external_definition_list_opt down '}'          // CFA, namespace
+                {
+                        distQual( $5, $1 );
+                        forall = false;
                         $$ = $5;
+                }
-        | type_qualifier_list
-                { if ( $1->type->forall ) xxx = forall = true; } // remember generic type
-          '{' external_definition_list_opt '}'                          // CFA, namespace
+                {
-                        for ( DeclarationNode * iter = $4; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                                if ( isMangled( iter->linkage ) ) {             // ignore extern "C"
-                                        iter->addQualifiers( $1->clone() );
-                                } // if
-                        } // for
-                        xxx = false;
-                        delete $1;
-                        $$ = $4;
+                }
         | declaration_qualifier_list
+                { if ( $1->type->forall ) xxx = forall = true; } // remember generic type
+          '{' external_definition_list_opt '}'                          // CFA, namespace
+                {
+                        for ( DeclarationNode * iter = $4; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
+                                if ( isMangled( iter->linkage ) ) {             // ignore extern "C"
+                                        iter->addQualifiers( $1->clone() );
+                                } // if
+                        } // for
+                        xxx = false;
+                        delete $1;
+                        $$ = $4;
+                {
+                        if ( $1->type && $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( $1->type && $1->type->forall ) forall = true; // remember generic type
+                }
+          '{' up external_definition_list_opt down '}'          // CFA, namespace
+                {
+                        distQual( $5, $1 );
+                        forall = false;
+                        $$ = $5;
+                }
         | declaration_qualifier_list type_qualifier_list
+                {
+                        // forall must be in the type_qualifier_list
+                        if ( $2->type->forall ) xxx = forall = true; // remember generic type
+                }
+          '{' external_definition_list_opt '}'                          // CFA, namespace
+                {
+                        for ( DeclarationNode * iter = $5; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
+                                if ( isMangled( iter->linkage ) && isMangled( $2->linkage ) ) { // ignore extern "C"
+                                        iter->addQualifiers( $1->clone() );
+                                        iter->addQualifiers( $2->clone() );
+                                } // if
+                        } // for
+                        xxx = false;
+                        delete $1;
+                        delete $2;
+                        $$ = $5;
+                        if ( ($1->type && $1->type->qualifiers.val) || $2->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( ($1->type && $1->type->forall) || $2->type->forall ) forall = true; // remember generic type
+                }
+          '{' up external_definition_list_opt down '}'          // CFA, namespace
+                {
+                        distQual( $6, $1->addQualifiers( $2 ) );
+                        forall = false;
+                        $$ = $6;
+                }
+        ;
 …
         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; }
 …
                 { $$ = $3->addPointer( DeclarationNode::newPointer( $2, $1 ) ); }
         | '(' type_ptr ')' attribute_list_opt
                 { $$ = $2->addQualifiers( $4 ); }
+                { $$ = $2->addQualifiers( $4 ); }                               // redundant parenthesis
+        ;

src/ResolvExpr/AdjustExprType.cc

-              r7951100
+              rb067d9b
 // file "LICENCE" distributed with Cforall.
 //
 // AdjustExprType.cc --
+// AdjustExprType_old.cc --
 //
 // Author           : Richard C. Bilson
 …
 //
+#include "AST/Node.hpp"
+#include "AST/Pass.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"
 #include "SymTab/Indexer.h"       // for Indexer
 …
 namespace ResolvExpr {
+        class AdjustExprType : public WithShortCircuiting {
+          public:
+                AdjustExprType( const TypeEnvironment & env, const SymTab::Indexer & indexer );
+namespace {
+        class AdjustExprType_old final : public WithShortCircuiting {
+                public:
+                AdjustExprType_old( const TypeEnvironment & env, const SymTab::Indexer & indexer );
                 void premutate( VoidType * ) { visit_children = false; }
                 void premutate( BasicType * ) { visit_children = false; }
 …
                 void premutate( OneType * ) { visit_children = false; }
                 Type * postmutate( ArrayType *arrayType );
                 Type * postmutate( FunctionType *functionType );
                 Type * postmutate( TypeInstType *aggregateUseType );
+                Type * postmutate( ArrayType * arrayType );
+                Type * postmutate( FunctionType * functionType );
+                Type * postmutate( TypeInstType * aggregateUseType );
           private:
+                private:
                 const TypeEnvironment & env;
                 const SymTab::Indexer & indexer;
         };
+        void adjustExprType( Type *&type, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                PassVisitor<AdjustExprType> adjuster( env, indexer );
+                Type *newType = type->acceptMutator( adjuster );
+                type = newType;
+        }
+        void adjustExprType( Type *& type ) {
+                TypeEnvironment env;
+                SymTab::Indexer indexer;
+                adjustExprType( type, env, indexer );
+        }
+        AdjustExprType::AdjustExprType( const TypeEnvironment &env, const SymTab::Indexer &indexer )
+        AdjustExprType_old::AdjustExprType_old( const TypeEnvironment &env, const SymTab::Indexer &indexer )
                 : env( env ), indexer( indexer ) {
+        }
         Type * AdjustExprType::postmutate( ArrayType * arrayType ) {
                 PointerType *pointerType = new PointerType{ arrayType->get_qualifiers(), arrayType->base };
+        Type * AdjustExprType_old::postmutate( ArrayType * arrayType ) {
+                PointerType * pointerType = new PointerType{ arrayType->get_qualifiers(), arrayType->base };
                 arrayType->base = nullptr;
                 delete arrayType;
 …
+        }
         Type * AdjustExprType::postmutate( FunctionType * functionType ) {
+        Type * AdjustExprType_old::postmutate( FunctionType * functionType ) {
                 return new PointerType{ Type::Qualifiers(), functionType };
+        }
         Type * AdjustExprType::postmutate( TypeInstType * typeInst ) {
                 if ( const EqvClass* eqvClass = env.lookup( typeInst->get_name() ) ) {
+        Type * AdjustExprType_old::postmutate( TypeInstType * typeInst ) {
+                if ( const EqvClass * eqvClass = env.lookup( typeInst->get_name() ) ) {
                         if ( eqvClass->data.kind == TypeDecl::Ftype ) {
                                 return new PointerType{ Type::Qualifiers(), typeInst };
+                        }
                 } else if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
                         if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
+                } else if ( const NamedTypeDecl * ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
+                        if ( const TypeDecl * tyDecl = dynamic_cast< const TypeDecl * >( ntDecl ) ) {
                                 if ( tyDecl->get_kind() == TypeDecl::Ftype ) {
                                         return new PointerType{ Type::Qualifiers(), typeInst };
 …
                 return typeInst;
+        }
+} // anonymous namespace
+void adjustExprType( Type *&type, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+        PassVisitor<AdjustExprType_old> adjuster( env, indexer );
+        Type * newType = type->acceptMutator( adjuster );
+        type = newType;
+}
+void adjustExprType( Type *& type ) {
+        TypeEnvironment env;
+        SymTab::Indexer indexer;
+        adjustExprType( type, env, indexer );
+}
+namespace {
+        struct AdjustExprType_new final : public ast::WithShortCircuiting {
+                const ast::TypeEnvironment & tenv;
+                const ast::SymbolTable & symtab;
+                AdjustExprType_new( const ast::TypeEnvironment & e, const ast::SymbolTable & syms )
+                : tenv( e ), symtab( syms ) {}
+                void premutate( const ast::VoidType * ) { visit_children = false; }
+                void premutate( const ast::BasicType * ) { visit_children = false; }
+                void premutate( const ast::PointerType * ) { visit_children = false; }
+                void premutate( const ast::ArrayType * ) { visit_children = false; }
+                void premutate( const ast::FunctionType * ) { visit_children = false; }
+                void premutate( const ast::StructInstType * ) { visit_children = false; }
+                void premutate( const ast::UnionInstType * ) { visit_children = false; }
+                void premutate( const ast::EnumInstType * ) { visit_children = false; }
+                void premutate( const ast::TraitInstType * ) { visit_children = false; }
+                void premutate( const ast::TypeInstType * ) { visit_children = false; }
+                void premutate( const ast::TupleType * ) { visit_children = false; }
+                void premutate( const ast::VarArgsType * ) { visit_children = false; }
+                void premutate( const ast::ZeroType * ) { visit_children = false; }
+                void premutate( const ast::OneType * ) { visit_children = false; }
+                const ast::Type * postmutate( const ast::ArrayType * at ) {
+                        return new ast::PointerType{ at->base, at->qualifiers };
+                }
+                const ast::Type * postmutate( const ast::FunctionType * ft ) {
+                        return new ast::PointerType{ ft };
+                }
+                const ast::Type * postmutate( const ast::TypeInstType * inst ) {
+                        // replace known function-type-variables with pointer-to-function
+                        if ( const ast::EqvClass * eqvClass = tenv.lookup( inst->name ) ) {
+                                if ( eqvClass->data.kind == ast::TypeVar::Ftype ) {
+                                        return new ast::PointerType{ inst };
+                                }
+                        } else if ( const ast::NamedTypeDecl * ntDecl = symtab.lookupType( inst->name ) ) {
+                                if ( auto tyDecl = dynamic_cast< const ast::TypeDecl * >( ntDecl ) ) {
+                                        if ( tyDecl->kind == ast::TypeVar::Ftype ) {
+                                                return new ast::PointerType{ inst };
+                                        }
+                                }
+                        }
+                        return inst;
+                }
+        };
+} // anonymous namespace
+const ast::Type * adjustExprType(
+        const ast::Type * type, const ast::TypeEnvironment & env, const ast::SymbolTable & symtab
+) {
+        ast::Pass<AdjustExprType_new> adjuster{ env, symtab };
+        return type->accept( adjuster );
+}
 } // namespace ResolvExpr

src/ResolvExpr/Alternative.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:44:23 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat May 16 23:54:23 2015
 // Update Count     : 2
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Thu Oct 11 10:55:00 2018
+// Update Count     : 3
 //
 …
 #include <utility>                       // for move
 #include "Common/utility.h"              // for maybeClone
+#include "Common/utility.h"              // for cloneAll
 #include "ResolvExpr/Cost.h"             // for Cost, Cost::zero, operator<<
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
 …
 namespace ResolvExpr {
+        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ) {}
+        Alternative::Alternative()
+        : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ), env(), openVars(), need() {}
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
+                : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ) {}
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env )
+        : cost( Cost::zero ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars(), need() {}
+        Alternative::Alternative( const Alternative &o, Expression *expr, const Cost &cost )
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( o.env ), openVars( o.openVars ),
+          need() { cloneAll( o.need, need ); }
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost, const Cost &cvtCost )
+                : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ) {}
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env,
+                const OpenVarSet& openVars, const AssertionList& oneed, const Cost& cost )
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars( openVars ),
+          need() { cloneAll( oneed, need ); }
+        Alternative::Alternative( const Alternative &other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), env( other.env ) {
+        }
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env,
+                const OpenVarSet& openVars, const AssertionList& oneed, const Cost& cost,
+                const Cost &cvtCost )
+        : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ), openVars( openVars ),
+          need() { cloneAll( oneed, need ); }
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env,
+                const OpenVarSet &openVars, const AssertionSet &oneed, const Cost &cost)
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars( openVars ),
+          need() { cloneAll( oneed, need ); }
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env,
+                const OpenVarSet &openVars, const AssertionSet &oneed, const Cost &cost,
+                const Cost& cvtCost )
+        : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ), openVars( openVars ),
+          need() { cloneAll( oneed, need ); }
+        Alternative::Alternative( Expression *expr, TypeEnvironment &&env, OpenVarSet &&openVars,
+                AssertionSet &&needSet, const Cost &cost )
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( std::move(env) ),
+          openVars( std::move(openVars) ), need( needSet.begin(), needSet.end() ) {}
+        Alternative::Alternative( Expression *expr, TypeEnvironment &&env, OpenVarSet &&openVars,
+                AssertionSet &&needSet, const Cost &cost, const Cost &cvtCost )
+        : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( std::move(env) ),
+          openVars( std::move(openVars) ), need( needSet.begin(), needSet.end() ) {}
+        Alternative::Alternative( const Alternative &other )
+        : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ),
+          env( other.env ), openVars( other.openVars ), need() { cloneAll( other.need, need ); }
         Alternative &Alternative::operator=( const Alternative &other ) {
 …
                 expr = maybeClone( other.expr );
                 env = other.env;
+                openVars = other.openVars;
+                need.clear();
+                cloneAll( other.need, need );
                 return *this;
+        }
+        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( std::move( other.env ) ) {
+                other.expr = nullptr;
+        }
+        Alternative::Alternative( Alternative && other )
+        : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ),
+          env( std::move( other.env ) ), openVars( std::move( other.openVars ) ),
+          need( std::move( other.need ) ) { other.expr = nullptr; }
         Alternative & Alternative::operator=( Alternative && other ) {
 …
                 expr = other.expr;
                 env = std::move( other.env );
+                openVars = std::move( other.openVars );
+                need = std::move( other.need );
                 other.expr = nullptr;
                 return *this;
 …
         Alternative::~Alternative() {
+                for ( AssertionItem& n : need ) { delete n.decl; }
                 delete expr;
+        }
 …
                         os << "Null expression!" << std::endl;
                 } // if
                 os << indent << "Environment: ";
+                os << indent << "Environment:";
                 env.print( os, indent+1 );
                 os << std::endl;
+        }
-        void splice( AltList& dst, AltList& src ) {
-                dst.reserve( dst.size() + src.size() );
-                for ( Alternative& alt : src ) {
-                        dst.push_back( std::move(alt) );
+                }
-                src.clear();
+        }
-        void spliceBegin( AltList& dst, AltList& src ) {
-                splice( src, dst );
-                dst.swap( src );
+        }

src/ResolvExpr/Alternative.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:45:43 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:36:36 2017
 // Update Count     : 3
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Thu Oct 11 10:55:00 2018
+// Update Count     : 4
 //
 …
 #include "Cost.h"             // for Cost
+#include "TypeEnvironment.h"  // for TypeEnvironment
+#include "TypeEnvironment.h"  // for TypeEnvironment, AssertionSetValue
+#include "Common/utility.h"   // for maybeClone
 class Expression;
 namespace ResolvExpr {
+        /// One assertion to resolve
+        struct AssertionItem {
+                const DeclarationWithType* decl;
+                AssertionSetValue info;
+                AssertionItem() = default;
+                AssertionItem( const DeclarationWithType* decl, const AssertionSetValue& info )
+                : decl(decl), info(info) {}
+                AssertionItem( const AssertionSet::value_type& e ) : decl(e.first), info(e.second) {}
+                operator AssertionSet::value_type () const { return { decl, info }; }
+                // to support cloneAll
+                AssertionItem clone() const { return { maybeClone(decl), info }; }
+        };
+        /// A list of unresolved assertions
+        using AssertionList = std::vector<AssertionItem>;
+        /// Clones an assertion list into an assertion set
+        static inline void cloneAll( const AssertionList& src, AssertionSet& dst ) {
+                for ( const AssertionItem& item : src ) {
+                        dst.emplace( maybeClone(item.decl), item.info );
+                }
+        }
+        /// Clones an assertion set into an assertion list
+        static inline void cloneAll( const AssertionSet& src, AssertionList& dst ) {
+                dst.reserve( dst.size() + src.size() );
+                for ( const auto& entry : src ) {
+                        dst.emplace_back( maybeClone(entry.first), entry.second );
+                }
+        }
+        /// Clones an assertion list into an assertion list
+        static inline void cloneAll( const AssertionList& src, AssertionList& dst ) {
+                dst.reserve( dst.size() + src.size() );
+                for ( const AssertionItem& item : src ) {
+                        dst.emplace_back( maybeClone(item.decl), item.info );
+                }
+        }
+        /// One option for resolution of an expression
         struct Alternative {
                 Alternative();
+                Alternative( Expression *expr, const TypeEnvironment &env, const Cost &cost );
+                Alternative( Expression *expr, const TypeEnvironment &env, const Cost &cost, const Cost &cvtCost );
+                Alternative( Expression *expr, const TypeEnvironment &env );
+                Alternative( const Alternative &o, Expression *expr, const Cost &cost );
+                Alternative( Expression *expr, const TypeEnvironment &env, const OpenVarSet& openVars,
+                        const AssertionList& need, const Cost &cost );
+                Alternative( Expression *expr, const TypeEnvironment &env, const OpenVarSet& openVars,
+                        const AssertionList& need, const Cost &cost, const Cost &cvtCost );
+                Alternative( Expression *expr, const TypeEnvironment &env, const OpenVarSet &openVars,
+                        const AssertionSet &need, const Cost &cost);
+                Alternative( Expression *expr, const TypeEnvironment &env, const OpenVarSet &openVars,
+                        const AssertionSet &need, const Cost &cost, const Cost& cvtCost );
+                Alternative( Expression *expr, TypeEnvironment &&env, OpenVarSet &&openVars,
+                        AssertionSet &&need, const Cost &cost );
+                Alternative( Expression *expr, TypeEnvironment &&env, OpenVarSet &&openVars,
+                        AssertionSet &&need, const Cost &cost, const Cost &cvtCost );
                 Alternative( const Alternative &other );
                 Alternative &operator=( const Alternative &other );
 …
+                }
+                Cost cost;
+                Cost cvtCost;
+                Expression *expr;
+                TypeEnvironment env;
+                /// Sorts by cost
+                bool operator< ( const Alternative& o ) const { return cost < o.cost; }
+                Cost cost;            ///< Cost of the whole expression
+                Cost cvtCost;         ///< Cost of conversions to the satisfying expression
+                Expression *expr;     ///< Satisfying expression
+                TypeEnvironment env;  ///< Containing type environment
+                OpenVarSet openVars;  ///< Open variables for environment
+                AssertionList need;   ///< Assertions which need to be resolved
         };
         typedef std::vector< Alternative > AltList;
-        /// Moves all elements from src to the end of dst
-        void splice( AltList& dst, AltList& src );
-        /// Moves all elements from src to the beginning of dst
-        void spliceBegin( AltList& dst, AltList& src );
         static inline std::ostream & operator<<(std::ostream & os, const ResolvExpr::Alternative & alt) {

src/ResolvExpr/AlternativeFinder.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Feb 17 11:19:39 2018
 // Update Count     : 33
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:35:00 2019
+// Update Count     : 38
 //
 …
 #include <vector>                  // for vector
+#include "CompilationState.h"      // for resolvep
 #include "Alternative.h"           // for AltList, Alternative
 #include "AlternativeFinder.h"
+#include "AST/Expr.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for deleteAll, printAll, CodeLocation
 …
 #include "InitTweak/InitTweak.h"   // for getFunctionName
 #include "RenameVars.h"            // for RenameVars, global_renamer
+#include "ResolveAssertions.h"     // for resolveAssertions
 #include "ResolveTypeof.h"         // for resolveTypeof
 #include "Resolver.h"              // for resolveStmtExpr
 …
 #include "typeops.h"               // for adjustExprType, polyCost, castCost
-extern bool resolvep;
 #define PRINT( text ) if ( resolvep ) { text }
 //#define DEBUG_COST
-using std::move;
-/// copies any copyable type
-template<typename T>
-T copy(const T& x) { return x; }
 namespace ResolvExpr {
 …
                 void postvisit( OffsetofExpr * offsetofExpr );
                 void postvisit( OffsetPackExpr * offsetPackExpr );
-                void postvisit( AttrExpr * attrExpr );
                 void postvisit( LogicalExpr * logicalExpr );
                 void postvisit( ConditionalExpr * conditionalExpr );
 …
                 void addAnonConversions( const Alternative & alt );
                 /// Adds alternatives for member expressions, given the aggregate, conversion cost for that aggregate, and name of the member
                 template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name );
+                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Alternative &alt, const Cost &newCost, const std::string & name );
                 /// Adds alternatives for member expressions where the left side has tuple type
                 void addTupleMembers( TupleType * tupleType, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member );
+                void addTupleMembers( TupleType *tupleType, Expression *expr, const Alternative &alt, const Cost &newCost, Expression *member );
                 /// Adds alternatives for offsetof expressions, given the base type and name of the member
                 template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );
 …
                 /// Finds matching alternatives for a function, given a set of arguments
                 template<typename OutputIterator>
                 void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, const ExplodedArgs& args, OutputIterator out );
                 /// Checks if assertion parameters match for a new alternative
+                void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, const ExplodedArgs_old& args, OutputIterator out );
+                /// Sets up parameter inference for an output alternative
                 template< typename OutputIterator >
                 void inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out );
+                void inferParameters( Alternative &newAlt, OutputIterator out );
         private:
                 AlternativeFinder & altFinder;
 …
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt ) {
                 Indenter indent = { Indenter::tabsize, indentAmt };
+                Indenter indent = { indentAmt };
                 for ( AltList::const_iterator i = list.begin(); i != list.end(); ++i ) {
                         i->print( os, indent );
 …
                                                 selected[ mangleName ] = current;
                                         } else if ( candidate->cost == mapPlace->second.candidate->cost ) {
+                                                PRINT(
+                                                        std::cerr << "marking ambiguous" << std::endl;
+                                                )
+                                                mapPlace->second.isAmbiguous = true;
+                                                // if one of the candidates contains a deleted identifier, can pick the other, since
+                                                // deleted expressions should not be ambiguous if there is another option that is at least as good
+                                                if ( findDeletedExpr( candidate->expr ) ) {
+                                                        // do nothing
+                                                        PRINT( std::cerr << "candidate is deleted" << std::endl; )
+                                                } else if ( findDeletedExpr( mapPlace->second.candidate->expr ) ) {
+                                                        PRINT( std::cerr << "current is deleted" << std::endl; )
+                                                        selected[ mangleName ] = current;
+                                                } else {
+                                                        PRINT(
+                                                                std::cerr << "marking ambiguous" << std::endl;
+                                                        )
+                                                        mapPlace->second.isAmbiguous = true;
+                                                }
                                         } else {
                                                 PRINT(
 …
+        }
         void AlternativeFinder::find( Expression *expr, bool adjust, bool prune, bool failFast ) {
+        void AlternativeFinder::find( Expression *expr, ResolvMode mode ) {
                 PassVisitor<Finder> finder( *this );
                 expr->accept( finder );
                 if ( failFast && alternatives.empty() ) {
+                if ( mode.failFast && alternatives.empty() ) {
                         PRINT(
                                 std::cerr << "No reasonable alternatives for expression " << expr << std::endl;
 …
                         SemanticError( expr, "No reasonable alternatives for expression " );
+                }
+                if ( prune ) {
+                if ( mode.satisfyAssns || mode.prune ) {
+                        // trim candidates just to those where the assertions resolve
+                        // - necessary pre-requisite to pruning
+                        AltList candidates;
+                        std::list<std::string> errors;
+                        for ( unsigned i = 0; i < alternatives.size(); ++i ) {
+                                resolveAssertions( alternatives[i], indexer, candidates, errors );
+                        }
+                        // fail early if none such
+                        if ( mode.failFast && candidates.empty() ) {
+                                std::ostringstream stream;
+                                stream << "No alternatives with satisfiable assertions for " << expr << "\n";
+                                //        << "Alternatives with failing assertions are:\n";
+                                // printAlts( alternatives, stream, 1 );
+                                for ( const auto& err : errors ) {
+                                        stream << err;
+                                }
+                                SemanticError( expr->location, stream.str() );
+                        }
+                        // reset alternatives
+                        alternatives = std::move( candidates );
+                }
+                if ( mode.prune ) {
                         auto oldsize = alternatives.size();
                         PRINT(
 …
                         AltList pruned;
                         pruneAlternatives( alternatives.begin(), alternatives.end(), back_inserter( pruned ) );
                         if ( failFast && pruned.empty() ) {
+                        if ( mode.failFast && pruned.empty() ) {
                                 std::ostringstream stream;
                                 AltList winners;
 …
+                }
                 // adjust types after pruning so that types substituted by pruneAlternatives are correctly adjusted
                 for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
                         if ( adjust ) {
                                 adjustExprType( i->expr->get_result(), i->env, indexer );
+                if ( mode.adjust ) {
+                        for ( Alternative& i : alternatives ) {
+                                adjustExprType( i.expr->get_result(), i.env, indexer );
+                        }
+                }
 …
         void AlternativeFinder::findWithAdjustment( Expression *expr ) {
                 find( expr, true );
+                find( expr, ResolvMode::withAdjustment() );
+        }
         void AlternativeFinder::findWithoutPrune( Expression * expr ) {
                 find( expr, true, false );
+                find( expr, ResolvMode::withoutPrune() );
+        }
         void AlternativeFinder::maybeFind( Expression * expr ) {
                 find( expr, true, true, false );
+                find( expr, ResolvMode::withoutFailFast() );
+        }
 …
+                }
                 if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->result ) ) {
                         addAggMembers( structInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, "" );
                 } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->result ) ) {
                         addAggMembers( unionInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, "" );
+                if ( StructInstType * structInst = dynamic_cast< StructInstType* >( aggrExpr->result ) ) {
+                        addAggMembers( structInst, aggrExpr.get(), alt, alt.cost+Cost::safe, "" );
+                } else if ( UnionInstType * unionInst = dynamic_cast< UnionInstType* >( aggrExpr->result ) ) {
+                        addAggMembers( unionInst, aggrExpr.get(), alt, alt.cost+Cost::safe, "" );
                 } // if
+        }
         template< typename StructOrUnionType >
         void AlternativeFinder::Finder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name ) {
+        void AlternativeFinder::Finder::addAggMembers( StructOrUnionType * aggInst, Expression * expr, const Alternative& alt, const Cost &newCost, const std::string & name ) {
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
                 for ( Declaration * decl : members ) {
                         if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( decl ) ) {
+                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType* >( decl ) ) {
                                 // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
                                 // can't construct in place and use vector::back
                                 Alternative newAlt( new MemberExpr( dwt, expr->clone() ), env, newCost );
+                                Alternative newAlt{ alt, new MemberExpr{ dwt, expr->clone() }, newCost };
                                 renameTypes( newAlt.expr );
                                 addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
 …
+        }
         void AlternativeFinder::Finder::addTupleMembers( TupleType * tupleType, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
+        void AlternativeFinder::Finder::addTupleMembers( TupleType * tupleType, Expression * expr, const Alternative &alt, const Cost &newCost, Expression * member ) {
                 if ( ConstantExpr * constantExpr = dynamic_cast< ConstantExpr * >( member ) ) {
                         // get the value of the constant expression as an int, must be between 0 and the length of the tuple type to have meaning
+                        // xxx - this should be improved by memoizing the value of constant exprs
+                        // during parsing and reusing that information here.
+                        std::stringstream ss( constantExpr->get_constant()->get_value() );
+                        int val = 0;
+                        auto val = constantExpr->intValue();
                         std::string tmp;
+                        if ( ss >> val && ! (ss >> tmp) ) {
+                                if ( val >= 0 && (unsigned int)val < tupleType->size() ) {
+                                        alternatives.push_back( Alternative( new TupleIndexExpr( expr->clone(), val ), env, newCost ) );
+                                } // if
+                        if ( val >= 0 && (unsigned long long)val < tupleType->size() ) {
+                                alternatives.push_back( Alternative{
+                                        alt, new TupleIndexExpr( expr->clone(), val ), newCost } );
                         } // if
-                } else if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( member ) ) {
-                        // xxx - temporary hack until 0/1 are int constants
-                        if ( nameExpr->get_name() == "0" || nameExpr->get_name() == "1" ) {
-                                std::stringstream ss( nameExpr->get_name() );
-                                int val;
-                                ss >> val;
-                                alternatives.push_back( Alternative( new TupleIndexExpr( expr->clone(), val ), env, newCost ) );
+                        }
                 } // if
+        }
+        void AlternativeFinder::Finder::postvisit( ApplicationExpr *applicationExpr ) {
+                alternatives.push_back( Alternative( applicationExpr->clone(), env, Cost::zero ) );
+        }
+        Cost computeConversionCost( Type * actualType, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
+        void AlternativeFinder::Finder::postvisit( ApplicationExpr * applicationExpr ) {
+                alternatives.push_back( Alternative{ applicationExpr->clone(), env } );
+        }
+        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
                 PRINT(
                         std::cerr << std::endl << "converting ";
 …
                         std::cerr << std::endl;
+                )
                 Cost convCost = conversionCost( actualType, formalType, indexer, env );
+                Cost convCost = conversionCost( actualType, formalType, actualIsLvalue, indexer, env );
                 PRINT(
                         std::cerr << std::endl << "cost is " << convCost << std::endl;
 …
         Cost computeExpressionConversionCost( Expression *& actualExpr, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
+                Cost convCost = computeConversionCost( actualExpr->result, formalType, indexer, env );
+                Cost convCost = computeConversionCost(
+                        actualExpr->result, formalType, actualExpr->get_lvalue(), indexer, env );
                 // if there is a non-zero conversion cost, ignoring poly cost, then the expression requires conversion.
 …
         Cost computeApplicationConversionCost( Alternative &alt, const SymTab::Indexer &indexer ) {
                 ApplicationExpr *appExpr = strict_dynamic_cast< ApplicationExpr* >( alt.expr );
                 PointerType *pointer = strict_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
                 FunctionType *function = strict_dynamic_cast< FunctionType* >( pointer->get_base() );
+                PointerType *pointer = strict_dynamic_cast< PointerType* >( appExpr->function->result );
+                FunctionType *function = strict_dynamic_cast< FunctionType* >( pointer->base );
                 Cost convCost = Cost::zero;
                 std::list< DeclarationWithType* >& formals = function->get_parameters();
+                std::list< DeclarationWithType* >& formals = function->parameters;
                 std::list< DeclarationWithType* >::iterator formal = formals.begin();
                 std::list< Expression* >& actuals = appExpr->get_args();
                 for ( std::list< Expression* >::iterator actualExpr = actuals.begin(); actualExpr != actuals.end(); ++actualExpr ) {
                         Type * actualType = (*actualExpr)->get_result();
+                std::list< Expression* >& actuals = appExpr->args;
+                for ( Expression*& actualExpr : actuals ) {
+                        Type * actualType = actualExpr->result;
                         PRINT(
                                 std::cerr << "actual expression:" << std::endl;
                                 (*actualExpr)->print( std::cerr, 8 );
+                                actualExpr->print( std::cerr, 8 );
                                 std::cerr << "--- results are" << std::endl;
                                 actualType->print( std::cerr, 8 );
+                        )
                         if ( formal == formals.end() ) {
                                 if ( function->get_isVarArgs() ) {
+                                if ( function->isVarArgs ) {
                                         convCost.incUnsafe();
                                         PRINT( std::cerr << "end of formals with varargs function: inc unsafe: " << convCost << std::endl; ; )
                                         // convert reference-typed expressions to value-typed expressions
                                         referenceToRvalueConversion( *actualExpr, convCost );
+                                        referenceToRvalueConversion( actualExpr, convCost );
                                         continue;
                                 } else {
 …
+                                }
+                        }
+                        if ( DefaultArgExpr * def = dynamic_cast< DefaultArgExpr * >( actualExpr ) ) {
+                                // default arguments should be free - don't include conversion cost.
+                                // Unwrap them here because they are not relevant to the rest of the system.
+                                actualExpr = def->expr;
+                                ++formal;
+                                continue;
+                        }
+                        // mark conversion cost to formal and also specialization cost of formal type
                         Type * formalType = (*formal)->get_type();
+                        convCost += computeExpressionConversionCost( *actualExpr, formalType, indexer, alt.env );
+                        convCost += computeExpressionConversionCost( actualExpr, formalType, indexer, alt.env );
+                        convCost.decSpec( specCost( formalType ) );
                         ++formal; // can't be in for-loop update because of the continue
+                }
 …
+                }
+                for ( InferredParams::const_iterator assert = appExpr->get_inferParams().begin(); assert != appExpr->get_inferParams().end(); ++assert ) {
+                        convCost += computeConversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
+                // specialization cost of return types can't be accounted for directly, it disables
+                // otherwise-identical calls, like this example based on auto-newline in the I/O lib:
+                //
+                //   forall(otype OS) {
+                //     void ?|?(OS&, int);  // with newline
+                //     OS&  ?|?(OS&, int);  // no newline, always chosen due to more specialization
+                //   }
+                // mark type variable and specialization cost of forall clause
+                convCost.incVar( function->forall.size() );
+                for ( TypeDecl* td : function->forall ) {
+                        convCost.decSpec( td->assertions.size() );
+                }
 …
                                 needAssertions[ *assert ].isUsed = true;
+                        }
+///     needAssertions.insert( needAssertions.end(), (*tyvar)->get_assertions().begin(), (*tyvar)->get_assertions().end() );
+                }
+        }
+        static const int recursionLimit = /*10*/ 4;  ///< Limit to depth of recursion satisfaction
+        void addToIndexer( AssertionSet &assertSet, SymTab::Indexer &indexer ) {
+                for ( AssertionSet::iterator i = assertSet.begin(); i != assertSet.end(); ++i ) {
+                        if ( i->second.isUsed ) {
+                                indexer.addId( i->first );
+                        }
+                }
+        }
+        template< typename ForwardIterator, typename OutputIterator >
+        void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, int level, const SymTab::Indexer &indexer, OutputIterator out ) {
+                if ( begin == end ) {
+                        if ( newNeed.empty() ) {
+                                PRINT(
+                                        std::cerr << "all assertions satisfied, output alternative: ";
+                                        newAlt.print( std::cerr );
+                                        std::cerr << std::endl;
+                                );
+                                *out++ = newAlt;
+                                return;
+                        } else if ( level >= recursionLimit ) {
+                                SemanticError( newAlt.expr->location, "Too many recursive assertions" );
+                        } else {
+                                AssertionSet newerNeed;
+                                PRINT(
+                                        std::cerr << "recursing with new set:" << std::endl;
+                                        printAssertionSet( newNeed, std::cerr, 8 );
+                                )
+                                inferRecursive( newNeed.begin(), newNeed.end(), newAlt, openVars, decls, newerNeed, level+1, indexer, out );
+                                return;
+                        }
+                }
+                ForwardIterator cur = begin++;
+                if ( ! cur->second.isUsed ) {
+                        inferRecursive( begin, end, newAlt, openVars, decls, newNeed, level, indexer, out );
+                        return; // xxx - should this continue? previously this wasn't here, and it looks like it should be
+                }
+                DeclarationWithType *curDecl = cur->first;
+                PRINT(
+                        std::cerr << "inferRecursive: assertion is ";
+                        curDecl->print( std::cerr );
+                        std::cerr << std::endl;
+                )
+                std::list< SymTab::Indexer::IdData > candidates;
+                decls.lookupId( curDecl->get_name(), candidates );
+///   if ( candidates.empty() ) { std::cerr << "no candidates!" << std::endl; }
+                for ( const auto & data : candidates ) {
+                        DeclarationWithType * candidate = data.id;
+                        PRINT(
+                                std::cerr << "inferRecursive: candidate is ";
+                                candidate->print( std::cerr );
+                                std::cerr << std::endl;
+                        )
+                        AssertionSet newHave, newerNeed( newNeed );
+                        TypeEnvironment newEnv( newAlt.env );
+                        OpenVarSet newOpenVars( openVars );
+                        Type *adjType = candidate->get_type()->clone();
+                        adjustExprType( adjType, newEnv, indexer );
+                        renameTyVars( adjType );
+                        PRINT(
+                                std::cerr << "unifying ";
+                                curDecl->get_type()->print( std::cerr );
+                                std::cerr << " with ";
+                                adjType->print( std::cerr );
+                                std::cerr << std::endl;
+                        )
+                        if ( unify( curDecl->get_type(), adjType, newEnv, newerNeed, newHave, newOpenVars, indexer ) ) {
+                                PRINT(
+                                        std::cerr << "success!" << std::endl;
+                                )
+                                SymTab::Indexer newDecls( decls );
+                                addToIndexer( newHave, newDecls );
+                                Alternative newerAlt( newAlt );
+                                newerAlt.env = newEnv;
+                                assertf( candidate->get_uniqueId(), "Assertion candidate does not have a unique ID: %s", toString( candidate ).c_str() );
+                                // everything with an empty idChain was pulled in by the current assertion.
+                                // add current assertion's idChain + current assertion's ID so that the correct inferParameters can be found.
+                                for ( auto & a : newerNeed ) {
+                                        if ( a.second.idChain.empty() ) {
+                                                a.second.idChain = cur->second.idChain;
+                                                a.second.idChain.push_back( curDecl->get_uniqueId() );
+                                        }
+                                }
+                                Expression *varExpr = data.combine( newerAlt.cvtCost );
+                                delete varExpr->get_result();
+                                varExpr->set_result( adjType->clone() );
+                                PRINT(
+                                        std::cerr << "satisfying assertion " << curDecl->get_uniqueId() << " ";
+                                        curDecl->print( std::cerr );
+                                        std::cerr << " with declaration " << candidate->get_uniqueId() << " ";
+                                        candidate->print( std::cerr );
+                                        std::cerr << std::endl;
+                                )
+                                // follow the current assertion's ID chain to find the correct set of inferred parameters to add the candidate to (i.e. the set of inferred parameters belonging to the entity which requested the assertion parameter).
+                                InferredParams * inferParameters = &newerAlt.expr->get_inferParams();
+                                for ( UniqueId id : cur->second.idChain ) {
+                                        inferParameters = (*inferParameters)[ id ].inferParams.get();
+                                }
+                                // XXX: this is a memory leak, but adjType can't be deleted because it might contain assertions
+                                (*inferParameters)[ curDecl->get_uniqueId() ] = ParamEntry( candidate->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr );
+                                inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, level, indexer, out );
+                        } else {
+                                delete adjType;
+                        }
+                }
+        }
+                }
+        }
+        /// Unique identifier for matching expression resolutions to their requesting expression (located in CandidateFinder.cpp)
+        extern UniqueId globalResnSlot;
         template< typename OutputIterator >
+        void AlternativeFinder::Finder::inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out ) {
+//      PRINT(
+//          std::cerr << "inferParameters: assertions needed are" << std::endl;
+//          printAll( need, std::cerr, 8 );
+//          )
+                SymTab::Indexer decls( indexer );
+                // PRINT(
+                //      std::cerr << "============= original indexer" << std::endl;
+                //      indexer.print( std::cerr );
+                //      std::cerr << "============= new indexer" << std::endl;
+                //      decls.print( std::cerr );
+                // )
+                addToIndexer( have, decls );
+                AssertionSet newNeed;
+                PRINT(
+                        std::cerr << "env is: " << std::endl;
+                        newAlt.env.print( std::cerr, 0 );
+                        std::cerr << std::endl;
+                )
+                inferRecursive( need.begin(), need.end(), newAlt, openVars, decls, newNeed, 0, indexer, out );
+//      PRINT(
+//          std::cerr << "declaration 14 is ";
+//          Declaration::declFromId
+//          *out++ = newAlt;
+//          )
+        void AlternativeFinder::Finder::inferParameters( Alternative &newAlt, OutputIterator out ) {
+                // Set need bindings for any unbound assertions
+                UniqueId crntResnSlot = 0;  // matching ID for this expression's assertions
+                for ( auto& assn : newAlt.need ) {
+                        // skip already-matched assertions
+                        if ( assn.info.resnSlot != 0 ) continue;
+                        // assign slot for expression if needed
+                        if ( crntResnSlot == 0 ) { crntResnSlot = ++globalResnSlot; }
+                        // fix slot to assertion
+                        assn.info.resnSlot = crntResnSlot;
+                }
+                // pair slot to expression
+                if ( crntResnSlot != 0 ) { newAlt.expr->resnSlots.push_back( crntResnSlot ); }
+                // add to output list, assertion resolution is deferred
+                *out++ = newAlt;
+        }
 …
         ConstantExpr* getDefaultValue( Initializer* init ) {
                 if ( SingleInit* si = dynamic_cast<SingleInit*>( init ) ) {
+                        if ( CastExpr* ce = dynamic_cast<CastExpr*>( si->get_value() ) ) {
+                                return dynamic_cast<ConstantExpr*>( ce->get_arg() );
+                        if ( CastExpr* ce = dynamic_cast<CastExpr*>( si->value ) ) {
+                                return dynamic_cast<ConstantExpr*>( ce->arg );
+                        } else {
+                                return dynamic_cast<ConstantExpr*>( si->value );
+                        }
+                }
 …
                 /// Gets the list of exploded alternatives for this pack
                 const ExplodedActual& getExpl( const ExplodedArgs& args ) const {
+                const ExplodedActual& getExpl( const ExplodedArgs_old& args ) const {
                         return args[nextArg-1][explAlt];
+                }
 …
         /// Instantiates an argument to match a formal, returns false if no results left
         bool instantiateArgument( Type* formalType, Initializer* initializer,
                         const ExplodedArgs& args, std::vector<ArgPack>& results, std::size_t& genStart,
+                        const ExplodedArgs_old& args, std::vector<ArgPack>& results, std::size_t& genStart,
                         const SymTab::Indexer& indexer, unsigned nTuples = 0 ) {
                 if ( TupleType * tupleType = dynamic_cast<TupleType*>( formalType ) ) {
 …
                                                                 indexer ) ) {
                                                         results.emplace_back(
                                                                 i, cnstExpr, move(env), move(need), move(have),
+                                                                i, new DefaultArgExpr( cnstExpr ), move(env), move(need), move(have),
                                                                 move(openVars), nextArg, nTuples );
+                                                }
 …
+                }
                 // build and validate new alternative
                 Alternative newAlt( appExpr, result.env, cost );
+                Alternative newAlt{ appExpr, result.env, result.openVars, result.need, cost };
                 PRINT(
                         std::cerr << "instantiate function success: " << appExpr << std::endl;
 …
                         printAssertionSet( result.need, std::cerr, 8 );
+                )
                 inferParameters( result.need, result.have, newAlt, result.openVars, out );
+                inferParameters( newAlt, out );
+        }
         template<typename OutputIterator>
         void AlternativeFinder::Finder::makeFunctionAlternatives( const Alternative &func,
                         FunctionType *funcType, const ExplodedArgs &args, OutputIterator out ) {
+                        FunctionType *funcType, const ExplodedArgs_old &args, OutputIterator out ) {
                 OpenVarSet funcOpenVars;
                 AssertionSet funcNeed, funcHave;
 …
                 funcFinder.findWithAdjustment( untypedExpr->function );
                 // if there are no function alternatives, then proceeding is a waste of time.
+                // xxx - findWithAdjustment throws, so this check and others like it shouldn't be necessary.
                 if ( funcFinder.alternatives.empty() ) return;
 …
                 // pre-explode arguments
                 ExplodedArgs argExpansions;
+                ExplodedArgs_old argExpansions;
                 argExpansions.reserve( argAlternatives.size() );
 …
                         argExpansions.emplace_back();
                         auto& argE = argExpansions.back();
                         argE.reserve( arg.alternatives.size() );
+                        // argE.reserve( arg.alternatives.size() );
                         for ( const Alternative& actual : arg ) {
 …
                                 std::cerr << "bindings are:" << std::endl;
                                 withFunc.env.print( std::cerr, 8 );
+                                std::cerr << "cost is: " << withFunc.cost << std::endl;
                                 std::cerr << "cost of conversion is:" << cvtCost << std::endl;
+                        )
 …
                 // function may return struct or union value, in which case we need to add alternatives
                 // for implicitconversions to each of the anonymous members, must happen after findMinCost
+                // for implicit conversions to each of the anonymous members, must happen after findMinCost
                 // since anon conversions are never the cheapest expression
                 for ( const Alternative & alt : winners ) {
 …
         bool isLvalue( Expression *expr ) {
                 // xxx - recurse into tuples?
                 return expr->result && ( expr->result->get_lvalue() || dynamic_cast< ReferenceType * >( expr->result ) );
+                return expr->result && ( expr->get_lvalue() || dynamic_cast< ReferenceType * >( expr->result ) );
+        }
 …
                         if ( isLvalue( alt.expr ) ) {
                                 alternatives.push_back(
                                         Alternative{ new AddressExpr( alt.expr->clone() ), alt.env, alt.cost } );
+                                        Alternative{ alt, new AddressExpr( alt.expr->clone() ), alt.cost } );
                         } // if
                 } // for
 …
         void AlternativeFinder::Finder::postvisit( LabelAddressExpr * expr ) {
                 alternatives.push_back( Alternative{ expr->clone(), env, Cost::zero } );
+                alternatives.push_back( Alternative{ expr->clone(), env } );
+        }
 …
                 assert( toType );
                 toType = resolveTypeof( toType, indexer );
+                assert(!dynamic_cast<TypeofType *>(toType));
                 SymTab::validateType( toType, &indexer );
                 adjustExprType( toType, env, indexer );
 …
                 AltList candidates;
                 for ( Alternative & alt : finder.alternatives ) {
+                        AssertionSet needAssertions, haveAssertions;
+                        OpenVarSet openVars;
+                        AssertionSet needAssertions( alt.need.begin(), alt.need.end() );
+                        AssertionSet haveAssertions;
+                        OpenVarSet openVars{ alt.openVars };
                         alt.env.extractOpenVars( openVars );
 …
                         unify( castExpr->result, alt.expr->result, alt.env, needAssertions,
                                 haveAssertions, openVars, indexer );
                         Cost thisCost = castCost( alt.expr->result, castExpr->result, indexer,
                                 alt.env );
+                        Cost thisCost = castCost( alt.expr->result, castExpr->result, alt.expr->get_lvalue(),
+                                indexer, alt.env );
                         PRINT(
                                 std::cerr << "working on cast with result: " << castExpr->result << std::endl;
 …
                                 // count one safe conversion for each value that is thrown away
                                 thisCost.incSafe( discardedValues );
                                 Alternative newAlt( restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ), alt.env,
                                         alt.cost, thisCost );
                                 inferParameters( needAssertions, haveAssertions, newAlt, openVars,
                                         back_inserter( candidates ) );
+                                Alternative newAlt{
+                                        restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ),
+                                        alt.env, openVars, needAssertions, alt.cost, alt.cost + thisCost };
+                                inferParameters( newAlt, back_inserter( candidates ) );
                         } // if
                 } // for
 …
         void AlternativeFinder::Finder::postvisit( VirtualCastExpr * castExpr ) {
                 assertf( castExpr->get_result(), "Implicate virtual cast targets not yet supported." );
+                assertf( castExpr->get_result(), "Implicit virtual cast targets not yet supported." );
                 AlternativeFinder finder( indexer, env );
                 // don't prune here, since it's guaranteed all alternatives will have the same type
                 finder.findWithoutPrune( castExpr->get_arg() );
                 for ( Alternative & alt : finder.alternatives ) {
                         alternatives.push_back( Alternative(
                                 new VirtualCastExpr( alt.expr->clone(), castExpr->get_result()->clone() ),
                                 alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative{
+                                alt, new VirtualCastExpr{ alt.expr->clone(), castExpr->get_result()->clone() },
+                                alt.cost } );
+                }
+        }
 …
                 /// Gets name from untyped member expression (member must be NameExpr)
                 const std::string& get_member_name( UntypedMemberExpr *memberExpr ) {
+                        if ( dynamic_cast< ConstantExpr * >( memberExpr->get_member() ) ) {
+                                SemanticError( memberExpr, "Indexed access to struct fields unsupported: " );
+                        } // if
                         NameExpr * nameExpr = dynamic_cast< NameExpr * >( memberExpr->get_member() );
                         assert( nameExpr );
 …
                         // find member of the given type
                         if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
                                 addAggMembers( structInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
+                                addAggMembers( structInst, aggrExpr, *agg, cost, get_member_name(memberExpr) );
                         } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
                                 addAggMembers( unionInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
+                                addAggMembers( unionInst, aggrExpr, *agg, cost, get_member_name(memberExpr) );
                         } else if ( TupleType * tupleType = dynamic_cast< TupleType * >( aggrExpr->get_result() ) ) {
                                 addTupleMembers( tupleType, aggrExpr, cost, agg->env, memberExpr->get_member() );
+                                addTupleMembers( tupleType, aggrExpr, *agg, cost, memberExpr->get_member() );
                         } // if
                 } // for
 …
         void AlternativeFinder::Finder::postvisit( MemberExpr *memberExpr ) {
                 alternatives.push_back( Alternative( memberExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ memberExpr->clone(), env } );
+        }
 …
                         // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
                         // can't construct in place and use vector::back
                         Alternative newAlt( newExpr, env, Cost::zero, cost );
+                        Alternative newAlt{ newExpr, env, OpenVarSet{}, AssertionList{}, Cost::zero, cost };
                         PRINT(
                                 std::cerr << "decl is ";
 …
                 // not sufficient to clone here, because variable's type may have changed
                 // since the VariableExpr was originally created.
                 alternatives.push_back( Alternative( new VariableExpr( variableExpr->var ), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ new VariableExpr{ variableExpr->var }, env } );
+        }
         void AlternativeFinder::Finder::postvisit( ConstantExpr *constantExpr ) {
                 alternatives.push_back( Alternative( constantExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ constantExpr->clone(), env } );
+        }
 …
                 if ( sizeofExpr->get_isType() ) {
                         Type * newType = sizeofExpr->get_type()->clone();
+                        alternatives.push_back( Alternative( new SizeofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
+                        alternatives.push_back( Alternative{
+                                new SizeofExpr{ resolveTypeof( newType, indexer ) }, env } );
                 } else {
                         // find all alternatives for the argument to sizeof
 …
                         Alternative &choice = winners.front();
                         referenceToRvalueConversion( choice.expr, choice.cost );
+                        alternatives.push_back( Alternative( new SizeofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
+                        alternatives.push_back( Alternative{
+                                choice, new SizeofExpr( choice.expr->clone() ), Cost::zero } );
                 } // if
+        }
 …
                 if ( alignofExpr->get_isType() ) {
                         Type * newType = alignofExpr->get_type()->clone();
+                        alternatives.push_back( Alternative( new AlignofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
+                        alternatives.push_back( Alternative{
+                                new AlignofExpr{ resolveTypeof( newType, indexer ) }, env } );
                 } else {
                         // find all alternatives for the argument to sizeof
 …
                         Alternative &choice = winners.front();
                         referenceToRvalueConversion( choice.expr, choice.cost );
+                        alternatives.push_back( Alternative( new AlignofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
+                        alternatives.push_back( Alternative{
+                                choice, new AlignofExpr{ choice.expr->clone() }, Cost::zero } );
                 } // if
+        }
 …
                 for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
                         if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( *i ) ) {
+                                alternatives.push_back( Alternative( new OffsetofExpr( aggInst->clone(), dwt ), env, Cost::zero ) );
+                                alternatives.push_back( Alternative{
+                                        new OffsetofExpr{ aggInst->clone(), dwt }, env } );
                                 renameTypes( alternatives.back().expr );
                         } else {
 …
         void AlternativeFinder::Finder::postvisit( OffsetofExpr *offsetofExpr ) {
                 alternatives.push_back( Alternative( offsetofExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ offsetofExpr->clone(), env } );
+        }
         void AlternativeFinder::Finder::postvisit( OffsetPackExpr *offsetPackExpr ) {
+                alternatives.push_back( Alternative( offsetPackExpr->clone(), env, Cost::zero ) );
+        }
+        namespace {
+                void resolveAttr( SymTab::Indexer::IdData data, FunctionType *function, Type *argType, const TypeEnvironment &env, AlternativeFinder & finder ) {
+                        // assume no polymorphism
+                        // assume no implicit conversions
+                        assert( function->get_parameters().size() == 1 );
+                        PRINT(
+                                std::cerr << "resolvAttr: funcDecl is ";
+                                data.id->print( std::cerr );
+                                std::cerr << " argType is ";
+                                argType->print( std::cerr );
+                                std::cerr << std::endl;
+                        )
+                        const SymTab::Indexer & indexer = finder.get_indexer();
+                        AltList & alternatives = finder.get_alternatives();
+                        if ( typesCompatibleIgnoreQualifiers( argType, function->get_parameters().front()->get_type(), indexer, env ) ) {
+                                Cost cost = Cost::zero;
+                                Expression * newExpr = data.combine( cost );
+                                alternatives.push_back( Alternative( new AttrExpr( newExpr, argType->clone() ), env, Cost::zero, cost ) );
+                                for ( DeclarationWithType * retVal : function->returnVals ) {
+                                        alternatives.back().expr->result = retVal->get_type()->clone();
+                                } // for
+                        } // if
+                }
+        }
+        void AlternativeFinder::Finder::postvisit( AttrExpr *attrExpr ) {
+                // assume no 'pointer-to-attribute'
+                NameExpr *nameExpr = dynamic_cast< NameExpr* >( attrExpr->get_attr() );
+                assert( nameExpr );
+                std::list< SymTab::Indexer::IdData > attrList;
+                indexer.lookupId( nameExpr->get_name(), attrList );
+                if ( attrExpr->get_isType() || attrExpr->get_expr() ) {
+                        for ( auto & data : attrList ) {
+                                DeclarationWithType * id = data.id;
+                                // check if the type is function
+                                if ( FunctionType *function = dynamic_cast< FunctionType* >( id->get_type() ) ) {
+                                        // assume exactly one parameter
+                                        if ( function->get_parameters().size() == 1 ) {
+                                                if ( attrExpr->get_isType() ) {
+                                                        resolveAttr( data, function, attrExpr->get_type(), env, altFinder);
+                                                } else {
+                                                        AlternativeFinder finder( indexer, env );
+                                                        finder.find( attrExpr->get_expr() );
+                                                        for ( AltList::iterator choice = finder.alternatives.begin(); choice != finder.alternatives.end(); ++choice ) {
+                                                                if ( choice->expr->get_result()->size() == 1 ) {
+                                                                        resolveAttr(data, function, choice->expr->get_result(), choice->env, altFinder );
+                                                                } // fi
+                                                        } // for
+                                                } // if
+                                        } // if
+                                } // if
+                        } // for
+                } else {
+                        for ( auto & data : attrList ) {
+                                Cost cost = Cost::zero;
+                                Expression * newExpr = data.combine( cost );
+                                alternatives.push_back( Alternative( newExpr, env, Cost::zero, cost ) );
+                                renameTypes( alternatives.back().expr );
+                        } // for
+                } // if
+        }
+        void AlternativeFinder::Finder::postvisit( LogicalExpr *logicalExpr ) {
+                alternatives.push_back( Alternative{ offsetPackExpr->clone(), env } );
+        }
+        void AlternativeFinder::Finder::postvisit( LogicalExpr * logicalExpr ) {
                 AlternativeFinder firstFinder( indexer, env );
                 firstFinder.findWithAdjustment( logicalExpr->get_arg1() );
 …
                 for ( const Alternative & first : firstFinder.alternatives ) {
                         for ( const Alternative & second : secondFinder.alternatives ) {
+                                TypeEnvironment compositeEnv;
+                                compositeEnv.simpleCombine( first.env );
+                                TypeEnvironment compositeEnv{ first.env };
                                 compositeEnv.simpleCombine( second.env );
+                                LogicalExpr *newExpr = new LogicalExpr( first.expr->clone(), second.expr->clone(), logicalExpr->get_isAnd() );
+                                alternatives.push_back( Alternative( newExpr, compositeEnv, first.cost + second.cost ) );
+                                OpenVarSet openVars{ first.openVars };
+                                mergeOpenVars( openVars, second.openVars );
+                                AssertionSet need;
+                                cloneAll( first.need, need );
+                                cloneAll( second.need, need );
+                                LogicalExpr *newExpr = new LogicalExpr{
+                                        first.expr->clone(), second.expr->clone(), logicalExpr->get_isAnd() };
+                                alternatives.push_back( Alternative{
+                                        newExpr, std::move(compositeEnv), std::move(openVars),
+                                        AssertionList( need.begin(), need.end() ), first.cost + second.cost } );
+                        }
+                }
 …
                         for ( const Alternative & second : secondFinder.alternatives ) {
                                 for ( const Alternative & third : thirdFinder.alternatives ) {
+                                        TypeEnvironment compositeEnv;
+                                        compositeEnv.simpleCombine( first.env );
+                                        TypeEnvironment compositeEnv{ first.env };
                                         compositeEnv.simpleCombine( second.env );
                                         compositeEnv.simpleCombine( third.env );
+                                        OpenVarSet openVars{ first.openVars };
+                                        mergeOpenVars( openVars, second.openVars );
+                                        mergeOpenVars( openVars, third.openVars );
+                                        AssertionSet need;
+                                        cloneAll( first.need, need );
+                                        cloneAll( second.need, need );
+                                        cloneAll( third.need, need );
+                                        AssertionSet have;
                                         // unify true and false types, then infer parameters to produce new alternatives
-                                        OpenVarSet openVars;
-                                        AssertionSet needAssertions, haveAssertions;
-                                        Alternative newAlt( 0, compositeEnv, first.cost + second.cost + third.cost );
                                         Type* commonType = nullptr;
+                                        if ( unify( second.expr->result, third.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+                                                ConditionalExpr *newExpr = new ConditionalExpr( first.expr->clone(), second.expr->clone(), third.expr->clone() );
+                                        if ( unify( second.expr->result, third.expr->result, compositeEnv,
+                                                        need, have, openVars, indexer, commonType ) ) {
+                                                ConditionalExpr *newExpr = new ConditionalExpr{
+                                                        first.expr->clone(), second.expr->clone(), third.expr->clone() };
                                                 newExpr->result = commonType ? commonType : second.expr->result->clone();
                                                 // convert both options to the conditional result type
+                                                newAlt.cost += computeExpressionConversionCost( newExpr->arg2, newExpr->result, indexer, newAlt.env );
+                                                newAlt.cost += computeExpressionConversionCost( newExpr->arg3, newExpr->result, indexer, newAlt.env );
+                                                newAlt.expr = newExpr;
+                                                inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );
+                                                Cost cost = first.cost + second.cost + third.cost;
+                                                cost += computeExpressionConversionCost(
+                                                        newExpr->arg2, newExpr->result, indexer, compositeEnv );
+                                                cost += computeExpressionConversionCost(
+                                                        newExpr->arg3, newExpr->result, indexer, compositeEnv );
+                                                // output alternative
+                                                Alternative newAlt{
+                                                        newExpr, std::move(compositeEnv), std::move(openVars),
+                                                        AssertionList( need.begin(), need.end() ), cost };
+                                                inferParameters( newAlt, back_inserter( alternatives ) );
                                         } // if
                                 } // for
 …
                 secondFinder.findWithAdjustment( commaExpr->get_arg2() );
                 for ( const Alternative & alt : secondFinder.alternatives ) {
+                        alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt.expr->clone() ), alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative{
+                                alt, new CommaExpr{ newFirstArg->clone(), alt.expr->clone() }, alt.cost } );
                 } // for
                 delete newFirstArg;
 …
                 for ( const Alternative & first : firstFinder.alternatives ) {
                         for ( const Alternative & second : secondFinder.alternatives ) {
+                                TypeEnvironment compositeEnv;
+                                compositeEnv.simpleCombine( first.env );
+                                TypeEnvironment compositeEnv{ first.env };
                                 compositeEnv.simpleCombine( second.env );
+                                OpenVarSet openVars;
+                                AssertionSet needAssertions, haveAssertions;
+                                Alternative newAlt( 0, compositeEnv, first.cost + second.cost );
+                                OpenVarSet openVars{ first.openVars };
+                                mergeOpenVars( openVars, second.openVars );
+                                AssertionSet need;
+                                cloneAll( first.need, need );
+                                cloneAll( second.need, need );
+                                AssertionSet have;
                                 Type* commonType = nullptr;
+                                if ( unify( first.expr->result, second.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+                                        RangeExpr * newExpr = new RangeExpr( first.expr->clone(), second.expr->clone() );
+                                if ( unify( first.expr->result, second.expr->result, compositeEnv, need, have,
+                                                openVars, indexer, commonType ) ) {
+                                        RangeExpr * newExpr =
+                                                new RangeExpr{ first.expr->clone(), second.expr->clone() };
                                         newExpr->result = commonType ? commonType : first.expr->result->clone();
+                                        newAlt.expr = newExpr;
+                                        inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );
+                                        Alternative newAlt{
+                                                newExpr, std::move(compositeEnv), std::move(openVars),
+                                                AssertionList( need.begin(), need.end() ), first.cost + second.cost };
+                                        inferParameters( newAlt, back_inserter( alternatives ) );
                                 } // if
                         } // for
 …
                         TypeEnvironment compositeEnv;
+                        simpleCombineEnvironments( alts.begin(), alts.end(), compositeEnv );
+                        alternatives.push_back(
+                                Alternative{ new TupleExpr( exprs ), compositeEnv, sumCost( alts ) } );
+                        OpenVarSet openVars;
+                        AssertionSet need;
+                        for ( const Alternative& alt : alts ) {
+                                compositeEnv.simpleCombine( alt.env );
+                                mergeOpenVars( openVars, alt.openVars );
+                                cloneAll( alt.need, need );
+                        }
+                        alternatives.push_back( Alternative{
+                                new TupleExpr{ exprs }, std::move(compositeEnv), std::move(openVars),
+                                AssertionList( need.begin(), need.end() ), sumCost( alts ) } );
                 } // for
+        }
         void AlternativeFinder::Finder::postvisit( TupleExpr *tupleExpr ) {
                 alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ tupleExpr->clone(), env } );
+        }
         void AlternativeFinder::Finder::postvisit( ImplicitCopyCtorExpr * impCpCtorExpr ) {
                 alternatives.push_back( Alternative( impCpCtorExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ impCpCtorExpr->clone(), env } );
+        }
 …
                 finder.findWithoutPrune( ctorExpr->get_callExpr() );
                 for ( Alternative & alt : finder.alternatives ) {
+                        alternatives.push_back( Alternative( new ConstructorExpr( alt.expr->clone() ), alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative{
+                                alt, new ConstructorExpr( alt.expr->clone() ), alt.cost } );
+                }
+        }
         void AlternativeFinder::Finder::postvisit( TupleIndexExpr *tupleExpr ) {
                 alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ tupleExpr->clone(), env } );
+        }
         void AlternativeFinder::Finder::postvisit( TupleAssignExpr *tupleAssignExpr ) {
                 alternatives.push_back( Alternative( tupleAssignExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ tupleAssignExpr->clone(), env } );
+        }
 …
                         // ensure that the id is passed on to the UniqueExpr alternative so that the expressions are "linked"
                         UniqueExpr * newUnqExpr = new UniqueExpr( alt.expr->clone(), unqExpr->get_id() );
                         alternatives.push_back( Alternative( newUnqExpr, alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative{ alt, newUnqExpr, alt.cost } );
+                }
+        }
 …
                 ResolvExpr::resolveStmtExpr( newStmtExpr, indexer );
                 // xxx - this env is almost certainly wrong, and needs to somehow contain the combined environments from all of the statements in the stmtExpr...
                 alternatives.push_back( Alternative( newStmtExpr, env, Cost::zero ) );
+                alternatives.push_back( Alternative{ newStmtExpr, env } );
+        }
 …
                         for ( Alternative & alt : finder.get_alternatives() ) {
                                 TypeEnvironment newEnv( alt.env );
+                                AssertionSet needAssertions, haveAssertions;
+                                OpenVarSet openVars;  // find things in env that don't have a "representative type" and claim those are open vars?
+                                AssertionSet need;
+                                cloneAll( alt.need, need );
+                                AssertionSet have;
+                                OpenVarSet openVars( alt.openVars );
+                                // xxx - find things in env that don't have a "representative type" and claim
+                                // those are open vars?
                                 PRINT(
                                         std::cerr << "  @ " << toType << " " << initAlt.designation << std::endl;
+                                )
+                                // It's possible that a cast can throw away some values in a multiply-valued expression.  (An example is a
+                                // cast-to-void, which casts from one value to zero.)  Figure out the prefix of the subexpression results
+                                // that are cast directly.  The candidate is invalid if it has fewer results than there are types to cast
+                                // to.
+                                // It's possible that a cast can throw away some values in a multiply-valued
+                                // expression. (An example is a cast-to-void, which casts from one value to
+                                // zero.)  Figure out the prefix of the subexpression results that are cast
+                                // directly.  The candidate is invalid if it has fewer results than there are
+                                // types to cast to.
                                 int discardedValues = alt.expr->result->size() - toType->size();
                                 if ( discardedValues < 0 ) continue;
+                                // xxx - may need to go into tuple types and extract relevant types and use unifyList. Note that currently, this does not
+                                // allow casting a tuple to an atomic type (e.g. (int)([1, 2, 3]))
+                                // xxx - may need to go into tuple types and extract relevant types and use
+                                // unifyList. Note that currently, this does not allow casting a tuple to an
+                                // atomic type (e.g. (int)([1, 2, 3]))
                                 // unification run for side-effects
+                                unify( toType, alt.expr->result, newEnv, needAssertions, haveAssertions, openVars, indexer ); // xxx - do some inspecting on this line... why isn't result bound to initAlt.type??
+                                Cost thisCost = castCost( alt.expr->result, toType, indexer, newEnv );
+                                unify( toType, alt.expr->result, newEnv, need, have, openVars, indexer );
+                                // xxx - do some inspecting on this line... why isn't result bound to initAlt.type?
+                                Cost thisCost = castCost( alt.expr->result, toType, alt.expr->get_lvalue(),
+                                        indexer, newEnv );
                                 if ( thisCost != Cost::infinity ) {
                                         // count one safe conversion for each value that is thrown away
                                         thisCost.incSafe( discardedValues );
+                                        Alternative newAlt( new InitExpr( restructureCast( alt.expr->clone(), toType, true ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost );
+                                        inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( candidates ) );
+                                        Alternative newAlt{
+                                                new InitExpr{
+                                                        restructureCast( alt.expr->clone(), toType, true ), initAlt.designation->clone() },
+                                                std::move(newEnv), std::move(openVars),
+                                                AssertionList( need.begin(), need.end() ), alt.cost, thisCost };
+                                        inferParameters( newAlt, back_inserter( candidates ) );
+                                }
+                        }

src/ResolvExpr/AlternativeFinder.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:56:12 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Wed Jul 26 11:24:00 2017
 // Update Count     : 4
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Oct -5 10:01:00 2018
+// Update Count     : 5
 //
 …
 #include "ResolvExpr/Cost.h"             // for Cost, Cost::infinity
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
+#include "ResolvMode.h"                  // for ResolvMode
 #include "SynTree/Visitor.h"             // for Visitor
 #include "SynTree/SynTree.h"             // for Visitor Nodes
 …
         /// First index is which argument, second index is which alternative for that argument,
         /// third index is which exploded element of that alternative
         using ExplodedArgs = std::vector< std::vector< ExplodedActual > >;
+        using ExplodedArgs_old = std::vector< std::vector< ExplodedActual > >;
         class AlternativeFinder {
 …
+                }
                 void find( Expression *expr, bool adjust = false, bool prune = true, bool failFast = true );
+                void find( Expression *expr, ResolvMode mode = ResolvMode{} );
                 /// Calls find with the adjust flag set; adjustment turns array and function types into equivalent pointer types
                 void findWithAdjustment( Expression *expr );

src/ResolvExpr/CastCost.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 06:57:43 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Feb  2 15:34:36 2016
 // Update Count     : 7
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:12:00 2019
+// Update Count     : 8
 //
 #include <cassert>                       // for assert
+#include "AST/Print.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "ConversionCost.h"              // for ConversionCost
 #include "Cost.h"                        // for Cost, Cost::infinity
 …
 namespace ResolvExpr {
         struct CastCost : public ConversionCost {
+        struct CastCost_old : public ConversionCost {
           public:
+                CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
+                CastCost_old( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
                 using ConversionCost::previsit;
                 using ConversionCost::postvisit;
                 void postvisit( BasicType * basicType );
                 void postvisit( PointerType * pointerType );
+                void postvisit( const BasicType * basicType );
+                void postvisit( const PointerType * pointerType );
         };
+        Cost castCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+                if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
+                        if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+        Cost castCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+                if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType * >( dest ) ) {
+                        if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->name ) ) {
                                 if ( eqvClass->type ) {
                                         return castCost( src, eqvClass->type, indexer, env );
+                                        return castCost( src, eqvClass->type, srcIsLvalue, indexer, env );
                                 } else {
                                         return Cost::infinity;
+                                }
                         } else if ( NamedTypeDecl *namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) {
+                        } else if ( const NamedTypeDecl * namedType = indexer.lookupType( destAsTypeInst->name ) ) {
                                 // all typedefs should be gone by this point
                                 TypeDecl *type = strict_dynamic_cast< TypeDecl* >( namedType );
+                                const TypeDecl * type = strict_dynamic_cast< const TypeDecl * >( namedType );
                                 if ( type->base ) {
                                         return castCost( src, type->base, indexer, env ) + Cost::safe;
+                                        return castCost( src, type->base, srcIsLvalue, indexer, env ) + Cost::safe;
                                 } // if
                         } // if
 …
                         PRINT( std::cerr << "compatible!" << std::endl; )
                         return Cost::zero;
                 } else if ( dynamic_cast< VoidType* >( dest ) ) {
+                } else if ( dynamic_cast< const VoidType * >( dest ) ) {
                         return Cost::safe;
                 } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
+                } else if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
                         return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
+                        return convertToReferenceCost( src, refType, srcIsLvalue, indexer, env, [](const Type * t1, const Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
                                 return ptrsCastable( t1, t2, env, indexer );
                         });
                 } else {
+                        PassVisitor<CastCost> converter( dest, indexer, env, castCost );
+                        PassVisitor<CastCost_old> converter(
+                                dest, srcIsLvalue, indexer, env,
+                                (Cost (*)( const Type *, const Type *, bool, const SymTab::Indexer &, const TypeEnvironment & ))
+                                        castCost );
                         src->accept( converter );
                         if ( converter.pass.get_cost() == Cost::infinity ) {
 …
+        }
+        CastCost::CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : ConversionCost( dest, indexer, env, costFunc ) {
+        }
+        void CastCost::postvisit( BasicType *basicType ) {
+                PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
+        CastCost_old::CastCost_old( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : ConversionCost( dest, srcIsLvalue, indexer, env, costFunc ) {
+        }
+        void CastCost_old::postvisit( const BasicType * basicType ) {
+                const PointerType * destAsPointer = dynamic_cast< const PointerType * >( dest );
                 if ( destAsPointer && basicType->isInteger() ) {
                         // necessary for, e.g. unsigned long => void*
+                        // necessary for, e.g. unsigned long => void *
                         cost = Cost::unsafe;
                 } else {
                         cost = conversionCost( basicType, dest, indexer, env );
+                        cost = conversionCost( basicType, dest, srcIsLvalue, indexer, env );
                 } // if
+        }
         void CastCost::postvisit( PointerType *pointerType ) {
                 if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
                         if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->base, destAsPtr->base, indexer, env ) ) {
+        void CastCost_old::postvisit( const PointerType * pointerType ) {
+                if ( const PointerType * destAsPtr = dynamic_cast< const PointerType * >( dest ) ) {
+                        if ( pointerType->tq <= destAsPtr->tq && typesCompatibleIgnoreQualifiers( pointerType->base, destAsPtr->base, indexer, env ) ) {
                                 cost = Cost::safe;
                         } else {
 …
                                 } // if
                         } // if
                 } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
+                } else if ( const BasicType * destAsBasic = dynamic_cast< const BasicType * >( dest ) ) {
                         if ( destAsBasic->isInteger() ) {
                                 // necessary for, e.g. void* => unsigned long
+                                // necessary for, e.g. void * => unsigned long
                                 cost = Cost::unsafe;
                         } // if
+                }
+        }
+namespace {
+        struct CastCost_new : public ConversionCost_new {
+                using ConversionCost_new::previsit;
+                using ConversionCost_new::postvisit;
+                CastCost_new(
+                        const ast::Type * dst, const ast::SymbolTable & symtab,
+                        const ast::TypeEnvironment & env, CostCalculation costFunc )
+                : ConversionCost_new( dst, symtab, env, costFunc ) {}
+                void postvisit( const ast::BasicType * basicType ) {
+                        auto ptr = dynamic_cast< const ast::PointerType * >( dst );
+                        if ( ptr && basicType->isInteger() ) {
+                                // needed for, e.g. unsigned long => void *
+                                cost = Cost::unsafe;
+                        } else {
+                                cost = conversionCost( basicType, dst, symtab, env );
+                        }
+                }
+                void postvisit( const ast::PointerType * pointerType ) {
+                        if ( auto ptr = dynamic_cast< const ast::PointerType * >( dst ) ) {
+                                if (
+                                        pointerType->qualifiers <= ptr->qualifiers
+                                        && typesCompatibleIgnoreQualifiers( pointerType->base, ptr->base, symtab, env )
+                                ) {
+                                        cost = Cost::safe;
+                                } else {
+                                        ast::TypeEnvironment newEnv{ env };
+                                        if ( auto wParams = pointerType->base.as< ast::ParameterizedType >() ) {
+                                                newEnv.add( wParams->forall );
+                                        }
+                                        int castResult = ptrsCastable( pointerType->base, ptr->base, symtab, newEnv );
+                                        if ( castResult > 0 ) {
+                                                cost = Cost::safe;
+                                        } else if ( castResult < 0 ) {
+                                                cost = Cost::infinity;
+                                        }
+                                }
+                        } else if ( auto basic = dynamic_cast< const ast::BasicType * >( dst ) ) {
+                                if ( basic->isInteger() ) {
+                                        // necessary for, e.g. void * => unsigned long
+                                        cost = Cost::unsafe;
+                                }
+                        }
+                }
+        };
+} // anonymous namespace
+Cost castCost(
+        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+        const ast::TypeEnvironment & env
+) {
+        if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
+                if ( const ast::EqvClass * eqvClass = env.lookup( typeInst->name ) ) {
+                        // check cast cost against bound type, if present
+                        if ( eqvClass->bound ) {
+                                return castCost( src, eqvClass->bound, symtab, env );
+                        } else {
+                                return Cost::infinity;
+                        }
+                } else if ( const ast::NamedTypeDecl * named = symtab.lookupType( typeInst->name ) ) {
+                        // all typedefs should be gone by now
+                        auto type = strict_dynamic_cast< const ast::TypeDecl * >( named );
+                        if ( type->base ) {
+                                return castCost( src, type->base, symtab, env ) + Cost::safe;
+                        }
+                }
+        }
+        PRINT(
+                std::cerr << "castCost ::: src is ";
+                ast::print( std::cerr, src );
+                std::cerr << std::endl << "dest is ";
+                ast::print( std::cerr, dst );
+                std::cerr << std::endl << "env is" << std::endl;
+                ast::print( std::cerr, env, 2 );
+        )
+        if ( typesCompatibleIgnoreQualifiers( src, dst, symtab, env ) ) {
+                PRINT( std::cerr << "compatible!" << std::endl; )
+                return Cost::zero;
+        } else if ( dynamic_cast< const ast::VoidType * >( dst ) ) {
+                return Cost::safe;
+        } else if ( auto refType = dynamic_cast< const ast::ReferenceType * >( dst ) ) {
+                PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
+                #warning cast on ptrsCastable artifact of having two functions, remove when port done
+                return convertToReferenceCost(
+                        src, refType, symtab, env,
+                        ( int (*)(
+                                const ast::Type *, const ast::Type *, const ast::SymbolTable &,
+                                const ast::TypeEnvironment & )
+                        ) ptrsCastable );
+        } else {
+                #warning cast on castCost artifact of having two functions, remove when port done
+                ast::Pass< CastCost_new > converter{
+                        dst, symtab, env,
+                        ( Cost (*)(
+                                const ast::Type *, const ast::Type *, const ast::SymbolTable &,
+                                const ast::TypeEnvironment & )
+                        ) castCost };
+                src->accept( converter );
+                return converter.pass.cost;
+        }
+}
 } // namespace ResolvExpr

src/ResolvExpr/CommonType.cc

-              r7951100
+              rb067d9b
 // Created On       : Sun May 17 06:59:27 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Sep 25 15:18:17 2017
 // Update Count     : 9
+// Last Modified On : Thu Feb 14 17:10:10 2019
+// Update Count     : 24
 //
 …
 #include <utility>                       // for pair
+#include "AST/Decl.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for OpenVarSet, AssertionSet
 …
 #include "SynTree/Type.h"                // for BasicType, BasicType::Kind::...
 #include "SynTree/Visitor.h"             // for Visitor
 #include "Unify.h"                       // for unifyExact, bindVar, WidenMode
+#include "Unify.h"                       // for unifyExact, WidenMode
 #include "typeops.h"                     // for isFtype
 …
 namespace ResolvExpr {
         struct CommonType : public WithShortCircuiting {
                 CommonType( Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars );
                 Type *get_result() const { return result; }
+        struct CommonType_old : public WithShortCircuiting {
+                CommonType_old( Type * type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars );
+                Type * get_result() const { return result; }
                 void previsit( BaseSyntaxNode * ) { visit_children = false; }
 …
           private:
                 template< typename Pointer > void getCommonWithVoidPointer( Pointer* voidPointer, Pointer* otherPointer );
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
                 Type *result;
                 Type *type2;                            // inherited
+                template< typename Pointer > void getCommonWithVoidPointer( Pointer * voidPointer, Pointer * otherPointer );
+                template< typename RefType > void handleRefType( RefType * inst, Type * other );
+                Type * result;
+                Type * type2;                           // inherited
                 bool widenFirst, widenSecond;
                 const SymTab::Indexer &indexer;
 …
                                 std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                        )
                         if ( (widenFirst || t2->get_qualifiers() <= t1->get_qualifiers()) && (widenSecond || t1->get_qualifiers() <= t2->get_qualifiers()) ) {
+                        if ( (widenFirst || t2->tq <= t1->tq) && (widenSecond || t1->tq <= t2->tq) ) {
                                 PRINT(
                                         std::cerr << "widen okay" << std::endl;
+                                )
                                 common->get_qualifiers() |= t1->get_qualifiers();
                                 common->get_qualifiers() |= t2->get_qualifiers();
+                                common->tq |= t1->tq;
+                                common->tq |= t2->tq;
                                 return common;
+                        }
 …
+        }
         Type *commonType( Type *type1, Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars ) {
                 PassVisitor<CommonType> visitor( type2, widenFirst, widenSecond, indexer, env, openVars );
+        Type * commonType( Type * type1, Type * type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars ) {
+                PassVisitor<CommonType_old> visitor( type2, widenFirst, widenSecond, indexer, env, openVars );
                 int depth1 = type1->referenceDepth();
 …
                                                 std::cerr << "formal is reference; result should be reference" << std::endl;
+                                        )
                                         result = new ReferenceType( ref1->get_qualifiers(), result );
+                                        result = new ReferenceType( ref1->tq, result );
+                                }
                                 PRINT(
 …
                 type1->accept( visitor );
                 Type *result = visitor.pass.get_result();
+                Type * result = visitor.pass.get_result();
                 if ( ! result ) {
                         // this appears to be handling for opaque type declarations
                         if ( widenSecond ) {
                                 if ( TypeInstType *inst = dynamic_cast< TypeInstType* >( type2 ) ) {
                                         if ( NamedTypeDecl *nt = indexer.lookupType( inst->get_name() ) ) {
                                                 TypeDecl *type = strict_dynamic_cast< TypeDecl* >( nt );
+                                if ( const TypeInstType * inst = dynamic_cast< const TypeInstType * >( type2 ) ) {
+                                        if ( const NamedTypeDecl * nt = indexer.lookupType( inst->get_name() ) ) {
+                                                const TypeDecl * type = strict_dynamic_cast< const TypeDecl * >( nt );
                                                 if ( type->get_base() ) {
                                                         Type::Qualifiers tq1 = type1->get_qualifiers(), tq2 = type2->get_qualifiers();
+                                                        Type::Qualifiers tq1 = type1->tq, tq2 = type2->tq;
                                                         AssertionSet have, need;
                                                         OpenVarSet newOpen( openVars );
                                                         type1->get_qualifiers() = Type::Qualifiers();
                                                         type->get_base()->get_qualifiers() = tq1;
+                                                        type1->tq = Type::Qualifiers();
+                                                        type->get_base()->tq = tq1;
                                                         if ( unifyExact( type1, type->get_base(), env, have, need, newOpen, indexer ) ) {
                                                                 result = type1->clone();
                                                                 result->get_qualifiers() = tq1 | tq2;
+                                                                result->tq = tq1 | tq2;
                                                         } // if
                                                         type1->get_qualifiers() = tq1;
                                                         type->get_base()->get_qualifiers() = Type::Qualifiers();
+                                                        type1->tq = tq1;
+                                                        type->get_base()->tq = Type::Qualifiers();
                                                 } // if
                                         } // if
 …
+        }
+        static const BasicType::Kind combinedType[][ BasicType::NUMBER_OF_BASIC_TYPES ] =
+        {
+/*              Bool            Char    SignedChar      UnsignedChar    ShortSignedInt  ShortUnsignedInt        SignedInt       UnsignedInt     LongSignedInt   LongUnsignedInt LongLongSignedInt       LongLongUnsignedInt     Float   Double  LongDouble      FloatComplex    DoubleComplex   LongDoubleComplex       FloatImaginary  DoubleImaginary LongDoubleImaginary   SignedInt128   UnsignedInt128   Float80   Float128 */
+                /* Bool */      { BasicType::Bool,              BasicType::Char,        BasicType::SignedChar,  BasicType::UnsignedChar,        BasicType::ShortSignedInt,      BasicType::ShortUnsignedInt,    BasicType::SignedInt,   BasicType::UnsignedInt, BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* Char */      { BasicType::Char,              BasicType::Char,        BasicType::UnsignedChar,        BasicType::UnsignedChar,        BasicType::ShortSignedInt,      BasicType::ShortUnsignedInt,    BasicType::SignedInt,   BasicType::UnsignedInt, BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* SignedChar */        { BasicType::SignedChar,        BasicType::UnsignedChar,        BasicType::SignedChar,  BasicType::UnsignedChar,        BasicType::ShortSignedInt,      BasicType::ShortUnsignedInt,    BasicType::SignedInt,   BasicType::UnsignedInt, BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* UnsignedChar */      { BasicType::UnsignedChar,      BasicType::UnsignedChar,        BasicType::UnsignedChar,        BasicType::UnsignedChar,        BasicType::ShortSignedInt,      BasicType::ShortUnsignedInt,    BasicType::SignedInt,   BasicType::UnsignedInt, BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* ShortSignedInt */    { BasicType::ShortSignedInt,    BasicType::ShortSignedInt,      BasicType::ShortSignedInt,      BasicType::ShortSignedInt,      BasicType::ShortSignedInt,      BasicType::ShortUnsignedInt,    BasicType::SignedInt,   BasicType::UnsignedInt, BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* ShortUnsignedInt */  { BasicType::ShortUnsignedInt,  BasicType::ShortUnsignedInt,    BasicType::ShortUnsignedInt,    BasicType::ShortUnsignedInt,    BasicType::ShortUnsignedInt,    BasicType::ShortUnsignedInt,    BasicType::SignedInt,   BasicType::UnsignedInt, BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* SignedInt */         { BasicType::SignedInt,         BasicType::SignedInt,   BasicType::SignedInt,   BasicType::SignedInt,   BasicType::SignedInt,   BasicType::SignedInt,   BasicType::SignedInt,   BasicType::UnsignedInt, BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* UnsignedInt */       { BasicType::UnsignedInt,               BasicType::UnsignedInt, BasicType::UnsignedInt, BasicType::UnsignedInt, BasicType::UnsignedInt, BasicType::UnsignedInt, BasicType::UnsignedInt, BasicType::UnsignedInt, BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* LongSignedInt */     { BasicType::LongSignedInt,             BasicType::LongSignedInt,       BasicType::LongSignedInt,       BasicType::LongSignedInt,       BasicType::LongSignedInt,       BasicType::LongSignedInt,       BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongSignedInt,       BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* LongUnsignedInt */   { BasicType::LongUnsignedInt,   BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongUnsignedInt,     BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* LongLongSignedInt */         { BasicType::LongLongSignedInt, BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongSignedInt,   BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* LongLongUnsignedInt */       { BasicType::LongLongUnsignedInt,       BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128 },
+                /* Float */     { BasicType::Float,     BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::Float,       BasicType::Float, BasicType::Float80, BasicType::Float128 },
+                /* Double */    { BasicType::Double,    BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::Double,      BasicType::LongDouble,  BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::Double,      BasicType::Double, BasicType::Float80, BasicType::Float128 },
+                /* LongDouble */        { BasicType::LongDouble,                BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDouble,  BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDouble,  BasicType::LongDouble, BasicType::BasicType::LongDouble, BasicType::Float128 },
+                /* FloatComplex */      { BasicType::FloatComplex,      BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::FloatComplex, BasicType::LongDoubleComplex, BasicType::LongDoubleComplex, },
+                /* DoubleComplex */     { BasicType::DoubleComplex,     BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::DoubleComplex,       BasicType::DoubleComplex, BasicType::LongDoubleComplex, BasicType::LongDoubleComplex },
+                /* LongDoubleComplex */         { BasicType::LongDoubleComplex, BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex, BasicType::LongDoubleComplex, BasicType::LongDoubleComplex, },
+                /* FloatImaginary */    { BasicType::FloatComplex,      BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatImaginary,      BasicType::DoubleImaginary,     BasicType::LongDoubleImaginary, BasicType::FloatImaginary,      BasicType::FloatImaginary, BasicType::LongDoubleImaginary, BasicType::LongDoubleImaginary, },
+                /* DoubleImaginary */   { BasicType::DoubleComplex,     BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::DoubleComplex,       BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::DoubleImaginary,     BasicType::DoubleImaginary,     BasicType::LongDoubleImaginary, BasicType::DoubleImaginary,     BasicType::DoubleImaginary, BasicType::LongDoubleImaginary, BasicType::LongDoubleImaginary, },
+                /* LongDoubleImaginary */       { BasicType::LongDoubleComplex, BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleImaginary, BasicType::LongDoubleImaginary, BasicType::LongDoubleImaginary, BasicType::LongDoubleImaginary, BasicType::LongDoubleImaginary, },
+                /* SignedInt128 */      { BasicType::SignedInt128,      BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::SignedInt128,        BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::SignedInt128,        BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128, },
+                /* UnsignedInt128 */    { BasicType::UnsignedInt128,    BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::UnsignedInt128,      BasicType::Float,       BasicType::Double,      BasicType::LongDouble,  BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::FloatComplex,        BasicType::DoubleComplex,       BasicType::LongDoubleComplex,   BasicType::UnsignedInt128,      BasicType::UnsignedInt128, BasicType::Float80, BasicType::Float128, },
+                /* Float80 */   { BasicType::Float80,   BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::Float80,     BasicType::LongDouble,  BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::Float80,     BasicType::Float80, BasicType::Float80, BasicType::Float128 },
+                /* Float128 */  { BasicType::Float128,  BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::Float128,    BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::LongDoubleComplex,   BasicType::Float128,    BasicType::Float128, BasicType::Float128, BasicType::Float128 },
+        };
+        // GENERATED START, DO NOT EDIT
+        // GENERATED BY BasicTypes-gen.cc
+        #define BT BasicType::
+        static const BasicType::Kind commonTypes[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor
+                /*                                      B                       C                      SC                      UC                      SI                     SUI
+                                                        I                      UI                      LI                     LUI                     LLI                    LLUI
+                                                       IB                     UIB                     _FH                     _FH                      _F                     _FC
+                                                        F                      FC                     _FX                    _FXC                      FD                    _FDC
+                                                        D                      DC                    F80X                   _FDXC                     F80                     _FB
+                                                    _FLDC                      FB                      LD                     LDC                    _FBX                  _FLDXC
+                                 */
+                                  {
+                /*      B */                BT Bool,                BT Char,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                                             BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*      C */                BT Char,                BT Char,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                                             BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     SC */          BT SignedChar,          BT SignedChar,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                                             BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     UC */        BT UnsignedChar,        BT UnsignedChar,        BT UnsignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                                             BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     SI */      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                                             BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    SUI */    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,
+                                             BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*      I */           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,
+                                             BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     UI */         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,
+                                           BT UnsignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     LI */       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,
+                                         BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    LUI */     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,
+                                       BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    LLI */   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,
+                                     BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*   LLUI */ BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt,
+                                   BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     IB */        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,
+                                          BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,
+                                          BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    UIB */      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,
+                                        BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,
+                                        BT UnsignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    _FH */            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,
+                                              BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,
+                                              BT uFloat16,            BT uFloat16,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    _FH */     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,
+                                       BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,
+                                       BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat32Complex,     BT uFloat32Complex,
+                                          BT FloatComplex,        BT FloatComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,     BT uFloat64Complex,     BT uFloat64Complex,
+                                         BT DoubleComplex,       BT DoubleComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     _F */            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,
+                                              BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,
+                                              BT uFloat32,            BT uFloat32,            BT uFloat32,     BT uFloat32Complex,            BT uFloat32,     BT uFloat32Complex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    _FC */     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,
+                                       BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,
+                                       BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,
+                                          BT FloatComplex,        BT FloatComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,     BT uFloat64Complex,     BT uFloat64Complex,
+                                         BT DoubleComplex,       BT DoubleComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*      F */               BT Float,               BT Float,               BT Float,               BT Float,               BT Float,               BT Float,
+                                                 BT Float,               BT Float,               BT Float,               BT Float,               BT Float,               BT Float,
+                                                 BT Float,               BT Float,               BT Float,        BT FloatComplex,               BT Float,        BT FloatComplex,
+                                                 BT Float,        BT FloatComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     FC */        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,
+                                          BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,
+                                          BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,
+                                          BT FloatComplex,        BT FloatComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,     BT uFloat64Complex,     BT uFloat64Complex,
+                                         BT DoubleComplex,       BT DoubleComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    _FX */           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,
+                                             BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,
+                                             BT uFloat32x,           BT uFloat32x,           BT uFloat32x,    BT uFloat32xComplex,           BT uFloat32x,    BT uFloat32xComplex,
+                                             BT uFloat32x,    BT uFloat32xComplex,           BT uFloat32x,    BT uFloat32xComplex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*   _FXC */    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,
+                                      BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,
+                                      BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,
+                                      BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,     BT uFloat64Complex,     BT uFloat64Complex,
+                                         BT DoubleComplex,       BT DoubleComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     FD */            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,
+                                              BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,
+                                              BT uFloat64,            BT uFloat64,            BT uFloat64,     BT uFloat64Complex,            BT uFloat64,     BT uFloat64Complex,
+                                              BT uFloat64,     BT uFloat64Complex,            BT uFloat64,     BT uFloat64Complex,            BT uFloat64,     BT uFloat64Complex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*   _FDC */     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,
+                                       BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,
+                                       BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,
+                                       BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,
+                                         BT DoubleComplex,       BT DoubleComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*      D */              BT Double,              BT Double,              BT Double,              BT Double,              BT Double,              BT Double,
+                                                BT Double,              BT Double,              BT Double,              BT Double,              BT Double,              BT Double,
+                                                BT Double,              BT Double,              BT Double,       BT DoubleComplex,              BT Double,       BT DoubleComplex,
+                                                BT Double,       BT DoubleComplex,              BT Double,       BT DoubleComplex,              BT Double,       BT DoubleComplex,
+                                                BT Double,       BT DoubleComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     DC */       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,
+                                         BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,
+                                         BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,
+                                         BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,
+                                         BT DoubleComplex,       BT DoubleComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*   F80X */           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,
+                                             BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,
+                                             BT uFloat64x,           BT uFloat64x,           BT uFloat64x,    BT uFloat64xComplex,           BT uFloat64x,    BT uFloat64xComplex,
+                                             BT uFloat64x,    BT uFloat64xComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uFloat64x,    BT uFloat64xComplex,
+                                             BT uFloat64x,    BT uFloat64xComplex,           BT uFloat64x,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*  _FDXC */    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,
+                                      BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,
+                                      BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,
+                                      BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,
+                                      BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    F80 */           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,
+                                             BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,
+                                             BT uuFloat80,           BT uuFloat80,           BT uuFloat80,    BT uFloat64xComplex,           BT uuFloat80,    BT uFloat64xComplex,
+                                             BT uuFloat80,    BT uFloat64xComplex,           BT uuFloat80,    BT uFloat64xComplex,           BT uuFloat80,    BT uFloat64xComplex,
+                                             BT uuFloat80,    BT uFloat64xComplex,           BT uuFloat80,    BT uFloat64xComplex,           BT uuFloat80,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    _FB */           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,
+                                             BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,
+                                             BT uFloat128,           BT uFloat128,           BT uFloat128,    BT uFloat128Complex,           BT uFloat128,    BT uFloat128Complex,
+                                             BT uFloat128,    BT uFloat128Complex,           BT uFloat128,    BT uFloat128Complex,           BT uFloat128,    BT uFloat128Complex,
+                                             BT uFloat128,    BT uFloat128Complex,           BT uFloat128,    BT uFloat128Complex,           BT uFloat128,           BT uFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*  _FLDC */    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
+                                      BT uFloat128Complex,    BT uFloat128Complex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     FB */          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,
+                                            BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,
+                                            BT uuFloat128,          BT uuFloat128,          BT uuFloat128,    BT uFloat128Complex,          BT uuFloat128,    BT uFloat128Complex,
+                                            BT uuFloat128,    BT uFloat128Complex,          BT uuFloat128,    BT uFloat128Complex,          BT uuFloat128,    BT uFloat128Complex,
+                                            BT uuFloat128,    BT uFloat128Complex,          BT uuFloat128,    BT uFloat128Complex,          BT uuFloat128,          BT uuFloat128,
+                                      BT uFloat128Complex,          BT uuFloat128,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*     LD */          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,
+                                            BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,
+                                            BT LongDouble,          BT LongDouble,          BT LongDouble,   BT LongDoubleComplex,          BT LongDouble,   BT LongDoubleComplex,
+                                            BT LongDouble,   BT LongDoubleComplex,          BT LongDouble,   BT LongDoubleComplex,          BT LongDouble,   BT LongDoubleComplex,
+                                            BT LongDouble,   BT LongDoubleComplex,          BT LongDouble,   BT LongDoubleComplex,          BT LongDouble,          BT LongDouble,
+                                     BT LongDoubleComplex,          BT LongDouble,          BT LongDouble,   BT LongDoubleComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*    LDC */   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
+                                     BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
+                                     BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
+                                     BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
+                                     BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
+                                     BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /*   _FBX */          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,
+                                            BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,
+                                            BT uFloat128x,          BT uFloat128x,          BT uFloat128x,   BT uFloat128xComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                            BT uFloat128x,   BT uFloat128xComplex,          BT uFloat128x,   BT uFloat128xComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                            BT uFloat128x,   BT uFloat128xComplex,          BT uFloat128x,   BT uFloat128xComplex,          BT uFloat128x,          BT uFloat128x,
+                                     BT uFloat128xComplex,          BT uFloat128x,          BT uFloat128x,   BT uFloat128xComplex,          BT uFloat128x,   BT uFloat128xComplex,
+                                  },
+                                  {
+                /* _FLDXC */   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                     BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                     BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                     BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                     BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                     BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,   BT uFloat128xComplex,
+                                  },
+        }; // commonTypes
+        #undef BT
+        // GENERATED END
         static_assert(
                 sizeof(combinedType)/sizeof(combinedType[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES*BasicType::NUMBER_OF_BASIC_TYPES,
+                sizeof(commonTypes)/sizeof(commonTypes[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
                 "Each basic type kind should have a corresponding row in the combined type matrix"
         );
         CommonType::CommonType( Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars )
+        CommonType_old::CommonType_old( Type * type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars )
                 : result( 0 ), type2( type2 ), widenFirst( widenFirst ), widenSecond( widenSecond ), indexer( indexer ), env( env ), openVars( openVars ) {
+        }
         void CommonType::postvisit( VoidType * ) {}
         void CommonType::postvisit( BasicType *basicType ) {
                 if ( BasicType *otherBasic = dynamic_cast< BasicType* >( type2 ) ) {
                         BasicType::Kind newType = combinedType[ basicType->get_kind() ][ otherBasic->get_kind() ];
                         if ( ( ( newType == basicType->get_kind() && basicType->get_qualifiers() >= otherBasic->get_qualifiers() ) || widenFirst ) && ( ( newType == otherBasic->get_kind() && basicType->get_qualifiers() <= otherBasic->get_qualifiers() ) || widenSecond ) ) {
                                 result = new BasicType( basicType->get_qualifiers() | otherBasic->get_qualifiers(), newType );
+        void CommonType_old::postvisit( VoidType * ) {}
+        void CommonType_old::postvisit( BasicType * basicType ) {
+                if ( BasicType * otherBasic = dynamic_cast< BasicType * >( type2 ) ) {
+                        BasicType::Kind newType = commonTypes[ basicType->get_kind() ][ otherBasic->get_kind() ];
+                        if ( ( ( newType == basicType->get_kind() && basicType->tq >= otherBasic->tq ) || widenFirst ) && ( ( newType == otherBasic->get_kind() && basicType->tq <= otherBasic->tq ) || widenSecond ) ) {
+                                result = new BasicType( basicType->tq | otherBasic->tq, newType );
                         } // if
                 } else if ( dynamic_cast< EnumInstType * > ( type2 ) || dynamic_cast< ZeroType* >( type2 ) || dynamic_cast< OneType* >( type2 ) ) {
+                } else if ( dynamic_cast< EnumInstType * > ( type2 ) || dynamic_cast< ZeroType * >( type2 ) || dynamic_cast< OneType * >( type2 ) ) {
                         // use signed int in lieu of the enum/zero/one type
                         BasicType::Kind newType = combinedType[ basicType->get_kind() ][ BasicType::SignedInt ];
                         if ( ( ( newType == basicType->get_kind() && basicType->get_qualifiers() >= type2->get_qualifiers() ) || widenFirst ) && ( ( newType != basicType->get_kind() && basicType->get_qualifiers() <= type2->get_qualifiers() ) || widenSecond ) ) {
                                 result = new BasicType( basicType->get_qualifiers() | type2->get_qualifiers(), newType );
+                        BasicType::Kind newType = commonTypes[ basicType->get_kind() ][ BasicType::SignedInt ];
+                        if ( ( ( newType == basicType->get_kind() && basicType->tq >= type2->tq ) || widenFirst ) && ( ( newType != basicType->get_kind() && basicType->tq <= type2->tq ) || widenSecond ) ) {
+                                result = new BasicType( basicType->tq | type2->tq, newType );
                         } // if
                 } // if
 …
         template< typename Pointer >
         void CommonType::getCommonWithVoidPointer( Pointer* voidPointer, Pointer* otherPointer ) {
                 if ( TypeInstType* var = dynamic_cast< TypeInstType* >( otherPointer->get_base() ) ) {
+        void CommonType_old::getCommonWithVoidPointer( Pointer * voidPointer, Pointer * otherPointer ) {
+                if ( TypeInstType * var = dynamic_cast< TypeInstType * >( otherPointer->get_base() ) ) {
                         OpenVarSet::const_iterator entry = openVars.find( var->get_name() );
                         if ( entry != openVars.end() ) {
                                 AssertionSet need, have;
                                 WidenMode widen( widenFirst, widenSecond );
                                 if ( entry != openVars.end() && ! bindVar(var, voidPointer->get_base(), entry->second, env, need, have, openVars, widen, indexer ) ) return;
+                                if ( entry != openVars.end() && ! env.bindVar(var, voidPointer->get_base(), entry->second, need, have, openVars, widen, indexer ) ) return;
+                        }
+                }
                 result = voidPointer->clone();
                 result->get_qualifiers() |= otherPointer->get_qualifiers();
+        }
         void CommonType::postvisit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
+                result->tq |= otherPointer->tq;
+        }
+        void CommonType_old::postvisit( PointerType * pointerType ) {
+                if ( PointerType * otherPointer = dynamic_cast< PointerType * >( type2 ) ) {
                         // std::cerr << "commonType: two pointers: " << pointerType << " / " << otherPointer << std::endl;
                         if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base()) ) {
+                        if ( widenFirst && dynamic_cast< VoidType * >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base()) ) {
                                 getCommonWithVoidPointer( otherPointer, pointerType );
                         } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base()) ) {
+                        } else if ( widenSecond && dynamic_cast< VoidType * >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base()) ) {
                                 getCommonWithVoidPointer( pointerType, otherPointer );
                         } else if ( ( pointerType->get_base()->get_qualifiers() >= otherPointer->get_base()->get_qualifiers() || widenFirst )
                                            && ( pointerType->get_base()->get_qualifiers() <= otherPointer->get_base()->get_qualifiers() || widenSecond ) ) {
+                        } else if ( ( pointerType->get_base()->tq >= otherPointer->get_base()->tq || widenFirst )
+                                           && ( pointerType->get_base()->tq <= otherPointer->get_base()->tq || widenSecond ) ) {
                                 // std::cerr << "middle case" << std::endl;
                                 Type::Qualifiers tq1 = pointerType->get_base()->get_qualifiers(), tq2 = otherPointer->get_base()->get_qualifiers();
                                 pointerType->get_base()->get_qualifiers() = Type::Qualifiers();
                                 otherPointer->get_base()->get_qualifiers() = Type::Qualifiers();
+                                Type::Qualifiers tq1 = pointerType->get_base()->tq, tq2 = otherPointer->get_base()->tq;
+                                pointerType->get_base()->tq = Type::Qualifiers();
+                                otherPointer->get_base()->tq = Type::Qualifiers();
                                 AssertionSet have, need;
                                 OpenVarSet newOpen( openVars );
 …
                                                 result = otherPointer->clone();
                                         } // if
                                         result->get_qualifiers() = tq1 | tq2;
+                                        strict_dynamic_cast<PointerType *>(result)->base->tq = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;
                                 } // if
                                 pointerType->get_base()->get_qualifiers() = tq1;
                                 otherPointer->get_base()->get_qualifiers() = tq2;
+                                pointerType->get_base()->tq = tq1;
+                                otherPointer->get_base()->tq = tq2;
                         } // if
                 } else if ( widenSecond && dynamic_cast< ZeroType* >( type2 ) ) {
+                } else if ( widenSecond && dynamic_cast< ZeroType * >( type2 ) ) {
                         result = pointerType->clone();
                         result->get_qualifiers() |= type2->get_qualifiers();
+                        result->tq |= type2->tq;
                 } // if
+        }
         void CommonType::postvisit( ArrayType * ) {}
         void CommonType::postvisit( ReferenceType *refType ) {
                 if ( ReferenceType *otherRef = dynamic_cast< ReferenceType* >( type2 ) ) {
+        void CommonType_old::postvisit( ArrayType * ) {}
+        void CommonType_old::postvisit( ReferenceType * refType ) {
+                if ( ReferenceType * otherRef = dynamic_cast< ReferenceType * >( type2 ) ) {
                         // std::cerr << "commonType: both references: " << refType << " / " << otherRef << std::endl;
                         // std::cerr << ( refType->get_base()->get_qualifiers() >= otherRef->get_base()->get_qualifiers() || widenFirst ) << (refType->get_base()->get_qualifiers() <= otherRef->get_base()->get_qualifiers() || widenSecond) << std::endl;
                         if ( widenFirst && dynamic_cast< VoidType* >( otherRef->get_base() ) && ! isFtype(refType->get_base()) ) {
+                        // std::cerr << ( refType->get_base()->tq >= otherRef->get_base()->tq || widenFirst ) << (refType->get_base()->tq <= otherRef->get_base()->tq || widenSecond) << std::endl;
+                        if ( widenFirst && dynamic_cast< VoidType * >( otherRef->get_base() ) && ! isFtype(refType->get_base()) ) {
                                 getCommonWithVoidPointer( otherRef, refType );
                         } else if ( widenSecond && dynamic_cast< VoidType* >( refType->get_base() ) && ! isFtype(otherRef->get_base()) ) {
+                        } else if ( widenSecond && dynamic_cast< VoidType * >( refType->get_base() ) && ! isFtype(otherRef->get_base()) ) {
                                 getCommonWithVoidPointer( refType, otherRef );
                         } else if ( ( refType->get_base()->get_qualifiers() >= otherRef->get_base()->get_qualifiers() || widenFirst )
                                            && ( refType->get_base()->get_qualifiers() <= otherRef->get_base()->get_qualifiers() || widenSecond ) ) {
+                        } else if ( ( refType->get_base()->tq >= otherRef->get_base()->tq || widenFirst )
+                                           && ( refType->get_base()->tq <= otherRef->get_base()->tq || widenSecond ) ) {
                                 // std::cerr << "middle case" << std::endl;
                                 Type::Qualifiers tq1 = refType->get_base()->get_qualifiers(), tq2 = otherRef->get_base()->get_qualifiers();
                                 refType->get_base()->get_qualifiers() = Type::Qualifiers();
                                 otherRef->get_base()->get_qualifiers() = Type::Qualifiers();
+                                Type::Qualifiers tq1 = refType->get_base()->tq, tq2 = otherRef->get_base()->tq;
+                                refType->get_base()->tq = Type::Qualifiers();
+                                otherRef->get_base()->tq = Type::Qualifiers();
                                 AssertionSet have, need;
                                 OpenVarSet newOpen( openVars );
 …
                                                 result = otherRef->clone();
                                         } // if
                                         result->get_qualifiers() = tq1 | tq2;
+                                        strict_dynamic_cast<ReferenceType *>(result)->base->tq = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;
                                 } // if
                                 refType->get_base()->get_qualifiers() = tq1;
                                 otherRef->get_base()->get_qualifiers() = tq2;
+                                refType->get_base()->tq = tq1;
+                                otherRef->get_base()->tq = tq2;
                         } // if
                 } else if ( widenSecond && dynamic_cast< ZeroType* >( type2 ) ) {
+                } else if ( widenSecond && dynamic_cast< ZeroType * >( type2 ) ) {
                         result = refType->clone();
                         result->get_qualifiers() |= type2->get_qualifiers();
+                        result->tq |= type2->tq;
                 } // if
+        }
         void CommonType::postvisit( FunctionType * ) {}
         void CommonType::postvisit( StructInstType * ) {}
         void CommonType::postvisit( UnionInstType * ) {}
         void CommonType::postvisit( EnumInstType *enumInstType ) {
                 if ( dynamic_cast< BasicType * >( type2 ) || dynamic_cast< ZeroType* >( type2 ) || dynamic_cast< OneType* >( type2 ) ) {
+        void CommonType_old::postvisit( FunctionType * ) {}
+        void CommonType_old::postvisit( StructInstType * ) {}
+        void CommonType_old::postvisit( UnionInstType * ) {}
+        void CommonType_old::postvisit( EnumInstType * enumInstType ) {
+                if ( dynamic_cast< BasicType * >( type2 ) || dynamic_cast< ZeroType * >( type2 ) || dynamic_cast< OneType * >( type2 ) ) {
                         // reuse BasicType, EnumInstType code by swapping type2 with enumInstType
                         result = commonType( type2, enumInstType, widenSecond, widenFirst, indexer, env, openVars );
 …
+        }
         void CommonType::postvisit( TraitInstType * ) {
+        }
         void CommonType::postvisit( TypeInstType *inst ) {
+        void CommonType_old::postvisit( TraitInstType * ) {
+        }
+        void CommonType_old::postvisit( TypeInstType * inst ) {
                 if ( widenFirst ) {
                         NamedTypeDecl *nt = indexer.lookupType( inst->get_name() );
+                        const NamedTypeDecl * nt = indexer.lookupType( inst->get_name() );
                         if ( nt ) {
                                 TypeDecl *type = strict_dynamic_cast< TypeDecl* >( nt );
+                                const TypeDecl * type = strict_dynamic_cast< const TypeDecl * >( nt );
                                 if ( type->get_base() ) {
                                         Type::Qualifiers tq1 = inst->get_qualifiers(), tq2 = type2->get_qualifiers();
+                                        Type::Qualifiers tq1 = inst->tq, tq2 = type2->tq;
                                         AssertionSet have, need;
                                         OpenVarSet newOpen( openVars );
                                         type2->get_qualifiers() = Type::Qualifiers();
                                         type->get_base()->get_qualifiers() = tq1;
+                                        type2->tq = Type::Qualifiers();
+                                        type->get_base()->tq = tq1;
                                         if ( unifyExact( type->get_base(), type2, env, have, need, newOpen, indexer ) ) {
                                                 result = type2->clone();
                                                 result->get_qualifiers() = tq1 | tq2;
+                                                result->tq = tq1 | tq2;
                                         } // if
                                         type2->get_qualifiers() = tq2;
                                         type->get_base()->get_qualifiers() = Type::Qualifiers();
+                                        type2->tq = tq2;
+                                        type->get_base()->tq = Type::Qualifiers();
                                 } // if
                         } // if
 …
+        }
         void CommonType::postvisit( TupleType * ) {}
         void CommonType::postvisit( VarArgsType * ) {}
         void CommonType::postvisit( ZeroType *zeroType ) {
+        void CommonType_old::postvisit( TupleType * ) {}
+        void CommonType_old::postvisit( VarArgsType * ) {}
+        void CommonType_old::postvisit( ZeroType * zeroType ) {
                 if ( widenFirst ) {
                         if ( dynamic_cast< BasicType* >( type2 ) || dynamic_cast< PointerType* >( type2 ) || dynamic_cast< EnumInstType* >( type2 ) ) {
                                 if ( widenSecond || zeroType->get_qualifiers() <= type2->get_qualifiers() ) {
+                        if ( dynamic_cast< BasicType * >( type2 ) || dynamic_cast< PointerType * >( type2 ) || dynamic_cast< EnumInstType * >( type2 ) ) {
+                                if ( widenSecond || zeroType->tq <= type2->tq ) {
                                         result = type2->clone();
                                         result->get_qualifiers() |= zeroType->get_qualifiers();
+                                }
                         } else if ( widenSecond && dynamic_cast< OneType* >( type2 ) ) {
                                 result = new BasicType( zeroType->get_qualifiers(), BasicType::SignedInt );
                                 result->get_qualifiers() |= type2->get_qualifiers();
+                        }
+                }
+        }
         void CommonType::postvisit( OneType *oneType ) {
+                                        result->tq |= zeroType->tq;
+                                }
+                        } else if ( widenSecond && dynamic_cast< OneType * >( type2 ) ) {
+                                result = new BasicType( zeroType->tq, BasicType::SignedInt );
+                                result->tq |= type2->tq;
+                        }
+                }
+        }
+        void CommonType_old::postvisit( OneType * oneType ) {
                 if ( widenFirst ) {
                         if ( dynamic_cast< BasicType* >( type2 ) || dynamic_cast< EnumInstType* >( type2 ) ) {
                                 if ( widenSecond || oneType->get_qualifiers() <= type2->get_qualifiers() ) {
+                        if ( dynamic_cast< BasicType * >( type2 ) || dynamic_cast< EnumInstType * >( type2 ) ) {
+                                if ( widenSecond || oneType->tq <= type2->tq ) {
                                         result = type2->clone();
+                                        result->get_qualifiers() |= oneType->get_qualifiers();
+                                }
+                        } else if ( widenSecond && dynamic_cast< ZeroType* >( type2 ) ) {
+                                result = new BasicType( oneType->get_qualifiers(), BasicType::SignedInt );
+                                result->get_qualifiers() |= type2->get_qualifiers();
+                        }
+                }
+        }
+                                        result->tq |= oneType->tq;
+                                }
+                        } else if ( widenSecond && dynamic_cast< ZeroType * >( type2 ) ) {
+                                result = new BasicType( oneType->tq, BasicType::SignedInt );
+                                result->tq |= type2->tq;
+                        }
+                }
+        }
+        class CommonType_new final : public ast::WithShortCircuiting {
+                const ast::Type * type2;
+                WidenMode widen;
+                const ast::SymbolTable & symtab;
+                ast::TypeEnvironment & tenv;
+                const ast::OpenVarSet & open;
+        public:
+                ast::ptr< ast::Type > result;
+                CommonType_new(
+                        const ast::Type * t2, WidenMode w, const ast::SymbolTable & st,
+                        ast::TypeEnvironment & env, const ast::OpenVarSet & o )
+                : type2( t2 ), widen( w ), symtab( st ), tenv( env ), open( o ), result() {}
+                void previsit( const ast::Node * ) { visit_children = false; }
+                void postvisit( const ast::VoidType * ) {}
+                void postvisit( const ast::BasicType * basic ) {
+                        if ( auto basic2 = dynamic_cast< const ast::BasicType * >( type2 ) ) {
+                                #warning remove casts when `commonTypes` moved to new AST
+                                ast::BasicType::Kind kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)basic2->kind ];
+                                if (
+                                        ( ( kind == basic->kind && basic->qualifiers >= basic2->qualifiers )
+                                                || widen.first )
+                                        && ( ( kind == basic2->kind && basic->qualifiers <= basic2->qualifiers )
+                                                || widen.second )
+                                ) {
+                                        result = new ast::BasicType{ kind, basic->qualifiers | basic2->qualifiers };
+                                }
+                        } else if (
+                                dynamic_cast< const ast::EnumInstType * >( type2 )
+                                || dynamic_cast< const ast::ZeroType * >( type2 )
+                                || dynamic_cast< const ast::OneType * >( type2 )
+                        ) {
+                                #warning remove casts when `commonTypes` moved to new AST
+                                ast::BasicType::Kind kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)ast::BasicType::SignedInt ];
+                                if (
+                                        ( ( kind == basic->kind && basic->qualifiers >= type2->qualifiers )
+                                                || widen.first )
+                                        && ( ( kind != basic->kind && basic->qualifiers <= type2->qualifiers )
+                                                || widen.second )
+                                ) {
+                                        result = new ast::BasicType{ kind, basic->qualifiers | type2->qualifiers };
+                                }
+                        }
+                }
+        private:
+                template< typename Pointer >
+                void getCommonWithVoidPointer( const Pointer * voidPtr, const Pointer * oPtr ) {
+                        const ast::Type * base = oPtr->base;
+                        if ( auto var = dynamic_cast< const ast::TypeInstType * >( base ) ) {
+                                auto entry = open.find( var->name );
+                                if ( entry != open.end() ) {
+                                        ast::AssertionSet need, have;
+                                        if ( ! tenv.bindVar(
+                                                var, voidPtr->base, entry->second, need, have, open, widen, symtab )
+                                        ) return;
+                                }
+                        }
+                        result = voidPtr;
+                        add_qualifiers( result, oPtr->qualifiers );
+                }
+        public:
+                void postvisit( const ast::PointerType * pointer ) {
+                        if ( auto pointer2 = dynamic_cast< const ast::PointerType * >( type2 ) ) {
+                                if (
+                                        widen.first
+                                        && pointer2->base.as< ast::VoidType >()
+                                        && ! ast::isFtype( pointer->base )
+                                ) {
+                                        getCommonWithVoidPointer( pointer2, pointer );
+                                } else if (
+                                        widen.second
+                                        && pointer->base.as< ast::VoidType >()
+                                        && ! ast::isFtype( pointer2->base )
+                                ) {
+                                        getCommonWithVoidPointer( pointer, pointer2 );
+                                } else if (
+                                        ( pointer->base->qualifiers >= pointer2->base->qualifiers || widen.first )
+                                        && ( pointer->base->qualifiers <= pointer2->base->qualifiers || widen.second )
+                                ) {
+                                        ast::CV::Qualifiers q1 = pointer->base->qualifiers;
+                                        ast::CV::Qualifiers q2 = pointer2->base->qualifiers;
+                                        // force t{1,2} to be cloned if their qualifiers must be stripped, so that
+                                        // pointer{,2}->base are unchanged
+                                        ast::ptr< ast::Type > t1{ pointer->base }, t2{ pointer2->base };
+                                        reset_qualifiers( t1 );
+                                        reset_qualifiers( t2 );
+                                        ast::AssertionSet have, need;
+                                        ast::OpenVarSet newOpen{ open };
+                                        if ( unifyExact( t1, t2, tenv, have, need, newOpen, noWiden(), symtab ) ) {
+                                                result = pointer;
+                                                if ( q1.val != q2.val ) {
+                                                        // reset result->base->qualifiers to be union of two base qualifiers
+                                                        strict_dynamic_cast< ast::PointerType * >(
+                                                                result.get_and_mutate()
+                                                        )->base.get_and_mutate()->qualifiers = q1 | q2;
+                                                }
+                                        }
+                                }
+                        } else if ( widen.second && dynamic_cast< const ast::ZeroType * >( type2 ) ) {
+                                result = pointer;
+                                add_qualifiers( result, type2->qualifiers );
+                        }
+                }
+                void postvisit( const ast::ArrayType * ) {}
+                void postvisit( const ast::ReferenceType * ref ) {
+                        if ( auto ref2 = dynamic_cast< const ast::ReferenceType * >( type2 ) ) {
+                                if (
+                                        widen.first && ref2->base.as< ast::VoidType >() && ! ast::isFtype( ref->base )
+                                ) {
+                                        getCommonWithVoidPointer( ref2, ref );
+                                } else if (
+                                        widen.second && ref->base.as< ast::VoidType>() && ! ast::isFtype( ref2->base )
+                                ) {
+                                        getCommonWithVoidPointer( ref, ref2 );
+                                } else if (
+                                        ( ref->base->qualifiers >= ref2->base->qualifiers || widen.first )
+                                        && ( ref->base->qualifiers <= ref2->base->qualifiers || widen.second )
+                                ) {
+                                        ast::CV::Qualifiers q1 = ref->base->qualifiers, q2 = ref2->base->qualifiers;
+                                        // force t{1,2} to be cloned if their qualifiers must be stripped, so that
+                                        // ref{,2}->base are unchanged
+                                        ast::ptr< ast::Type > t1{ ref->base }, t2{ ref2->base };
+                                        reset_qualifiers( t1 );
+                                        reset_qualifiers( t2 );
+                                        ast::AssertionSet have, need;
+                                        ast::OpenVarSet newOpen{ open };
+                                        if ( unifyExact( t1, t2, tenv, have, need, newOpen, noWiden(), symtab ) ) {
+                                                result = ref;
+                                                if ( q1.val != q2.val ) {
+                                                        // reset result->base->qualifiers to be union of two base qualifiers
+                                                        strict_dynamic_cast< ast::ReferenceType * >(
+                                                                result.get_and_mutate()
+                                                        )->base.get_and_mutate()->qualifiers = q1 | q2;
+                                                }
+                                        }
+                                }
+                        } else if ( widen.second && dynamic_cast< const ast::ZeroType * >( type2 ) ) {
+                                result = ref;
+                                add_qualifiers( result, type2->qualifiers );
+                        }
+                }
+                void postvisit( const ast::FunctionType * ) {}
+                void postvisit( const ast::StructInstType * ) {}
+                void postvisit( const ast::UnionInstType * ) {}
+                void postvisit( const ast::EnumInstType * enumInst ) {
+                        if (
+                                dynamic_cast< const ast::BasicType * >( type2 )
+                                || dynamic_cast< const ast::ZeroType * >( type2 )
+                                || dynamic_cast< const ast::OneType * >( type2 )
+                        ) {
+                                // reuse BasicType/EnumInstType common type by swapping
+                                result = commonType( type2, enumInst, widen, symtab, tenv, open );
+                        }
+                }
+                void postvisit( const ast::TraitInstType * ) {}
+                void postvisit( const ast::TypeInstType * inst ) {
+                        if ( ! widen.first ) return;
+                        if ( const ast::NamedTypeDecl * nt = symtab.lookupType( inst->name ) ) {
+                                if ( const ast::Type * base =
+                                                strict_dynamic_cast< const ast::TypeDecl * >( nt )->base
+                                ) {
+                                        ast::CV::Qualifiers q1 = inst->qualifiers, q2 = type2->qualifiers;
+                                        // force t{1,2} to be cloned if their qualifiers must be mutated
+                                        ast::ptr< ast::Type > t1{ base }, t2{ type2 };
+                                        reset_qualifiers( t1, q1 );
+                                        reset_qualifiers( t2 );
+                                        ast::AssertionSet have, need;
+                                        ast::OpenVarSet newOpen{ open };
+                                        if ( unifyExact( t1, t2, tenv, have, need, newOpen, noWiden(), symtab ) ) {
+                                                result = type2;
+                                                reset_qualifiers( result, q1 | q2 );
+                                        }
+                                }
+                        }
+                }
+                void postvisit( const ast::TupleType * ) {}
+                void postvisit( const ast::VarArgsType * ) {}
+                void postvisit( const ast::ZeroType * zero ) {
+                        if ( ! widen.first ) return;
+                        if (
+                                dynamic_cast< const ast::BasicType * >( type2 )
+                                || dynamic_cast< const ast::PointerType * >( type2 )
+                                || dynamic_cast< const ast::EnumInstType * >( type2 )
+                        ) {
+                                if ( widen.second || zero->qualifiers <= type2->qualifiers ) {
+                                        result = type2;
+                                        add_qualifiers( result, zero->qualifiers );
+                                }
+                        } else if ( widen.second && dynamic_cast< const ast::OneType * >( type2 ) ) {
+                                result = new ast::BasicType{
+                                        ast::BasicType::SignedInt, zero->qualifiers | type2->qualifiers };
+                        }
+                }
+                void postvisit( const ast::OneType * one ) {
+                        if ( ! widen.first ) return;
+                        if (
+                                dynamic_cast< const ast::BasicType * >( type2 )
+                                || dynamic_cast< const ast::EnumInstType * >( type2 )
+                        ) {
+                                if ( widen.second || one->qualifiers <= type2->qualifiers ) {
+                                        result = type2;
+                                        add_qualifiers( result, one->qualifiers );
+                                }
+                        } else if ( widen.second && dynamic_cast< const ast::ZeroType * >( type2 ) ) {
+                                result = new ast::BasicType{
+                                        ast::BasicType::SignedInt, one->qualifiers | type2->qualifiers };
+                        }
+                }
+        };
+        namespace {
+                ast::ptr< ast::Type > handleReference(
+                        const ast::ptr< ast::Type > & t1, const ast::ptr< ast::Type > & t2, WidenMode widen,
+                        const ast::SymbolTable & symtab, ast::TypeEnvironment & env,
+                        const ast::OpenVarSet & open
+                ) {
+                        ast::ptr<ast::Type> common;
+                        ast::AssertionSet have, need;
+                        ast::OpenVarSet newOpen{ open };
+                        // need unify to bind type variables
+                        if ( unify( t1, t2, env, have, need, newOpen, symtab, common ) ) {
+                                ast::CV::Qualifiers q1 = t1->qualifiers, q2 = t2->qualifiers;
+                                PRINT(
+                                        std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                                )
+                                if ( ( widen.first || q2 <= q1 ) && ( widen.second || q1 <= q2 ) ) {
+                                        PRINT(
+                                                std::cerr << "widen okay" << std::endl;
+                                        )
+                                        add_qualifiers( common, q1 | q2 );
+                                        return common;
+                                }
+                        }
+                        PRINT(
+                                std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
+                        )
+                        return { nullptr };
+                }
+        }
+        ast::ptr< ast::Type > commonType(
+                        const ast::ptr< ast::Type > & type1, const ast::ptr< ast::Type > & type2,
+                        WidenMode widen, const ast::SymbolTable & symtab, ast::TypeEnvironment & env,
+                        const ast::OpenVarSet & open
+        ) {
+                unsigned depth1 = type1->referenceDepth();
+                unsigned depth2 = type2->referenceDepth();
+                if ( depth1 != depth2 ) {  // implies depth1 > 0 || depth2 > 0
+                        PRINT(
+                                std::cerr << "reference depth diff: " << (depth1-depth2) << std::endl;
+                        )
+                        ast::ptr< ast::Type > result;
+                        const ast::ReferenceType * ref1 = type1.as< ast::ReferenceType >();
+                        const ast::ReferenceType * ref2 = type1.as< ast::ReferenceType >();
+                        if ( depth1 > depth2 ) {
+                                assert( ref1 );
+                                result = handleReference( ref1->base, type2, widen, symtab, env, open );
+                        } else {  // implies depth1 < depth2
+                                assert( ref2 );
+                                result = handleReference( type1, ref2->base, widen, symtab, env, open );
+                        }
+                        if ( result && ref1 ) {
+                                // formal is reference, so result should be reference
+                                PRINT(
+                                        std::cerr << "formal is reference; result should be reference" << std::endl;
+                                )
+                                result = new ast::ReferenceType{ result, ref1->qualifiers };
+                        }
+                        PRINT(
+                                std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is "
+                                "[" << result << "]" << std::endl;
+                        )
+                        return result;
+                }
+                // otherwise both are reference types of the same depth and this is handled by the visitor
+                ast::Pass<CommonType_new> visitor{ type2, widen, symtab, env, open };
+                type1->accept( visitor );
+                ast::ptr< ast::Type > result = visitor.pass.result;
+                // handling for opaque type declarations (?)
+                if ( ! result && widen.second ) {
+                        if ( const ast::TypeInstType * inst = type2.as< ast::TypeInstType >() ) {
+                                if ( const ast::NamedTypeDecl * nt = symtab.lookupType( inst->name ) ) {
+                                        auto type = strict_dynamic_cast< const ast::TypeDecl * >( nt );
+                                        if ( type->base ) {
+                                                ast::CV::Qualifiers q1 = type1->qualifiers, q2 = type2->qualifiers;
+                                                ast::AssertionSet have, need;
+                                                ast::OpenVarSet newOpen{ open };
+                                                // force t{1,2} to be cloned if its qualifiers must be stripped, so that
+                                                // type1 and type->base are left unchanged; calling convention forces
+                                                // {type1,type->base}->strong_ref >= 1
+                                                ast::ptr<ast::Type> t1{ type1 }, t2{ type->base };
+                                                reset_qualifiers( t1 );
+                                                reset_qualifiers( t2, q1 );
+                                                if ( unifyExact( t1, t2, env, have, need, newOpen, noWiden(), symtab ) ) {
+                                                        result = t1;
+                                                        reset_qualifiers( result, q1 | q2 );
+                                                }
+                                        }
+                                }
+                        }
+                }
+                return result;
+        }
 } // namespace ResolvExpr

src/ResolvExpr/ConversionCost.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 07:06:19 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Sep 25 15:43:34 2017
 // Update Count     : 10
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Aug 12 10:21:00 2019
+// Update Count     : 27
 //
 …
 namespace ResolvExpr {
+        const Cost Cost::zero =      Cost(  0,  0,  0,  0 );
+        const Cost Cost::infinity =  Cost( -1, -1, -1, -1 );
+        const Cost Cost::unsafe =    Cost(  1,  0,  0,  0 );
+        const Cost Cost::poly =      Cost(  0,  1,  0,  0 );
+        const Cost Cost::safe =      Cost(  0,  0,  1,  0 );
+        const Cost Cost::reference = Cost(  0,  0,  0,  1 );
+#if 0
+        const Cost Cost::zero =      Cost{  0,  0,  0,  0,  0,  0,  0 };
+        const Cost Cost::infinity =  Cost{ -1, -1, -1, -1, -1,  1, -1 };
+        const Cost Cost::unsafe =    Cost{  1,  0,  0,  0,  0,  0,  0 };
+        const Cost Cost::poly =      Cost{  0,  1,  0,  0,  0,  0,  0 };
+        const Cost Cost::safe =      Cost{  0,  0,  1,  0,  0,  0,  0 };
+        const Cost Cost::sign =      Cost{  0,  0,  0,  1,  0,  0,  0 };
+        const Cost Cost::var =       Cost{  0,  0,  0,  0,  1,  0,  0 };
+        const Cost Cost::spec =      Cost{  0,  0,  0,  0,  0, -1,  0 };
+        const Cost Cost::reference = Cost{  0,  0,  0,  0,  0,  0,  1 };
+#endif
 #if 0
 …
 #define PRINT(x)
 #endif
+        Cost conversionCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+                if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
+        Cost conversionCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+                if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         PRINT( std::cerr << "type inst " << destAsTypeInst->name; )
                         if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->name ) ) {
+                        if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->name ) ) {
                                 if ( eqvClass->type ) {
                                         return conversionCost( src, eqvClass->type, indexer, env );
+                                        return conversionCost( src, eqvClass->type, srcIsLvalue, indexer, env );
                                 } else {
                                         return Cost::infinity;
+                                }
                         } else if ( NamedTypeDecl *namedType = indexer.lookupType( destAsTypeInst->name ) ) {
+                        } else if ( const NamedTypeDecl * namedType = indexer.lookupType( destAsTypeInst->name ) ) {
                                 PRINT( std::cerr << " found" << std::endl; )
                                 TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );
+                                const TypeDecl * type = dynamic_cast< const TypeDecl * >( namedType );
                                 // all typedefs should be gone by this point
                                 assert( type );
                                 if ( type->base ) {
+                                        return conversionCost( src, type->base, indexer, env ) + Cost::safe;
+                                        return conversionCost( src, type->base, srcIsLvalue, indexer, env )
+                                                + Cost::safe;
                                 } // if
                         } // if
 …
                         PRINT( std::cerr << "compatible!" << std::endl; )
                         return Cost::zero;
                 } else if ( dynamic_cast< VoidType* >( dest ) ) {
+                } else if ( dynamic_cast< const VoidType * >( dest ) ) {
                         return Cost::safe;
                 } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
+                } else if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
                         return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const SymTab::Indexer &, const TypeEnvironment & env ){
+                        return convertToReferenceCost( src, refType, srcIsLvalue, indexer, env, [](const Type * const t1, const Type * t2, const SymTab::Indexer &, const TypeEnvironment & env ){
                                 return ptrsAssignable( t1, t2, env );
                         });
                 } else {
+                        PassVisitor<ConversionCost> converter( dest, indexer, env, conversionCost );
+                        PassVisitor<ConversionCost> converter(
+                                dest, srcIsLvalue, indexer, env,
+                                (Cost (*)(const Type *, const Type *, bool, const SymTab::Indexer&, const TypeEnvironment&))
+                                        conversionCost );
                         src->accept( converter );
                         if ( converter.pass.get_cost() == Cost::infinity ) {
 …
+        }
+        Cost convertToReferenceCost( Type * src, Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
+        static Cost convertToReferenceCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 PRINT( std::cerr << "convert to reference cost... diff " << diff << " " << src << " / " << dest << std::endl; )
                 if ( diff > 0 ) {
                         // TODO: document this
+                        Cost cost = convertToReferenceCost( strict_dynamic_cast< ReferenceType * >( src )->base, dest, diff-1, indexer, env, func );
+                        Cost cost = convertToReferenceCost(
+                                strict_dynamic_cast< const ReferenceType * >( src )->base, dest, srcIsLvalue,
+                                diff-1, indexer, env, func );
                         cost.incReference();
                         return cost;
                 } else if ( diff < -1 ) {
                         // TODO: document this
+                        Cost cost = convertToReferenceCost( src, strict_dynamic_cast< ReferenceType * >( dest )->base, diff+1, indexer, env, func );
+                        Cost cost = convertToReferenceCost(
+                                src, strict_dynamic_cast< const ReferenceType * >( dest )->base, srcIsLvalue,
+                                diff+1, indexer, env, func );
                         cost.incReference();
                         return cost;
                 } else if ( diff == 0 ) {
                         ReferenceType * srcAsRef = dynamic_cast< ReferenceType * >( src );
                         ReferenceType * destAsRef = dynamic_cast< ReferenceType * >( dest );
+                        const ReferenceType * srcAsRef = dynamic_cast< const ReferenceType * >( src );
+                        const ReferenceType * destAsRef = dynamic_cast< const ReferenceType * >( dest );
                         if ( srcAsRef && destAsRef ) { // pointer-like conversions between references
                                 PRINT( std::cerr << "converting between references" << std::endl; )
                                 Type::Qualifiers tq1 = srcAsRef->base->get_qualifiers();
                                 Type::Qualifiers tq2 = destAsRef->base->get_qualifiers();
+                                Type::Qualifiers tq1 = srcAsRef->base->tq;
+                                Type::Qualifiers tq2 = destAsRef->base->tq;
                                 if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers( srcAsRef->base, destAsRef->base, indexer, env ) ) {
                                         PRINT( std::cerr << " :: compatible and good qualifiers" << std::endl; )
 …
                         } else {
                                 PRINT( std::cerr << "reference to rvalue conversion" << std::endl; )
+                                PassVisitor<ConversionCost> converter( dest, indexer, env, conversionCost );
+                                PassVisitor<ConversionCost> converter(
+                                        dest, srcIsLvalue, indexer, env,
+                                        (Cost (*)(const Type *, const Type *, bool, const SymTab::Indexer&, const TypeEnvironment&))
+                                                conversionCost );
                                 src->accept( converter );
                                 return converter.pass.get_cost();
                         } // if
                 } else {
                         ReferenceType * destAsRef = dynamic_cast< ReferenceType * >( dest );
+                        const ReferenceType * destAsRef = dynamic_cast< const ReferenceType * >( dest );
                         assert( diff == -1 && destAsRef );
                         PRINT( std::cerr << "dest is: " << dest << " / src is: " << src << std::endl; )
                         if ( typesCompatibleIgnoreQualifiers( src, destAsRef->base, indexer, env ) ) {
                                 PRINT( std::cerr << "converting compatible base type" << std::endl; )
                                 if ( src->get_lvalue() ) {
+                                if ( srcIsLvalue ) {
                                         PRINT(
                                                 std::cerr << "lvalue to reference conversion" << std::endl;
 …
+                                        )
                                         // lvalue-to-reference conversion:  cv lvalue T => cv T &
                                         if ( src->get_qualifiers() == destAsRef->base->get_qualifiers() ) {
+                                        if ( src->tq == destAsRef->base->tq ) {
                                                 return Cost::reference; // cost needs to be non-zero to add cast
                                         } if ( src->get_qualifiers() < destAsRef->base->get_qualifiers() ) {
+                                        } if ( src->tq < destAsRef->base->tq ) {
                                                 return Cost::safe; // cost needs to be higher than previous cast to differentiate adding qualifiers vs. keeping same
                                         } else {
 …
+        }
+        Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
+        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, bool srcIsLvalue,
+                        const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 int sdepth = src->referenceDepth(), ddepth = dest->referenceDepth();
                 Cost cost = convertToReferenceCost( src, dest, sdepth-ddepth, indexer, env, func );
+                Cost cost = convertToReferenceCost( src, dest, srcIsLvalue, sdepth-ddepth, indexer, env, func );
                 PRINT( std::cerr << "convertToReferenceCost result: " << cost << std::endl; )
                 return cost;
+        }
+        ConversionCost::ConversionCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : dest( dest ), indexer( indexer ), cost( Cost::infinity ), env( env ), costFunc( costFunc ) {
+        }
+/*
+            Old
+            ===
+           Double
+             |
+           Float
+             |
+           ULong
+           /   \
+        UInt    Long
+           \   /
+            Int
+             |
+           Ushort
+             |
+           Short
+             |
+           Uchar
+           /   \
+        Schar   Char
+                                New
+                                ===
+                       +-----LongDoubleComplex--+
+           LongDouble--+          |             +-LongDoubleImag
+             |         +---DoubleComplex---+         |
+           Double------+        |          +----DoubleImag
+             |           +-FloatComplex-+            |
+           Float---------+              +-------FloatImag
+             |
+          ULongLong
+             |
+          LongLong
+             |
+           ULong
+           /   \
+        UInt    Long
+           \   /
+            Int
+             |
+           Ushort
+             |
+           Short
+             |
+           Uchar
+           /   \
+        Schar   Char
+           \   /
+            Bool
+*/
+        static const int costMatrix[][ BasicType::NUMBER_OF_BASIC_TYPES ] = {
+        /* Src \ Dest:  Bool    Char    SChar   UChar   Short   UShort  Int     UInt    Long    ULong   LLong   ULLong  Float   Double  LDbl    FCplex  DCplex  LDCplex FImag   DImag   LDImag  I128,   U128, F80, F128 */
+                /* Bool */      { 0,    1,              1,              2,              3,              4,              5,              6,              6,              7,              8,              9,              12,             13,             14,             12,             13,             14,             -1,             -1,             -1,             10,             11,       14,   15},
+                /* Char */      { -1,   0,              -1,             1,              2,              3,              4,              5,              5,              6,              7,              8,              11,             12,             13,             11,             12,             13,             -1,             -1,             -1,             9,              10,       13,   14},
+                /* SChar */ { -1,       -1,             0,              1,              2,              3,              4,              5,              5,              6,              7,              8,              11,             12,             13,             11,             12,             13,             -1,             -1,             -1,             9,              10,       13,   14},
+                /* UChar */ { -1,       -1,             -1,             0,              1,              2,              3,              4,              4,              5,              6,              7,              10,             11,             12,             10,             11,             12,             -1,             -1,             -1,             8,              9,        12,   13},
+                /* Short */ { -1,       -1,             -1,             -1,             0,              1,              2,              3,              3,              4,              5,              6,              9,              10,             11,             9,              10,             11,             -1,             -1,             -1,             7,              8,        11,   12},
+                /* UShort */{ -1,       -1,             -1,             -1,             -1,             0,              1,              2,              2,              3,              4,              5,              8,              9,              10,             8,              9,              10,             -1,             -1,             -1,             6,              7,        10,   11},
+                /* Int */       { -1,   -1,             -1,             -1,             -1,             -1,             0,              1,              1,              2,              3,              4,              7,              8,              9,              7,              8,              9,              -1,             -1,             -1,             5,              6,        9,    10},
+                /* UInt */      { -1,   -1,             -1,             -1,             -1,             -1,             -1,             0,              -1,             1,              2,              3,              6,              7,              8,              6,              7,              8,              -1,             -1,             -1,             4,              5,        8,    9},
+                /* Long */      { -1,   -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              2,              3,              6,              7,              8,              6,              7,              8,              -1,             -1,             -1,             4,              5,        8,    9},
+                /* ULong */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              2,              5,              6,              7,              5,              6,              7,              -1,             -1,             -1,             3,              4,        7,    8},
+                /* LLong */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              4,              5,              6,              4,              5,              6,              -1,             -1,             -1,             2,              3,        6,    7},
+                /* ULLong */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              3,              4,              5,              3,              4,              5,              -1,             -1,             -1,             1,              2,        5,    6},
+                /* Float */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              2,              1,              2,              3,              -1,             -1,             -1,             -1,             -1,       2,    3},
+                /* Double */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              -1,             1,              2,              -1,             -1,             -1,             -1,             -1,       1,    2},
+                /* LDbl */      { -1,   -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              -1,             -1,             1,              -1,             -1,             -1,             -1,             -1,       -1,   1},
+                /* FCplex */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              2,              -1,             -1,             -1,             -1,             -1,       -1,   -1},
+                /* DCplex */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              -1,             -1,             -1,             -1,             -1,       -1,   -1},
+                /* LDCplex */{ -1,      -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              -1,             -1,             -1,             -1,             -1,       -1,   -1},
+                /* FImag */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              2,              3,              0,              1,              2,              -1,             -1,       -1,   -1},
+                /* DImag */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              2,              -1,             0,              1,              -1,             -1,       -1,   -1},
+                /* LDImag */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              -1,             -1,             0,              -1,             -1,       -1,   -1},
+                /* I128 */  { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             2,              3,              4,              3,              4,              5,              -1,             -1,             -1,             0,              1,        4,    4},
+                /* U128 */  { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              2,              3,              2,              3,              4,              -1,             -1,             -1,             -1,             0,        3,    3},
+                /* F80 */       { -1,   -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              -1,             -1,             1,              -1,             -1,             -1,             -1,             -1,       0,    1},
+                /* F128 */      { -1,   -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              -1,             -1,             -1,             -1,             -1,       -1,   0},
+        };
+        ConversionCost::ConversionCost( const Type * dest, bool srcIsLvalue, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : dest( dest ), srcIsLvalue( srcIsLvalue ), indexer( indexer ), cost( Cost::infinity ), env( env ), costFunc( costFunc ) {
+        }
+        // GENERATED START, DO NOT EDIT
+        // GENERATED BY BasicTypes-gen.cc
+        /* EXTENDED INTEGRAL RANK HIERARCHY (root to leaves)
+                                 _Bool
+        char                signed char         unsigned char
+                  signed short int         unsigned short int
+                  signed int               unsigned int
+                  signed long int          unsigned long int
+                  signed long long int     unsigned long long int
+                  __int128                 unsigned __int128
+                  _Float16                 _Float16 _Complex
+                  _Float32                 _Float32 _Complex
+                  float                    float _Complex
+                  _Float32x                _Float32x _Complex
+                  _Float64                 _Float64 _Complex
+                  double                   double _Complex
+                  _Float64x                _Float64x _Complex
+                             __float80
+                  _Float128                _Float128 _Complex
+                            __float128
+                  long double              long double _Complex
+                  _Float128x               _Float128x _Complex
+        */
+        // GENERATED END
+        // GENERATED START, DO NOT EDIT
+        // GENERATED BY BasicTypes-gen.cc
+        static const int costMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node
+                /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
+                /*      B */ {   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  15,  16,  17,  16,  18,  17, },
+                /*      C */ {  -1,   0,   1,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
+                /*     SC */ {  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
+                /*     UC */ {  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
+                /*     SI */ {  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  15,  14,  16,  15, },
+                /*    SUI */ {  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  15,  14,  16,  15, },
+                /*      I */ {  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  14,  13,  15,  14, },
+                /*     UI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  14,  13,  15,  14, },
+                /*     LI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  13,  12,  14,  13, },
+                /*    LUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  13,  12,  14,  13, },
+                /*    LLI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  12,  11,  13,  12, },
+                /*   LLUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  12,  11,  13,  12, },
+                /*     IB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  11,  10,  12,  11, },
+                /*    UIB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  11,  10,  12,  11, },
+                /*    _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,  10,   9,  11,  10, },
+                /*    _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,   5,  -1,   6,  -1,  -1,   7,  -1,  -1,   8,  -1,   9, },
+                /*     _F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   9,   8,  10,   9, },
+                /*    _FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,   5,  -1,  -1,   6,  -1,  -1,   7,  -1,   8, },
+                /*      F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   8,   7,   9,   8, },
+                /*     FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,  -1,   5,  -1,  -1,   6,  -1,   7, },
+                /*    _FX */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   7,   6,   8,   7, },
+                /*   _FXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,  -1,   4,  -1,  -1,   5,  -1,   6, },
+                /*     FD */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   6,   5,   7,   6, },
+                /*   _FDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,  -1,   3,  -1,  -1,   4,  -1,   5, },
+                /*      D */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   5,   4,   6,   5, },
+                /*     DC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,  -1,   2,  -1,  -1,   3,  -1,   4, },
+                /*   F80X */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   4,   3,   5,   4, },
+                /*  _FDXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,  -1,   1,  -1,  -1,   2,  -1,   3, },
+                /*    F80 */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   1,   0,   1,   2,   2,   3,   3,   4,   4, },
+                /*    _FB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3, },
+                /*  _FLDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,  -1,   1,  -1,   2, },
+                /*     FB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   1,   0,   1,   2,   2,   3, },
+                /*     LD */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2, },
+                /*    LDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1, },
+                /*   _FBX */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1, },
+                /* _FLDXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0, },
+        }; // costMatrix
+        static const int maxIntCost = 15;
+        // GENERATED END
         static_assert(
                 sizeof(costMatrix)/sizeof(costMatrix[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES*BasicType::NUMBER_OF_BASIC_TYPES,
                 "Each basic type kind should have a corresponding row in the cost matrix"
+                sizeof(costMatrix)/sizeof(costMatrix[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
+                "Missing row in the cost matrix"
         );
+        void ConversionCost::postvisit( VoidType * ) {
+        // GENERATED START, DO NOT EDIT
+        // GENERATED BY BasicTypes-gen.cc
+        static const int signMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion
+                /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
+                /*      B */ {   0,   0,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*      C */ {  -1,   0,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     SC */ {  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     UC */ {  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     SI */ {  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    SUI */ {  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*      I */ {  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     UI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     LI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    LUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    LLI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*   LLUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     IB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    UIB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*     _F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    _FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*      F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*    _FX */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*   _FXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*     FD */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*   _FDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*      D */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     DC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*   F80X */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*  _FDXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*    F80 */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    _FB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0, },
+                /*  _FLDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*     FB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0, },
+                /*     LD */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0, },
+                /*    LDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0, },
+                /*   _FBX */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0, },
+                /* _FLDXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0, },
+        }; // signMatrix
+        // GENERATED END
+        static_assert(
+                sizeof(signMatrix)/sizeof(signMatrix[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
+                "Missing row in the sign matrix"
+        );
+        void ConversionCost::postvisit( const VoidType * ) {
                 cost = Cost::infinity;
+        }
         void ConversionCost::postvisit(BasicType *basicType) {
                 if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
                         int tableResult = costMatrix[ basicType->get_kind() ][ destAsBasic->get_kind() ];
+        void ConversionCost::postvisit(const BasicType * basicType) {
+                if ( const BasicType * destAsBasic = dynamic_cast< const BasicType * >( dest ) ) {
+                        int tableResult = costMatrix[ basicType->kind ][ destAsBasic->kind ];
                         if ( tableResult == -1 ) {
                                 cost = Cost::unsafe;
 …
                                 cost = Cost::zero;
                                 cost.incSafe( tableResult );
+                        } // if
+                } else if ( dynamic_cast< EnumInstType *>( dest ) ) {
+                                cost.incSign( signMatrix[ basicType->kind ][ destAsBasic->kind ] );
+                        } // if
+                } else if ( dynamic_cast< const EnumInstType * >( dest ) ) {
                         // xxx - not positive this is correct, but appears to allow casting int => enum
                         cost = Cost::unsafe;
 …
+        }
         void ConversionCost::postvisit( PointerType * pointerType ) {
                 if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
+        void ConversionCost::postvisit( const PointerType * pointerType ) {
+                if ( const PointerType * destAsPtr = dynamic_cast< const PointerType * >( dest ) ) {
                         PRINT( std::cerr << pointerType << " ===> " << destAsPtr << std::endl; )
                         Type::Qualifiers tq1 = pointerType->base->get_qualifiers();
                         Type::Qualifiers tq2 = destAsPtr->base->get_qualifiers();
+                        Type::Qualifiers tq1 = pointerType->base->tq;
+                        Type::Qualifiers tq2 = destAsPtr->base->tq;
                         if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers( pointerType->base, destAsPtr->base, indexer, env ) ) {
                                 PRINT( std::cerr << " :: compatible and good qualifiers" << std::endl; )
 …
                                         // types are the same, except otherPointer has more qualifiers
                                         cost = Cost::safe;
+                                }
+                                } // if
                         } else {
                                 int assignResult = ptrsAssignable( pointerType->base, destAsPtr->base, env );
 …
+        }
         void ConversionCost::postvisit( ArrayType * ) {}
         void ConversionCost::postvisit( ReferenceType * refType ) {
+        void ConversionCost::postvisit( const ArrayType * ) {}
+        void ConversionCost::postvisit( const ReferenceType * refType ) {
                 // Note: dest can never be a reference, since it would have been caught in an earlier check
                 assert( ! dynamic_cast< ReferenceType * >( dest ) );
+                assert( ! dynamic_cast< const ReferenceType * >( dest ) );
                 // convert reference to rvalue: cv T1 & => T2
                 // recursively compute conversion cost from T1 to T2.
                 // cv can be safely dropped because of 'implicit dereference' behavior.
                 cost = costFunc( refType->base, dest, indexer, env );
                 if ( refType->base->get_qualifiers() == dest->get_qualifiers() ) {
+                cost = costFunc( refType->base, dest, srcIsLvalue, indexer, env );
+                if ( refType->base->tq == dest->tq ) {
                         cost.incReference();  // prefer exact qualifiers
                 } else if ( refType->base->get_qualifiers() < dest->get_qualifiers() ) {
+                } else if ( refType->base->tq < dest->tq ) {
                         cost.incSafe(); // then gaining qualifiers
                 } else {
 …
+        }
         void ConversionCost::postvisit( FunctionType * ) {}
         void ConversionCost::postvisit( StructInstType * inst ) {
                 if ( StructInstType *destAsInst = dynamic_cast< StructInstType* >( dest ) ) {
+        void ConversionCost::postvisit( const FunctionType * ) {}
+        void ConversionCost::postvisit( const StructInstType * inst ) {
+                if ( const StructInstType * destAsInst = dynamic_cast< const StructInstType * >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
                                 cost = Cost::zero;
 …
+        }
         void ConversionCost::postvisit( UnionInstType * inst ) {
                 if ( UnionInstType *destAsInst = dynamic_cast< UnionInstType* >( dest ) ) {
+        void ConversionCost::postvisit( const UnionInstType * inst ) {
+                if ( const UnionInstType * destAsInst = dynamic_cast< const UnionInstType * >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
                                 cost = Cost::zero;
 …
+        }
         void ConversionCost::postvisit( EnumInstType * ) {
+        void ConversionCost::postvisit( const EnumInstType * ) {
                 static Type::Qualifiers q;
                 static BasicType integer( q, BasicType::SignedInt );
                 cost = costFunc( &integer, dest, indexer, env );  // safe if dest >= int
+                cost = costFunc( &integer, dest, srcIsLvalue, indexer, env );  // safe if dest >= int
                 if ( cost < Cost::unsafe ) {
                         cost.incSafe();
 …
+        }
         void ConversionCost::postvisit( TraitInstType * ) {}
         void ConversionCost::postvisit( TypeInstType *inst ) {
                 if ( const EqvClass *eqvClass = env.lookup( inst->name ) ) {
                         cost = costFunc( eqvClass->type, dest, indexer, env );
                 } else if ( TypeInstType *destAsInst = dynamic_cast< TypeInstType* >( dest ) ) {
+        void ConversionCost::postvisit( const TraitInstType * ) {}
+        void ConversionCost::postvisit( const TypeInstType * inst ) {
+                if ( const EqvClass * eqvClass = env.lookup( inst->name ) ) {
+                        cost = costFunc( eqvClass->type, dest, srcIsLvalue, indexer, env );
+                } else if ( const TypeInstType * destAsInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
                                 cost = Cost::zero;
+                        }
                 } else if ( NamedTypeDecl *namedType = indexer.lookupType( inst->name ) ) {
                         TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );
+                } else if ( const NamedTypeDecl * namedType = indexer.lookupType( inst->name ) ) {
+                        const TypeDecl * type = dynamic_cast< const TypeDecl * >( namedType );
                         // all typedefs should be gone by this point
                         assert( type );
                         if ( type->base ) {
                                 cost = costFunc( type->base, dest, indexer, env ) + Cost::safe;
                         } // if
                 } // if
+        }
         void ConversionCost::postvisit( TupleType * tupleType ) {
+                                cost = costFunc( type->base, dest, srcIsLvalue, indexer, env ) + Cost::safe;
+                        } // if
+                } // if
+        }
+        void ConversionCost::postvisit( const TupleType * tupleType ) {
                 Cost c = Cost::zero;
                 if ( TupleType * destAsTuple = dynamic_cast< TupleType * >( dest ) ) {
+                if ( const TupleType * destAsTuple = dynamic_cast< const TupleType * >( dest ) ) {
                         std::list< Type * >::const_iterator srcIt = tupleType->types.begin();
                         std::list< Type * >::const_iterator destIt = destAsTuple->types.begin();
                         while ( srcIt != tupleType->types.end() && destIt != destAsTuple->types.end() ) {
                                 Cost newCost = costFunc( *srcIt++, *destIt++, indexer, env );
+                                Cost newCost = costFunc( * srcIt++, * destIt++, srcIsLvalue, indexer, env );
                                 if ( newCost == Cost::infinity ) {
                                         return;
 …
+        }
         void ConversionCost::postvisit( VarArgsType * ) {
                 if ( dynamic_cast< VarArgsType* >( dest ) ) {
                         cost = Cost::zero;
+                }
+        }
         void ConversionCost::postvisit( ZeroType * ) {
                 if ( dynamic_cast< ZeroType * >( dest ) ) {
                         cost = Cost::zero;
                 } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
                         // copied from visit(BasicType*) for signed int, but +1 for safe conversions
                         int tableResult = costMatrix[ BasicType::SignedInt ][ destAsBasic->get_kind() ];
+        void ConversionCost::postvisit( const VarArgsType * ) {
+                if ( dynamic_cast< const VarArgsType * >( dest ) ) {
+                        cost = Cost::zero;
+                }
+        }
+        void ConversionCost::postvisit( const ZeroType * ) {
+                if ( dynamic_cast< const ZeroType * >( dest ) ) {
+                        cost = Cost::zero;
+                } else if ( const BasicType * destAsBasic = dynamic_cast< const BasicType * >( dest ) ) {
+                        // copied from visit(BasicType *) for signed int, but +1 for safe conversions
+                        int tableResult = costMatrix[ BasicType::SignedInt ][ destAsBasic->kind ];
                         if ( tableResult == -1 ) {
                                 cost = Cost::unsafe;
 …
                                 cost = Cost::zero;
                                 cost.incSafe( tableResult + 1 );
+                        }
+                } else if ( dynamic_cast< PointerType* >( dest ) ) {
+                        cost = Cost::safe;
+                }
+        }
+        void ConversionCost::postvisit( OneType * ) {
+                if ( dynamic_cast< OneType * >( dest ) ) {
+                        cost = Cost::zero;
+                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
+                        // copied from visit(BasicType*) for signed int, but +1 for safe conversions
+                        int tableResult = costMatrix[ BasicType::SignedInt ][ destAsBasic->get_kind() ];
+                                cost.incSign( signMatrix[ BasicType::SignedInt ][ destAsBasic->kind ] );
+                        } // if
+                } else if ( dynamic_cast< const PointerType * >( dest ) ) {
+                        cost = Cost::zero;
+                        cost.incSafe( maxIntCost + 2 ); // +1 for zero_t -> int, +1 for disambiguation
+                } // if
+        }
+        void ConversionCost::postvisit( const OneType * ) {
+                if ( dynamic_cast< const OneType * >( dest ) ) {
+                        cost = Cost::zero;
+                } else if ( const BasicType * destAsBasic = dynamic_cast< const BasicType * >( dest ) ) {
+                        // copied from visit(BasicType *) for signed int, but +1 for safe conversions
+                        int tableResult = costMatrix[ BasicType::SignedInt ][ destAsBasic->kind ];
                         if ( tableResult == -1 ) {
                                 cost = Cost::unsafe;
 …
                                 cost = Cost::zero;
                                 cost.incSafe( tableResult + 1 );
+                                cost.incSign( signMatrix[ BasicType::SignedInt ][ destAsBasic->kind ] );
+                        } // if
+                } // if
+        }
+static int localPtrsAssignable(const ast::Type * t1, const ast::Type * t2,
+                const ast::SymbolTable &, const ast::TypeEnvironment & env ) {
+        return ptrsAssignable( t1, t2, env );
+}
+// TODO: This is used for overload resolution. It might be able to be dropped once the old system
+// is removed.
+static Cost localConversionCost(
+        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+        const ast::TypeEnvironment & env
+) { return conversionCost( src, dst, symtab, env ); }
+Cost conversionCost(
+        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+        const ast::TypeEnvironment & env
+) {
+        if ( const ast::TypeInstType * inst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
+                if ( const ast::EqvClass * eqv = env.lookup( inst->name ) ) {
+                        if ( eqv->bound ) {
+                                return conversionCost(src, eqv->bound, symtab, env );
+                        } else {
+                                return Cost::infinity;
+                        }
+                }
+        }
+                } else if ( const ast::NamedTypeDecl * named = symtab.lookupType( inst->name ) ) {
+                        const ast::TypeDecl * type = dynamic_cast< const ast::TypeDecl * >( named );
+                        assertf( type, "Unexpected typedef." );
+                        if ( type->base ) {
+                                return conversionCost( src, type->base, symtab, env ) + Cost::safe;
+                        }
+                }
+        }
+        if ( typesCompatibleIgnoreQualifiers( src, dst, symtab, env ) ) {
+                return Cost::zero;
+        } else if ( dynamic_cast< const ast::VoidType * >( dst ) ) {
+                return Cost::safe;
+        } else if ( const ast::ReferenceType * refType =
+                         dynamic_cast< const ast::ReferenceType * >( dst ) ) {
+                return convertToReferenceCost( src, refType, symtab, env, localPtrsAssignable );
+        } else {
+                ast::Pass<ConversionCost_new> converter( dst, symtab, env, localConversionCost );
+                src->accept( converter );
+                return converter.pass.cost;
+        }
+}
+static Cost convertToReferenceCost( const ast::Type * src, const ast::Type * dst,
+                int diff, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env,
+                NumCostCalculation func ) {
+        if ( 0 < diff ) {
+                Cost cost = convertToReferenceCost(
+                        strict_dynamic_cast< const ast::ReferenceType * >( src )->base,
+                        dst, (diff - 1), symtab, env, func );
+                cost.incReference();
+                return cost;
+        } else if ( diff < -1 ) {
+                Cost cost = convertToReferenceCost(
+                        src, strict_dynamic_cast< const ast::ReferenceType * >( dst )->base,
+                        (diff + 1), symtab, env, func );
+                cost.incReference();
+                return cost;
+        } else if ( 0 == diff ) {
+                const ast::ReferenceType * srcAsRef = dynamic_cast< const ast::ReferenceType * >( src );
+                const ast::ReferenceType * dstAsRef = dynamic_cast< const ast::ReferenceType * >( dst );
+                if ( srcAsRef && dstAsRef ) {
+                        ast::CV::Qualifiers tq1 = srcAsRef->base->qualifiers;
+                        ast::CV::Qualifiers tq2 = dstAsRef->base->qualifiers;
+                        if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers(
+                                        srcAsRef->base, dstAsRef->base, symtab, env ) ) {
+                                if ( tq1 == tq2 ) {
+                                        return Cost::zero;
+                                } else {
+                                        return Cost::safe;
+                                }
+                        } else {
+                                int assignResult = func( srcAsRef->base, dstAsRef->base, symtab, env );
+                                if ( 0 < assignResult ) {
+                                        return Cost::safe;
+                                } else if ( assignResult < 0 ) {
+                                        return Cost::unsafe;
+                                }
+                        }
+                } else {
+                        ast::Pass<ConversionCost_new> converter( dst, symtab, env, localConversionCost );
+                        src->accept( converter );
+                        return converter.pass.cost;
+                }
+        } else {
+                assert( -1 == diff );
+                const ast::ReferenceType * dstAsRef = dynamic_cast< const ast::ReferenceType * >( dst );
+                assert( dstAsRef );
+                if ( typesCompatibleIgnoreQualifiers( src, dstAsRef->base, symtab, env ) ) {
+                        if ( src->is_lvalue() ) {
+                                if ( src->qualifiers == dstAsRef->base->qualifiers ) {
+                                        return Cost::reference;
+                                } else if ( src->qualifiers < dstAsRef->base->qualifiers ) {
+                                        return Cost::safe;
+                                } else {
+                                        return Cost::unsafe;
+                                }
+                        } else if ( dstAsRef->base->is_const() ) {
+                                return Cost::safe;
+                        } else {
+                                return Cost::unsafe;
+                        }
+                }
+        }
+        return Cost::infinity;
+}
+Cost convertToReferenceCost( const ast::Type * src, const ast::ReferenceType * dst,
+            const ast::SymbolTable & symtab, const ast::TypeEnvironment & env,
+                NumCostCalculation func ) {
+        int sdepth = src->referenceDepth(), ddepth = dst->referenceDepth();
+        return convertToReferenceCost( src, dst, sdepth - ddepth, symtab, env, func );
+}
+void ConversionCost_new::postvisit( const ast::VoidType * voidType ) {
+        (void)voidType;
+        cost = Cost::infinity;
+}
+void ConversionCost_new::postvisit( const ast::BasicType * basicType ) {
+        if ( const ast::BasicType * dstAsBasic = dynamic_cast< const ast::BasicType * >( dst ) ) {
+                int tableResult = costMatrix[ basicType->kind ][ dstAsBasic->kind ];
+                if ( tableResult == -1 ) {
+                        cost = Cost::unsafe;
+                } else {
+                        cost = Cost::zero;
+                        cost.incSafe( tableResult );
+                        cost.incSign( signMatrix[ basicType->kind ][ dstAsBasic->kind ] );
+                }
+        } else if ( dynamic_cast< const ast::EnumInstType * >( dst ) ) {
+                // xxx - not positive this is correct, but appears to allow casting int => enum
+                cost = Cost::unsafe;
+        }
+}
+void ConversionCost_new::postvisit( const ast::PointerType * pointerType ) {
+        if ( const ast::PointerType * dstAsPtr = dynamic_cast< const ast::PointerType * >( dst ) ) {
+                ast::CV::Qualifiers tq1 = pointerType->base->qualifiers;
+                ast::CV::Qualifiers tq2 = dstAsPtr->base->qualifiers;
+                if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers(
+                                pointerType->base, dstAsPtr->base, symtab, env ) ) {
+                        if ( tq1 == tq2 ) {
+                                cost = Cost::zero;
+                        } else {
+                                cost = Cost::safe;
+                        }
+                } else {
+                        int assignResult = ptrsAssignable( pointerType->base, dstAsPtr->base, env );
+                        if ( 0 < assignResult && tq1 <= tq2 ) {
+                                if ( tq1 == tq2 ) {
+                                        cost = Cost::safe;
+                                } else {
+                                        cost = Cost::safe + Cost::safe;
+                                }
+                        } else if ( assignResult < 0 ) {
+                                cost = Cost::unsafe;
+                        } // else Cost::infinity
+                }
+        }
+}
+void ConversionCost_new::postvisit( const ast::ArrayType * arrayType ) {
+        (void)arrayType;
+}
+void ConversionCost_new::postvisit( const ast::ReferenceType * refType ) {
+        assert( nullptr == dynamic_cast< const ast::ReferenceType * >( dst ) );
+        cost = costCalc( refType->base, dst, symtab, env );
+        if ( refType->base->qualifiers == dst->qualifiers ) {
+                cost.incReference();
+        } else if ( refType->base->qualifiers < dst->qualifiers ) {
+                cost.incSafe();
+        } else {
+                cost.incUnsafe();
+        }
+}
+void ConversionCost_new::postvisit( const ast::FunctionType * functionType ) {
+        (void)functionType;
+}
+void ConversionCost_new::postvisit( const ast::StructInstType * structInstType ) {
+        if ( const ast::StructInstType * dstAsInst =
+                        dynamic_cast< const ast::StructInstType * >( dst ) ) {
+                if ( structInstType->name == dstAsInst->name ) {
+                        cost = Cost::zero;
+                }
+        }
+}
+void ConversionCost_new::postvisit( const ast::UnionInstType * unionInstType ) {
+        if ( const ast::UnionInstType * dstAsInst =
+                        dynamic_cast< const ast::UnionInstType * >( dst ) ) {
+                if ( unionInstType->name == dstAsInst->name ) {
+                        cost = Cost::zero;
+                }
+        }
+}
+void ConversionCost_new::postvisit( const ast::EnumInstType * enumInstType ) {
+        (void)enumInstType;
+        static const ast::BasicType integer( ast::BasicType::SignedInt );
+        cost = costCalc( &integer, dst, symtab, env );
+        if ( cost < Cost::unsafe ) {
+                cost.incSafe();
+        }
+}
+void ConversionCost_new::postvisit( const ast::TraitInstType * traitInstType ) {
+        (void)traitInstType;
+}
+void ConversionCost_new::postvisit( const ast::TypeInstType * typeInstType ) {
+        if ( const ast::EqvClass * eqv = env.lookup( typeInstType->name ) ) {
+                cost = costCalc( eqv->bound, dst, symtab, env );
+        } else if ( const ast::TypeInstType * dstAsInst =
+                        dynamic_cast< const ast::TypeInstType * >( dst ) ) {
+                if ( typeInstType->name == dstAsInst->name ) {
+                        cost = Cost::zero;
+                }
+        } else if ( const ast::NamedTypeDecl * namedType = symtab.lookupType( typeInstType->name ) ) {
+                const ast::TypeDecl * type = dynamic_cast< const ast::TypeDecl * >( namedType );
+                assertf( type, "Unexpected typedef.");
+                if ( type->base ) {
+                        cost = costCalc( type->base, dst, symtab, env ) + Cost::safe;
+                }
+        }
+}
+void ConversionCost_new::postvisit( const ast::TupleType * tupleType ) {
+        Cost c = Cost::zero;
+        if ( const ast::TupleType * dstAsTuple = dynamic_cast< const ast::TupleType * >( dst ) ) {
+                auto srcIt = tupleType->types.begin();
+                auto dstIt = dstAsTuple->types.begin();
+                auto srcEnd = tupleType->types.end();
+                auto dstEnd = dstAsTuple->types.end();
+                while ( srcIt != srcEnd && dstIt != dstEnd ) {
+                        Cost newCost = costCalc( * srcIt++, * dstIt++, symtab, env );
+                        if ( newCost == Cost::infinity ) {
+                                return;
+                        }
+                        c += newCost;
+                }
+                if ( dstIt != dstEnd ) {
+                        cost = Cost::infinity;
+                } else {
+                        cost = c;
+                }
+        }
+}
+void ConversionCost_new::postvisit( const ast::VarArgsType * varArgsType ) {
+        (void)varArgsType;
+        if ( dynamic_cast< const ast::VarArgsType * >( dst ) ) {
+                cost = Cost::zero;
+        }
+}
+void ConversionCost_new::postvisit( const ast::ZeroType * zeroType ) {
+        (void)zeroType;
+        if ( dynamic_cast< const ast::ZeroType * >( dst ) ) {
+                cost = Cost::zero;
+        } else if ( const ast::BasicType * dstAsBasic =
+                        dynamic_cast< const ast::BasicType * >( dst ) ) {
+                int tableResult = costMatrix[ ast::BasicType::SignedInt ][ dstAsBasic->kind ];
+                if ( -1 == tableResult ) {
+                        cost = Cost::unsafe;
+                } else {
+                        cost = Cost::zero;
+                        cost.incSafe( tableResult + 1 );
+                        cost.incSign( signMatrix[ ast::BasicType::SignedInt ][ dstAsBasic->kind ] );
+                }
+        }
+}
+void ConversionCost_new::postvisit( const ast::OneType * oneType ) {
+        (void)oneType;
+        if ( dynamic_cast< const ast::OneType * >( dst ) ) {
+                cost = Cost::zero;
+        } else if ( const ast::BasicType * dstAsBasic =
+                        dynamic_cast< const ast::BasicType * >( dst ) ) {
+                int tableResult = costMatrix[ ast::BasicType::SignedInt ][ dstAsBasic->kind ];
+                if ( -1 == tableResult ) {
+                        cost = Cost::unsafe;
+                } else {
+                        cost = Cost::zero;
+                        cost.incSafe( tableResult + 1 );
+                        cost.incSign( signMatrix[ ast::BasicType::SignedInt ][ dstAsBasic->kind ] );
+                }
+        } else if ( dynamic_cast< const ast::PointerType * >( dst ) ) {
+                cost = Cost::zero;
+                cost.incSafe( maxIntCost + 2 );
+        }
+}
 } // namespace ResolvExpr

src/ResolvExpr/ConversionCost.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 09:37:28 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:38:24 2017
 // Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:13:00 2019
+// Update Count     : 6
 //
 …
 #include "Cost.h"             // for Cost
+#include "AST/Fwd.hpp"
+#include "AST/Pass.hpp"       // for WithShortCircuiting
 #include "Common/PassVisitor.h"
 #include "SynTree/Visitor.h"  // for Visitor
 …
         class TypeEnvironment;
+        typedef std::function<Cost(Type *, Type *, const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
+        typedef std::function<Cost(const Type *, const Type *, bool,
+                const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
         struct ConversionCost : public WithShortCircuiting {
           public:
+                ConversionCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
+                ConversionCost( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
                 Cost get_cost() const { return cost; }
                 void previsit( BaseSyntaxNode * ) { visit_children = false; }
+                void previsit( const BaseSyntaxNode * ) { visit_children = false; }
                 void postvisit( VoidType * voidType );
                 void postvisit( BasicType * basicType );
                 void postvisit( PointerType * pointerType );
                 void postvisit( ArrayType * arrayType );
                 void postvisit( ReferenceType * refType );
                 void postvisit( FunctionType * functionType );
                 void postvisit( StructInstType * aggregateUseType );
                 void postvisit( UnionInstType * aggregateUseType );
                 void postvisit( EnumInstType * aggregateUseType );
                 void postvisit( TraitInstType * aggregateUseType );
                 void postvisit( TypeInstType * aggregateUseType );
                 void postvisit( TupleType * tupleType );
                 void postvisit( VarArgsType * varArgsType );
                 void postvisit( ZeroType * zeroType );
                 void postvisit( OneType * oneType );
+                void postvisit( const VoidType * voidType );
+                void postvisit( const BasicType * basicType );
+                void postvisit( const PointerType * pointerType );
+                void postvisit( const ArrayType * arrayType );
+                void postvisit( const ReferenceType * refType );
+                void postvisit( const FunctionType * functionType );
+                void postvisit( const StructInstType * aggregateUseType );
+                void postvisit( const UnionInstType * aggregateUseType );
+                void postvisit( const EnumInstType * aggregateUseType );
+                void postvisit( const TraitInstType * aggregateUseType );
+                void postvisit( const TypeInstType * aggregateUseType );
+                void postvisit( const TupleType * tupleType );
+                void postvisit( const VarArgsType * varArgsType );
+                void postvisit( const ZeroType * zeroType );
+                void postvisit( const OneType * oneType );
           protected:
+                Type *dest;
+                const Type * dest;
+                bool srcIsLvalue;
                 const SymTab::Indexer &indexer;
                 Cost cost;
 …
         };
+        typedef std::function<int(Type *, Type *, const SymTab::Indexer &, const TypeEnvironment &)> PtrsFunction;
+        Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
+        typedef std::function<int(const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment &)> PtrsFunction;
+        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
+// Some function pointer types, differ in return type.
+using CostCalculation = std::function<Cost(const ast::Type *, const ast::Type *,
+        const ast::SymbolTable &, const ast::TypeEnvironment &)>;
+using NumCostCalculation = std::function<int(const ast::Type *, const ast::Type *,
+        const ast::SymbolTable &, const ast::TypeEnvironment &)>;
+#warning when the old ConversionCost is removed, get ride of the _new suffix.
+class ConversionCost_new : public ast::WithShortCircuiting {
+protected:
+        const ast::Type * dst;
+        const ast::SymbolTable & symtab;
+        const ast::TypeEnvironment & env;
+        CostCalculation costCalc;
+public:
+        Cost cost;
+        ConversionCost_new( const ast::Type * dst, const ast::SymbolTable & symtab,
+                        const ast::TypeEnvironment & env, CostCalculation costCalc ) :
+                dst( dst ), symtab( symtab ), env( env ), costCalc( costCalc ), cost( Cost::infinity )
+        {}
+        void previsit( const ast::Node * ) { visit_children = false; }
+        void postvisit( const ast::VoidType * voidType );
+        void postvisit( const ast::BasicType * basicType );
+        void postvisit( const ast::PointerType * pointerType );
+        void postvisit( const ast::ArrayType * arrayType );
+        void postvisit( const ast::ReferenceType * refType );
+        void postvisit( const ast::FunctionType * functionType );
+        void postvisit( const ast::StructInstType * structInstType );
+        void postvisit( const ast::UnionInstType * unionInstType );
+        void postvisit( const ast::EnumInstType * enumInstType );
+        void postvisit( const ast::TraitInstType * traitInstType );
+        void postvisit( const ast::TypeInstType * typeInstType );
+        void postvisit( const ast::TupleType * tupleType );
+        void postvisit( const ast::VarArgsType * varArgsType );
+        void postvisit( const ast::ZeroType * zeroType );
+        void postvisit( const ast::OneType * oneType );
+};
+Cost convertToReferenceCost( const ast::Type * src, const ast::ReferenceType * dest,
+        const ast::SymbolTable & indexer, const ast::TypeEnvironment & env, NumCostCalculation func );
 } // namespace ResolvExpr

src/ResolvExpr/Cost.h

-              r7951100
+              rb067d9b
 // Cost.h --
 //
 // Author           : Richard C. Bilson
+// Author           : Peter Buhr and Aaron Moss
 // Created On       : Sun May 17 09:39:50 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:35:55 2017
 // Update Count     : 5
+// Last Modified On : Fri Jun 21 11:39:13 2019
+// Update Count     : 63
 //
 …
 #include <iostream>
+#include <cassert>
+#include <climits>
 namespace ResolvExpr {
+        // To maximize performance and space, the 7 resolution costs are packed into a single 64-bit word. However, the
+        // specialization cost is a negative value so a correction is needed is a few places.
         class Cost {
+          private:
+                Cost( int unsafeCost, int polyCost, int safeCost, int referenceCost );
+                union {
+                        struct {
+                        #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+                                // Little-endian => first value is low priority and last is high priority.
+                                unsigned char padding;                                  ///< unused
+                                unsigned char referenceCost;                    ///< reference conversions
+                                unsigned char specCost;                                 ///< Polymorphic type specializations (type assertions), negative cost
+                                unsigned char varCost;                                  ///< Count of polymorphic type variables
+                                unsigned char signCost;                                 ///< Count of safe sign conversions
+                                unsigned char safeCost;                                 ///< Safe (widening) conversions
+                                unsigned char polyCost;                                 ///< Count of parameters and return values bound to some poly type
+                                unsigned char unsafeCost;                               ///< Unsafe (narrowing) conversions
+                        #else
+                                #error Cost BIG_ENDIAN unsupported
+                        #endif
+                        } v;
+                        uint64_t all;
+                };
+                static const unsigned char correctb = 0xff;             // byte correction for negative spec cost
+                static const uint64_t correctw = 0x00'00'00'00'00'ff'00'00; //' word correction for negative spec cost
+          public:
+                // Compiler adjusts constants for correct endian.
+                enum : uint64_t {
+                        zero      = 0x00'00'00'00'00'ff'00'00,
+                        infinity  = 0xff'ff'ff'ff'ff'00'ff'ff,
+                        unsafe    = 0x01'00'00'00'00'ff'00'00,
+                        poly      = 0x00'01'00'00'00'ff'00'00,
+                        safe      = 0x00'00'01'00'00'ff'00'00,
+                        sign      = 0x00'00'00'01'00'ff'00'00,
+                        var       = 0x00'00'00'00'01'ff'00'00,
+                        spec      = 0x00'00'00'00'00'fe'00'00,
+                        reference = 0x00'00'00'00'00'ff'01'00,
+                }; //'
+          public:
+                Cost & incUnsafe( int inc = 1 );
+                Cost & incPoly( int inc = 1 );
+                Cost & incSafe( int inc = 1 );
+                Cost & incReference( int inc = 1 );
+                Cost( uint64_t all ) { Cost::all = all; }
+                Cost( int unsafeCost, int polyCost, int safeCost, int signCost, int varCost, int specCost, int referenceCost ) {
+                        // Assume little-endian => first value is low priority and last is high priority.
+                        v = {
+                        #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+                                (unsigned char)0,                                               // padding
+                                (unsigned char)referenceCost,                   // low priority
+                                (unsigned char)(specCost + correctb),   // correct for signedness
+                                (unsigned char)varCost,
+                                (unsigned char)signCost,
+                                (unsigned char)safeCost,
+                                (unsigned char)polyCost,
+                                (unsigned char)unsafeCost,                              // high priority
+                        #else
+                                #error Cost BIG_ENDIAN unsupported
+                        #endif
+                        };
+                }
+                int get_unsafeCost() const { return unsafeCost; }
+                int get_polyCost() const { return polyCost; }
+                int get_safeCost() const { return safeCost; }
+                int get_referenceCost() const { return referenceCost; }
+                int get_unsafeCost() const { return v.unsafeCost; }
+                int get_polyCost() const { return v.polyCost; }
+                int get_safeCost() const { return v.safeCost; }
+                int get_signCost() const { return v.signCost; }
+                int get_varCost() const { return v.varCost; }
+                int get_specCost() const { return -(correctb - v.specCost); }
+                int get_referenceCost() const { return v.referenceCost; }
+                Cost operator+( const Cost &other ) const;
+                Cost operator-( const Cost &other ) const;
+                Cost &operator+=( const Cost &other );
+                bool operator<( const Cost &other ) const;
+                bool operator==( const Cost &other ) const;
+                bool operator!=( const Cost &other ) const;
+                friend std::ostream &operator<<( std::ostream &os, const Cost &cost );
+                friend bool operator==( const Cost, const Cost );
+                friend bool operator!=( const Cost lhs, const Cost rhs );
+                // returns negative for *this < rhs, 0 for *this == rhs, positive for *this > rhs
+                int compare( const Cost rhs ) const {
+                        if ( all == infinity ) return 1;
+                        if ( rhs.all == infinity ) return -1;
+                        return all > rhs.all ? 1 : all == rhs.all ? 0 : -1;
+                }
+                friend bool operator<( const Cost lhs, const Cost rhs );
+                static const Cost zero;
+                static const Cost infinity;
+                friend Cost operator+( const Cost lhs, const Cost rhs );
+                Cost operator+=( const Cost rhs ) {
+                        if ( all == infinity ) return *this;
+                        if ( rhs.all == infinity ) {
+                                all = infinity;
+                                return *this;
+                        }
+                        all += rhs.all - correctw;                                      // correct for negative spec cost
+                        return *this;
+                }
+                static const Cost unsafe;
+                static const Cost poly;
+                static const Cost safe;
+                static const Cost reference;
+          private:
+                int compare( const Cost &other ) const;
+                Cost incUnsafe( int inc = 1 ) {
+                        if ( all != infinity ) { assert( v.unsafeCost + inc <= UCHAR_MAX ); v.unsafeCost += inc; }
+                        return *this;
+                }
+                int unsafeCost;
+                int polyCost;
+                int safeCost;
+                int referenceCost;
+                Cost incPoly( int inc = 1 ) {
+                        if ( all != infinity ) { assert( v.polyCost + inc <= UCHAR_MAX ); v.polyCost += inc; }
+                        return *this;
+                }
+                Cost incSafe( int inc = 1 ) {
+                        if ( all != infinity ) { assert( v.safeCost + inc <= UCHAR_MAX ); v.safeCost += inc; }
+                        return *this;
+                }
+                Cost incSign( int inc = 1 ) {
+                        if ( all != infinity ) { assert( v.signCost + inc <= UCHAR_MAX ); v.signCost += inc; }
+                        return *this;
+                }
+                Cost incVar( int inc = 1 ) {
+                        if ( all != infinity ) { assert( v.varCost + inc <= UCHAR_MAX ); v.varCost += inc; }
+                        return *this;
+                }
+                Cost decSpec( int dec = 1 ) {
+                        if ( all != infinity ) { assert( v.specCost - dec >= 0 ); v.specCost -= dec; }
+                        return *this;
+                }
+                Cost incReference( int inc = 1 ) {
+                        if ( all != infinity ) { assert( v.referenceCost + inc <= UCHAR_MAX ); v.referenceCost += inc; }
+                        return *this;
+                }
+                friend std::ostream & operator<<( std::ostream & os, const Cost cost );
         };
+        inline Cost::Cost( int unsafeCost, int polyCost, int safeCost, int referenceCost ) : unsafeCost( unsafeCost ), polyCost( polyCost ), safeCost( safeCost ), referenceCost( referenceCost ) {}
+        inline Cost & Cost::incUnsafe( int inc ) {
+                if ( *this == infinity ) return *this;
+                unsafeCost += inc;
+                return *this;
+        inline bool operator==( const Cost lhs, const Cost rhs ) {
+                return lhs.all == rhs.all;
+        }
+        inline Cost & Cost::incPoly( int inc ) {
+                if ( *this == infinity ) return *this;
+                polyCost += inc;
+                return *this;
+        inline bool operator!=( const Cost lhs, const Cost rhs ) {
+                return !( lhs.all == rhs.all );
+        }
         inline Cost & Cost::incSafe( int inc ) {
                 if ( *this == infinity ) return *this;
                 safeCost += inc;
                 return *this;
+        inline bool operator<( const Cost lhs, const Cost rhs ) {
+                if ( lhs.all == Cost::infinity ) return false;
+                if ( rhs.all == Cost::infinity ) return true;
+                return lhs.all < rhs.all;
+        }
+        inline Cost & Cost::incReference( int inc ) {
+                if ( *this == infinity ) return *this;
+                referenceCost += inc;
+                return *this;
+        inline Cost operator+( const Cost lhs, const Cost rhs ) {
+                if ( lhs.all == Cost::infinity || rhs.all == Cost::infinity ) return Cost{ Cost::infinity };
+                return Cost{ lhs.all + rhs.all - Cost::correctw }; // correct for negative spec cost
+        }
+        inline Cost Cost::operator+( const Cost &other ) const {
+                if ( *this == infinity || other == infinity ) return infinity;
+                return Cost( unsafeCost + other.unsafeCost, polyCost + other.polyCost, safeCost + other.safeCost, referenceCost + other.referenceCost );
+        }
+        inline Cost Cost::operator-( const Cost &other ) const {
+                if ( *this == infinity || other == infinity ) return infinity;
+                return Cost( unsafeCost - other.unsafeCost, polyCost - other.polyCost, safeCost - other.safeCost, referenceCost - other.referenceCost );
+        }
+        inline Cost &Cost::operator+=( const Cost &other ) {
+                if ( *this == infinity ) return *this;
+                if ( other == infinity ) {
+                        *this = infinity;
+                        return *this;
+                }
+                unsafeCost += other.unsafeCost;
+                polyCost += other.polyCost;
+                safeCost += other.safeCost;
+                referenceCost += other.referenceCost;
+                return *this;
+        }
+        inline bool Cost::operator<( const Cost &other ) const {
+                if ( *this == infinity ) return false;
+                if ( other == infinity ) return true;
+                if ( unsafeCost > other.unsafeCost ) {
+                        return false;
+                } else if ( unsafeCost < other.unsafeCost ) {
+                        return true;
+                } else if ( polyCost > other.polyCost ) {
+                        return false;
+                } else if ( polyCost < other.polyCost ) {
+                        return true;
+                } else if ( safeCost > other.safeCost ) {
+                        return false;
+                } else if ( safeCost < other.safeCost ) {
+                        return true;
+                } else if ( referenceCost > other.referenceCost ) {
+                        return false;
+                } else if ( referenceCost < other.referenceCost ) {
+                        return true;
+                } else {
+                        return false;
+                } // if
+        }
+        inline bool Cost::operator==( const Cost &other ) const {
+                return unsafeCost == other.unsafeCost
+                        && polyCost == other.polyCost
+                        && safeCost == other.safeCost
+                        && referenceCost == other.referenceCost;
+        }
+        inline bool Cost::operator!=( const Cost &other ) const {
+                return !( *this == other );
+        }
+        inline std::ostream &operator<<( std::ostream &os, const Cost &cost ) {
+                os << "( " << cost.unsafeCost << ", " << cost.polyCost << ", " << cost.safeCost << ", " << cost.referenceCost << " )";
+                return os;
+        inline std::ostream & operator<<( std::ostream & os, const Cost cost ) {
+                return os << "( " << cost.get_unsafeCost() << ", " << cost.get_polyCost() << ", " << cost.get_safeCost()
+                                  << ", " << cost.get_signCost() << ", " << cost.get_varCost() << ", " << cost.get_specCost()
+                                  << ", " << cost.get_referenceCost() << " )";
+        }
 } // namespace ResolvExpr

src/ResolvExpr/CurrentObject.cc

-              r7951100
+              rb067d9b
 #include <stddef.h>                    // for size_t
 #include <cassert>                     // for assertf, assert, safe_dynamic_...
+#include <deque>
 #include <iostream>                    // for ostream, operator<<, basic_ost...
 #include <stack>                       // for stack
 #include <string>                      // for string, operator<<, allocator
+#include "AST/Expr.hpp"                // for InitAlternative
+#include "AST/GenericSubstitution.hpp" // for genericSubstitution
+#include "AST/Init.hpp"                // for Designation
+#include "AST/Node.hpp"                // for readonly
+#include "AST/Type.hpp"
 #include "Common/Indenter.h"           // for Indenter, operator<<
 #include "Common/SemanticError.h"      // for SemanticError
 …
                 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 );
+                }
 …
         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) );
+                        }
+                }
 …
 } // namespace ResolvExpr
+namespace ast {
+        /// create a new MemberIterator that traverses a type correctly
+        MemberIterator * createMemberIterator( const CodeLocation & loc, const Type * type );
+        /// Iterates "other" types (e.g. basic, pointer) which do not change at list initializer entry
+        class SimpleIterator final : public MemberIterator {
+                CodeLocation location;
+                readonly< Type > type = nullptr;
+        public:
+                SimpleIterator( const CodeLocation & loc, const Type * t ) : location( loc ), type( t ) {}
+                void setPosition(
+                        std::deque< ptr< Expr > >::const_iterator begin,
+                        std::deque< ptr< Expr > >::const_iterator end
+                ) override {
+                        if ( begin != end ) {
+                                SemanticError( location, "Un-designated initializer given non-empty designator" );
+                        }
+                }
+                std::deque< InitAlternative > operator* () const override { return first(); }
+                operator bool() const override { return type; }
+                SimpleIterator & bigStep() override { return smallStep(); }
+                SimpleIterator & smallStep() override {
+                        type = nullptr;  // empty on increment because no members
+                        return *this;
+                }
+                const Type * getType() override { return type; }
+                const Type * getNext() override { return type; }
+                std::deque< InitAlternative > first() const override {
+                        if ( type ) return { InitAlternative{ type, new Designation{ location } } };
+                        return {};
+                }
+        };
+        /// Iterates array types
+        class ArrayIterator final : public MemberIterator {
+                CodeLocation location;
+                readonly< ArrayType > array = nullptr;
+                readonly< Type > base = nullptr;
+                size_t index = 0;
+                size_t size = 0;
+                std::unique_ptr< MemberIterator > memberIter;
+                void setSize( const Expr * expr ) {
+                        auto res = eval(expr);
+                        if ( ! res.second ) {
+                                SemanticError( location,
+                                        toString("Array designator must be a constant expression: ", expr ) );
+                        }
+                        size = res.first;
+                }
+        public:
+                ArrayIterator( const CodeLocation & loc, const ArrayType * at )
+                : location( loc ), array( at ), base( at->base ) {
+                        PRINT( std::cerr << "Creating array iterator: " << at << std::endl; )
+                        memberIter.reset( createMemberIterator( loc, base ) );
+                        if ( at->isVarLen ) {
+                                SemanticError( location, at, "VLA initialization does not support @=: " );
+                        }
+                        setSize( at->dimension );
+                }
+                void setPosition( const Expr * expr ) {
+                        // need to permit integer-constant-expressions, including: integer constants,
+                        // enumeration constants, character constants, sizeof expressions, alignof expressions,
+                        // cast expressions
+                        if ( auto constExpr = dynamic_cast< const ConstantExpr * >( expr ) ) {
+                                try {
+                                        index = constExpr->intValue();
+                                } catch ( SemanticErrorException & ) {
+                                        SemanticError( expr,
+                                                "Constant expression of non-integral type in array designator: " );
+                                }
+                        } else if ( auto castExpr = dynamic_cast< const CastExpr * >( expr ) ) {
+                                setPosition( castExpr->arg );
+                        } else if (
+                                dynamic_cast< const SizeofExpr * >( expr )
+                                || dynamic_cast< const AlignofExpr * >( expr )
+                        ) {
+                                index = 0;
+                        } else {
+                                assertf( false,
+                                        "bad designator given to ArrayIterator: %s", toString( expr ).c_str() );
+                        }
+                }
+                void setPosition(
+                        std::deque< ptr< Expr > >::const_iterator begin,
+                        std::deque< ptr< Expr > >::const_iterator end
+                ) override {
+                        if ( begin == end ) return;
+                        setPosition( *begin );
+                        memberIter->setPosition( ++begin, end );
+                }
+                std::deque< InitAlternative > operator* () const override { return first(); }
+                operator bool() const override { return index < size; }
+                ArrayIterator & bigStep() override {
+                        PRINT( std::cerr << "bigStep in ArrayIterator (" << index << "/" << size << ")" << std::endl; )
+                        ++index;
+                        memberIter.reset( index < size ? createMemberIterator( location, base ) : nullptr );
+                        return *this;
+                }
+                ArrayIterator & smallStep() override {
+                        PRINT( std::cerr << "smallStep in ArrayIterator (" << index << "/" << size << ")" << std::endl; )
+                        if ( memberIter ) {
+                                PRINT( std::cerr << "has member iter: " << *memberIter << std::endl; )
+                                memberIter->smallStep();
+                                if ( *memberIter ) {
+                                        PRINT( std::cerr << "has valid member iter" << std::endl; )
+                                        return *this;
+                                }
+                        }
+                        return bigStep();
+                }
+                const Type * getType() override { return array; }
+                const Type * getNext() override { return base; }
+                std::deque< InitAlternative > first() const override {
+                        PRINT( std::cerr << "first in ArrayIterator (" << index << "/" << size << ")" << std::endl; )
+                        if ( memberIter && *memberIter ) {
+                                std::deque< InitAlternative > ret = memberIter->first();
+                                for ( InitAlternative & alt : ret ) {
+                                        alt.designation.get_and_mutate()->designators.emplace_front(
+                                                ConstantExpr::from_ulong( location, index ) );
+                                }
+                                return ret;
+                        }
+                        return {};
+                }
+        };
+        class AggregateIterator : public MemberIterator {
+        protected:
+                using MemberList = std::vector< ptr< Decl > >;
+                CodeLocation location;
+                std::string kind;  // for debug
+                std::string name;
+                const Type * inst;
+                const MemberList & members;
+                MemberList::const_iterator curMember;
+                bool atbegin = true;  // false at first {small,big}Step
+                const Type * curType = nullptr;
+                std::unique_ptr< MemberIterator > memberIter = nullptr;
+                TypeSubstitution sub;
+                bool init() {
+                        PRINT( std::cerr << "--init()--" << members.size() << std::endl; )
+                        if ( curMember != members.end() ) {
+                                if ( auto field = curMember->as< ObjectDecl >() ) {
+                                        PRINT( std::cerr << "incremented to field: " << field << std::endl; )
+                                        curType = field->get_type();
+                                        memberIter.reset( createMemberIterator( location, curType ) );
+                                        return true;
+                                }
+                        }
+                        return false;
+                }
+                AggregateIterator(
+                        const CodeLocation & loc, const std::string k, const std::string & n, const Type * i,
+                        const MemberList & ms )
+                : location( loc ), kind( k ), name( n ), inst( i ), members( ms ), curMember( ms.begin() ),
+                  sub( genericSubstitution( i ) ) {
+                        PRINT( std::cerr << "Creating " << kind << "(" << name << ")"; )
+                        init();
+                }
+        public:
+                void setPosition(
+                        std::deque< ptr< Expr > >::const_iterator begin,
+                        std::deque< ptr< Expr > >::const_iterator end
+                ) final {
+                        if ( begin == end ) return;
+                        if ( auto varExpr = begin->as< VariableExpr >() ) {
+                                for ( curMember = members.begin(); curMember != members.end(); ++curMember ) {
+                                        if ( *curMember != varExpr->var ) continue;
+                                        ++begin;
+                                        memberIter.reset( createMemberIterator( location, varExpr->result ) );
+                                        curType = varExpr->result;
+                                        atbegin = curMember == members.begin() && begin == end;
+                                        memberIter->setPosition( begin, end );
+                                        return;
+                                }
+                                assertf( false,
+                                        "could not find member in %s: %s", kind.c_str(), toString( varExpr ).c_str() );
+                        } else {
+                                assertf( false,
+                                        "bad designator given to %s: %s", kind.c_str(), toString( *begin ).c_str() );
+                        }
+                }
+                std::deque< InitAlternative > operator* () const final {
+                        if ( memberIter && *memberIter ) {
+                                std::deque< InitAlternative > ret = memberIter->first();
+                                PRINT( std::cerr << "sub: " << sub << std::endl; )
+                                for ( InitAlternative & alt : ret ) {
+                                        PRINT( std::cerr << "iterating and adding designators" << std::endl; )
+                                        alt.designation.get_and_mutate()->designators.emplace_front(
+                                                new VariableExpr{ location, curMember->strict_as< ObjectDecl >() } );
+                                        // need to substitute for generic types so that casts are to concrete types
+                                        PRINT( std::cerr << "  type is: " << alt.type; )
+                                        sub.apply( alt.type ); // also apply to designation??
+                                        PRINT( std::cerr << " ==> " << alt.type << std::endl; )
+                                }
+                                return ret;
+                        }
+                        return {};
+                }
+                AggregateIterator & smallStep() final {
+                        PRINT( std::cerr << "smallStep in " << kind << std::endl; )
+                        atbegin = false;
+                        if ( memberIter ) {
+                                PRINT( std::cerr << "has member iter, incrementing..." << std::endl; )
+                                memberIter->smallStep();
+                                if ( *memberIter ) {
+                                        PRINT( std::cerr << "success!" << std::endl; )
+                                        return *this;
+                                }
+                        }
+                        return bigStep();
+                }
+                AggregateIterator & bigStep() override = 0;
+                const Type * getType() final { return inst; }
+                const Type * getNext() final {
+                        return ( memberIter && *memberIter ) ? memberIter->getType() : nullptr;
+                }
+                std::deque< InitAlternative > first() const final {
+                        std::deque< InitAlternative > ret;
+                        PRINT( std::cerr << "first " << kind << std::endl; )
+                        if ( memberIter && *memberIter ) {
+                                PRINT( std::cerr << "adding children" << std::endl; )
+                                ret = memberIter->first();
+                                for ( InitAlternative & alt : ret ) {
+                                        PRINT( std::cerr << "iterating and adding designators" << std::endl; )
+                                        alt.designation.get_and_mutate()->designators.emplace_front(
+                                                new VariableExpr{ location, curMember->strict_as< ObjectDecl >() } );
+                                }
+                        }
+                        if ( atbegin ) {
+                                // only add self if at the very beginning of the structure
+                                PRINT( std::cerr << "adding self" << std::endl; )
+                                ret.emplace_front( inst, new Designation{ location } );
+                        }
+                        return ret;
+                }
+        };
+        class StructIterator final : public AggregateIterator {
+        public:
+                StructIterator( const CodeLocation & loc, const StructInstType * inst )
+                : AggregateIterator( loc, "StructIterator", inst->name, inst, inst->base->members ) {}
+                operator bool() const override {
+                        return curMember != members.end() || (memberIter && *memberIter);
+                }
+                StructIterator & bigStep() override {
+                        PRINT( std::cerr << "bigStep in " << kind << std::endl; )
+                        atbegin = false;
+                        memberIter = nullptr;
+                        curType = nullptr;
+                        while ( curMember != members.end() ) {
+                                ++curMember;
+                                if ( init() ) return *this;
+                        }
+                        return *this;
+                }
+        };
+        class UnionIterator final : public AggregateIterator {
+        public:
+                UnionIterator( const CodeLocation & loc, const UnionInstType * inst )
+                : AggregateIterator( loc, "UnionIterator", inst->name, inst, inst->base->members ) {}
+                operator bool() const override { return memberIter && *memberIter; }
+                UnionIterator & bigStep() override {
+                        // unions only initialize one member
+                        PRINT( std::cerr << "bigStep in " << kind << std::endl; )
+                        atbegin = false;
+                        memberIter = nullptr;
+                        curType = nullptr;
+                        curMember = members.end();
+                        return *this;
+                }
+        };
+        class TupleIterator final : public AggregateIterator {
+        public:
+                TupleIterator( const CodeLocation & loc, const TupleType * inst )
+                : AggregateIterator(
+                        loc, "TupleIterator", toString("Tuple", inst->size()), inst, inst->members
+                ) {}
+                operator bool() const override {
+                        return curMember != members.end() || (memberIter && *memberIter);
+                }
+                TupleIterator & bigStep() override {
+                        PRINT( std::cerr << "bigStep in " << kind << std::endl; )
+                        atbegin = false;
+                        memberIter = nullptr;
+                        curType = nullptr;
+                        while ( curMember != members.end() ) {
+                                ++curMember;
+                                if ( init() ) return *this;
+                        }
+                        return *this;
+                }
+        };
+        MemberIterator * createMemberIterator( const CodeLocation & loc, const Type * type ) {
+                if ( auto aggr = dynamic_cast< const ReferenceToType * >( type ) ) {
+                        if ( auto sit = dynamic_cast< const StructInstType * >( aggr ) ) {
+                                return new StructIterator{ loc, sit };
+                        } else if ( auto uit = dynamic_cast< const UnionInstType * >( aggr ) ) {
+                                return new UnionIterator{ loc, uit };
+                        } else {
+                                assertf(
+                                        dynamic_cast< const EnumInstType * >( aggr )
+                                                || dynamic_cast< const TypeInstType * >( aggr ),
+                                        "Encountered unhandled ReferenceToType in createMemberIterator: %s",
+                                                toString( type ).c_str() );
+                                return new SimpleIterator{ loc, type };
+                        }
+                } else if ( auto at = dynamic_cast< const ArrayType * >( type ) ) {
+                        return new ArrayIterator{ loc, at };
+                } else if ( auto tt = dynamic_cast< const TupleType * >( type ) ) {
+                        return new TupleIterator{ loc, tt };
+                } else {
+                        return new SimpleIterator{ loc, type };
+                }
+        }
+        CurrentObject::CurrentObject( const CodeLocation & loc, const Type * type ) : objStack() {
+                objStack.emplace_back( new SimpleIterator{ loc, type } );
+        }
+        const Designation * CurrentObject::findNext( const Designation * designation ) {
+                using DesignatorChain = std::deque< ptr< Expr > >;
+                PRINT( std::cerr << "___findNext" << std::endl; )
+                // find all the d's
+                std::vector< DesignatorChain > desigAlts{ {} }, newDesigAlts;
+                std::deque< const Type * > curTypes{ objStack.back()->getType() }, newTypes;
+                for ( const Expr * expr : designation->designators ) {
+                        PRINT( std::cerr << "____untyped: " << expr << std::endl; )
+                        auto dit = desigAlts.begin();
+                        if ( auto nexpr = dynamic_cast< const NameExpr * >( expr ) ) {
+                                for ( const Type * t : curTypes ) {
+                                        assert( dit != desigAlts.end() );
+                                        DesignatorChain & d = *dit;
+                                        PRINT( std::cerr << "____actual: " << t << std::endl; )
+                                        if ( auto refType = dynamic_cast< const ReferenceToType * >( t ) ) {
+                                                // concatenate identical field names
+                                                for ( const Decl * mem : refType->lookup( nexpr->name ) ) {
+                                                        if ( auto field = dynamic_cast< const ObjectDecl * >( mem ) ) {
+                                                                PRINT( std::cerr << "____alt: " << field->type << std::endl; )
+                                                                DesignatorChain d2 = d;
+                                                                d2.emplace_back( new VariableExpr{ expr->location, field } );
+                                                                newDesigAlts.emplace_back( std::move( d2 ) );
+                                                                newTypes.emplace_back( field->type );
+                                                        }
+                                                }
+                                        }
+                                        ++dit;
+                                }
+                        } else {
+                                for ( const Type * t : curTypes ) {
+                                        assert( dit != desigAlts.end() );
+                                        DesignatorChain & d = *dit;
+                                        if ( auto at = dynamic_cast< const ArrayType * >( t ) ) {
+                                                PRINT( std::cerr << "____alt: " << at->get_base() << std::endl; )
+                                                d.emplace_back( expr );
+                                                newDesigAlts.emplace_back( d );
+                                                newTypes.emplace_back( at->base );
+                                        }
+                                }
+                        }
+                        // reset queue
+                        desigAlts = std::move( newDesigAlts );
+                        newDesigAlts.clear();
+                        curTypes = std::move( newTypes );
+                        newTypes.clear();
+                        assertf( desigAlts.size() == curTypes.size(), "Designator alternatives (%zu) and current types (%zu) out of sync", desigAlts.size(), curTypes.size() );
+                }
+                if ( desigAlts.size() > 1 ) {
+                        SemanticError( designation, toString("Too many alternatives (", desigAlts.size(), ") for designation: ") );
+                } else if ( desigAlts.empty() ) {
+                        SemanticError( designation, "No reasonable alternatives for designation: " );
+                }
+                DesignatorChain & d = desigAlts.back();
+                PRINT( for ( Expression * expr : d ) {
+                        std::cerr << "____desig: " << expr << std::endl;
+                } ) // for
+                assertf( ! curTypes.empty(), "empty designator chosen");
+                // set new designators
+                assertf( ! objStack.empty(), "empty object stack when setting designation" );
+                Designation * actualDesignation =
+                        new Designation{ designation->location, DesignatorChain{d} };
+                objStack.back()->setPosition( d ); // destroys d
+                return actualDesignation;
+        }
+        void CurrentObject::setNext( const Designation * designation ) {
+                PRINT( std::cerr << "____setNext" << designation << std::endl; )
+                assertf( ! objStack.empty(), "obj stack empty in setNext" );
+                objStack.back()->setPosition( designation->designators );
+        }
+        void CurrentObject::increment() {
+                PRINT( std::cerr << "____increment" << std::endl; )
+                if ( objStack.empty() ) return;
+                PRINT( std::cerr << *objStack.back() << std::endl; )
+                objStack.back()->smallStep();
+        }
+        void CurrentObject::enterListInit( const CodeLocation & loc ) {
+                PRINT( std::cerr << "____entering list init" << std::endl; )
+                assertf( ! objStack.empty(), "empty obj stack entering list init" );
+                const ast::Type * type = objStack.back()->getNext();
+                assert( type );
+                objStack.emplace_back( createMemberIterator( loc, type ) );
+        }
+        void CurrentObject::exitListInit() {
+                PRINT( std::cerr << "____exiting list init" << std::endl; )
+                assertf( ! objStack.empty(), "objstack empty" );
+                objStack.pop_back();
+                if ( ! objStack.empty() ) {
+                        PRINT( std::cerr << *objStack.back() << std::endl; )
+                        objStack.back()->bigStep();
+                }
+        }
+        std::deque< InitAlternative > CurrentObject::getOptions() {
+                PRINT( std::cerr << "____getting current options" << std::endl; )
+                assertf( ! objStack.empty(), "objstack empty in getOptions" );
+                return **objStack.back();
+        }
+        const Type * CurrentObject::getCurrentType() {
+                PRINT( std::cerr << "____getting current type" << std::endl; )
+                assertf( ! objStack.empty(), "objstack empty in getCurrentType" );
+                return objStack.back()->getNext();
+        }
+}
 // Local Variables: //
 // tab-width: 4 //

src/ResolvExpr/CurrentObject.h

-              r7951100
+              rb067d9b
 #pragma once
+#include <deque>
 #include <list>   // for list
+#include <memory> // for unique_ptr
 #include <stack>  // for stack
+#include <vector>
+#include "AST/Node.hpp"  // for ptr
+#include "Common/CodeLocation.h"
 class Designation;
 …
 } // namespace ResolvExpr
+namespace ast {
+        // AST class types
+        class Designation;
+        struct InitAlternative;
+        class Type;
+        /// Iterates members of a type by initializer
+        class MemberIterator {
+        public:
+                virtual ~MemberIterator() {}
+                /// Internal set position based on iterator ranges
+                virtual void setPosition(
+                        std::deque< ptr< Expr > >::const_iterator it,
+                        std::deque< ptr< Expr > >::const_iterator end ) = 0;
+                /// walks the current object using the given designators as a guide
+                void setPosition( const std::deque< ptr< Expr > > & designators ) {
+                        setPosition( designators.begin(), designators.end() );
+                }
+                /// retrieve the list of possible (Type,Designation) pairs for the current position in the
+                /// current object
+                virtual std::deque< InitAlternative > operator* () const = 0;
+                /// true if the iterator is not currently at the end
+                virtual operator bool() const = 0;
+                /// moves the iterator by one member in the current object
+                virtual MemberIterator & bigStep() = 0;
+                /// moves the iterator by one member in the current subobject
+                virtual MemberIterator & smallStep() = 0;
+                /// the type of the current object
+                virtual const Type * getType() = 0;
+                /// the type of the current subobject
+                virtual const Type * getNext() = 0;
+                /// helper for operator*; aggregates must add designator to each init alternative, but
+                /// adding designators in operator* creates duplicates
+                virtual std::deque< InitAlternative > first() const = 0;
+        };
+        /// Builds initializer lists in resolution
+        class CurrentObject final {
+                std::vector< std::shared_ptr<MemberIterator> > objStack;
+        public:
+                CurrentObject() = default;
+                CurrentObject( const CodeLocation & loc, const Type * type );
+                /// resolves unresolved designation
+                const Designation * findNext( const Designation * designation );
+                /// sets current position using the resolved designation
+                void setNext( const ast::Designation * designation );
+                /// steps to next sub-object of current object
+                void increment();
+                /// sets new current object for the duration of this brace-enclosed intializer-list
+                void enterListInit( const CodeLocation & loc );
+                /// restores previous current object
+                void exitListInit();
+                /// produces a list of alternatives (Type *, Designation *) for the current sub-object's
+                /// initializer.
+                std::deque< InitAlternative > getOptions();
+                /// produces the type of the current object but no subobjects
+                const Type * getCurrentType();
+        };
+} // namespace ast
 // Local Variables: //
 // tab-width: 4 //

src/ResolvExpr/ExplodedActual.cc

-              r7951100
+              rb067d9b
 // file "LICENCE" distributed with Cforall.
 //
 // Alternative.h --
+// ExplodedActual.cc --
 //
 // Author           : Aaron B. Moss
 …
+        }
+}
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //

src/ResolvExpr/ExplodedActual.h

-              r7951100
+              rb067d9b
 // file "LICENCE" distributed with Cforall.
 //
 // Alternative.h --
+// ExplodedActual.h --
 //
 // Author           : Aaron B. Moss
 …
                 ExplodedActual() : env(), cost(Cost::zero), exprs() {}
                 ExplodedActual( const Alternative& actual, const SymTab::Indexer& indexer );
+                ExplodedActual(ExplodedActual&&) = default;
+                ExplodedActual& operator= (ExplodedActual&&) = default;
         };
+}
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //

src/ResolvExpr/FindOpenVars.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 09:42:48 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun May 17 09:45:25 2015
 // Update Count     : 3
+// Last Modified By : Andrew
+// Last Modified On : Fri Jul 12 14:18:00 2019
+// Update Count     : 4
 //
 …
 #include <map>                    // for map<>::mapped_type
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"
 #include "SynTree/Declaration.h"  // for TypeDecl, DeclarationWithType (ptr ...
 …
 namespace ResolvExpr {
         struct FindOpenVars : public WithGuards {
                 FindOpenVars( OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
+        struct FindOpenVars_old : public WithGuards {
+                FindOpenVars_old( OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
                 void previsit( PointerType * pointerType );
                 void previsit( ArrayType * arrayType );
                 void previsit( FunctionType * functionType );
                 void previsit( TupleType * tupleType );
+                void previsit( const PointerType * pointerType );
+                void previsit( const ArrayType * arrayType );
+                void previsit( const FunctionType * functionType );
+                void previsit( const TupleType * tupleType );
                 void common_action( Type *type );
+                void common_action( const Type *type );
                 OpenVarSet &openVars, &closedVars;
 …
         };
         void findOpenVars( Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen ) {
                 PassVisitor<FindOpenVars> finder( openVars, closedVars, needAssertions, haveAssertions, firstIsOpen );
+        void findOpenVars( const Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen ) {
+                PassVisitor<FindOpenVars_old> finder( openVars, closedVars, needAssertions, haveAssertions, firstIsOpen );
                 type->accept( finder );
+        }
         FindOpenVars::FindOpenVars( OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen )
+        FindOpenVars_old::FindOpenVars_old( OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen )
                 : openVars( openVars ), closedVars( closedVars ), needAssertions( needAssertions ), haveAssertions( haveAssertions ), nextIsOpen( firstIsOpen ) {
+        }
         void FindOpenVars::common_action( Type *type ) {
+        void FindOpenVars_old::common_action( const Type * type ) {
                 if ( nextIsOpen ) {
                         for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( Type::ForallList::const_iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
                                 openVars[ (*i)->get_name() ] = TypeDecl::Data{ (*i) };
                                 for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {
 …
+                        }
                 } else {
                         for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( Type::ForallList::const_iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
                                 closedVars[ (*i)->get_name() ] = TypeDecl::Data{ (*i) };
                                 for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {
 …
+        }
         void FindOpenVars::previsit(PointerType *pointerType) {
+        void FindOpenVars_old::previsit(const PointerType * pointerType) {
                 common_action( pointerType );
+        }
         void FindOpenVars::previsit(ArrayType *arrayType) {
+        void FindOpenVars_old::previsit(const ArrayType * arrayType) {
                 common_action( arrayType );
+        }
         void FindOpenVars::previsit(FunctionType *functionType) {
+        void FindOpenVars_old::previsit(const FunctionType * functionType) {
                 common_action( functionType );
                 nextIsOpen = ! nextIsOpen;
 …
+        }
         void FindOpenVars::previsit(TupleType *tupleType) {
+        void FindOpenVars_old::previsit(const TupleType * tupleType) {
                 common_action( tupleType );
+        }
+        namespace {
+                struct FindOpenVars_new final : public ast::WithGuards {
+                        ast::OpenVarSet & open;
+                        ast::OpenVarSet & closed;
+                        ast::AssertionSet & need;
+                        ast::AssertionSet & have;
+                        bool nextIsOpen;
+                        FindOpenVars_new(
+                                ast::OpenVarSet & o, ast::OpenVarSet & c, ast::AssertionSet & n,
+                                ast::AssertionSet & h, FirstMode firstIsOpen )
+                        : open( o ), closed( c ), need( n ), have( h ), nextIsOpen( firstIsOpen ) {}
+                        void previsit( const ast::FunctionType * type ) {
+                                // mark open/closed variables
+                                if ( nextIsOpen ) {
+                                        for ( const ast::TypeDecl * decl : type->forall ) {
+                                                open[ decl->name ] = ast::TypeDecl::Data{ decl };
+                                                for ( const ast::DeclWithType * assert : decl->assertions ) {
+                                                        need[ assert ].isUsed = false;
+                                                }
+                                        }
+                                } else {
+                                        for ( const ast::TypeDecl * decl : type->forall ) {
+                                                closed[ decl->name ] = ast::TypeDecl::Data{ decl };
+                                                for ( const ast::DeclWithType * assert : decl->assertions ) {
+                                                        have[ assert ].isUsed = false;
+                                                }
+                                        }
+                                }
+                                // flip open variables for contained function types
+                                nextIsOpen = ! nextIsOpen;
+                                GuardAction( [this](){ nextIsOpen = ! nextIsOpen; } );
+                        }
+                };
+        }
+        void findOpenVars(
+                        const ast::Type * type, ast::OpenVarSet & open, ast::OpenVarSet & closed,
+                        ast::AssertionSet & need, ast::AssertionSet & have, FirstMode firstIsOpen ) {
+                ast::Pass< FindOpenVars_new > finder{ open, closed, need, have, firstIsOpen };
+                type->accept( finder );
+        }
 } // namespace ResolvExpr

src/ResolvExpr/FindOpenVars.h

-              r7951100
+              rb067d9b
 #pragma once
+#include "AST/TypeEnvironment.hpp"  // for AssertionSet, OpenVarSet
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
 class Type;
+namespace ast {
+        class Type;
+}
 namespace ResolvExpr {
         // Updates open and closed variables and their associated assertions
+        void findOpenVars( Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
+        void findOpenVars( const Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
+        enum FirstMode { FirstClosed, FirstOpen };
+        // Updates open and closed variables and their associated assertions
+        void findOpenVars(
+                const ast::Type * type, ast::OpenVarSet & open, ast::OpenVarSet & closed,
+                ast::AssertionSet & need, ast::AssertionSet & have, FirstMode firstIsOpen );
 } // namespace ResolvExpr

src/ResolvExpr/Occurs.cc

-              r7951100
+              rb067d9b
         struct Occurs : public WithVisitorRef<Occurs> {
                 Occurs( std::string varName, const TypeEnvironment &env );
                 void previsit( TypeInstType * typeInst );
+                void previsit( const TypeInstType * typeInst );
                 bool result;
 …
         };
         bool occurs( Type *type, std::string varName, const TypeEnvironment &env ) {
+        bool occurs( const Type *type, const std::string & varName, const TypeEnvironment &env ) {
                 PassVisitor<Occurs> occur( varName, env );
                 type->accept( occur );
 …
+        }
         void Occurs::previsit( TypeInstType * typeInst ) {
+        void Occurs::previsit( const TypeInstType * typeInst ) {
                 ///   std::cerr << "searching for vars: ";
 ///   std::copy( eqvVars.begin(), eqvVars.end(), std::ostream_iterator< std::string >( std::cerr, " " ) );

src/ResolvExpr/PolyCost.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 09:50:12 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun May 17 09:52:02 2015
 // Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 19 10:45:00 2019
+// Update Count     : 4
 //
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"
 #include "SymTab/Indexer.h"   // for Indexer
 …
+        }
+// TODO: When the old PolyCost is torn out get rid of the _new suffix.
+struct PolyCost_new {
+        int result;
+        const ast::SymbolTable &symtab;
+        const ast::TypeEnvironment &env_;
+        PolyCost_new( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) :
+                result( 0 ), symtab( symtab ), env_( env ) {}
+        void previsit( const ast::TypeInstType * type ) {
+                if ( const ast::EqvClass * eqv = env_.lookup( type->name ) ) /* && */ if ( eqv->bound ) {
+                        if ( const ast::TypeInstType * otherType = eqv->bound.as< ast::TypeInstType >() ) {
+                                if ( symtab.lookupType( otherType->name ) ) {
+                                        // Bound to opaque type.
+                                        result += 1;
+                                }
+                        } else {
+                                // Bound to concrete type.
+                                result += 1;
+                        }
+                }
+        }
+};
+int polyCost(
+        const ast::Type * type, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
+) {
+        ast::Pass<PolyCost_new> costing( symtab, env );
+        type->accept( costing );
+        return costing.pass.result;
+}
 } // namespace ResolvExpr

src/ResolvExpr/PtrsAssignable.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:44:11 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:36:05 2016
+// Update Count     : 8
+//
+// Last Modified By : Andrew
+// Last Modified On : Mon Jun 24 15:29:00 2019
+// Update Count     : 9
+//
+#include "typeops.h"
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 …
 namespace ResolvExpr {
         struct PtrsAssignable : public WithShortCircuiting {
                 PtrsAssignable( Type *dest, const TypeEnvironment &env );
+                PtrsAssignable( const Type * dest, const TypeEnvironment &env );
                 int get_result() const { return result; }
                 void previsit( Type * ) { visit_children = false; }
                 void postvisit( VoidType * voidType );
                 void postvisit( BasicType * basicType );
                 void postvisit( PointerType * pointerType );
                 void postvisit( ArrayType * arrayType );
                 void postvisit( FunctionType * functionType );
                 void postvisit( StructInstType * inst );
                 void postvisit( UnionInstType * inst );
                 void postvisit( EnumInstType * inst );
                 void postvisit( TraitInstType * inst );
                 void postvisit( TypeInstType * inst );
                 void postvisit( TupleType * tupleType );
                 void postvisit( VarArgsType * varArgsType );
                 void postvisit( ZeroType * zeroType );
                 void postvisit( OneType * oneType );
+                void previsit( const Type * ) { visit_children = false; }
+                void postvisit( const VoidType * voidType );
+                void postvisit( const BasicType * basicType );
+                void postvisit( const PointerType * pointerType );
+                void postvisit( const ArrayType * arrayType );
+                void postvisit( const FunctionType * functionType );
+                void postvisit( const StructInstType * inst );
+                void postvisit( const UnionInstType * inst );
+                void postvisit( const EnumInstType * inst );
+                void postvisit( const TraitInstType * inst );
+                void postvisit( const TypeInstType * inst );
+                void postvisit( const TupleType * tupleType );
+                void postvisit( const VarArgsType * varArgsType );
+                void postvisit( const ZeroType * zeroType );
+                void postvisit( const OneType * oneType );
           private:
                 Type *dest;
+                const Type * dest;
                 int result;
                 const TypeEnvironment &env;
         };
         int ptrsAssignable( Type *src, Type *dest, const TypeEnvironment &env ) {
+        int ptrsAssignable( const Type *src, const Type * dest, const TypeEnvironment &env ) {
                 // std::cerr << "assignable: " << src << " | " << dest << std::endl;
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
                         if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+                if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType* >( dest ) ) {
+                        if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
                                 return ptrsAssignable( src, eqvClass->type, env );
                         } // if
                 } // if
                 if ( dynamic_cast< VoidType* >( dest ) ) {
+                if ( dynamic_cast< const VoidType* >( dest ) ) {
                         // void * = T * for any T is unsafe
                         // xxx - this should be safe, but that currently breaks the build
 …
+        }
         PtrsAssignable::PtrsAssignable( Type *dest, const TypeEnvironment &env ) : dest( dest ), result( 0 ), env( env ) {}
         void PtrsAssignable::postvisit( VoidType * ) {
+        PtrsAssignable::PtrsAssignable( const Type * dest, const TypeEnvironment &env ) : dest( dest ), result( 0 ), env( env ) {}
+        void PtrsAssignable::postvisit( const VoidType * ) {
                 // T * = void * is disallowed - this is a change from C, where any
                 // void * can be assigned or passed to a non-void pointer without a cast.
+        }
         void PtrsAssignable::postvisit( __attribute__((unused)) BasicType *basicType ) {}
         void PtrsAssignable::postvisit( __attribute__((unused)) PointerType *pointerType ) {}
         void PtrsAssignable::postvisit( __attribute__((unused)) ArrayType *arrayType ) {}
         void PtrsAssignable::postvisit( __attribute__((unused)) FunctionType *functionType ) {}
         void PtrsAssignable::postvisit(  __attribute__((unused)) StructInstType *inst ) {}
         void PtrsAssignable::postvisit(  __attribute__((unused)) UnionInstType *inst ) {}
         void PtrsAssignable::postvisit( EnumInstType * ) {
                 if ( dynamic_cast< BasicType* >( dest ) ) {
+        void PtrsAssignable::postvisit( const BasicType * ) {}
+        void PtrsAssignable::postvisit( const PointerType * ) {}
+        void PtrsAssignable::postvisit( const ArrayType * ) {}
+        void PtrsAssignable::postvisit( const FunctionType * ) {}
+        void PtrsAssignable::postvisit( const StructInstType * ) {}
+        void PtrsAssignable::postvisit( const UnionInstType * ) {}
+        void PtrsAssignable::postvisit( const EnumInstType * ) {
+                if ( dynamic_cast< const BasicType* >( dest ) ) {
                         // int * = E *, etc. is safe. This isn't technically correct, as each
                         // enum has one basic type that it is compatible with, an that type can
 …
+        }
         void PtrsAssignable::postvisit(  __attribute__((unused)) TraitInstType *inst ) {}
         void PtrsAssignable::postvisit( TypeInstType *inst ) {
                 if ( const EqvClass *eqvClass = env.lookup( inst->get_name() ) ) {
+        void PtrsAssignable::postvisit(  const TraitInstType * ) {}
+        void PtrsAssignable::postvisit( const TypeInstType * inst ) {
+                if ( const EqvClass * eqvClass = env.lookup( inst->name ) ) {
                         if ( eqvClass->type ) {
                                 // T * = S * for any S depends on the type bound to T
 …
+        }
+        void PtrsAssignable::postvisit(  __attribute__((unused)) TupleType *tupleType ) {}
+        void PtrsAssignable::postvisit(  __attribute__((unused)) VarArgsType *varArgsType ) {}
+        void PtrsAssignable::postvisit(  __attribute__((unused)) ZeroType *zeroType ) {}
+        void PtrsAssignable::postvisit(  __attribute__((unused)) OneType *oneType ) {}
+        void PtrsAssignable::postvisit( const TupleType * ) {}
+        void PtrsAssignable::postvisit( const VarArgsType * ) {}
+        void PtrsAssignable::postvisit( const ZeroType * ) {}
+        void PtrsAssignable::postvisit( const OneType * ) {}
+// TODO: Get rid of the `_new` suffix when the old version is removed.
+struct PtrsAssignable_new : public ast::WithShortCircuiting {
+        const ast::Type * dst;
+        const ast::TypeEnvironment & typeEnv;
+        int result;
+        PtrsAssignable_new( const ast::Type * dst, const ast::TypeEnvironment & env ) :
+                dst( dst ), typeEnv( env ), result( 0 ) {}
+        void previsit( Type * ) { visit_children = false; }
+        void postvisit( const ast::EnumInstType * ) {
+                if ( dynamic_cast< const ast::BasicType * >( dst ) ) {
+                        // int * = E *, etc. is safe. This isn't technically correct, as each
+                        // enum has one basic type that it is compatible with, an that type can
+                        // differ from enum to enum. Without replicating GCC's internal logic,
+                        // there is no way to know which type this particular enum is compatible
+                        // with, so punt on this for now.
+                        result = 1;
+                }
+        }
+        void postvisit( const ast::TypeInstType * inst ) {
+                if ( const ast::EqvClass * eqv = typeEnv.lookup( inst->name ) ) {
+                        if ( eqv->bound ) {
+                                // T * = S * for any S depends on the type bound to T
+                                result = ptrsAssignable( eqv->bound, dst, typeEnv );
+                        }
+                }
+        }
+};
+int ptrsAssignable( const ast::Type * src, const ast::Type * dst,
+                const ast::TypeEnvironment & env ) {
+        if ( const ast::TypeInstType * dstAsInst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
+                if ( const ast::EqvClass * eqv = env.lookup( dstAsInst->name ) ) {
+                        return ptrsAssignable( src, eqv->bound, env );
+                }
+        }
+        if ( dynamic_cast< const ast::VoidType * >( dst ) ) {
+                return -1;
+        } else {
+                ast::Pass<PtrsAssignable_new> visitor( dst, env );
+                src->accept( visitor );
+                return visitor.pass.result;
+        }
+// see ticket #136 (this should be able to replace the visitor).
+#if 0
+        if ( const ast::TypeInstType * dstAsTypeInst =
+                        dynamic_cast< const ast::TypeInstType* >( dst ) ) {
+                if ( const ast::EqvClass * eqv = env.lookup( dstAsTypeInst->get_name() ) ) {
+                        return ptrsAssignable( src, eqv->type, env );
+                } // if
+        } // if
+        if ( dynamic_cast< VoidType* >( dst ) ) {
+                // void * = T * for any T is unsafe
+                // xxx - this should be safe, but that currently breaks the build
+                return -1;
+        } else if ( dynamic_cast< EnumInstType * >( src ) ) {
+                if ( dynamic_cast< BasicType * >( dst ) ) {
+                        // int * = E *, etc. is safe. This isn't technically correct, as each
+                        // enum has one basic type that it is compatible with, an that type can
+                        // differ from enum to enum. Without replicating GCC's internal logic,
+                        // there is no way to know which type this particular enum is compatible
+                        // with, so punt on this for now.
+                        return 1;
+                }
+        } else if ( const ast::TypeInstType * typeInstType =
+                        dynamic_cast< const ast::TypeInstType * >( src ) ) {
+                if ( const ast::EqvClass * eqv = env.lookup( typeInstType->name ) ) {
+                        if ( eqv->bound ) {
+                                // T * = S * for any S depends on the type bound to T
+                                return ptrsAssignable( eqv->bound, dst, env );
+                        }
+                }
+        }
+        return 0;
+#endif
+}
 } // namespace ResolvExpr

src/ResolvExpr/PtrsCastable.cc

-              r7951100
+              rb067d9b
 //
+#include "AST/Decl.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 …
 namespace ResolvExpr {
         struct PtrsCastable : public WithShortCircuiting  {
+        struct PtrsCastable_old : public WithShortCircuiting  {
           public:
                 PtrsCastable( Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+                PtrsCastable_old( const Type * dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
                 int get_result() const { return result; }
                 void previsit( Type * ) { visit_children = false; }
                 void postvisit( VoidType * voidType );
                 void postvisit( BasicType * basicType );
                 void postvisit( PointerType * pointerType );
                 void postvisit( ArrayType * arrayType );
                 void postvisit( FunctionType * functionType );
                 void postvisit( StructInstType * inst );
                 void postvisit( UnionInstType * inst );
                 void postvisit( EnumInstType * inst );
                 void postvisit( TraitInstType * inst );
                 void postvisit( TypeInstType * inst );
                 void postvisit( TupleType * tupleType );
                 void postvisit( VarArgsType * varArgsType );
                 void postvisit( ZeroType * zeroType );
                 void postvisit( OneType * oneType );
+                void previsit( const Type * ) { visit_children = false; }
+                void postvisit( const VoidType * voidType );
+                void postvisit( const BasicType * basicType );
+                void postvisit( const PointerType * pointerType );
+                void postvisit( const ArrayType * arrayType );
+                void postvisit( const FunctionType * functionType );
+                void postvisit( const StructInstType * inst );
+                void postvisit( const UnionInstType * inst );
+                void postvisit( const EnumInstType * inst );
+                void postvisit( const TraitInstType * inst );
+                void postvisit( const TypeInstType * inst );
+                void postvisit( const TupleType * tupleType );
+                void postvisit( const VarArgsType * varArgsType );
+                void postvisit( const ZeroType * zeroType );
+                void postvisit( const OneType * oneType );
           private:
                 Type *dest;
+                const Type * dest;
                 int result;
                 const TypeEnvironment &env;
 …
         namespace {
                 int objectCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
                         if ( dynamic_cast< FunctionType* >( src ) ) {
+                int objectCast( const Type * src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                        if ( dynamic_cast< const FunctionType* >( src ) ) {
                                 return -1;
                         } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( src ) ) {
                                 if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
                                         if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
                                                 if ( tyDecl->get_kind() == TypeDecl::Ftype ) {
+                        } else if ( const TypeInstType * typeInst = dynamic_cast< const TypeInstType* >( src ) ) {
+                                if ( const NamedTypeDecl * ntDecl = indexer.lookupType( typeInst->name ) ) {
+                                        if ( const TypeDecl * tyDecl = dynamic_cast< const TypeDecl* >( ntDecl ) ) {
+                                                if ( tyDecl->kind == TypeDecl::Ftype ) {
                                                         return -1;
                                                 } // if
                                         } //if
                                 } else if ( const EqvClass *eqvClass = env.lookup( typeInst->get_name() ) ) {
+                                } else if ( const EqvClass * eqvClass = env.lookup( typeInst->get_name() ) ) {
                                         if ( eqvClass->data.kind == TypeDecl::Ftype ) {
                                                 return -1;
 …
                         return 1;
+                }
                 int functionCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                int functionCast( const Type * src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
                         return -1 * objectCast( src, env, indexer );  // reverse the sense of objectCast
+                }
+        }
         int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
                         if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+        int ptrsCastable( const Type * src, const Type * dest, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType* >( dest ) ) {
+                        if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
                                 // xxx - should this be ptrsCastable?
                                 return ptrsAssignable( src, eqvClass->type, env );
                         } // if
                 } // if
                 if ( dynamic_cast< VoidType* >( dest ) ) {
+                if ( dynamic_cast< const VoidType* >( dest ) ) {
                         return objectCast( src, env, indexer );
                 } else {
                         PassVisitor<PtrsCastable> ptrs( dest, env, indexer );
+                        PassVisitor<PtrsCastable_old> ptrs( dest, env, indexer );
                         src->accept( ptrs );
                         return ptrs.pass.get_result();
 …
+        }
         PtrsCastable::PtrsCastable( Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer )
+        PtrsCastable_old::PtrsCastable_old( const Type * dest, const TypeEnvironment &env, const SymTab::Indexer &indexer )
                 : dest( dest ), result( 0 ), env( env ), indexer( indexer )     {
+        }
         void PtrsCastable::postvisit( VoidType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::postvisit( BasicType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::postvisit( PointerType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::postvisit( ArrayType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::postvisit( FunctionType * ) {
+        void PtrsCastable_old::postvisit( const VoidType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const BasicType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const PointerType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const ArrayType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const FunctionType * ) {
                 // result = -1;
                 result = functionCast( dest, env, indexer );
+        }
         void PtrsCastable::postvisit( StructInstType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::postvisit( UnionInstType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::postvisit( EnumInstType * ) {
                 if ( dynamic_cast< EnumInstType* >( dest ) ) {
+        void PtrsCastable_old::postvisit( const StructInstType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const UnionInstType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const EnumInstType * ) {
+                if ( dynamic_cast< const EnumInstType * >( dest ) ) {
                         result = 1;
                 } else if ( BasicType *bt = dynamic_cast< BasicType* >( dest ) ) {
                         if ( bt->get_kind() == BasicType::SignedInt ) {
+                } else if ( const BasicType * bt = dynamic_cast< const BasicType * >( dest ) ) {
+                        if ( bt->kind == BasicType::SignedInt ) {
                                 result = 0;
                         } else {
 …
+        }
         void PtrsCastable::postvisit( TraitInstType * ) {}
         void PtrsCastable::postvisit(TypeInstType *inst) {
+        void PtrsCastable_old::postvisit( const TraitInstType * ) {}
+        void PtrsCastable_old::postvisit( const TypeInstType *inst ) {
                 //result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0 ? 1 : -1;
                 result = objectCast( inst, env, indexer ) == objectCast( dest, env, indexer ) ? 1 : -1;
+        }
+        void PtrsCastable::postvisit( TupleType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable::postvisit( VarArgsType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable::postvisit( ZeroType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable::postvisit( OneType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const TupleType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const VarArgsType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const ZeroType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+        void PtrsCastable_old::postvisit( const OneType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+namespace {
+        // can this type be cast to an object (1 for yes, -1 for no)
+        int objectCast(
+                const ast::Type * src, const ast::TypeEnvironment & env, const ast::SymbolTable & symtab
+        ) {
+                if ( dynamic_cast< const ast::FunctionType * >( src ) ) {
+                        return -1;
+                } else if ( auto inst = dynamic_cast< const ast::TypeInstType * >( src ) ) {
+                        if ( const ast::NamedTypeDecl * named = symtab.lookupType( inst->name ) ) {
+                                if ( auto tyDecl = dynamic_cast< const ast::TypeDecl * >( named ) ) {
+                                        if ( tyDecl->kind == ast::TypeVar::Ftype ) {
+                                                return -1;
+                                        }
+                                }
+                        } else if ( const ast::EqvClass * eqvClass = env.lookup( inst->name ) ) {
+                                if ( eqvClass->data.kind == ast::TypeVar::Ftype ) {
+                                        return -1;
+                                }
+                        }
+                }
+                return 1;
+        }
+        // can this type be cast to a function (inverse of objectCast)
+        int functionCast(
+                const ast::Type * src, const ast::TypeEnvironment & env, const ast::SymbolTable & symtab
+        ) {
+                return -1 * objectCast( src, env, symtab );
+        }
+        class PtrsCastable_new : public ast::WithShortCircuiting {
+                const ast::Type * dst;
+                const ast::TypeEnvironment & env;
+                const ast::SymbolTable & symtab;
+        public:
+                int result;
+                PtrsCastable_new(
+                        const ast::Type * d, const ast::TypeEnvironment & e, const ast::SymbolTable & syms )
+                : dst( d ), env( e ), symtab( syms ), result( 0 ) {}
+                void previsit( const ast::Type * ) { visit_children = false; }
+                void postvisit( const ast::VoidType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::BasicType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::PointerType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::ArrayType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::FunctionType * ) {
+                        result = functionCast( dst, env, symtab );
+                }
+                void postvisit( const ast::StructInstType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::UnionInstType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::EnumInstType * ) {
+                        if ( dynamic_cast< const ast::EnumInstType * >( dst ) ) {
+                                result = 1;
+                        } else if ( auto bt = dynamic_cast< const ast::BasicType * >( dst ) ) {
+                                if ( bt->kind == ast::BasicType::SignedInt ) {
+                                        result = 0;
+                                } else {
+                                        result = 1;
+                                }
+                        } else {
+                                result = objectCast( dst, env, symtab );
+                        }
+                }
+                void postvisit( const ast::TraitInstType * ) {}
+                void postvisit( const ast::TypeInstType * inst ) {
+                        // check trait and destination type are both object or both function
+                        result = objectCast( inst, env, symtab ) == objectCast( dst, env, symtab ) ? 1 : -1;
+                }
+                void postvisit( const ast::TupleType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::VarArgsType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::ZeroType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+                void postvisit( const ast::OneType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+        };
+} // anonymous namespace
+int ptrsCastable(
+        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+        const ast::TypeEnvironment & env
+) {
+        if ( auto inst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
+                if ( const ast::EqvClass * eqvClass = env.lookup( inst->name ) ) {
+                        return ptrsAssignable( src, eqvClass->bound, env );
+                }
+        }
+        if ( dynamic_cast< const ast::VoidType * >( dst ) ) {
+                return objectCast( src, env, symtab );
+        } else {
+                ast::Pass< PtrsCastable_new > ptrs{ dst, env, symtab };
+                src->accept( ptrs );
+                return ptrs.pass.result;
+        }
+}
 } // namespace ResolvExpr

src/ResolvExpr/RenameVars.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:05:18 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Mar  2 17:36:32 2016
 // Update Count     : 5
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Jun 20 17:39:00 2019
+// Update Count     : 8
 //
 …
 #include <utility>                 // for pair
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"
+#include "Common/ScopedMap.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "RenameVars.h"
 …
 namespace ResolvExpr {
-        namespace {
-                struct RenameVars {
-                        RenameVars();
-                        void reset();
+                        void previsit( TypeInstType * instType );
+                        void previsit( Type * );
+                        void postvisit( Type * );
+namespace {
+        class RenamingData {
+                int level = 0;
+                int resetCount = 0;
+                ScopedMap< std::string, std::string > nameMap;
+                  private:
+                        int level, resetCount;
+                        std::list< std::map< std::string, std::string > > mapStack;
+                };
+                PassVisitor<RenameVars> global_renamer;
+        } // namespace
+        void renameTyVars( Type * t ) {
+                t->accept( global_renamer );
+        }
+        void resetTyVarRenaming() {
+                global_renamer.pass.reset();
+        }
+        namespace {
+                RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) {
+                        mapStack.push_front( std::map< std::string, std::string >() );
+        public:
+                void reset() {
+                        level = 0;
+                        ++resetCount;
+                }
+                void RenameVars::reset() {
+                        level = 0;
+                        resetCount++;
+                using mapConstIterator = ScopedMap< std::string, std::string >::const_iterator;
+                void rename( TypeInstType * type ) {
+                        mapConstIterator it = nameMap.find( type->name );
+                        if ( it != nameMap.end() ) {
+                                type->name = it->second;
+                        }
+                }
+                void RenameVars::previsit( TypeInstType * instType ) {
+                        previsit( (Type *)instType );
+                        std::map< std::string, std::string >::const_iterator i = mapStack.front().find( instType->name );
+                        if ( i != mapStack.front().end() ) {
+                                instType->name = i->second;
+                        } // if
+                }
+                void RenameVars::previsit( Type * type ) {
+                void openLevel( Type * type ) {
                         if ( ! type->forall.empty() ) {
+                                // copies current name mapping into new mapping
+                                mapStack.push_front( mapStack.front() );
+                                nameMap.beginScope();
                                 // renames all "forall" type names to `_${level}_${name}'
                                 for ( auto td : type->forall ) {
 …
                                         output << "_" << resetCount << "_" << level << "_" << td->name;
                                         std::string newname( output.str() );
                                         mapStack.front()[ td->get_name() ] = newname;
+                                        nameMap[ td->get_name() ] = newname;
                                         td->name = newname;
                                         // ditto for assertion names, the next level in
 …
+                }
+                void RenameVars::postvisit( Type * type ) {
+                        // clears name mapping added by typeBefore()
+                        if ( ! type->forall.empty() ) {
+                                mapStack.pop_front();
+                        } // if
+                void closeLevel( Type * type ) {
+                        if ( !type->forall.empty() ) {
+                                nameMap.endScope();
+                        }
+                }
+        } // namespace
+                const ast::TypeInstType * rename( const ast::TypeInstType * type ) {
+                        mapConstIterator it = nameMap.find( type->name );
+                        if ( it != nameMap.end() ) {
+                                ast::TypeInstType * mutType = ast::mutate( type );
+                                mutType->name = it->second;
+                    type = mutType;
+                        }
+                        return type;
+                }
+                template<typename NodeT>
+                const NodeT * openLevel( const NodeT * type ) {
+                        if ( !type->forall.empty() ) {
+                                nameMap.beginScope();
+                                // Load new names from this forall clause and perform renaming.
+                                NodeT * mutType = ast::mutate( type );
+                                for ( ast::ptr< ast::TypeDecl > & td : mutType->forall ) {
+                                        std::ostringstream output;
+                                        output << "_" << resetCount << "_" << level << "_" << td->name;
+                                        std::string newname( output.str() );
+                                        nameMap[ td->name ] = newname;
+                                        ++level;
+                                        ast::TypeDecl * decl = ast::mutate( td.get() );
+                                        decl->name = newname;
+                                        td = decl;
+                                }
+                        }
+                        return type;
+                }
+                template<typename NodeT>
+                const NodeT * closeLevel( const NodeT * type ) {
+                        if ( !type->forall.empty() ) {
+                                nameMap.endScope();
+                        }
+                        return type;
+                }
+        };
+        // Global State:
+        RenamingData renaming;
+        struct RenameVars {
+                void previsit( TypeInstType * instType ) {
+                        renaming.openLevel( (Type*)instType );
+                        renaming.rename( instType );
+                }
+                void previsit( Type * type ) {
+                        renaming.openLevel( type );
+                }
+                void postvisit( Type * type ) {
+                        renaming.closeLevel( type );
+                }
+                const ast::FunctionType * previsit( const ast::FunctionType * type ) {
+                        return renaming.openLevel( type );
+                }
+                const ast::StructInstType * previsit( const ast::StructInstType * type ) {
+                        return renaming.openLevel( type );
+                }
+                const ast::UnionInstType * previsit( const ast::UnionInstType * type ) {
+                        return renaming.openLevel( type );
+                }
+                const ast::TraitInstType * previsit( const ast::TraitInstType * type ) {
+                        return renaming.openLevel( type );
+                }
+                const ast::TypeInstType * previsit( const ast::TypeInstType * type ) {
+                        return renaming.rename( renaming.openLevel( type ) );
+                }
+                const ast::ParameterizedType * postvisit( const ast::ParameterizedType * type ) {
+                        return renaming.closeLevel( type );
+                }
+        };
+} // namespace
+void renameTyVars( Type * t ) {
+        PassVisitor<RenameVars> renamer;
+        t->accept( renamer );
+}
+const ast::Type * renameTyVars( const ast::Type * t ) {
+        ast::Pass<RenameVars> renamer;
+        return t->accept( renamer );
+}
+void resetTyVarRenaming() {
+        renaming.reset();
+}
 } // namespace ResolvExpr

src/ResolvExpr/RenameVars.h

-              r7951100
+              rb067d9b
 #include "SynTree/Visitor.h"  // for Visitor
+namespace ast {
+        class Type;
+}
 namespace ResolvExpr {
         /// Provides a consistent renaming of forall type names in a hierarchy by prefixing them with a unique "level" ID
         void renameTyVars( Type * );
+        const ast::Type * renameTyVars( const ast::Type * );
         /// resets internal state of renamer to avoid overflow

src/ResolvExpr/ResolveTypeof.cc

-              r7951100
+              rb067d9b
 #include <cassert>               // for assert
+#include "AST/CVQualifiers.hpp"
+#include "AST/Node.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"  // for PassVisitor
+#include "Common/utility.h"      // for copy
 #include "Resolver.h"            // for resolveInVoidContext
 #include "SynTree/Expression.h"  // for Expression
 …
+        }
         class ResolveTypeof : public WithShortCircuiting {
+        class ResolveTypeof_old : public WithShortCircuiting {
           public:
                 ResolveTypeof( const SymTab::Indexer &indexer ) : indexer( indexer ) {}
+                ResolveTypeof_old( const SymTab::Indexer &indexer ) : indexer( indexer ) {}
                 void premutate( TypeofType *typeofType );
                 Type * postmutate( TypeofType *typeofType );
 …
         Type * resolveTypeof( Type *type, const SymTab::Indexer &indexer ) {
                 PassVisitor<ResolveTypeof> mutator( indexer );
+                PassVisitor<ResolveTypeof_old> mutator( indexer );
                 return type->acceptMutator( mutator );
+        }
         void ResolveTypeof::premutate( TypeofType * ) {
+        void ResolveTypeof_old::premutate( TypeofType * ) {
                 visit_children = false;
+        }
         Type * ResolveTypeof::postmutate( TypeofType *typeofType ) {
+        Type * ResolveTypeof_old::postmutate( TypeofType *typeofType ) {
 #if 0
                 std::cerr << "resolving typeof: ";
 …
                 std::cerr << std::endl;
 #endif
+                if ( typeofType->expr ) {
+                // pass on null expression
+                if ( ! typeofType->expr ) return typeofType;
+                bool isBasetypeof = typeofType->is_basetypeof;
+                auto oldQuals = typeofType->get_qualifiers().val;
+                Type* newType;
+                if ( TypeExpr* tyExpr = dynamic_cast<TypeExpr*>(typeofType->expr) ) {
+                        // typeof wrapping type
+                        newType = tyExpr->type;
+                        tyExpr->type = nullptr;
+                        delete tyExpr;
+                } else {
+                        // typeof wrapping expression
                         Expression * newExpr = resolveInVoidContext( typeofType->expr, indexer );
                         assert( newExpr->result && ! newExpr->result->isVoid() );
                         Type * newType = newExpr->result;
+                        newType = newExpr->result;
                         newExpr->result = nullptr;
                         delete typeofType;
                         delete newExpr;
+                }
+                // clear qualifiers for base, combine with typeoftype quals in any case
+                if ( isBasetypeof ) {
+                        // replace basetypeof(<enum>) by int
+                        if ( dynamic_cast<EnumInstType*>(newType) ) {
+                                Type* newerType =
+                                        new BasicType{ newType->get_qualifiers(), BasicType::SignedInt,
+                                        newType->attributes };
+                                delete newType;
+                                newType = newerType;
+                        }
+                        newType->get_qualifiers().val
+                                = ( newType->get_qualifiers().val & ~Type::Qualifiers::Mask ) | oldQuals;
+                } else {
+                        newType->get_qualifiers().val |= oldQuals;
+                }
+                return newType;
+        }
+namespace {
+        struct ResolveTypeof_new : public ast::WithShortCircuiting {
+                const ast::SymbolTable & localSymtab;
+                ResolveTypeof_new( const ast::SymbolTable & syms ) : localSymtab( syms ) {}
+                void premutate( const ast::TypeofType * ) { visit_children = false; }
+                const ast::Type * postmutate( const ast::TypeofType * typeofType ) {
+                        // pass on null expression
+                        if ( ! typeofType->expr ) return typeofType;
+                        ast::ptr< ast::Type > newType;
+                        if ( auto tyExpr = typeofType->expr.as< ast::TypeExpr >() ) {
+                                // typeof wrapping type
+                                newType = tyExpr->type;
+                        } else {
+                                // typeof wrapping expression
+                                ast::TypeEnvironment dummy;
+                                ast::ptr< ast::Expr > newExpr =
+                                        resolveInVoidContext( typeofType->expr, localSymtab, dummy );
+                                assert( newExpr->result && ! newExpr->result->isVoid() );
+                                newType = newExpr->result;
+                        }
+                        // clear qualifiers for base, combine with typeoftype quals regardless
+                        if ( typeofType->kind == ast::TypeofType::Basetypeof ) {
+                                // replace basetypeof(<enum>) by int
+                                if ( newType.as< ast::EnumInstType >() ) {
+                                        newType = new ast::BasicType{
+                                                ast::BasicType::SignedInt, newType->qualifiers, copy(newType->attributes) };
+                                }
+                                reset_qualifiers(
+                                        newType,
+                                        ( newType->qualifiers & ~ast::CV::EquivQualifiers ) | typeofType->qualifiers );
+                        } else {
+                                add_qualifiers( newType, typeofType->qualifiers );
+                        }
                         return newType;
+                } // if
+                return typeofType;
+        }
+                }
+        };
+} // anonymous namespace
+const ast::Type * resolveTypeof( const ast::Type * type , const ast::SymbolTable & symtab ) {
+        ast::Pass< ResolveTypeof_new > mutator{ symtab };
+        return type->accept( mutator );
+}
 } // namespace ResolvExpr

src/ResolvExpr/ResolveTypeof.h

-              r7951100
+              rb067d9b
 class Indexer;
 }  // namespace SymTab
+namespace ast {
+        class Type;
+        class SymbolTable;
+}
 namespace ResolvExpr {
         Type *resolveTypeof( Type*, const SymTab::Indexer &indexer );
+        const ast::Type * resolveTypeof( const ast::Type *, const ast::SymbolTable & );
 } // namespace ResolvExpr

src/ResolvExpr/Resolver.cc

-              r7951100
+              rb067d9b
 // Resolver.cc --
 //
 // Author           : Richard C. Bilson
+// Author           : Aaron B. Moss
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Feb 17 11:19:40 2018
 // Update Count     : 213
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Wed May 29 11:00:00 2019
+// Update Count     : 241
 //
-#include <stddef.h>                      // for NULL
 #include <cassert>                       // for strict_dynamic_cast, assert
 #include <memory>                        // for allocator, allocator_traits<...
 #include <tuple>                         // for get
 #include <vector>
+#include <vector>                        // for vector
 #include "Alternative.h"                 // for Alternative, AltList
 #include "AlternativeFinder.h"           // for AlternativeFinder, resolveIn...
+#include "Candidate.hpp"
+#include "CandidateFinder.hpp"
+#include "CurrentObject.h"               // for CurrentObject
+#include "RenameVars.h"                  // for RenameVars, global_renamer
+#include "Resolver.h"
+#include "ResolvMode.h"                  // for ResolvMode
+#include "typeops.h"                     // for extractResultType
+#include "Unify.h"                       // for unify
+#include "AST/Chain.hpp"
+#include "AST/Decl.hpp"
+#include "AST/Init.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Print.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/utility.h"              // for ValueGuard, group_iterate
-#include "CurrentObject.h"               // for CurrentObject
 #include "InitTweak/GenInit.h"
 #include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt
-#include "RenameVars.h"                  // for RenameVars, global_renamer
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
-#include "ResolveTypeof.h"               // for resolveTypeof
-#include "Resolver.h"
 #include "SymTab/Autogen.h"              // for SizeType
 #include "SymTab/Indexer.h"              // for Indexer
 …
 #include "SynTree/Visitor.h"             // for acceptAll, maybeAccept
 #include "Tuples/Tuples.h"
+#include "typeops.h"                     // for extractResultType
+#include "Unify.h"                       // for unify
+#include "Validate/FindSpecialDecls.h"   // for SizeType
 using namespace std;
 namespace ResolvExpr {
         struct Resolver final : public WithIndexer, public WithGuards, public WithVisitorRef<Resolver>, public WithShortCircuiting, public WithStmtsToAdd {
                 Resolver() {}
                 Resolver( const SymTab::Indexer & other ) {
+        struct Resolver_old final : public WithIndexer, public WithGuards, public WithVisitorRef<Resolver_old>, public WithShortCircuiting, public WithStmtsToAdd {
+                Resolver_old() {}
+                Resolver_old( const SymTab::Indexer & other ) {
                         indexer = other;
+                }
+                void previsit( FunctionDecl *functionDecl );
+                void postvisit( FunctionDecl *functionDecl );
+                void previsit( ObjectDecl *objectDecll );
+                void previsit( TypeDecl *typeDecl );
+                void previsit( FunctionDecl * functionDecl );
+                void postvisit( FunctionDecl * functionDecl );
+                void previsit( ObjectDecl * objectDecll );
                 void previsit( EnumDecl * enumDecl );
                 void previsit( StaticAssertDecl * assertDecl );
 …
                 void previsit( PointerType * at );
                 void previsit( ExprStmt *exprStmt );
                 void previsit( AsmExpr *asmExpr );
                 void previsit( AsmStmt *asmStmt );
                 void previsit( IfStmt *ifStmt );
                 void previsit( WhileStmt *whileStmt );
                 void previsit( ForStmt *forStmt );
                 void previsit( SwitchStmt *switchStmt );
                 void previsit( CaseStmt *caseStmt );
                 void previsit( BranchStmt *branchStmt );
                 void previsit( ReturnStmt *returnStmt );
                 void previsit( ThrowStmt *throwStmt );
                 void previsit( CatchStmt *catchStmt );
+                void previsit( ExprStmt * exprStmt );
+                void previsit( AsmExpr * asmExpr );
+                void previsit( AsmStmt * asmStmt );
+                void previsit( IfStmt * ifStmt );
+                void previsit( WhileStmt * whileStmt );
+                void previsit( ForStmt * forStmt );
+                void previsit( SwitchStmt * switchStmt );
+                void previsit( CaseStmt * caseStmt );
+                void previsit( BranchStmt * branchStmt );
+                void previsit( ReturnStmt * returnStmt );
+                void previsit( ThrowStmt * throwStmt );
+                void previsit( CatchStmt * catchStmt );
                 void previsit( WaitForStmt * stmt );
+                void previsit( WithStmt * withStmt );
+                void previsit( SingleInit *singleInit );
+                void previsit( ListInit *listInit );
+                void previsit( ConstructorInit *ctorInit );
+                void previsit( SingleInit * singleInit );
+                void previsit( ListInit * listInit );
+                void previsit( ConstructorInit * ctorInit );
           private:
                 typedef std::list< Initializer * >::iterator InitIterator;
 …
                 void handlePtrType( PtrType * type );
-                void resolveWithExprs( std::list< Expression * > & withExprs, std::list< Statement * > & newStmts );
                 void fallbackInit( ConstructorInit * ctorInit );
 …
         };
+        struct ResolveWithExprs : public WithIndexer, public WithGuards, public WithVisitorRef<ResolveWithExprs>, public WithShortCircuiting, public WithStmtsToAdd {
+                void previsit( FunctionDecl * );
+                void previsit( WithStmt * );
+                void resolveWithExprs( std::list< Expression * > & withExprs, std::list< Statement * > & newStmts );
+        };
         void resolve( std::list< Declaration * > translationUnit ) {
                 PassVisitor<Resolver> resolver;
+                PassVisitor<Resolver_old> resolver;
                 acceptAll( translationUnit, resolver );
+        }
         void resolveDecl( Declaration * decl, const SymTab::Indexer &indexer ) {
                 PassVisitor<Resolver> resolver( indexer );
+        void resolveDecl( Declaration * decl, const SymTab::Indexer & indexer ) {
+                PassVisitor<Resolver_old> resolver( indexer );
                 maybeAccept( decl, resolver );
+        }
         namespace {
                 struct DeleteFinder : public WithShortCircuiting        {
+                struct DeleteFinder_old : public WithShortCircuiting    {
                         DeletedExpr * delExpr = nullptr;
                         void previsit( DeletedExpr * expr ) {
 …
         DeletedExpr * findDeletedExpr( Expression * expr ) {
                 PassVisitor<DeleteFinder> finder;
+                PassVisitor<DeleteFinder_old> finder;
                 expr->accept( finder );
                 return finder.pass.delExpr;
 …
         namespace {
                 struct StripCasts {
+                struct StripCasts_old {
                         Expression * postmutate( CastExpr * castExpr ) {
                                 if ( castExpr->isGenerated && ResolvExpr::typesCompatible( castExpr->arg->result, castExpr->result, SymTab::Indexer() ) ) {
 …
                         static void strip( Expression *& expr ) {
                                 PassVisitor<StripCasts> stripper;
+                                PassVisitor<StripCasts_old> stripper;
                                 expr = expr->acceptMutator( stripper );
+                        }
                 };
                 void finishExpr( Expression *&expr, const TypeEnvironment &env, TypeSubstitution * oldenv = nullptr ) {
+                void finishExpr( Expression *& expr, const TypeEnvironment & env, TypeSubstitution * oldenv = nullptr ) {
                         expr->env = oldenv ? oldenv->clone() : new TypeSubstitution;
                         env.makeSubstitution( *expr->env );
                         StripCasts::strip( expr ); // remove unnecessary casts that may be buried in an expression
+                        StripCasts_old::strip( expr ); // remove unnecessary casts that may be buried in an expression
+                }
                 void removeExtraneousCast( Expression *& expr, const SymTab::Indexer & indexer ) {
                         if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
                                 if ( ResolvExpr::typesCompatible( castExpr->arg->result, castExpr->result, indexer ) ) {
+                                if ( typesCompatible( castExpr->arg->result, castExpr->result, indexer ) ) {
                                         // cast is to the same type as its argument, so it's unnecessary -- remove it
                                         expr = castExpr->arg;
 …
         namespace {
                 void findUnfinishedKindExpression(Expression * untyped, Alternative & alt, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, bool adjust = false, bool prune = true, bool failFast = true) {
+                void findUnfinishedKindExpression(Expression * untyped, Alternative & alt, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, ResolvMode mode = ResolvMode{} ) {
                         assertf( untyped, "expected a non-null expression." );
+                        // xxx - this isn't thread-safe, but should work until we parallelize the resolver
+                        static unsigned recursion_level = 0;
+                        ++recursion_level;
                         TypeEnvironment env;
                         AlternativeFinder finder( indexer, env );
+                        finder.find( untyped, adjust, prune, failFast );
+                        finder.find( untyped, recursion_level == 1 ? mode.atTopLevel() : mode );
+                        --recursion_level;
                         #if 0
 …
                         #endif
+                        // produce filtered list of alternatives
                         AltList candidates;
                         for ( Alternative & alt : finder.get_alternatives() ) {
 …
+                        }
+                        // xxx - if > 1 alternative with same cost, ignore deleted and pick from remaining
+                        // choose the lowest cost expression among the candidates
+                        // produce invalid error if no candidates
+                        if ( candidates.empty() ) {
+                                SemanticError( untyped, toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: ") );
+                        }
+                        // search for cheapest candidate
                         AltList winners;
+                        findMinCost( candidates.begin(), candidates.end(), back_inserter( winners ) );
+                        if ( winners.size() == 0 ) {
+                                SemanticError( untyped, toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: ") );
+                        } else if ( winners.size() != 1 ) {
+                        bool seen_undeleted = false;
+                        for ( unsigned i = 0; i < candidates.size(); ++i ) {
+                                int c = winners.empty() ? -1 : candidates[i].cost.compare( winners.front().cost );
+                                if ( c > 0 ) continue; // skip more expensive than winner
+                                if ( c < 0 ) {
+                                        // reset on new cheapest
+                                        seen_undeleted = ! findDeletedExpr( candidates[i].expr );
+                                        winners.clear();
+                                } else /* if ( c == 0 ) */ {
+                                        if ( findDeletedExpr( candidates[i].expr ) ) {
+                                                // skip deleted expression if already seen one equivalent-cost not
+                                                if ( seen_undeleted ) continue;
+                                        } else if ( ! seen_undeleted ) {
+                                                // replace list of equivalent-cost deleted expressions with one non-deleted
+                                                winners.clear();
+                                                seen_undeleted = true;
+                                        }
+                                }
+                                winners.emplace_back( std::move( candidates[i] ) );
+                        }
+                        // promote alternative.cvtCost to .cost
+                        // xxx - I don't know why this is done, but I'm keeping the behaviour from findMinCost
+                        for ( Alternative& winner : winners ) {
+                                winner.cost = winner.cvtCost;
+                        }
+                        // produce ambiguous errors, if applicable
+                        if ( winners.size() != 1 ) {
                                 std::ostringstream stream;
                                 stream << "Cannot choose between " << winners.size() << " alternatives for " << kindStr << (kindStr != "" ? " " : "") << "expression\n";
 …
+                        }
+                        // there is one unambiguous interpretation - move the expression into the with statement
+                        Alternative & choice = winners.front();
+                        if ( findDeletedExpr( choice.expr ) ) {
+                        // single selected choice
+                        Alternative& choice = winners.front();
+                        // fail on only expression deleted
+                        if ( ! seen_undeleted ) {
                                 SemanticError( untyped->location, choice.expr, "Unique best alternative includes deleted identifier in " );
+                        }
+                        // xxx - check for ambiguous expressions
+                        // output selected choice
                         alt = std::move( choice );
+                }
                 /// resolve `untyped` to the expression whose alternative satisfies `pred` with the lowest cost; kindStr is used for providing better error messages
                 void findKindExpression(Expression *& untyped, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, bool adjust = false, bool prune = true, bool failFast = true) {
+                void findKindExpression(Expression *& untyped, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, ResolvMode mode = ResolvMode{}) {
                         if ( ! untyped ) return;
                         Alternative choice;
                         findUnfinishedKindExpression( untyped, choice, indexer, kindStr, pred, adjust, prune, failFast );
+                        findUnfinishedKindExpression( untyped, choice, indexer, kindStr, pred, mode );
                         finishExpr( choice.expr, choice.env, untyped->env );
                         delete untyped;
 …
         // used in resolveTypeof
         Expression * resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer ) {
+        Expression * resolveInVoidContext( Expression * expr, const SymTab::Indexer & indexer ) {
                 TypeEnvironment env;
                 return resolveInVoidContext( expr, indexer, env );
+        }
         Expression * resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer, TypeEnvironment &env ) {
+        Expression * resolveInVoidContext( Expression * expr, const SymTab::Indexer & indexer, TypeEnvironment & env ) {
                 // it's a property of the language that a cast expression has either 1 or 0 interpretations; if it has 0
                 // interpretations, an exception has already been thrown.
                 assertf( expr, "expected a non-null expression." );
                 static CastExpr untyped( nullptr ); // cast to void
                 untyped.location = expr->location;
+                CastExpr * untyped = new CastExpr( expr ); // cast to void
+                untyped->location = expr->location;
                 // set up and resolve expression cast to void
-                untyped.arg = expr;
                 Alternative choice;
                 findUnfinishedKindExpression( &untyped, choice, indexer, "", standardAlternativeFilter, true );
+                findUnfinishedKindExpression( untyped, choice, indexer, "", standardAlternativeFilter, ResolvMode::withAdjustment() );
                 CastExpr * castExpr = strict_dynamic_cast< CastExpr * >( choice.expr );
+                assert( castExpr );
                 env = std::move( choice.env );
 …
                 // unlink the arg so that it isn't deleted twice at the end of the program
                 untyped.arg = nullptr;
+                untyped->arg = nullptr;
                 return ret;
+        }
         void findVoidExpression( Expression *& untyped, const SymTab::Indexer &indexer ) {
+        void findVoidExpression( Expression *& untyped, const SymTab::Indexer & indexer ) {
                 resetTyVarRenaming();
                 TypeEnvironment env;
 …
+        }
         void findSingleExpression( Expression *&untyped, const SymTab::Indexer &indexer ) {
+        void findSingleExpression( Expression *& untyped, const SymTab::Indexer & indexer ) {
                 findKindExpression( untyped, indexer, "", standardAlternativeFilter );
+        }
 …
                         if ( dynamic_cast< EnumInstType * >( type ) ) {
                                 return true;
                         } else if ( BasicType *bt = dynamic_cast< BasicType * >( type ) ) {
+                        } else if ( BasicType * bt = dynamic_cast< BasicType * >( type ) ) {
                                 return bt->isInteger();
                         } else if ( dynamic_cast< ZeroType* >( type ) != nullptr || dynamic_cast< OneType* >( type ) != nullptr ) {
 …
+                }
                 void findIntegralExpression( Expression *& untyped, const SymTab::Indexer &indexer ) {
+                void findIntegralExpression( Expression *& untyped, const SymTab::Indexer & indexer ) {
                         findKindExpression( untyped, indexer, "condition", isIntegralType );
+                }
+        }
+        void Resolver::previsit( ObjectDecl *objectDecl ) {
+                Type *new_type = resolveTypeof( objectDecl->get_type(), indexer );
+                objectDecl->set_type( new_type );
+                // To handle initialization of routine pointers, e.g., int (*fp)(int) = foo(), means that class-variable
+                // initContext is changed multiple time because the LHS is analysed twice. The second analysis changes
+                // initContext because of a function type can contain object declarations in the return and parameter types. So
+                // each value of initContext is retained, so the type on the first analysis is preserved and used for selecting
+                // the RHS.
+                GuardValue( currentObject );
+                currentObject = CurrentObject( objectDecl->get_type() );
+                if ( inEnumDecl && dynamic_cast< EnumInstType * >( objectDecl->get_type() ) ) {
+                        // enumerator initializers should not use the enum type to initialize, since
+                        // the enum type is still incomplete at this point. Use signed int instead.
+                        currentObject = CurrentObject( new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
+                }
+        }
+        template< typename PtrType >
+        void Resolver::handlePtrType( PtrType * type ) {
+                if ( type->get_dimension() ) {
+                        findSingleExpression( type->dimension, SymTab::SizeType->clone(), indexer );
+                }
+        }
+        void Resolver::previsit( ArrayType * at ) {
+                handlePtrType( at );
+        }
+        void Resolver::previsit( PointerType * pt ) {
+                handlePtrType( pt );
+        }
+        void Resolver::previsit( TypeDecl *typeDecl ) {
+                if ( typeDecl->get_base() ) {
+                        Type *new_type = resolveTypeof( typeDecl->get_base(), indexer );
+                        typeDecl->set_base( new_type );
+                } // if
+        }
+        void Resolver::previsit( FunctionDecl *functionDecl ) {
+#if 0
+                std::cerr << "resolver visiting functiondecl ";
+                functionDecl->print( std::cerr );
+                std::cerr << std::endl;
+#endif
+                Type *new_type = resolveTypeof( functionDecl->type, indexer );
+                functionDecl->set_type( new_type );
+                GuardValue( functionReturn );
+                functionReturn = ResolvExpr::extractResultType( functionDecl->type );
+        bool isStructOrUnion( const Alternative & alt ) {
+                Type * t = alt.expr->result->stripReferences();
+                return dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t );
+        }
+        void resolveWithExprs( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<ResolveWithExprs> resolver;
+                acceptAll( translationUnit, resolver );
+        }
+        void ResolveWithExprs::resolveWithExprs( std::list< Expression * > & withExprs, std::list< Statement * > & newStmts ) {
+                for ( Expression *& expr : withExprs )  {
+                        // only struct- and union-typed expressions are viable candidates
+                        findKindExpression( expr, indexer, "with statement", isStructOrUnion );
+                        // if with expression might be impure, create a temporary so that it is evaluated once
+                        if ( Tuples::maybeImpure( expr ) ) {
+                                static UniqueName tmpNamer( "_with_tmp_" );
+                                ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), expr->result->clone(), new SingleInit( expr ) );
+                                expr = new VariableExpr( tmp );
+                                newStmts.push_back( new DeclStmt( tmp ) );
+                                if ( InitTweak::isConstructable( tmp->type ) ) {
+                                        // generate ctor/dtor and resolve them
+                                        tmp->init = InitTweak::genCtorInit( tmp );
+                                        tmp->accept( *visitor );
+                                }
+                        }
+                }
+        }
+        void ResolveWithExprs::previsit( WithStmt * withStmt ) {
+                resolveWithExprs( withStmt->exprs, stmtsToAddBefore );
+        }
+        void ResolveWithExprs::previsit( FunctionDecl * functionDecl ) {
+                {
                         // resolve with-exprs with parameters in scope and add any newly generated declarations to the
 …
+        }
+        void Resolver::postvisit( FunctionDecl *functionDecl ) {
+                // default value expressions have an environment which shouldn't be there and trips up later passes.
+                // xxx - it might be necessary to somehow keep the information from this environment, but I can't currently
+                // see how it's useful.
+        void Resolver_old::previsit( ObjectDecl * objectDecl ) {
+                // To handle initialization of routine pointers, e.g., int (*fp)(int) = foo(), means that
+                // class-variable initContext is changed multiple time because the LHS is analysed twice.
+                // The second analysis changes initContext because of a function type can contain object
+                // declarations in the return and parameter types. So each value of initContext is
+                // retained, so the type on the first analysis is preserved and used for selecting the RHS.
+                GuardValue( currentObject );
+                currentObject = CurrentObject( objectDecl->get_type() );
+                if ( inEnumDecl && dynamic_cast< EnumInstType * >( objectDecl->get_type() ) ) {
+                        // enumerator initializers should not use the enum type to initialize, since
+                        // the enum type is still incomplete at this point. Use signed int instead.
+                        currentObject = CurrentObject( new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
+                }
+        }
+        template< typename PtrType >
+        void Resolver_old::handlePtrType( PtrType * type ) {
+                if ( type->get_dimension() ) {
+                        findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
+                }
+        }
+        void Resolver_old::previsit( ArrayType * at ) {
+                handlePtrType( at );
+        }
+        void Resolver_old::previsit( PointerType * pt ) {
+                handlePtrType( pt );
+        }
+        void Resolver_old::previsit( FunctionDecl * functionDecl ) {
+#if 0
+                std::cerr << "resolver visiting functiondecl ";
+                functionDecl->print( std::cerr );
+                std::cerr << std::endl;
+#endif
+                GuardValue( functionReturn );
+                functionReturn = ResolvExpr::extractResultType( functionDecl->type );
+        }
+        void Resolver_old::postvisit( FunctionDecl * functionDecl ) {
+                // default value expressions have an environment which shouldn't be there and trips up
+                // later passes.
+                // xxx - it might be necessary to somehow keep the information from this environment, but I
+                // can't currently see how it's useful.
                 for ( Declaration * d : functionDecl->type->parameters ) {
                         if ( ObjectDecl * obj = dynamic_cast< ObjectDecl * >( d ) ) {
 …
+        }
         void Resolver::previsit( EnumDecl * ) {
+        void Resolver_old::previsit( EnumDecl * ) {
                 // in case we decide to allow nested enums
                 GuardValue( inEnumDecl );
 …
+        }
         void Resolver::previsit( StaticAssertDecl * assertDecl ) {
+        void Resolver_old::previsit( StaticAssertDecl * assertDecl ) {
                 findIntegralExpression( assertDecl->condition, indexer );
+        }
         void Resolver::previsit( ExprStmt *exprStmt ) {
+        void Resolver_old::previsit( ExprStmt * exprStmt ) {
                 visit_children = false;
                 assertf( exprStmt->expr, "ExprStmt has null Expression in resolver" );
 …
+        }
         void Resolver::previsit( AsmExpr *asmExpr ) {
+        void Resolver_old::previsit( AsmExpr * asmExpr ) {
                 visit_children = false;
                 findVoidExpression( asmExpr->operand, indexer );
 …
+        }
         void Resolver::previsit( AsmStmt *asmStmt ) {
+        void Resolver_old::previsit( AsmStmt * asmStmt ) {
                 visit_children = false;
                 acceptAll( asmStmt->get_input(), *visitor );
 …
+        }
         void Resolver::previsit( IfStmt *ifStmt ) {
+        void Resolver_old::previsit( IfStmt * ifStmt ) {
                 findIntegralExpression( ifStmt->condition, indexer );
+        }
         void Resolver::previsit( WhileStmt *whileStmt ) {
+        void Resolver_old::previsit( WhileStmt * whileStmt ) {
                 findIntegralExpression( whileStmt->condition, indexer );
+        }
         void Resolver::previsit( ForStmt *forStmt ) {
+        void Resolver_old::previsit( ForStmt * forStmt ) {
                 if ( forStmt->condition ) {
                         findIntegralExpression( forStmt->condition, indexer );
 …
+        }
         void Resolver::previsit( SwitchStmt *switchStmt ) {
+        void Resolver_old::previsit( SwitchStmt * switchStmt ) {
                 GuardValue( currentObject );
                 findIntegralExpression( switchStmt->condition, indexer );
 …
+        }
         void Resolver::previsit( CaseStmt *caseStmt ) {
+        void Resolver_old::previsit( CaseStmt * caseStmt ) {
                 if ( caseStmt->condition ) {
                         std::list< InitAlternative > initAlts = currentObject.getOptions();
 …
+        }
         void Resolver::previsit( BranchStmt *branchStmt ) {
+        void Resolver_old::previsit( BranchStmt * branchStmt ) {
                 visit_children = false;
                 // must resolve the argument for a computed goto
 …
+        }
         void Resolver::previsit( ReturnStmt *returnStmt ) {
+        void Resolver_old::previsit( ReturnStmt * returnStmt ) {
                 visit_children = false;
                 if ( returnStmt->expr ) {
 …
+        }
         void Resolver::previsit( ThrowStmt *throwStmt ) {
+        void Resolver_old::previsit( ThrowStmt * throwStmt ) {
                 visit_children = false;
                 // TODO: Replace *exception type with &exception type.
                 if ( throwStmt->get_expr() ) {
+                        StructDecl * exception_decl =
+                                indexer.lookupStruct( "__cfaabi_ehm__base_exception_t" );
+                        const StructDecl * exception_decl = indexer.lookupStruct( "__cfaabi_ehm__base_exception_t" );
                         assert( exception_decl );
                         Type * exceptType = new PointerType( noQualifiers, new StructInstType( noQualifiers, exception_decl ) );
+                        Type * exceptType = new PointerType( noQualifiers, new StructInstType( noQualifiers, const_cast<StructDecl *>(exception_decl) ) );
                         findSingleExpression( throwStmt->expr, exceptType, indexer );
+                }
+        }
         void Resolver::previsit( CatchStmt *catchStmt ) {
+        void Resolver_old::previsit( CatchStmt * catchStmt ) {
                 if ( catchStmt->cond ) {
                         findSingleExpression( catchStmt->cond, new BasicType( noQualifiers, BasicType::Bool ), indexer );
 …
+        }
         void Resolver::previsit( WaitForStmt * stmt ) {
+        void Resolver_old::previsit( WaitForStmt * stmt ) {
                 visit_children = false;
 …
                                                         // Make sure we don't widen any existing bindings
+                                                        for ( auto & i : resultEnv ) {
+                                                                i.allowWidening = false;
+                                                        }
+                                                        resultEnv.forbidWidening();
                                                         // Find any unbound type variables
 …
                                                         auto param_end = function->parameters.end();
                                                         int n_mutex_arg = 0;
+                                                        int n_mutex_param = 0;
                                                         // For every arguments of its set, check if it matches one of the parameter
 …
                                                                         // We ran out of parameters but still have arguments
                                                                         // this function doesn't match
                                                                         SemanticError( function, toString("candidate function not viable: too many mutex arguments, expected ", n_mutex_arg, "\n" ));
+                                                                        SemanticError( function, toString("candidate function not viable: too many mutex arguments, expected ", n_mutex_param, "\n" ));
+                                                                }
                                                                 n_mutex_arg++;
+                                                                n_mutex_param++;
                                                                 // Check if the argument matches the parameter type in the current scope
 …
                                                         // Check if parameters are missing
                                                         if( advance_to_mutex( param, param_end ) ) {
+                                                                do {
+                                                                        n_mutex_param++;
+                                                                        param++;
+                                                                } while( advance_to_mutex( param, param_end ) );
                                                                 // We ran out of arguments but still have parameters left
                                                                 // this function doesn't match
                                                                 SemanticError( function, toString("candidate function not viable: too few mutex arguments, expected ", n_mutex_arg, "\n" ));
+                                                                SemanticError( function, toString("candidate function not viable: too few mutex arguments, expected ", n_mutex_param, "\n" ));
+                                                        }
 …
+                                                }
                                                 catch( SemanticErrorException &e ) {
+                                                catch( SemanticErrorException & e ) {
                                                         errors.append( e );
+                                                }
+                                        }
+                                }
                                 catch( SemanticErrorException &e ) {
+                                catch( SemanticErrorException & e ) {
                                         errors.append( e );
+                                }
 …
+        }
+        bool isStructOrUnion( const Alternative & alt ) {
+                Type * t = alt.expr->result->stripReferences();
+                return dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t );
+        }
+        void Resolver::resolveWithExprs( std::list< Expression * > & withExprs, std::list< Statement * > & newStmts ) {
+                for ( Expression *& expr : withExprs )  {
+                        // only struct- and union-typed expressions are viable candidates
+                        findKindExpression( expr, indexer, "with statement", isStructOrUnion );
+                        // if with expression might be impure, create a temporary so that it is evaluated once
+                        if ( Tuples::maybeImpure( expr ) ) {
+                                static UniqueName tmpNamer( "_with_tmp_" );
+                                ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), expr->result->clone(), new SingleInit( expr ) );
+                                expr = new VariableExpr( tmp );
+                                newStmts.push_back( new DeclStmt( tmp ) );
+                                if ( InitTweak::isConstructable( tmp->type ) ) {
+                                        // generate ctor/dtor and resolve them
+                                        tmp->init = InitTweak::genCtorInit( tmp );
+                                        tmp->accept( *visitor );
+                                }
+                        }
+                }
+        }
+        void Resolver::previsit( WithStmt * withStmt ) {
+                resolveWithExprs( withStmt->exprs, stmtsToAddBefore );
+        }
+        template< typename T >
+        bool isCharType( T t ) {
+        bool isCharType( Type * t ) {
                 if ( BasicType * bt = dynamic_cast< BasicType * >( t ) ) {
                         return bt->get_kind() == BasicType::Char || bt->get_kind() == BasicType::SignedChar ||
 …
+        }
         void Resolver::previsit( SingleInit *singleInit ) {
+        void Resolver_old::previsit( SingleInit * singleInit ) {
                 visit_children = false;
                 // resolve initialization using the possibilities as determined by the currentObject cursor
 …
                 initExpr->expr = nullptr;
                 std::swap( initExpr->env, newExpr->env );
+                // InitExpr may have inferParams in the case where the expression specializes a function pointer,
+                // and newExpr may already have inferParams of its own, so a simple swap is not sufficient.
+                // InitExpr may have inferParams in the case where the expression specializes a function
+                // pointer, and newExpr may already have inferParams of its own, so a simple swap is not
+                // sufficient.
                 newExpr->spliceInferParams( initExpr );
                 delete initExpr;
+                // get the actual object's type (may not exactly match what comes back from the resolver due to conversions)
+                // get the actual object's type (may not exactly match what comes back from the resolver
+                // due to conversions)
                 Type * initContext = currentObject.getCurrentType();
 …
                                 if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_result() ) ) {
                                         if ( isCharType( pt->get_base() ) ) {
+                                                if ( CastExpr *ce = dynamic_cast< CastExpr * >( newExpr ) ) {
+                                                        // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
+                                                if ( CastExpr * ce = dynamic_cast< CastExpr * >( newExpr ) ) {
+                                                        // strip cast if we're initializing a char[] with a char *,
+                                                        // e.g.  char x[] = "hello";
                                                         newExpr = ce->get_arg();
                                                         ce->set_arg( nullptr );
 …
+        }
         void Resolver::previsit( ListInit * listInit ) {
+        void Resolver_old::previsit( ListInit * listInit ) {
                 visit_children = false;
                 // move cursor into brace-enclosed initializer-list
                 currentObject.enterListInit();
+                // xxx - fix this so that the list isn't copied, iterator should be used to change current element
+                // xxx - fix this so that the list isn't copied, iterator should be used to change current
+                // element
                 std::list<Designation *> newDesignations;
                 for ( auto p : group_iterate(listInit->get_designations(), listInit->get_initializers()) ) {
                         // iterate designations and initializers in pairs, moving the cursor to the current designated object and resolving
                         // the initializer against that object.
+                        // iterate designations and initializers in pairs, moving the cursor to the current
+                        // designated object and resolving the initializer against that object.
                         Designation * des = std::get<0>(p);
                         Initializer * init = std::get<1>(p);
 …
         // ConstructorInit - fall back on C-style initializer
         void Resolver::fallbackInit( ConstructorInit * ctorInit ) {
+        void Resolver_old::fallbackInit( ConstructorInit * ctorInit ) {
                 // could not find valid constructor, or found an intrinsic constructor
                 // fall back on C-style initializer
                 delete ctorInit->get_ctor();
                 ctorInit->set_ctor( NULL );
+                ctorInit->set_ctor( nullptr );
                 delete ctorInit->get_dtor();
                 ctorInit->set_dtor( NULL );
+                ctorInit->set_dtor( nullptr );
                 maybeAccept( ctorInit->get_init(), *visitor );
+        }
 …
         void resolveCtorInit( ConstructorInit * ctorInit, const SymTab::Indexer & indexer ) {
                 assert( ctorInit );
                 PassVisitor<Resolver> resolver( indexer );
+                PassVisitor<Resolver_old> resolver( indexer );
                 ctorInit->accept( resolver );
+        }
 …
         void resolveStmtExpr( StmtExpr * stmtExpr, const SymTab::Indexer & indexer ) {
                 assert( stmtExpr );
                 PassVisitor<Resolver> resolver( indexer );
+                PassVisitor<Resolver_old> resolver( indexer );
                 stmtExpr->accept( resolver );
                 stmtExpr->computeResult();
 …
+        }
         void Resolver::previsit( ConstructorInit *ctorInit ) {
+        void Resolver_old::previsit( ConstructorInit * ctorInit ) {
                 visit_children = false;
                 // xxx - fallback init has been removed => remove fallbackInit function and remove complexity from FixInit and remove C-init from ConstructorInit
 …
                 // xxx - todo -- what about arrays?
                 // if ( dtor == NULL && InitTweak::isIntrinsicCallStmt( ctorInit->get_ctor() ) ) {
+                // if ( dtor == nullptr && InitTweak::isIntrinsicCallStmt( ctorInit->get_ctor() ) ) {
                 //      // can reduce the constructor down to a SingleInit using the
                 //      // second argument from the ctor call, since
                 //      delete ctorInit->get_ctor();
                 //      ctorInit->set_ctor( NULL );
+                //      ctorInit->set_ctor( nullptr );
                 //      Expression * arg =
 …
                 // }
+        }
+        ///////////////////////////////////////////////////////////////////////////
+        //
+        // *** NEW RESOLVER ***
+        //
+        ///////////////////////////////////////////////////////////////////////////
+        namespace {
+                /// Finds deleted expressions in an expression tree
+                struct DeleteFinder_new final : public ast::WithShortCircuiting {
+                        const ast::DeletedExpr * delExpr = nullptr;
+                        void previsit( const ast::DeletedExpr * expr ) {
+                                if ( delExpr ) { visit_children = false; }
+                                else { delExpr = expr; }
+                        }
+                        void previsit( const ast::Expr * ) {
+                                if ( delExpr ) { visit_children = false; }
+                        }
+                };
+        } // anonymous namespace
+        /// Check if this expression is or includes a deleted expression
+        const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
+                ast::Pass<DeleteFinder_new> finder;
+                expr->accept( finder );
+                return finder.pass.delExpr;
+        }
+        namespace {
+                /// always-accept candidate filter
+                bool anyCandidate( const Candidate & ) { return true; }
+                /// Calls the CandidateFinder and finds the single best candidate
+                CandidateRef findUnfinishedKindExpression(
+                        const ast::Expr * untyped, const ast::SymbolTable & symtab, const std::string & kind,
+                        std::function<bool(const Candidate &)> pred = anyCandidate, ResolvMode mode = {}
+                ) {
+                        if ( ! untyped ) return nullptr;
+                        // xxx - this isn't thread-safe, but should work until we parallelize the resolver
+                        static unsigned recursion_level = 0;
+                        ++recursion_level;
+                        ast::TypeEnvironment env;
+                        CandidateFinder finder{ symtab, env };
+                        finder.find( untyped, recursion_level == 1 ? mode.atTopLevel() : mode );
+                        --recursion_level;
+                        // produce a filtered list of candidates
+                        CandidateList candidates;
+                        for ( auto & cand : finder.candidates ) {
+                                if ( pred( *cand ) ) { candidates.emplace_back( cand ); }
+                        }
+                        // produce invalid error if no candidates
+                        if ( candidates.empty() ) {
+                                SemanticError( untyped,
+                                        toString( "No reasonable alternatives for ", kind, (kind != "" ? " " : ""),
+                                        "expression: ") );
+                        }
+                        // search for cheapest candidate
+                        CandidateList winners;
+                        bool seen_undeleted = false;
+                        for ( CandidateRef & cand : candidates ) {
+                                int c = winners.empty() ? -1 : cand->cost.compare( winners.front()->cost );
+                                if ( c > 0 ) continue;  // skip more expensive than winner
+                                if ( c < 0 ) {
+                                        // reset on new cheapest
+                                        seen_undeleted = ! findDeletedExpr( cand->expr );
+                                        winners.clear();
+                                } else /* if ( c == 0 ) */ {
+                                        if ( findDeletedExpr( cand->expr ) ) {
+                                                // skip deleted expression if already seen one equivalent-cost not
+                                                if ( seen_undeleted ) continue;
+                                        } else if ( ! seen_undeleted ) {
+                                                // replace list of equivalent-cost deleted expressions with one non-deleted
+                                                winners.clear();
+                                                seen_undeleted = true;
+                                        }
+                                }
+                                winners.emplace_back( std::move( cand ) );
+                        }
+                        // promote candidate.cvtCost to .cost
+                        promoteCvtCost( winners );
+                        // produce ambiguous errors, if applicable
+                        if ( winners.size() != 1 ) {
+                                std::ostringstream stream;
+                                stream << "Cannot choose between " << winners.size() << " alternatives for "
+                                        << kind << (kind != "" ? " " : "") << "expression\n";
+                                ast::print( stream, untyped );
+                                stream << " Alternatives are:\n";
+                                print( stream, winners, 1 );
+                                SemanticError( untyped->location, stream.str() );
+                        }
+                        // single selected choice
+                        CandidateRef & choice = winners.front();
+                        // fail on only expression deleted
+                        if ( ! seen_undeleted ) {
+                                SemanticError( untyped->location, choice->expr.get(), "Unique best alternative "
+                                "includes deleted identifier in " );
+                        }
+                        return std::move( choice );
+                }
+                /// Strips extraneous casts out of an expression
+                struct StripCasts_new final {
+                        const ast::Expr * postmutate( const ast::CastExpr * castExpr ) {
+                                if (
+                                        castExpr->isGenerated
+                                        && typesCompatible( castExpr->arg->result, castExpr->result )
+                                ) {
+                                        // generated cast is the same type as its argument, remove it after keeping env
+                                        return ast::mutate_field(
+                                                castExpr->arg.get(), &ast::Expr::env, castExpr->env );
+                                }
+                                return castExpr;
+                        }
+                        static void strip( ast::ptr< ast::Expr > & expr ) {
+                                ast::Pass< StripCasts_new > stripper;
+                                expr = expr->accept( stripper );
+                        }
+                };
+                /// Swaps argument into expression pointer, saving original environment
+                void swap_and_save_env( ast::ptr< ast::Expr > & expr, const ast::Expr * newExpr ) {
+                        ast::ptr< ast::TypeSubstitution > env = expr->env;
+                        expr.set_and_mutate( newExpr )->env = env;
+                }
+                /// Removes cast to type of argument (unlike StripCasts, also handles non-generated casts)
+                void removeExtraneousCast( ast::ptr<ast::Expr> & expr, const ast::SymbolTable & symtab ) {
+                        if ( const ast::CastExpr * castExpr = expr.as< ast::CastExpr >() ) {
+                                if ( typesCompatible( castExpr->arg->result, castExpr->result, symtab ) ) {
+                                        // cast is to the same type as its argument, remove it
+                                        swap_and_save_env( expr, castExpr->arg );
+                                }
+                        }
+                }
+                /// Establish post-resolver invariants for expressions
+                void finishExpr(
+                        ast::ptr< ast::Expr > & expr, const ast::TypeEnvironment & env,
+                        const ast::TypeSubstitution * oldenv = nullptr
+                ) {
+                        // set up new type substitution for expression
+                        ast::ptr< ast::TypeSubstitution > newenv =
+                                 oldenv ? oldenv : new ast::TypeSubstitution{};
+                        env.writeToSubstitution( *newenv.get_and_mutate() );
+                        expr.get_and_mutate()->env = std::move( newenv );
+                        // remove unncecessary casts
+                        StripCasts_new::strip( expr );
+                }
+        } // anonymous namespace
+        ast::ptr< ast::Expr > resolveInVoidContext(
+                const ast::Expr * expr, const ast::SymbolTable & symtab, ast::TypeEnvironment & env
+        ) {
+                assertf( expr, "expected a non-null expression" );
+                // set up and resolve expression cast to void
+                ast::CastExpr * untyped = new ast::CastExpr{ expr };
+                CandidateRef choice = findUnfinishedKindExpression(
+                        untyped, symtab, "", anyCandidate, ResolvMode::withAdjustment() );
+                // a cast expression has either 0 or 1 interpretations (by language rules);
+                // if 0, an exception has already been thrown, and this code will not run
+                const ast::CastExpr * castExpr = choice->expr.strict_as< ast::CastExpr >();
+                env = std::move( choice->env );
+                return castExpr->arg;
+        }
+        namespace {
+                /// Resolve `untyped` to the expression whose candidate is the best match for a `void`
+                /// context.
+                ast::ptr< ast::Expr > findVoidExpression(
+                        const ast::Expr * untyped, const ast::SymbolTable & symtab
+                ) {
+                        resetTyVarRenaming();
+                        ast::TypeEnvironment env;
+                        ast::ptr< ast::Expr > newExpr = resolveInVoidContext( untyped, symtab, env );
+                        finishExpr( newExpr, env, untyped->env );
+                        return newExpr;
+                }
+                /// resolve `untyped` to the expression whose candidate satisfies `pred` with the
+                /// lowest cost, returning the resolved version
+                ast::ptr< ast::Expr > findKindExpression(
+                        const ast::Expr * untyped, const ast::SymbolTable & symtab,
+                        std::function<bool(const Candidate &)> pred = anyCandidate,
+                        const std::string & kind = "", ResolvMode mode = {}
+                ) {
+                        if ( ! untyped ) return {};
+                        CandidateRef choice =
+                                findUnfinishedKindExpression( untyped, symtab, kind, pred, mode );
+                        finishExpr( choice->expr, choice->env, untyped->env );
+                        return std::move( choice->expr );
+                }
+                /// Resolve `untyped` to the single expression whose candidate is the best match
+                ast::ptr< ast::Expr > findSingleExpression(
+                        const ast::Expr * untyped, const ast::SymbolTable & symtab
+                ) {
+                        return findKindExpression( untyped, symtab );
+                }
+        } // anonymous namespace
+                ast::ptr< ast::Expr > findSingleExpression(
+                        const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab
+                ) {
+                        assert( untyped && type );
+                        ast::ptr< ast::Expr > castExpr = new ast::CastExpr{ untyped, type };
+                        ast::ptr< ast::Expr > newExpr = findSingleExpression( castExpr, symtab );
+                        removeExtraneousCast( newExpr, symtab );
+                        return newExpr;
+                }
+        namespace {
+                /// Predicate for "Candidate has integral type"
+                bool hasIntegralType( const Candidate & i ) {
+                        const ast::Type * type = i.expr->result;
+                        if ( auto bt = dynamic_cast< const ast::BasicType * >( type ) ) {
+                                return bt->isInteger();
+                        } else if (
+                                dynamic_cast< const ast::EnumInstType * >( type )
+                                || dynamic_cast< const ast::ZeroType * >( type )
+                                || dynamic_cast< const ast::OneType * >( type )
+                        ) {
+                                return true;
+                        } else return false;
+                }
+                /// Resolve `untyped` as an integral expression, returning the resolved version
+                ast::ptr< ast::Expr > findIntegralExpression(
+                        const ast::Expr * untyped, const ast::SymbolTable & symtab
+                ) {
+                        return findKindExpression( untyped, symtab, hasIntegralType, "condition" );
+                }
+                /// check if a type is a character type
+                bool isCharType( const ast::Type * t ) {
+                        if ( auto bt = dynamic_cast< const ast::BasicType * >( t ) ) {
+                                return bt->kind == ast::BasicType::Char
+                                        || bt->kind == ast::BasicType::SignedChar
+                                        || bt->kind == ast::BasicType::UnsignedChar;
+                        }
+                        return false;
+                }
+                /// Advance a type itertor to the next mutex parameter
+                template<typename Iter>
+                inline bool nextMutex( Iter & it, const Iter & end ) {
+                        while ( it != end && ! (*it)->get_type()->is_mutex() ) { ++it; }
+                        return it != end;
+                }
+        }
+        class Resolver_new final
+        : public ast::WithSymbolTable, public ast::WithGuards,
+          public ast::WithVisitorRef<Resolver_new>, public ast::WithShortCircuiting,
+          public ast::WithStmtsToAdd<> {
+                ast::ptr< ast::Type > functionReturn = nullptr;
+                ast::CurrentObject currentObject;
+                bool inEnumDecl = false;
+        public:
+                Resolver_new() = default;
+                Resolver_new( const ast::SymbolTable & syms ) { symtab = syms; }
+                void previsit( const ast::FunctionDecl * );
+                const ast::FunctionDecl * postvisit( const ast::FunctionDecl * );
+                void previsit( const ast::ObjectDecl * );
+                void previsit( const ast::EnumDecl * );
+                const ast::StaticAssertDecl * previsit( const ast::StaticAssertDecl * );
+                const ast::ArrayType * previsit( const ast::ArrayType * );
+                const ast::PointerType * previsit( const ast::PointerType * );
+                const ast::ExprStmt *        previsit( const ast::ExprStmt * );
+                const ast::AsmExpr *         previsit( const ast::AsmExpr * );
+                const ast::AsmStmt *         previsit( const ast::AsmStmt * );
+                const ast::IfStmt *          previsit( const ast::IfStmt * );
+                const ast::WhileStmt *       previsit( const ast::WhileStmt * );
+                const ast::ForStmt *         previsit( const ast::ForStmt * );
+                const ast::SwitchStmt *      previsit( const ast::SwitchStmt * );
+                const ast::CaseStmt *        previsit( const ast::CaseStmt * );
+                const ast::BranchStmt *      previsit( const ast::BranchStmt * );
+                const ast::ReturnStmt *      previsit( const ast::ReturnStmt * );
+                const ast::ThrowStmt *       previsit( const ast::ThrowStmt * );
+                const ast::CatchStmt *       previsit( const ast::CatchStmt * );
+                const ast::WaitForStmt *     previsit( const ast::WaitForStmt * );
+                const ast::SingleInit *      previsit( const ast::SingleInit * );
+                const ast::ListInit *        previsit( const ast::ListInit * );
+                const ast::ConstructorInit * previsit( const ast::ConstructorInit * );
+        };
+        void resolve( std::list< ast::ptr<ast::Decl> >& translationUnit ) {
+                ast::Pass< Resolver_new > resolver;
+                accept_all( translationUnit, resolver );
+        }
+        ast::ptr< ast::Init > resolveCtorInit(
+                const ast::ConstructorInit * ctorInit, const ast::SymbolTable & symtab
+        ) {
+                assert( ctorInit );
+                ast::Pass< Resolver_new > resolver{ symtab };
+                return ctorInit->accept( resolver );
+        }
+        ast::ptr< ast::Expr > resolveStmtExpr(
+                const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab
+        ) {
+                assert( stmtExpr );
+                ast::Pass< Resolver_new > resolver{ symtab };
+                ast::ptr< ast::Expr > ret = stmtExpr;
+                ret = ret->accept( resolver );
+                strict_dynamic_cast< ast::StmtExpr * >( ret.get_and_mutate() )->computeResult();
+                return ret;
+        }
+        void Resolver_new::previsit( const ast::FunctionDecl * functionDecl ) {
+                GuardValue( functionReturn );
+                functionReturn = extractResultType( functionDecl->type );
+        }
+        const ast::FunctionDecl * Resolver_new::postvisit( const ast::FunctionDecl * functionDecl ) {
+                // default value expressions have an environment which shouldn't be there and trips up
+                // later passes.
+                ast::ptr< ast::FunctionDecl > ret = functionDecl;
+                for ( unsigned i = 0; i < functionDecl->type->params.size(); ++i ) {
+                        const ast::ptr<ast::DeclWithType> & d = functionDecl->type->params[i];
+                        if ( const ast::ObjectDecl * obj = d.as< ast::ObjectDecl >() ) {
+                                if ( const ast::SingleInit * init = obj->init.as< ast::SingleInit >() ) {
+                                        if ( init->value->env == nullptr ) continue;
+                                        // clone initializer minus the initializer environment
+                                        ast::chain_mutate( ret )
+                                                ( &ast::FunctionDecl::type )
+                                                        ( &ast::FunctionType::params )[i]
+                                                                ( &ast::ObjectDecl::init )
+                                                                        ( &ast::SingleInit::value )->env = nullptr;
+                                        assert( functionDecl != ret.get() || functionDecl->unique() );
+                                        assert( ! ret->type->params[i].strict_as< ast::ObjectDecl >()->init.strict_as< ast::SingleInit >()->value->env );
+                                }
+                        }
+                }
+                return ret.get();
+        }
+        void Resolver_new::previsit( const ast::ObjectDecl * objectDecl ) {
+                // To handle initialization of routine pointers [e.g. int (*fp)(int) = foo()],
+                // class-variable `initContext` is changed multiple times because the LHS is analyzed
+                // twice. The second analysis changes `initContext` because a function type can contain
+                // object declarations in the return and parameter types. Therefore each value of
+                // `initContext` is retained so the type on the first analysis is preserved and used for
+                // selecting the RHS.
+                GuardValue( currentObject );
+                currentObject = ast::CurrentObject{ objectDecl->location, objectDecl->get_type() };
+                if ( inEnumDecl && dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() ) ) {
+                        // enumerator initializers should not use the enum type to initialize, since the
+                        // enum type is still incomplete at this point. Use `int` instead.
+                        currentObject = ast::CurrentObject{
+                                objectDecl->location, new ast::BasicType{ ast::BasicType::SignedInt } };
+                }
+        }
+        void Resolver_new::previsit( const ast::EnumDecl * ) {
+                // in case we decide to allow nested enums
+                GuardValue( inEnumDecl );
+                inEnumDecl = false;
+        }
+        const ast::StaticAssertDecl * Resolver_new::previsit(
+                const ast::StaticAssertDecl * assertDecl
+        ) {
+                return ast::mutate_field(
+                        assertDecl, &ast::StaticAssertDecl::cond,
+                        findIntegralExpression( assertDecl->cond, symtab ) );
+        }
+        template< typename PtrType >
+        const PtrType * handlePtrType( const PtrType * type, const ast::SymbolTable & symtab ) {
+                if ( type->dimension ) {
+                        #warning should use new equivalent to Validate::SizeType rather than sizeType here
+                        ast::ptr< ast::Type > sizeType = new ast::BasicType{ ast::BasicType::LongUnsignedInt };
+                        ast::mutate_field(
+                                type, &PtrType::dimension,
+                                findSingleExpression( type->dimension, sizeType, symtab ) );
+                }
+                return type;
+        }
+        const ast::ArrayType * Resolver_new::previsit( const ast::ArrayType * at ) {
+                return handlePtrType( at, symtab );
+        }
+        const ast::PointerType * Resolver_new::previsit( const ast::PointerType * pt ) {
+                return handlePtrType( pt, symtab );
+        }
+        const ast::ExprStmt * Resolver_new::previsit( const ast::ExprStmt * exprStmt ) {
+                visit_children = false;
+                assertf( exprStmt->expr, "ExprStmt has null expression in resolver" );
+                return ast::mutate_field(
+                        exprStmt, &ast::ExprStmt::expr, findVoidExpression( exprStmt->expr, symtab ) );
+        }
+        const ast::AsmExpr * Resolver_new::previsit( const ast::AsmExpr * asmExpr ) {
+                visit_children = false;
+                asmExpr = ast::mutate_field(
+                        asmExpr, &ast::AsmExpr::operand, findVoidExpression( asmExpr->operand, symtab ) );
+                if ( asmExpr->inout ) {
+                        asmExpr = ast::mutate_field(
+                                asmExpr, &ast::AsmExpr::inout, findVoidExpression( asmExpr->inout, symtab ) );
+                }
+                return asmExpr;
+        }
+        const ast::AsmStmt * Resolver_new::previsit( const ast::AsmStmt * asmStmt ) {
+                visitor->maybe_accept( asmStmt, &ast::AsmStmt::input );
+                visitor->maybe_accept( asmStmt, &ast::AsmStmt::output );
+                visit_children = false;
+                return asmStmt;
+        }
+        const ast::IfStmt * Resolver_new::previsit( const ast::IfStmt * ifStmt ) {
+                return ast::mutate_field(
+                        ifStmt, &ast::IfStmt::cond, findIntegralExpression( ifStmt->cond, symtab ) );
+        }
+        const ast::WhileStmt * Resolver_new::previsit( const ast::WhileStmt * whileStmt ) {
+                return ast::mutate_field(
+                        whileStmt, &ast::WhileStmt::cond, findIntegralExpression( whileStmt->cond, symtab ) );
+        }
+        const ast::ForStmt * Resolver_new::previsit( const ast::ForStmt * forStmt ) {
+                if ( forStmt->cond ) {
+                        forStmt = ast::mutate_field(
+                                forStmt, &ast::ForStmt::cond, findIntegralExpression( forStmt->cond, symtab ) );
+                }
+                if ( forStmt->inc ) {
+                        forStmt = ast::mutate_field(
+                                forStmt, &ast::ForStmt::inc, findVoidExpression( forStmt->inc, symtab ) );
+                }
+                return forStmt;
+        }
+        const ast::SwitchStmt * Resolver_new::previsit( const ast::SwitchStmt * switchStmt ) {
+                GuardValue( currentObject );
+                switchStmt = ast::mutate_field(
+                        switchStmt, &ast::SwitchStmt::cond,
+                        findIntegralExpression( switchStmt->cond, symtab ) );
+                currentObject = ast::CurrentObject{ switchStmt->location, switchStmt->cond->result };
+                return switchStmt;
+        }
+        const ast::CaseStmt * Resolver_new::previsit( const ast::CaseStmt * caseStmt ) {
+                if ( caseStmt->cond ) {
+                        std::deque< ast::InitAlternative > initAlts = currentObject.getOptions();
+                        assertf( initAlts.size() == 1, "SwitchStmt did not correctly resolve an integral "
+                                "expression." );
+                        ast::ptr< ast::Expr > untyped =
+                                new ast::CastExpr{ caseStmt->location, caseStmt->cond, initAlts.front().type };
+                        ast::ptr< ast::Expr > newExpr = findSingleExpression( untyped, symtab );
+                        // case condition cannot have a cast in C, so it must be removed here, regardless of
+                        // whether it would perform a conversion.
+                        if ( const ast::CastExpr * castExpr = newExpr.as< ast::CastExpr >() ) {
+                                swap_and_save_env( newExpr, castExpr->arg );
+                        }
+                        caseStmt = ast::mutate_field( caseStmt, &ast::CaseStmt::cond, newExpr );
+                }
+                return caseStmt;
+        }
+        const ast::BranchStmt * Resolver_new::previsit( const ast::BranchStmt * branchStmt ) {
+                visit_children = false;
+                // must resolve the argument of a computed goto
+                if ( branchStmt->kind == ast::BranchStmt::Goto && branchStmt->computedTarget ) {
+                        // computed goto argument is void*
+                        ast::ptr< ast::Type > target = new ast::PointerType{ new ast::VoidType{} };
+                        branchStmt = ast::mutate_field(
+                                branchStmt, &ast::BranchStmt::computedTarget,
+                                findSingleExpression( branchStmt->computedTarget, target, symtab ) );
+                }
+                return branchStmt;
+        }
+        const ast::ReturnStmt * Resolver_new::previsit( const ast::ReturnStmt * returnStmt ) {
+                visit_children = false;
+                if ( returnStmt->expr ) {
+                        returnStmt = ast::mutate_field(
+                                returnStmt, &ast::ReturnStmt::expr,
+                                findSingleExpression( returnStmt->expr, functionReturn, symtab ) );
+                }
+                return returnStmt;
+        }
+        const ast::ThrowStmt * Resolver_new::previsit( const ast::ThrowStmt * throwStmt ) {
+                visit_children = false;
+                if ( throwStmt->expr ) {
+                        const ast::StructDecl * exceptionDecl =
+                                symtab.lookupStruct( "__cfaabi_ehm__base_exception_t" );
+                        assert( exceptionDecl );
+                        ast::ptr< ast::Type > exceptType =
+                                new ast::PointerType{ new ast::StructInstType{ exceptionDecl } };
+                        throwStmt = ast::mutate_field(
+                                throwStmt, &ast::ThrowStmt::expr,
+                                findSingleExpression( throwStmt->expr, exceptType, symtab ) );
+                }
+                return throwStmt;
+        }
+        const ast::CatchStmt * Resolver_new::previsit( const ast::CatchStmt * catchStmt ) {
+                if ( catchStmt->cond ) {
+                        ast::ptr< ast::Type > boolType = new ast::BasicType{ ast::BasicType::Bool };
+                        catchStmt = ast::mutate_field(
+                                catchStmt, &ast::CatchStmt::cond,
+                                findSingleExpression( catchStmt->cond, boolType, symtab ) );
+                }
+                return catchStmt;
+        }
+        const ast::WaitForStmt * Resolver_new::previsit( const ast::WaitForStmt * stmt ) {
+                visit_children = false;
+                // Resolve all clauses first
+                for ( unsigned i = 0; i < stmt->clauses.size(); ++i ) {
+                        const ast::WaitForStmt::Clause & clause = stmt->clauses[i];
+                        ast::TypeEnvironment env;
+                        CandidateFinder funcFinder{ symtab, env };
+                        // Find all candidates for a function in canonical form
+                        funcFinder.find( clause.target.func, ResolvMode::withAdjustment() );
+                        if ( funcFinder.candidates.empty() ) {
+                                stringstream ss;
+                                ss << "Use of undeclared indentifier '";
+                                ss << clause.target.func.strict_as< ast::NameExpr >()->name;
+                                ss << "' in call to waitfor";
+                                SemanticError( stmt->location, ss.str() );
+                        }
+                        if ( clause.target.args.empty() ) {
+                                SemanticError( stmt->location,
+                                        "Waitfor clause must have at least one mutex parameter");
+                        }
+                        // Find all alternatives for all arguments in canonical form
+                        std::vector< CandidateFinder > argFinders =
+                                funcFinder.findSubExprs( clause.target.args );
+                        // List all combinations of arguments
+                        std::vector< CandidateList > possibilities;
+                        combos( argFinders.begin(), argFinders.end(), back_inserter( possibilities ) );
+                        // For every possible function:
+                        // * try matching the arguments to the parameters, not the other way around because
+                        //   more arguments than parameters
+                        CandidateList funcCandidates;
+                        std::vector< CandidateList > argsCandidates;
+                        SemanticErrorException errors;
+                        for ( CandidateRef & func : funcFinder.candidates ) {
+                                try {
+                                        auto pointerType = dynamic_cast< const ast::PointerType * >(
+                                                func->expr->result->stripReferences() );
+                                        if ( ! pointerType ) {
+                                                SemanticError( stmt->location, func->expr->result.get(),
+                                                        "candidate not viable: not a pointer type\n" );
+                                        }
+                                        auto funcType = pointerType->base.as< ast::FunctionType >();
+                                        if ( ! funcType ) {
+                                                SemanticError( stmt->location, func->expr->result.get(),
+                                                        "candidate not viable: not a function type\n" );
+                                        }
+                                        {
+                                                auto param    = funcType->params.begin();
+                                                auto paramEnd = funcType->params.end();
+                                                if( ! nextMutex( param, paramEnd ) ) {
+                                                        SemanticError( stmt->location, funcType,
+                                                                "candidate function not viable: no mutex parameters\n");
+                                                }
+                                        }
+                                        CandidateRef func2{ new Candidate{ *func } };
+                                        // strip reference from function
+                                        func2->expr = referenceToRvalueConversion( func->expr, func2->cost );
+                                        // Each argument must be matched with a parameter of the current candidate
+                                        for ( auto & argsList : possibilities ) {
+                                                try {
+                                                        // Declare data structures needed for resolution
+                                                        ast::OpenVarSet open;
+                                                        ast::AssertionSet need, have;
+                                                        ast::TypeEnvironment resultEnv{ func->env };
+                                                        // Add all type variables as open so that those not used in the
+                                                        // parameter list are still considered open
+                                                        resultEnv.add( funcType->forall );
+                                                        // load type variables from arguments into one shared space
+                                                        for ( auto & arg : argsList ) {
+                                                                resultEnv.simpleCombine( arg->env );
+                                                        }
+                                                        // Make sure we don't widen any existing bindings
+                                                        resultEnv.forbidWidening();
+                                                        // Find any unbound type variables
+                                                        resultEnv.extractOpenVars( open );
+                                                        auto param = funcType->params.begin();
+                                                        auto paramEnd = funcType->params.end();
+                                                        unsigned n_mutex_param = 0;
+                                                        // For every argument of its set, check if it matches one of the
+                                                        // parameters. The order is important
+                                                        for ( auto & arg : argsList ) {
+                                                                // Ignore non-mutex arguments
+                                                                if ( ! nextMutex( param, paramEnd ) ) {
+                                                                        // We ran out of parameters but still have arguments.
+                                                                        // This function doesn't match
+                                                                        SemanticError( stmt->location, funcType,
+                                                                                toString("candidate function not viable: too many mutex "
+                                                                                "arguments, expected ", n_mutex_param, "\n" ) );
+                                                                }
+                                                                ++n_mutex_param;
+                                                                // Check if the argument matches the parameter type in the current
+                                                                // scope
+                                                                ast::ptr< ast::Type > paramType = (*param)->get_type();
+                                                                if (
+                                                                        ! unify(
+                                                                                arg->expr->result, paramType, resultEnv, need, have, open,
+                                                                                symtab )
+                                                                ) {
+                                                                        // Type doesn't match
+                                                                        stringstream ss;
+                                                                        ss << "candidate function not viable: no known conversion "
+                                                                                "from '";
+                                                                        ast::print( ss, (*param)->get_type() );
+                                                                        ss << "' to '";
+                                                                        ast::print( ss, arg->expr->result );
+                                                                        ss << "' with env '";
+                                                                        ast::print( ss, resultEnv );
+                                                                        ss << "'\n";
+                                                                        SemanticError( stmt->location, funcType, ss.str() );
+                                                                }
+                                                                ++param;
+                                                        }
+                                                        // All arguments match!
+                                                        // Check if parameters are missing
+                                                        if ( nextMutex( param, paramEnd ) ) {
+                                                                do {
+                                                                        ++n_mutex_param;
+                                                                        ++param;
+                                                                } while ( nextMutex( param, paramEnd ) );
+                                                                // We ran out of arguments but still have parameters left; this
+                                                                // function doesn't match
+                                                                SemanticError( stmt->location, funcType,
+                                                                        toString( "candidate function not viable: too few mutex "
+                                                                        "arguments, expected ", n_mutex_param, "\n" ) );
+                                                        }
+                                                        // All parameters match!
+                                                        // Finish the expressions to tie in proper environments
+                                                        finishExpr( func2->expr, resultEnv );
+                                                        for ( CandidateRef & arg : argsList ) {
+                                                                finishExpr( arg->expr, resultEnv );
+                                                        }
+                                                        // This is a match, store it and save it for later
+                                                        funcCandidates.emplace_back( std::move( func2 ) );
+                                                        argsCandidates.emplace_back( std::move( argsList ) );
+                                                } catch ( SemanticErrorException & e ) {
+                                                        errors.append( e );
+                                                }
+                                        }
+                                } catch ( SemanticErrorException & e ) {
+                                        errors.append( e );
+                                }
+                        }
+                        // Make sure correct number of arguments
+                        if( funcCandidates.empty() ) {
+                                SemanticErrorException top( stmt->location,
+                                        "No alternatives for function in call to waitfor" );
+                                top.append( errors );
+                                throw top;
+                        }
+                        if( argsCandidates.empty() ) {
+                                SemanticErrorException top( stmt->location,
+                                        "No alternatives for arguments in call to waitfor" );
+                                top.append( errors );
+                                throw top;
+                        }
+                        if( funcCandidates.size() > 1 ) {
+                                SemanticErrorException top( stmt->location,
+                                        "Ambiguous function in call to waitfor" );
+                                top.append( errors );
+                                throw top;
+                        }
+                        if( argsCandidates.size() > 1 ) {
+                                SemanticErrorException top( stmt->location,
+                                        "Ambiguous arguments in call to waitfor" );
+                                top.append( errors );
+                                throw top;
+                        }
+                        // TODO: need to use findDeletedExpr to ensure no deleted identifiers are used.
+                        // build new clause
+                        ast::WaitForStmt::Clause clause2;
+                        clause2.target.func = funcCandidates.front()->expr;
+                        clause2.target.args.reserve( clause.target.args.size() );
+                        for ( auto arg : argsCandidates.front() ) {
+                                clause2.target.args.emplace_back( std::move( arg->expr ) );
+                        }
+                        // Resolve the conditions as if it were an IfStmt, statements normally
+                        clause2.cond = findSingleExpression( clause.cond, symtab );
+                        clause2.stmt = clause.stmt->accept( *visitor );
+                        // set results into stmt
+                        auto n = mutate( stmt );
+                        n->clauses[i] = std::move( clause2 );
+                        stmt = n;
+                }
+                if ( stmt->timeout.stmt ) {
+                        // resolve the timeout as a size_t, the conditions like IfStmt, and stmts normally
+                        ast::WaitForStmt::Timeout timeout2;
+                        ast::ptr< ast::Type > target =
+                                new ast::BasicType{ ast::BasicType::LongLongUnsignedInt };
+                        timeout2.time = findSingleExpression( stmt->timeout.time, target, symtab );
+                        timeout2.cond = findSingleExpression( stmt->timeout.cond, symtab );
+                        timeout2.stmt = stmt->timeout.stmt->accept( *visitor );
+                        // set results into stmt
+                        auto n = mutate( stmt );
+                        n->timeout = std::move( timeout2 );
+                        stmt = n;
+                }
+                if ( stmt->orElse.stmt ) {
+                        // resolve the condition like IfStmt, stmts normally
+                        ast::WaitForStmt::OrElse orElse2;
+                        orElse2.cond = findSingleExpression( stmt->orElse.cond, symtab );
+                        orElse2.stmt = stmt->orElse.stmt->accept( *visitor );
+                        // set results into stmt
+                        auto n = mutate( stmt );
+                        n->orElse = std::move( orElse2 );
+                        stmt = n;
+                }
+                return stmt;
+        }
+        const ast::SingleInit * Resolver_new::previsit( const ast::SingleInit * singleInit ) {
+                visit_children = false;
+                // resolve initialization using the possibilities as determined by the `currentObject`
+                // cursor.
+                ast::ptr< ast::Expr > untyped = new ast::UntypedInitExpr{
+                        singleInit->location, singleInit->value, currentObject.getOptions() };
+                ast::ptr<ast::Expr> newExpr = findSingleExpression( untyped, symtab );
+                const ast::InitExpr * initExpr = newExpr.strict_as< ast::InitExpr >();
+                // move cursor to the object that is actually initialized
+                currentObject.setNext( initExpr->designation );
+                // discard InitExpr wrapper and retain relevant pieces.
+                // `initExpr` may have inferred params in the case where the expression specialized a
+                // function pointer, and newExpr may already have inferParams of its own, so a simple
+                // swap is not sufficient
+                ast::Expr::InferUnion inferred = initExpr->inferred;
+                swap_and_save_env( newExpr, initExpr->expr );
+                newExpr.get_and_mutate()->inferred.splice( std::move(inferred) );
+                // get the actual object's type (may not exactly match what comes back from the resolver
+                // due to conversions)
+                const ast::Type * initContext = currentObject.getCurrentType();
+                removeExtraneousCast( newExpr, symtab );
+                // check if actual object's type is char[]
+                if ( auto at = dynamic_cast< const ast::ArrayType * >( initContext ) ) {
+                        if ( isCharType( at->base ) ) {
+                                // check if the resolved type is char*
+                                if ( auto pt = newExpr->result.as< ast::PointerType >() ) {
+                                        if ( isCharType( pt->base ) ) {
+                                                // strip cast if we're initializing a char[] with a char*
+                                                // e.g. char x[] = "hello"
+                                                if ( auto ce = newExpr.as< ast::CastExpr >() ) {
+                                                        swap_and_save_env( newExpr, ce->arg );
+                                                }
+                                        }
+                                }
+                        }
+                }
+                // move cursor to next object in preparation for next initializer
+                currentObject.increment();
+                // set initializer expression to resolved expression
+                return ast::mutate_field( singleInit, &ast::SingleInit::value, std::move(newExpr) );
+        }
+        const ast::ListInit * Resolver_new::previsit( const ast::ListInit * listInit ) {
+                // move cursor into brace-enclosed initializer-list
+                currentObject.enterListInit( listInit->location );
+                assert( listInit->designations.size() == listInit->initializers.size() );
+                for ( unsigned i = 0; i < listInit->designations.size(); ++i ) {
+                        // iterate designations and initializers in pairs, moving the cursor to the current
+                        // designated object and resolving the initializer against that object
+                        listInit = ast::mutate_field_index(
+                                listInit, &ast::ListInit::designations, i,
+                                currentObject.findNext( listInit->designations[i] ) );
+                        listInit = ast::mutate_field_index(
+                                listInit, &ast::ListInit::initializers, i,
+                                listInit->initializers[i]->accept( *visitor ) );
+                }
+                // move cursor out of brace-enclosed initializer-list
+                currentObject.exitListInit();
+                visit_children = false;
+                return listInit;
+        }
+        const ast::ConstructorInit * Resolver_new::previsit( const ast::ConstructorInit * ctorInit ) {
+                visitor->maybe_accept( ctorInit, &ast::ConstructorInit::ctor );
+                visitor->maybe_accept( ctorInit, &ast::ConstructorInit::dtor );
+                // found a constructor - can get rid of C-style initializer
+                // xxx - Rob suggests this field is dead code
+                ctorInit = ast::mutate_field( ctorInit, &ast::ConstructorInit::init, nullptr );
+                // intrinsic single-parameter constructors and destructors do nothing. Since this was
+                // implicitly generated, there's no way for it to have side effects, so get rid of it to
+                // clean up generated code
+                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->ctor ) ) {
+                        ctorInit = ast::mutate_field( ctorInit, &ast::ConstructorInit::ctor, nullptr );
+                }
+                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->dtor ) ) {
+                        ctorInit = ast::mutate_field( ctorInit, &ast::ConstructorInit::dtor, nullptr );
+                }
+                return ctorInit;
+        }
 } // namespace ResolvExpr

src/ResolvExpr/Resolver.h

-              r7951100
+              rb067d9b
 // Created On       : Sun May 17 12:18:34 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:36:57 2017
 // Update Count     : 3
+// Last Modified On : Mon Feb 18 20:40:38 2019
+// Update Count     : 4
 //
 #pragma once
+#include <list>  // for list
+#include <list>          // for list
+#include "AST/Node.hpp"  // for ptr
 class ConstructorInit;
 …
 class StmtExpr;
 namespace SymTab {
+class Indexer;
+}  // namespace SymTab
+        class Indexer;
+} // namespace SymTab
+namespace ast {
+        class ConstructorInit;
+        class Decl;
+        class DeletedExpr;
+        class Init;
+        class StmtExpr;
+        class SymbolTable;
+        class Type;
+        class TypeEnvironment;
+} // namespace ast
 namespace ResolvExpr {
         /// Checks types and binds syntactic constructs to typed representations
         void resolve( std::list< Declaration * > translationUnit );
         void resolveDecl( Declaration *, const SymTab::Indexer &indexer );
         Expression *resolveInVoidContext( Expression * expr, const SymTab::Indexer &indexer );
         void findVoidExpression( Expression *& untyped, const SymTab::Indexer &indexer );
         void findSingleExpression( Expression *& untyped, const SymTab::Indexer &indexer );
         void findSingleExpression( Expression *& untyped, Type * type, const SymTab::Indexer &indexer );
+        void resolveDecl( Declaration *, const SymTab::Indexer & indexer );
+        Expression *resolveInVoidContext( Expression * expr, const SymTab::Indexer & indexer );
+        void findVoidExpression( Expression *& untyped, const SymTab::Indexer & indexer );
+        void findSingleExpression( Expression *& untyped, const SymTab::Indexer & indexer );
+        void findSingleExpression( Expression *& untyped, Type * type, const SymTab::Indexer & indexer );
         void resolveCtorInit( ConstructorInit * ctorInit, const SymTab::Indexer & indexer );
         void resolveStmtExpr( StmtExpr * stmtExpr, const SymTab::Indexer & indexer );
+        /// Searches expr and returns the first DeletedExpr found, otherwise nullptr
+        DeletedExpr * findDeletedExpr( Expression * expr );
+        /// Resolves with-stmts and with-clauses on functions
+        void resolveWithExprs( std::list< Declaration * > & translationUnit );
+        /// Checks types and binds syntactic constructs to typed representations
+        void resolve( std::list< ast::ptr<ast::Decl> >& translationUnit );
+        /// Searches expr and returns the first DeletedExpr found, otherwise nullptr
+        const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr );
+        /// Find the expression candidate that is the unique best match for `untyped` in a `void`
+        /// context.
+        ast::ptr< ast::Expr > resolveInVoidContext(
+                const ast::Expr * expr, const ast::SymbolTable & symtab, ast::TypeEnvironment & env );
+        /// Resolve `untyped` to the single expression whose candidate is the best match for the
+        /// given type.
+        ast::ptr< ast::Expr > findSingleExpression(
+                const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab );
+        /// Resolves a constructor init expression
+        ast::ptr< ast::Init > resolveCtorInit(
+                const ast::ConstructorInit * ctorInit, const ast::SymbolTable & symtab );
+        /// Resolves a statement expression
+        ast::ptr< ast::Expr > resolveStmtExpr(
+                const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab );
 } // namespace ResolvExpr

src/ResolvExpr/TypeEnvironment.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:19:47 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun May 17 12:23:36 2015
 // Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jun 18 14:27:00 2019
+// Update Count     : 5
 //
 …
 #include <algorithm>                   // for copy, set_intersection
 #include <iterator>                    // for ostream_iterator, insert_iterator
+#include <memory>                      // for unique_ptr
 #include <utility>                     // for pair, move
 …
 #include "SynTree/Type.h"              // for Type, FunctionType, Type::Fora...
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
+#include "Tuples/Tuples.h"             // for isTtype
 #include "TypeEnvironment.h"
+#include "typeops.h"                   // for occurs
+#include "Unify.h"                     // for unifyInexact
 namespace ResolvExpr {
 …
+        }
+        EqvClass::EqvClass( EqvClass &&other )
+        : vars{std::move(other.vars)}, type{other.type},
+          allowWidening{std::move(other.allowWidening)}, data{std::move(other.data)} {
+                  other.type = nullptr;
+        }
         EqvClass &EqvClass::operator=( const EqvClass &other ) {
                 if ( this == &other ) return *this;
 …
+        }
+        EqvClass &EqvClass::operator=( EqvClass &&other ) {
+                if ( this == &other ) return *this;
+                delete type;
+                vars = std::move(other.vars);
+                type = other.type;
+                other.type = nullptr;
+                allowWidening = std::move(other.allowWidening);
+                data = std::move(other.data);
+                return *this;
+        }
         EqvClass::~EqvClass() {
                 delete type;
+        }
+        void EqvClass::set_type( Type* ty ) {
+                if ( ty == type ) return;
+                delete type;
+                type = ty;
+        }
 …
         const EqvClass* TypeEnvironment::lookup( const std::string &var ) const {
+                for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) {
+                        if ( i->vars.find( var ) != i->vars.end() ) {
+///       std::cout << var << " is in class ";
+///       i->print( std::cout );
+                                return &*i;
+                        }
+///     std::cout << var << " is not in class ";
+///     i->print( std::cout );
+                for ( ClassList::const_iterator i = env.begin(); i != env.end(); ++i ) {
+                        if ( i->vars.find( var ) != i->vars.end() ) return &*i;
                 } // for
                 return nullptr;
 …
                         ++next;
                         std::set<std::string> intersection;
                         std::set_intersection( i->vars.begin(), i->vars.end(), eqvClass.vars.begin(), eqvClass.vars.end(),
+                        std::set_intersection( i->vars.begin(), i->vars.end(), eqvClass.vars.begin(), eqvClass.vars.end(),
                                 std::inserter( intersection, intersection.begin() ) );
                         if ( ! intersection.empty() ) { env.erase( i ); }
                         i = next;
+                }
+        }
-        void TypeEnvironment::add( const EqvClass &eqvClass ) {
-                filterOverlappingClasses( env, eqvClass );
-                env.push_back( eqvClass );
+        }
 …
                         newClass.vars.insert( (*i)->get_name() );
                         newClass.data = TypeDecl::Data{ (*i) };
                         env.push_back( newClass );
+                        env.push_back( std::move(newClass) );
                 } // for
+        }
 …
                         // transition to TypeSubstitution
                         newClass.data = TypeDecl::Data{ TypeDecl::Dtype, false };
                         add( newClass );
+                        add( std::move(newClass) );
+                }
+        }
         void TypeEnvironment::makeSubstitution( TypeSubstitution &sub ) const {
                 for ( std::list< EqvClass >::const_iterator theClass = env.begin(); theClass != env.end(); ++theClass ) {
+                for ( ClassList::const_iterator theClass = env.begin(); theClass != env.end(); ++theClass ) {
                         for ( std::set< std::string >::const_iterator theVar = theClass->vars.begin(); theVar != theClass->vars.end(); ++theVar ) {
-///       std::cerr << "adding " << *theVar;
                                 if ( theClass->type ) {
-///         std::cerr << " bound to ";
-///         theClass->type->print( std::cerr );
-///         std::cerr << std::endl;
                                         sub.add( *theVar, theClass->type );
                                 } else if ( theVar != theClass->vars.begin() ) {
                                         TypeInstType *newTypeInst = new TypeInstType( Type::Qualifiers(), *theClass->vars.begin(), theClass->data.kind == TypeDecl::Ftype );
-///         std::cerr << " bound to variable " << *theClass->vars.begin() << std::endl;
                                         sub.add( *theVar, newTypeInst );
                                         delete newTypeInst;
 …
                         } // for
                 } // for
-///   std::cerr << "input env is:" << std::endl;
-///   print( std::cerr, 8 );
-///   std::cerr << "sub is:" << std::endl;
-///   sub.print( std::cerr, 8 );
                 sub.normalize();
+        }
 …
+        }
+        std::list< EqvClass >::iterator TypeEnvironment::internal_lookup( const std::string &var ) {
+                for ( std::list< EqvClass >::iterator i = env.begin(); i != env.end(); ++i ) {
+                        if ( i->vars.find( var ) == i->vars.end() ) {
+                                return i;
+                        } // if
+        TypeEnvironment::ClassList::iterator TypeEnvironment::internal_lookup( const std::string &var ) {
+                for ( ClassList::iterator i = env.begin(); i != env.end(); ++i ) {
+                        if ( i->vars.count( var ) ) return i;
                 } // for
                 return env.end();
 …
+        }
+        void TypeEnvironment::combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) ) {
+                TypeEnvironment secondCopy( second );
+                for ( std::list< EqvClass >::iterator firstClass = env.begin(); firstClass != env.end(); ++firstClass ) {
+                        EqvClass &newClass = *firstClass;
+                        std::set< std::string > newVars;
+                        for ( std::set< std::string >::const_iterator var = firstClass->vars.begin(); var != firstClass->vars.end(); ++var ) {
+                                std::list< EqvClass >::iterator secondClass = secondCopy.internal_lookup( *var );
+                                if ( secondClass != secondCopy.env.end() ) {
+                                        newVars.insert( secondClass->vars.begin(), secondClass->vars.end() );
+                                        if ( secondClass->type ) {
+                                                if ( newClass.type ) {
+                                                        Type *newType = combineFunc( newClass.type, secondClass->type );
+                                                        delete newClass.type;
+                                                        newClass.type = newType;
+                                                        newClass.allowWidening = newClass.allowWidening && secondClass->allowWidening;
+                                                } else {
+                                                        newClass.type = secondClass->type->clone();
+                                                        newClass.allowWidening = secondClass->allowWidening;
+                                                } // if
+                                        } // if
+                                        secondCopy.env.erase( secondClass );
+                                } // if
+                        } // for
+                        newClass.vars.insert( newVars.begin(), newVars.end() );
+                } // for
+                for ( std::list< EqvClass >::iterator secondClass = secondCopy.env.begin(); secondClass != secondCopy.env.end(); ++secondClass ) {
+                        env.push_back( *secondClass );
+                } // for
+        // xxx -- this should maybe be worrying about iterator invalidation (see resolv-proto)
+        bool TypeEnvironment::mergeBound( EqvClass& to, const EqvClass& from, OpenVarSet& openVars, const SymTab::Indexer& indexer ) {
+                if ( from.type ) {
+                        if ( to.type ) {
+                                // attempt to unify bound types
+                                std::unique_ptr<Type> toType{ to.type->clone() }, fromType{ from.type->clone() };
+                                WidenMode widen{ to.allowWidening, from.allowWidening };
+                                Type* common = nullptr;
+                                AssertionSet need, have;
+                                if ( unifyInexact( toType.get(), fromType.get(), *this, need, have, openVars, widen, indexer, common ) ) {
+                                        // unifies, set common type if necessary
+                                        if ( common ) {
+                                                common->get_qualifiers() = Type::Qualifiers{};
+                                                to.set_type( common );
+                                        }
+                                } else return false; // cannot unify
+                        } else {
+                                to.type = from.type->clone();
+                        }
+                }
+                // unify widening if matches
+                to.allowWidening &= from.allowWidening;
+                return true;
+        }
+        // xxx -- this should maybe be worrying about iterator invalidation (see resolv-proto)
+        bool TypeEnvironment::mergeClasses( TypeEnvironment::ClassList::iterator to, TypeEnvironment::ClassList::iterator from, OpenVarSet& openVars, const SymTab::Indexer& indexer ) {
+                EqvClass& r = *to;
+                EqvClass& s = *from;
+                // ensure bounds match
+                if ( ! mergeBound( r, s, openVars, indexer ) ) return false;
+                // check safely bindable
+                if ( r.type && occursIn( r.type, s.vars.begin(), s.vars.end(), *this ) ) return false;
+                // merge classes in
+                r.vars.insert( s.vars.begin(), s.vars.end() );
+                r.allowWidening &= s.allowWidening;
+                env.erase( from );
+                return true;
+        }
+        bool TypeEnvironment::combine( const TypeEnvironment& o, OpenVarSet& openVars, const SymTab::Indexer& indexer ) {
+                // short-circuit easy cases
+                if ( o.isEmpty() ) return true;
+                if ( isEmpty() ) {
+                        simpleCombine( o );
+                        return true;
+                }
+                // merge classes
+                for ( auto ct = o.env.begin(); ct != o.env.end(); ++ct ) {
+                        const EqvClass& c = *ct;
+                        // typeclass in local environment bound to c
+                        auto rt = env.end();
+                        // look for first existing bound variable
+                        auto vt = c.vars.begin();
+                        for ( ; vt != c.vars.end(); ++vt ) {
+                                rt = internal_lookup( *vt );
+                                if ( rt != env.end() ) break;
+                        }
+                        if ( rt != env.end() ) {  // c needs to be merged into *rt
+                                EqvClass& r = *rt;
+                                // merge bindings
+                                if ( ! mergeBound( r, c, openVars, indexer ) ) return false;
+                                // merge previous unbound variables into this class, checking occurs if needed
+                                if ( r.type ) for ( auto ut = c.vars.begin(); ut != vt; ++ut ) {
+                                        if ( occurs( r.type, *ut, *this ) ) return false;
+                                        r.vars.insert( *ut );
+                                } else { r.vars.insert( c.vars.begin(), vt ); }
+                                // merge subsequent variables into this class (skipping *vt, already there)
+                                while ( ++vt != c.vars.end() ) {
+                                        auto st = internal_lookup( *vt );
+                                        if ( st == env.end() ) {
+                                                // unbound, safe to add if passes occurs
+                                                if ( r.type && occurs( r.type, *vt, *this ) ) return false;
+                                                r.vars.insert( *vt );
+                                        } else if ( st != rt ) {
+                                                // bound, but not to the same class
+                                                if ( ! mergeClasses( rt, st, openVars, indexer ) ) return false;
+                                        }   // ignore bound into the same class
+                                }
+                        } else {  // no variables in c bound; just copy up
+                                env.push_back( c );
+                        }
+                }
+                // merged all classes
+                return true;
+        }
         void TypeEnvironment::extractOpenVars( OpenVarSet &openVars ) const {
                 for ( std::list< EqvClass >::const_iterator eqvClass = env.begin(); eqvClass != env.end(); ++eqvClass ) {
+                for ( ClassList::const_iterator eqvClass = env.begin(); eqvClass != env.end(); ++eqvClass ) {
                         for ( std::set< std::string >::const_iterator var = eqvClass->vars.begin(); var != eqvClass->vars.end(); ++var ) {
                                 openVars[ *var ] = eqvClass->data;
 …
+        }
+        bool isFtype( const Type * type ) {
+                if ( dynamic_cast< const FunctionType * >( type ) ) {
+                        return true;
+                } else if ( const TypeInstType *typeInst = dynamic_cast< const TypeInstType * >( type ) ) {
+                        return typeInst->get_isFtype();
+                } // if
+                return false;
+        }
+        bool tyVarCompatible( const TypeDecl::Data & data, const Type * type ) {
+                switch ( data.kind ) {
+                  case TypeDecl::Dtype:
+                        // to bind to an object type variable, the type must not be a function type.
+                        // if the type variable is specified to be a complete type then the incoming
+                        // type must also be complete
+                        // xxx - should this also check that type is not a tuple type and that it's not a ttype?
+                        return ! isFtype( type ) && (! data.isComplete || type->isComplete() );
+                  case TypeDecl::Ftype:
+                        return isFtype( type );
+                  case TypeDecl::Ttype:
+                        // ttype unifies with any tuple type
+                        return dynamic_cast< const TupleType * >( type ) || Tuples::isTtype( type );
+                  default:
+                        assertf(false, "Unhandled tyvar kind: %d", data.kind);
+                } // switch
+                return false;
+        }
+        bool TypeEnvironment::bindVar( const TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer ) {
+                // remove references from other, so that type variables can only bind to value types
+                bindTo = bindTo->stripReferences();
+                OpenVarSet::const_iterator tyvar = openVars.find( typeInst->get_name() );
+                assert( tyvar != openVars.end() );
+                if ( ! tyVarCompatible( tyvar->second, bindTo ) ) {
+                        return false;
+                } // if
+                if ( occurs( bindTo, typeInst->get_name(), *this ) ) {
+                        return false;
+                } // if
+                auto curClass = internal_lookup( typeInst->get_name() );
+                if ( curClass != env.end() ) {
+                        if ( curClass->type ) {
+                                Type *common = 0;
+                                // attempt to unify equivalence class type (which has qualifiers stripped, so they must be restored) with the type to bind to
+                                std::unique_ptr< Type > newType( curClass->type->clone() );
+                                newType->tq = typeInst->tq;
+                                if ( unifyInexact( newType.get(), bindTo, *this, need, have, openVars, widen & WidenMode( curClass->allowWidening, true ), indexer, common ) ) {
+                                        if ( common ) {
+                                                common->get_qualifiers() = Type::Qualifiers{};
+                                                curClass->set_type( common );
+                                        } // if
+                                } else return false;
+                        } else {
+                                Type* newType = bindTo->clone();
+                                newType->get_qualifiers() = Type::Qualifiers{};
+                                curClass->set_type( newType );
+                                curClass->allowWidening = widen.first && widen.second;
+                        } // if
+                } else {
+                        EqvClass newClass;
+                        newClass.vars.insert( typeInst->get_name() );
+                        newClass.type = bindTo->clone();
+                        newClass.type->get_qualifiers() = Type::Qualifiers();
+                        newClass.allowWidening = widen.first && widen.second;
+                        newClass.data = data;
+                        env.push_back( std::move(newClass) );
+                } // if
+                return true;
+        }
+        bool TypeEnvironment::bindVarToVar( const TypeInstType * var1, const TypeInstType * var2,
+                        TypeDecl::Data && data, AssertionSet &need, AssertionSet &have,
+                        const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer ) {
+                auto class1 = internal_lookup( var1->get_name() );
+                auto class2 = internal_lookup( var2->get_name() );
+                // exit early if variables already bound together
+                if ( class1 != env.end() && class1 == class2 ) {
+                        class1->allowWidening &= widen;
+                        return true;
+                }
+                bool widen1 = false, widen2 = false;
+                const Type *type1 = nullptr, *type2 = nullptr;
+                // check for existing bindings, perform occurs check
+                if ( class1 != env.end() ) {
+                        if ( class1->type ) {
+                                if ( occurs( class1->type, var2->get_name(), *this ) ) return false;
+                                type1 = class1->type;
+                        } // if
+                        widen1 = widen.first && class1->allowWidening;
+                } // if
+                if ( class2 != env.end() ) {
+                        if ( class2->type ) {
+                                if ( occurs( class2->type, var1->get_name(), *this ) ) return false;
+                                type2 = class2->type;
+                        } // if
+                        widen2 = widen.second && class2->allowWidening;
+                } // if
+                if ( type1 && type2 ) {
+                        // both classes bound, merge if bound types can be unified
+                        std::unique_ptr<Type> newType1{ type1->clone() }, newType2{ type2->clone() };
+                        WidenMode newWidenMode{ widen1, widen2 };
+                        Type *common = 0;
+                        if ( unifyInexact( newType1.get(), newType2.get(), *this, need, have, openVars, newWidenMode, indexer, common ) ) {
+                                class1->vars.insert( class2->vars.begin(), class2->vars.end() );
+                                class1->allowWidening = widen1 && widen2;
+                                if ( common ) {
+                                        common->get_qualifiers() = Type::Qualifiers{};
+                                        class1->set_type( common );
+                                }
+                                class1->data.isComplete |= data.isComplete;
+                                env.erase( class2 );
+                        } else return false;
+                } else if ( class1 != env.end() && class2 != env.end() ) {
+                        // both classes exist, at least one unbound, merge unconditionally
+                        if ( type1 ) {
+                                class1->vars.insert( class2->vars.begin(), class2->vars.end() );
+                                class1->allowWidening = widen1;
+                                class1->data.isComplete |= data.isComplete;
+                                env.erase( class2 );
+                        } else {
+                                class2->vars.insert( class1->vars.begin(), class1->vars.end() );
+                                class2->allowWidening = widen2;
+                                class2->data.isComplete |= data.isComplete;
+                                env.erase( class1 );
+                        } // if
+                } else if ( class1 != env.end() ) {
+                        // var2 unbound, add to class1
+                        class1->vars.insert( var2->get_name() );
+                        class1->allowWidening = widen1;
+                        class1->data.isComplete |= data.isComplete;
+                } else if ( class2 != env.end() ) {
+                        // var1 unbound, add to class2
+                        class2->vars.insert( var1->get_name() );
+                        class2->allowWidening = widen2;
+                        class2->data.isComplete |= data.isComplete;
+                } else {
+                        // neither var bound, create new class
+                        EqvClass newClass;
+                        newClass.vars.insert( var1->get_name() );
+                        newClass.vars.insert( var2->get_name() );
+                        newClass.allowWidening = widen1 && widen2;
+                        newClass.data = data;
+                        env.push_back( std::move(newClass) );
+                } // if
+                return true;
+        }
+        void TypeEnvironment::forbidWidening() {
+                for ( EqvClass& c : env ) c.allowWidening = false;
+        }
         std::ostream & operator<<( std::ostream & out, const TypeEnvironment & env ) {
                 env.print( out );

src/ResolvExpr/TypeEnvironment.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:24:58 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:35:45 2017
 // Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jul 19 17:00:10 2019
+// Update Count     : 10
 //
 …
 #include <iostream>                    // for ostream
 #include <list>                        // for list, list<>::iterator, list<>...
+#include <map>                         // for map, map<>::value_compare
+#include <set>                         // for set
+#include <map>                                             // for map, map<>::value_compare
+#include <unordered_map>
+#include <set>                                             // for set
 #include <string>                      // for string
+#include <utility>                     // for move, swap
+#include "WidenMode.h"                 // for WidenMode
 #include "SynTree/Declaration.h"       // for TypeDecl::Data, DeclarationWit...
 …
         // declarations.
         //
+        // I've seen a TU go from 54 minutes to 1 minute 34 seconds with the addition of this comparator.
+        // I've seen a TU go from 54 minutes to 1 minute 34 seconds with the addition of this
+        // comparator.
         //
         // Note: since this compares pointers for position, minor changes in the source file that affect
         // memory layout can alter compilation time in unpredictable ways. For example, the placement
         // of a line directive can reorder type pointers with respect to each other so that assertions
+        // are seen in different orders, causing a potentially different number of unification calls when
+        // resolving assertions. I've seen a TU go from 36 seconds to 27 seconds by reordering line directives
+        // alone, so it would be nice to fix this comparison so that assertions compare more consistently.
+        // I've tried to modify this to compare on mangle name instead of type as the second comparator, but
+        // this causes some assertions to never be recorded. More investigation is needed.
+        // are seen in different orders, causing a potentially different number of unification calls
+        // when resolving assertions. I've seen a TU go from 36 seconds to 27 seconds by reordering
+        // line directives alone, so it would be nice to fix this comparison so that assertions compare
+        // more consistently. I've tried to modify this to compare on mangle name instead of type as
+        // the second comparator, but this causes some assertions to never be recorded. More
+        // investigation is needed.
         struct AssertCompare {
                 bool operator()( DeclarationWithType * d1, DeclarationWithType * d2 ) const {
+                bool operator()( const DeclarationWithType * d1, const DeclarationWithType * d2 ) const {
                         int cmp = d1->get_name().compare( d2->get_name() );
                         return cmp < 0 ||
 …
         };
         struct AssertionSetValue {
+                bool isUsed;
+                // chain of Unique IDs of the assertion declarations. The first ID in the chain is the ID of an assertion on the current type,
+                // with each successive ID being the ID of an assertion pulled in by the previous ID. The last ID in the chain is
+                // the ID of the assertion that pulled in the current assertion.
+                std::list< UniqueId > idChain;
+                bool isUsed;        ///< True if assertion needs to be resolved
+                UniqueId resnSlot;  ///< ID of slot assertion belongs to
+                AssertionSetValue() : isUsed(false), resnSlot(0) {}
         };
+        typedef std::map< DeclarationWithType*, AssertionSetValue, AssertCompare > AssertionSet;
+        typedef std::map< std::string, TypeDecl::Data > OpenVarSet;
+        typedef std::map< const DeclarationWithType *, AssertionSetValue, AssertCompare > AssertionSet;
+        typedef std::unordered_map< std::string, TypeDecl::Data > OpenVarSet;
+        /// merges one set of open vars into another
+        static inline void mergeOpenVars( OpenVarSet& dst, const OpenVarSet& src ) {
+                for ( const auto& entry : src ) { dst[ entry.first ] = entry.second; }
+        }
         void printAssertionSet( const AssertionSet &, std::ostream &, int indent = 0 );
 …
         struct EqvClass {
                 std::set< std::string > vars;
                 Type *type;
+                Type * type;
                 bool allowWidening;
                 TypeDecl::Data data;
 …
                 EqvClass( const EqvClass &other );
                 EqvClass( const EqvClass &other, const Type *ty );
+                EqvClass( EqvClass &&other );
                 EqvClass &operator=( const EqvClass &other );
+                EqvClass &operator=( EqvClass &&other );
                 ~EqvClass();
                 void print( std::ostream &os, Indenter indent = {} ) const;
+                /// Takes ownership of `ty`, freeing old `type`
+                void set_type(Type* ty);
         };
         class TypeEnvironment {
+                using ClassList = std::list< EqvClass >;
           public:
                 const EqvClass* lookup( const std::string &var ) const;
                 void add( const EqvClass &eqvClass );
+          private:
                 void add( EqvClass &&eqvClass  );
+          public:
                 void add( const Type::ForallList &tyDecls );
                 void add( const TypeSubstitution & sub );
 …
                 bool isEmpty() const { return env.empty(); }
                 void print( std::ostream &os, Indenter indent = {} ) const;
+                void combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) );
+                /// Simply concatenate the second environment onto this one; no safety checks performed
                 void simpleCombine( const TypeEnvironment &second );
+          private:
+                /// Unifies the type bound of to with the type bound of from, returning false if fails
+                bool mergeBound( EqvClass& to, const EqvClass& from, OpenVarSet& openVars, const SymTab::Indexer& indexer );
+                /// Merges two type classes from local environment, returning false if fails
+                bool mergeClasses( ClassList::iterator to, ClassList::iterator from, OpenVarSet& openVars, const SymTab::Indexer& indexer );
+          public:
+                /// Merges the second environment with this one, checking compatibility.
+                /// Returns false if fails, but does NOT roll back partial changes.
+                bool combine( const TypeEnvironment& second, OpenVarSet& openVars, const SymTab::Indexer& indexer );
                 void extractOpenVars( OpenVarSet &openVars ) const;
                 TypeEnvironment *clone() const { return new TypeEnvironment( *this ); }
 …
                 void addActual( const TypeEnvironment& actualEnv, OpenVarSet& openVars );
+                typedef std::list< EqvClass >::iterator iterator;
+                iterator begin() { return env.begin(); }
+                iterator end() { return env.end(); }
+                typedef std::list< EqvClass >::const_iterator const_iterator;
+                const_iterator begin() const { return env.begin(); }
+                const_iterator end() const { return env.end(); }
+                /// Binds the type class represented by `typeInst` to the type `bindTo`; will add
+                /// the class if needed. Returns false on failure.
+                bool bindVar( const TypeInstType * typeInst, Type * bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer );
+                /// Binds the type classes represented by `var1` and `var2` together; will add
+                /// one or both classes if needed. Returns false on failure.
+                bool bindVarToVar( const TypeInstType * var1, const TypeInstType * var2, TypeDecl::Data && data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer );
+                /// Disallows widening for all bindings in the environment
+                void forbidWidening();
+                using iterator = ClassList::const_iterator;
+                iterator begin() const { return env.begin(); }
+                iterator end() const { return env.end(); }
           private:
+                std::list< EqvClass > env;
+                std::list< EqvClass >::iterator internal_lookup( const std::string &var );
+                ClassList env;
+                ClassList::iterator internal_lookup( const std::string &var );
         };

src/ResolvExpr/Unify.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar 16 16:22:54 2017
 // Update Count     : 42
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Sep  4 10:00:00 2019
+// Update Count     : 44
 //
-#include <cassert>                // for assertf, assert
-#include <iterator>               // for back_insert_iterator, back_inserter
-#include <map>                    // for _Rb_tree_const_iterator, _Rb_tree_i...
-#include <memory>                 // for unique_ptr
-#include <set>                    // for set
-#include <string>                 // for string, operator==, operator!=, bas...
-#include <utility>                // for pair, move
-#include "Common/PassVisitor.h"   // for PassVisitor
-#include "FindOpenVars.h"         // for findOpenVars
-#include "Parser/LinkageSpec.h"   // for C
-#include "SynTree/Constant.h"     // for Constant
-#include "SynTree/Declaration.h"  // for TypeDecl, TypeDecl::Data, Declarati...
-#include "SynTree/Expression.h"   // for TypeExpr, Expression, ConstantExpr
-#include "SynTree/Mutator.h"      // for Mutator
-#include "SynTree/Type.h"         // for Type, TypeInstType, FunctionType
-#include "SynTree/Visitor.h"      // for Visitor
-#include "Tuples/Tuples.h"        // for isTtype
-#include "TypeEnvironment.h"      // for EqvClass, AssertionSet, OpenVarSet
 #include "Unify.h"
+#include "typeops.h"              // for flatten, occurs, commonType
+#include <cassert>                  // for assertf, assert
+#include <iterator>                 // for back_insert_iterator, back_inserter
+#include <map>                      // for _Rb_tree_const_iterator, _Rb_tree_i...
+#include <memory>                   // for unique_ptr
+#include <set>                      // for set
+#include <string>                   // for string, operator==, operator!=, bas...
+#include <utility>                  // for pair, move
+#include <vector>
+#include "AST/Decl.hpp"
+#include "AST/Node.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
+#include "Common/PassVisitor.h"     // for PassVisitor
+#include "FindOpenVars.h"           // for findOpenVars
+#include "Parser/LinkageSpec.h"     // for C
+#include "SynTree/Constant.h"       // for Constant
+#include "SynTree/Declaration.h"    // for TypeDecl, TypeDecl::Data, Declarati...
+#include "SynTree/Expression.h"     // for TypeExpr, Expression, ConstantExpr
+#include "SynTree/Mutator.h"        // for Mutator
+#include "SynTree/Type.h"           // for Type, TypeInstType, FunctionType
+#include "SynTree/Visitor.h"        // for Visitor
+#include "Tuples/Tuples.h"          // for isTtype
+#include "TypeEnvironment.h"        // for EqvClass, AssertionSet, OpenVarSet
+#include "typeops.h"                // for flatten, occurs, commonType
+namespace ast {
+        class SymbolTable;
+}
 namespace SymTab {
 …
 namespace ResolvExpr {
         struct Unify : public WithShortCircuiting {
                 Unify( Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
+        struct Unify_old : public WithShortCircuiting {
+                Unify_old( Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer );
                 bool get_result() const { return result; }
 …
                 AssertionSet &haveAssertions;
                 const OpenVarSet &openVars;
                 WidenMode widenMode;
+                WidenMode widen;
                 const SymTab::Indexer &indexer;
         };
 …
         /// Attempts an inexact unification of type1 and type2.
         /// Returns false if no such unification; if the types can be unified, sets common (unless they unify exactly and have identical type qualifiers)
+        bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer, Type *&common );
+        bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
+        bool typesCompatible( Type *first, Type *second, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+        bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer, Type *&common );
+        bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer );
+        bool unifyExact(
+                const ast::Type * type1, const ast::Type * type2, ast::TypeEnvironment & env,
+                ast::AssertionSet & need, ast::AssertionSet & have, const ast::OpenVarSet & open,
+                WidenMode widen, const ast::SymbolTable & symtab );
+        bool typesCompatible( const Type * first, const Type * second, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
                 TypeEnvironment newEnv;
                 OpenVarSet openVars, closedVars; // added closedVars
                 AssertionSet needAssertions, haveAssertions;
                 Type *newFirst = first->clone(), *newSecond = second->clone();
+                Type * newFirst = first->clone(), * newSecond = second->clone();
                 env.apply( newFirst );
                 env.apply( newSecond );
 …
+        }
+        bool typesCompatibleIgnoreQualifiers( Type *first, Type *second, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+        bool typesCompatible(
+                        const ast::Type * first, const ast::Type * second, const ast::SymbolTable & symtab,
+                        const ast::TypeEnvironment & env ) {
+                ast::TypeEnvironment newEnv;
+                ast::OpenVarSet open, closed;
+                ast::AssertionSet need, have;
+                ast::ptr<ast::Type> newFirst{ first }, newSecond{ second };
+                env.apply( newFirst );
+                env.apply( newSecond );
+                findOpenVars( newFirst, open, closed, need, have, FirstClosed );
+                findOpenVars( newSecond, open, closed, need, have, FirstOpen );
+                return unifyExact(
+                        newFirst, newSecond, newEnv, need, have, open, noWiden(), symtab );
+        }
+        bool typesCompatibleIgnoreQualifiers( const Type * first, const Type * second, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 TypeEnvironment newEnv;
                 OpenVarSet openVars;
 …
+        }
+        bool isFtype( Type *type ) {
+                if ( dynamic_cast< FunctionType* >( type ) ) {
+                        return true;
+                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                        return typeInst->get_isFtype();
+                } // if
+                return false;
+        }
+        bool tyVarCompatible( const TypeDecl::Data & data, Type *type ) {
+                switch ( data.kind ) {
+                  case TypeDecl::Dtype:
+                        // to bind to an object type variable, the type must not be a function type.
+                        // if the type variable is specified to be a complete type then the incoming
+                        // type must also be complete
+                        // xxx - should this also check that type is not a tuple type and that it's not a ttype?
+                        return ! isFtype( type ) && (! data.isComplete || type->isComplete() );
+                  case TypeDecl::Ftype:
+                        return isFtype( type );
+                  case TypeDecl::Ttype:
+                        // ttype unifies with any tuple type
+                        return dynamic_cast< TupleType * >( type ) || Tuples::isTtype( type );
+                } // switch
+                return false;
+        }
+        bool bindVar( TypeInstType *typeInst, Type *other, const TypeDecl::Data & data, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+                // remove references from other, so that type variables can only bind to value types
+                other = other->stripReferences();
+                OpenVarSet::const_iterator tyvar = openVars.find( typeInst->get_name() );
+                assert( tyvar != openVars.end() );
+                if ( ! tyVarCompatible( tyvar->second, other ) ) {
+                        return false;
+                } // if
+                if ( occurs( other, typeInst->get_name(), env ) ) {
+                        return false;
+                } // if
+                if ( const EqvClass *curClass = env.lookup( typeInst->get_name() ) ) {
+                        if ( curClass->type ) {
+                                Type *common = 0;
+                                // attempt to unify equivalence class type (which has qualifiers stripped, so they must be restored) with the type to bind to
+                                std::unique_ptr< Type > newType( curClass->type->clone() );
+                                newType->get_qualifiers() = typeInst->get_qualifiers();
+                                if ( unifyInexact( newType.get(), other, env, needAssertions, haveAssertions, openVars, widenMode & WidenMode( curClass->allowWidening, true ), indexer, common ) ) {
+                                        if ( common ) {
+                                                common->get_qualifiers() = Type::Qualifiers();
+                                                env.add( EqvClass{ *curClass, common } );
+                                        } // if
+                                        return true;
+                                } else {
+                                        return false;
+                                } // if
+                        } else {
+                                EqvClass newClass { *curClass, other };
+                                newClass.type->get_qualifiers() = Type::Qualifiers();
+                                newClass.allowWidening = widenMode.widenFirst && widenMode.widenSecond;
+                                env.add( std::move(newClass) );
+                        } // if
+                } else {
+                        EqvClass newClass;
+                        newClass.vars.insert( typeInst->get_name() );
+                        newClass.type = other->clone();
+                        newClass.type->get_qualifiers() = Type::Qualifiers();
+                        newClass.allowWidening = widenMode.widenFirst && widenMode.widenSecond;
+                        newClass.data = data;
+                        env.add( newClass );
+                } // if
+                return true;
+        }
+        bool bindVarToVar( TypeInstType *var1, TypeInstType *var2, const TypeDecl::Data & data, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+                bool result = true;
+                const EqvClass *class1 = env.lookup( var1->get_name() );
+                const EqvClass *class2 = env.lookup( var2->get_name() );
+                bool widen1 = false, widen2 = false;
+                Type *type1 = nullptr, *type2 = nullptr;
+                if ( class1 ) {
+                        if ( class1->type ) {
+                                if ( occurs( class1->type, var2->get_name(), env ) ) {
+                                        return false;
+                                } // if
+                                type1 = class1->type->clone();
+                        } // if
+                        widen1 = widenMode.widenFirst && class1->allowWidening;
+                } // if
+                if ( class2 ) {
+                        if ( class2->type ) {
+                                if ( occurs( class2->type, var1->get_name(), env ) ) {
+                                        return false;
+                                } // if
+                                type2 = class2->type->clone();
+                        } // if
+                        widen2 = widenMode.widenSecond && class2->allowWidening;
+                } // if
+                if ( type1 && type2 ) {
+//    std::cerr << "has type1 && type2" << std::endl;
+                        WidenMode newWidenMode ( widen1, widen2 );
+                        Type *common = 0;
+                        if ( unifyInexact( type1, type2, env, needAssertions, haveAssertions, openVars, newWidenMode, indexer, common ) ) {
+                                EqvClass newClass1 = *class1;
+                                newClass1.vars.insert( class2->vars.begin(), class2->vars.end() );
+                                newClass1.allowWidening = widen1 && widen2;
+                                if ( common ) {
+                                        common->get_qualifiers() = Type::Qualifiers();
+                                        delete newClass1.type;
+                                        newClass1.type = common;
+                                } // if
+                                env.add( std::move(newClass1) );
+                        } else {
+                                result = false;
+                        } // if
+                } else if ( class1 && class2 ) {
+                        if ( type1 ) {
+                                EqvClass newClass1 = *class1;
+                                newClass1.vars.insert( class2->vars.begin(), class2->vars.end() );
+                                newClass1.allowWidening = widen1;
+                                env.add( std::move(newClass1) );
+                        } else {
+                                EqvClass newClass2 = *class2;
+                                newClass2.vars.insert( class1->vars.begin(), class1->vars.end() );
+                                newClass2.allowWidening = widen2;
+                                env.add( std::move(newClass2) );
+                        } // if
+                } else if ( class1 ) {
+                        EqvClass newClass1 = *class1;
+                        newClass1.vars.insert( var2->get_name() );
+                        newClass1.allowWidening = widen1;
+                        env.add( std::move(newClass1) );
+                } else if ( class2 ) {
+                        EqvClass newClass2 = *class2;
+                        newClass2.vars.insert( var1->get_name() );
+                        newClass2.allowWidening = widen2;
+                        env.add( std::move(newClass2) );
+                } else {
+                        EqvClass newClass;
+                        newClass.vars.insert( var1->get_name() );
+                        newClass.vars.insert( var2->get_name() );
+                        newClass.allowWidening = widen1 && widen2;
+                        newClass.data = data;
+                        env.add( newClass );
+                } // if
+                delete type1;
+                delete type2;
+                return result;
+        bool typesCompatibleIgnoreQualifiers(
+                        const ast::Type * first, const ast::Type * second, const ast::SymbolTable & symtab,
+                        const ast::TypeEnvironment & env ) {
+                ast::TypeEnvironment newEnv;
+                ast::OpenVarSet open;
+                ast::AssertionSet need, have;
+                ast::ptr<ast::Type> newFirst{ first }, newSecond{ second };
+                env.apply( newFirst );
+                env.apply( newSecond );
+                reset_qualifiers( newFirst );
+                reset_qualifiers( newSecond );
+                return unifyExact(
+                        newFirst, newSecond, newEnv, need, have, open, noWiden(), symtab );
+        }
 …
+        }
         bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+        bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer ) {
 #ifdef DEBUG
                 TypeEnvironment debugEnv( env );
 …
                 bool isopen2 = var2 && ( entry2 != openVars.end() );
+                if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
+                        result = bindVarToVar( var1, var2, entry1->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                if ( isopen1 && isopen2 ) {
+                        if ( entry1->second.kind != entry2->second.kind ) {
+                                result = false;
+                        } else {
+                                result = env.bindVarToVar(
+                                        var1, var2, TypeDecl::Data{ entry1->second, entry2->second }, needAssertions,
+                                        haveAssertions, openVars, widen, indexer );
+                        }
                 } else if ( isopen1 ) {
                         result = bindVar( var1, type2, entry1->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } else if ( isopen2 ) { // TODO: swap widenMode values in call, since type positions are flipped?
                         result = bindVar( var2, type1, entry2->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                        result = env.bindVar( var1, type2, entry1->second, needAssertions, haveAssertions, openVars, widen, indexer );
+                } else if ( isopen2 ) { // TODO: swap widen values in call, since type positions are flipped?
+                        result = env.bindVar( var2, type1, entry2->second, needAssertions, haveAssertions, openVars, widen, indexer );
                 } else {
                         PassVisitor<Unify> comparator( type2, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                        PassVisitor<Unify_old> comparator( type2, env, needAssertions, haveAssertions, openVars, widen, indexer );
                         type1->accept( comparator );
                         result = comparator.pass.get_result();
 …
+        }
         bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer, Type *&common ) {
+        bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer, Type *&common ) {
                 Type::Qualifiers tq1 = type1->get_qualifiers(), tq2 = type2->get_qualifiers();
                 type1->get_qualifiers() = Type::Qualifiers();
 …
                 std::cerr << std::endl;
 #endif
                 if ( ! unifyExact( type1, type2, env, needAssertions, haveAssertions, openVars, widenMode, indexer ) ) {
+                if ( ! unifyExact( type1, type2, env, needAssertions, haveAssertions, openVars, widen, indexer ) ) {
 #ifdef DEBUG
                         std::cerr << "unifyInexact: no exact unification found" << std::endl;
 #endif
                         if ( ( common = commonType( type1, type2, widenMode.widenFirst, widenMode.widenSecond, indexer, env, openVars ) ) ) {
                                 common->get_qualifiers() = tq1 | tq2;
+                        if ( ( common = commonType( type1, type2, widen.first, widen.second, indexer, env, openVars ) ) ) {
+                                common->tq = tq1.unify( tq2 );
 #ifdef DEBUG
                                 std::cerr << "unifyInexact: common type is ";
 …
                 } else {
                         if ( tq1 != tq2 ) {
                                 if ( ( tq1 > tq2 || widenMode.widenFirst ) && ( tq2 > tq1 || widenMode.widenSecond ) ) {
+                                if ( ( tq1 > tq2 || widen.first ) && ( tq2 > tq1 || widen.second ) ) {
                                         common = type1->clone();
                                         common->get_qualifiers() = tq1 | tq2;
+                                        common->tq = tq1.unify( tq2 );
                                         result = true;
                                 } else {
 …
                         } else {
                                 common = type1->clone();
                                 common->get_qualifiers() = tq1 | tq2;
+                                common->tq = tq1.unify( tq2 );
                                 result = true;
                         } // if
 …
+        }
         Unify::Unify( Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer )
                 : result( false ), type2( type2 ), env( env ), needAssertions( needAssertions ), haveAssertions( haveAssertions ), openVars( openVars ), widenMode( widenMode ), indexer( indexer ) {
+        }
         void Unify::postvisit( __attribute__((unused)) VoidType *voidType) {
+        Unify_old::Unify_old( Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer )
+                : result( false ), type2( type2 ), env( env ), needAssertions( needAssertions ), haveAssertions( haveAssertions ), openVars( openVars ), widen( widen ), indexer( indexer ) {
+        }
+        void Unify_old::postvisit( __attribute__((unused)) VoidType *voidType) {
                 result = dynamic_cast< VoidType* >( type2 );
+        }
         void Unify::postvisit(BasicType *basicType) {
+        void Unify_old::postvisit(BasicType *basicType) {
                 if ( BasicType *otherBasic = dynamic_cast< BasicType* >( type2 ) ) {
                         result = basicType->get_kind() == otherBasic->get_kind();
 …
+        }
         void Unify::postvisit(PointerType *pointerType) {
+        void Unify_old::postvisit(PointerType *pointerType) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
                         result = unifyExact( pointerType->get_base(), otherPointer->get_base(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
 …
+        }
         void Unify::postvisit(ReferenceType *refType) {
+        void Unify_old::postvisit(ReferenceType *refType) {
                 if ( ReferenceType *otherRef = dynamic_cast< ReferenceType* >( type2 ) ) {
                         result = unifyExact( refType->get_base(), otherRef->get_base(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
 …
+        }
         void Unify::postvisit(ArrayType *arrayType) {
+        void Unify_old::postvisit(ArrayType *arrayType) {
                 ArrayType *otherArray = dynamic_cast< ArrayType* >( type2 );
                 // to unify, array types must both be VLA or both not VLA
 …
         /// If this isn't done then argument lists can have wildly different
         /// size and structure, when they should be compatible.
         struct TtypeExpander : public WithShortCircuiting {
+        struct TtypeExpander_old : public WithShortCircuiting {
                 TypeEnvironment & tenv;
                 TtypeExpander( TypeEnvironment & tenv ) : tenv( tenv ) {}
+                TtypeExpander_old( TypeEnvironment & tenv ) : tenv( tenv ) {}
                 void premutate( TypeInstType * ) { visit_children = false; }
                 Type * postmutate( TypeInstType * typeInst ) {
 …
                 dst.clear();
                 for ( DeclarationWithType * dcl : src ) {
                         PassVisitor<TtypeExpander> expander( env );
+                        PassVisitor<TtypeExpander_old> expander( env );
                         dcl->acceptMutator( expander );
                         std::list< Type * > types;
 …
+        }
         void Unify::postvisit(FunctionType *functionType) {
+        void Unify_old::postvisit(FunctionType *functionType) {
                 FunctionType *otherFunction = dynamic_cast< FunctionType* >( type2 );
                 if ( otherFunction && functionType->get_isVarArgs() == otherFunction->get_isVarArgs() ) {
 …
                         // sizes don't have to match if ttypes are involved; need to be more precise wrt where the ttype is to prevent errors
+                        if ( (flatFunc->parameters.size() == flatOther->parameters.size() && flatFunc->returnVals.size() == flatOther->returnVals.size()) || flatFunc->isTtype() || flatOther->isTtype() ) {
+                        if (
+                                        (flatFunc->parameters.size() == flatOther->parameters.size() &&
+                                                flatFunc->returnVals.size() == flatOther->returnVals.size())
+                                        || flatFunc->isTtype()
+                                        || flatOther->isTtype()
+                        ) {
                                 if ( unifyDeclList( flatFunc->parameters.begin(), flatFunc->parameters.end(), flatOther->parameters.begin(), flatOther->parameters.end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
                                         if ( unifyDeclList( flatFunc->returnVals.begin(), flatFunc->returnVals.end(), flatOther->returnVals.begin(), flatOther->returnVals.end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
 …
         template< typename RefType >
         void Unify::handleRefType( RefType *inst, Type *other ) {
+        void Unify_old::handleRefType( RefType *inst, Type *other ) {
                 // check that other type is compatible and named the same
                 RefType *otherStruct = dynamic_cast< RefType* >( other );
 …
         template< typename RefType >
         void Unify::handleGenericRefType( RefType *inst, Type *other ) {
+        void Unify_old::handleGenericRefType( RefType *inst, Type *other ) {
                 // Check that other type is compatible and named the same
                 handleRefType( inst, other );
 …
+        }
         void Unify::postvisit(StructInstType *structInst) {
+        void Unify_old::postvisit(StructInstType *structInst) {
                 handleGenericRefType( structInst, type2 );
+        }
         void Unify::postvisit(UnionInstType *unionInst) {
+        void Unify_old::postvisit(UnionInstType *unionInst) {
                 handleGenericRefType( unionInst, type2 );
+        }
         void Unify::postvisit(EnumInstType *enumInst) {
+        void Unify_old::postvisit(EnumInstType *enumInst) {
                 handleRefType( enumInst, type2 );
+        }
         void Unify::postvisit(TraitInstType *contextInst) {
+        void Unify_old::postvisit(TraitInstType *contextInst) {
                 handleRefType( contextInst, type2 );
+        }
         void Unify::postvisit(TypeInstType *typeInst) {
+        void Unify_old::postvisit(TypeInstType *typeInst) {
                 assert( openVars.find( typeInst->get_name() ) == openVars.end() );
                 TypeInstType *otherInst = dynamic_cast< TypeInstType* >( type2 );
 …
+        }
         void Unify::postvisit(TupleType *tupleType) {
+        void Unify_old::postvisit(TupleType *tupleType) {
                 if ( TupleType *otherTuple = dynamic_cast< TupleType* >( type2 ) ) {
                         std::unique_ptr<TupleType> flat1( tupleType->clone() );
 …
                         std::list<Type *> types1, types2;
                         PassVisitor<TtypeExpander> expander( env );
+                        PassVisitor<TtypeExpander_old> expander( env );
                         flat1->acceptMutator( expander );
                         flat2->acceptMutator( expander );
 …
+        }
         void Unify::postvisit( __attribute__((unused)) VarArgsType *varArgsType ) {
+        void Unify_old::postvisit( __attribute__((unused)) VarArgsType *varArgsType ) {
                 result = dynamic_cast< VarArgsType* >( type2 );
+        }
         void Unify::postvisit( __attribute__((unused)) ZeroType *zeroType ) {
+        void Unify_old::postvisit( __attribute__((unused)) ZeroType *zeroType ) {
                 result = dynamic_cast< ZeroType* >( type2 );
+        }
         void Unify::postvisit( __attribute__((unused)) OneType *oneType ) {
+        void Unify_old::postvisit( __attribute__((unused)) OneType *oneType ) {
                 result = dynamic_cast< OneType* >( type2 );
+        }
-        // xxx - compute once and store in the FunctionType?
         Type * extractResultType( FunctionType * function ) {
                 if ( function->get_returnVals().size() == 0 ) {
 …
+                }
+        }
+        class Unify_new final : public ast::WithShortCircuiting {
+                const ast::Type * type2;
+                ast::TypeEnvironment & tenv;
+                ast::AssertionSet & need;
+                ast::AssertionSet & have;
+                const ast::OpenVarSet & open;
+                WidenMode widen;
+                const ast::SymbolTable & symtab;
+        public:
+                bool result;
+                Unify_new(
+                        const ast::Type * type2, ast::TypeEnvironment & env, ast::AssertionSet & need,
+                        ast::AssertionSet & have, const ast::OpenVarSet & open, WidenMode widen,
+                        const ast::SymbolTable & symtab )
+                : type2(type2), tenv(env), need(need), have(have), open(open), widen(widen),
+                  symtab(symtab), result(false) {}
+                void previsit( const ast::Node * ) { visit_children = false; }
+                void postvisit( const ast::VoidType * ) {
+                        result = dynamic_cast< const ast::VoidType * >( type2 );
+                }
+                void postvisit( const ast::BasicType * basic ) {
+                        if ( auto basic2 = dynamic_cast< const ast::BasicType * >( type2 ) ) {
+                                result = basic->kind == basic2->kind;
+                        }
+                }
+                void postvisit( const ast::PointerType * pointer ) {
+                        if ( auto pointer2 = dynamic_cast< const ast::PointerType * >( type2 ) ) {
+                                result = unifyExact(
+                                        pointer->base, pointer2->base, tenv, need, have, open,
+                                        noWiden(), symtab );
+                        }
+                }
+                void postvisit( const ast::ArrayType * array ) {
+                        auto array2 = dynamic_cast< const ast::ArrayType * >( type2 );
+                        if ( ! array2 ) return;
+                        // to unify, array types must both be VLA or both not VLA and both must have a
+                        // dimension expression or not have a dimension
+                        if ( array->isVarLen != array2->isVarLen ) return;
+                        if ( ! array->isVarLen && ! array2->isVarLen
+                                        && array->dimension && array2->dimension ) {
+                                auto ce1 = array->dimension.as< ast::ConstantExpr >();
+                                auto ce2 = array2->dimension.as< ast::ConstantExpr >();
+                                // see C11 Reference Manual 6.7.6.2.6
+                                // two array types with size specifiers that are integer constant expressions are
+                                // compatible if both size specifiers have the same constant value
+                                if ( ce1 && ce2 && ce1->intValue() != ce2->intValue() ) return;
+                        }
+                        result = unifyExact(
+                                array->base, array2->base, tenv, need, have, open, noWiden(),
+                                symtab );
+                }
+                void postvisit( const ast::ReferenceType * ref ) {
+                        if ( auto ref2 = dynamic_cast< const ast::ReferenceType * >( type2 ) ) {
+                                result = unifyExact(
+                                        ref->base, ref2->base, tenv, need, have, open, noWiden(),
+                                        symtab );
+                        }
+                }
+        private:
+                /// Replaces ttype variables with their bound types.
+                /// If this isn't done when satifying ttype assertions, then argument lists can have
+                /// different size and structure when they should be compatible.
+                struct TtypeExpander_new : public ast::WithShortCircuiting {
+                        ast::TypeEnvironment & tenv;
+                        TtypeExpander_new( ast::TypeEnvironment & env ) : tenv( env ) {}
+                        const ast::Type * postvisit( const ast::TypeInstType * typeInst ) {
+                                if ( const ast::EqvClass * clz = tenv.lookup( typeInst->name ) ) {
+                                        // expand ttype parameter into its actual type
+                                        if ( clz->data.kind == ast::TypeVar::Ttype && clz->bound ) {
+                                                return clz->bound;
+                                        }
+                                }
+                                return typeInst;
+                        }
+                };
+                /// returns flattened version of `src`
+                static std::vector< ast::ptr< ast::DeclWithType > > flattenList(
+                        const std::vector< ast::ptr< ast::DeclWithType > > & src, ast::TypeEnvironment & env
+                ) {
+                        std::vector< ast::ptr< ast::DeclWithType > > dst;
+                        dst.reserve( src.size() );
+                        for ( const ast::DeclWithType * d : src ) {
+                                ast::Pass<TtypeExpander_new> expander{ env };
+                                d = d->accept( expander );
+                                auto types = flatten( d->get_type() );
+                                for ( ast::ptr< ast::Type > & t : types ) {
+                                        // outermost const, volatile, _Atomic qualifiers in parameters should not play
+                                        // a role in the unification of function types, since they do not determine
+                                        // whether a function is callable.
+                                        // NOTE: **must** consider at least mutex qualifier, since functions can be
+                                        // overloaded on outermost mutex and a mutex function has different
+                                        // requirements than a non-mutex function
+                                        remove_qualifiers( t, ast::CV::Const | ast::CV::Volatile | ast::CV::Atomic );
+                                        dst.emplace_back( new ast::ObjectDecl{ d->location, "", t } );
+                                }
+                        }
+                        return dst;
+                }
+                /// Creates a tuple type based on a list of DeclWithType
+                template< typename Iter >
+                static ast::ptr< ast::Type > tupleFromDecls( Iter crnt, Iter end ) {
+                        std::vector< ast::ptr< ast::Type > > types;
+                        while ( crnt != end ) {
+                                // it is guaranteed that a ttype variable will be bound to a flat tuple, so ensure
+                                // that this results in a flat tuple
+                                flatten( (*crnt)->get_type(), types );
+                                ++crnt;
+                        }
+                        return { new ast::TupleType{ std::move(types) } };
+                }
+                template< typename Iter >
+                static bool unifyDeclList(
+                        Iter crnt1, Iter end1, Iter crnt2, Iter end2, ast::TypeEnvironment & env,
+                        ast::AssertionSet & need, ast::AssertionSet & have, const ast::OpenVarSet & open,
+                        const ast::SymbolTable & symtab
+                ) {
+                        while ( crnt1 != end1 && crnt2 != end2 ) {
+                                const ast::Type * t1 = (*crnt1)->get_type();
+                                const ast::Type * t2 = (*crnt2)->get_type();
+                                bool isTuple1 = Tuples::isTtype( t1 );
+                                bool isTuple2 = Tuples::isTtype( t2 );
+                                // assumes here that ttype *must* be last parameter
+                                if ( isTuple1 && ! isTuple2 ) {
+                                        // combine remainder of list2, then unify
+                                        return unifyExact(
+                                                t1, tupleFromDecls( crnt2, end2 ), env, need, have, open,
+                                                noWiden(), symtab );
+                                } else if ( ! isTuple1 && isTuple2 ) {
+                                        // combine remainder of list1, then unify
+                                        return unifyExact(
+                                                tupleFromDecls( crnt1, end1 ), t2, env, need, have, open,
+                                                noWiden(), symtab );
+                                }
+                                if ( ! unifyExact(
+                                        t1, t2, env, need, have, open, noWiden(), symtab )
+                                ) return false;
+                                ++crnt1; ++crnt2;
+                        }
+                        // May get to the end of one argument list before the other. This is only okay if the
+                        // other is a ttype
+                        if ( crnt1 != end1 ) {
+                                // try unifying empty tuple with ttype
+                                const ast::Type * t1 = (*crnt1)->get_type();
+                                if ( ! Tuples::isTtype( t1 ) ) return false;
+                                return unifyExact(
+                                        t1, tupleFromDecls( crnt2, end2 ), env, need, have, open,
+                                        noWiden(), symtab );
+                        } else if ( crnt2 != end2 ) {
+                                // try unifying empty tuple with ttype
+                                const ast::Type * t2 = (*crnt2)->get_type();
+                                if ( ! Tuples::isTtype( t2 ) ) return false;
+                                return unifyExact(
+                                        tupleFromDecls( crnt1, end1 ), t2, env, need, have, open,
+                                        noWiden(), symtab );
+                        }
+                        return true;
+                }
+                static bool unifyDeclList(
+                        const std::vector< ast::ptr< ast::DeclWithType > > & list1,
+                        const std::vector< ast::ptr< ast::DeclWithType > > & list2,
+                        ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
+                        const ast::OpenVarSet & open, const ast::SymbolTable & symtab
+                ) {
+                        return unifyDeclList(
+                                list1.begin(), list1.end(), list2.begin(), list2.end(), env, need, have, open,
+                                symtab );
+                }
+                static void markAssertionSet( ast::AssertionSet & assns, const ast::DeclWithType * assn ) {
+                        auto i = assns.find( assn );
+                        if ( i != assns.end() ) {
+                                i->second.isUsed = true;
+                        }
+                }
+                /// mark all assertions in `type` used in both `assn1` and `assn2`
+                static void markAssertions(
+                        ast::AssertionSet & assn1, ast::AssertionSet & assn2,
+                        const ast::ParameterizedType * type
+                ) {
+                        for ( const auto & tyvar : type->forall ) {
+                                for ( const ast::DeclWithType * assert : tyvar->assertions ) {
+                                        markAssertionSet( assn1, assert );
+                                        markAssertionSet( assn2, assert );
+                                }
+                        }
+                }
+        public:
+                void postvisit( const ast::FunctionType * func ) {
+                        auto func2 = dynamic_cast< const ast::FunctionType * >( type2 );
+                        if ( ! func2 ) return;
+                        if ( func->isVarArgs != func2->isVarArgs ) return;
+                        // Flatten the parameter lists for both functions so that tuple structure does not
+                        // affect unification. Does not actually mutate function parameters.
+                        auto params = flattenList( func->params, tenv );
+                        auto params2 = flattenList( func2->params, tenv );
+                        // sizes don't have to match if ttypes are involved; need to be more precise w.r.t.
+                        // where the ttype is to prevent errors
+                        if (
+                                ( params.size() != params2.size() || func->returns.size() != func2->returns.size() )
+                                && ! func->isTtype()
+                                && ! func2->isTtype()
+                        ) return;
+                        if ( ! unifyDeclList( params, params2, tenv, need, have, open, symtab ) ) return;
+                        if ( ! unifyDeclList(
+                                func->returns, func2->returns, tenv, need, have, open, symtab ) ) return;
+                        markAssertions( have, need, func );
+                        markAssertions( have, need, func2 );
+                        result = true;
+                }
+        private:
+                template< typename RefType >
+                const RefType * handleRefType( const RefType * inst, const ast::Type * other ) {
+                        // check that the other type is compatible and named the same
+                        auto otherInst = dynamic_cast< const RefType * >( other );
+                        result = otherInst && inst->name == otherInst->name;
+                        return otherInst;
+                }
+                /// Creates a tuple type based on a list of TypeExpr
+                template< typename Iter >
+                static const ast::Type * tupleFromExprs(
+                        const ast::TypeExpr * param, Iter & crnt, Iter end, ast::CV::Qualifiers qs
+                ) {
+                        std::vector< ast::ptr< ast::Type > > types;
+                        do {
+                                types.emplace_back( param->type );
+                                ++crnt;
+                                if ( crnt == end ) break;
+                                param = strict_dynamic_cast< const ast::TypeExpr * >( crnt->get() );
+                        } while(true);
+                        return new ast::TupleType{ std::move(types), qs };
+                }
+                template< typename RefType >
+                void handleGenericRefType( const RefType * inst, const ast::Type * other ) {
+                        // check that other type is compatible and named the same
+                        const RefType * inst2 = handleRefType( inst, other );
+                        if ( ! inst2 ) return;
+                        // check that parameters of types unify, if any
+                        const std::vector< ast::ptr< ast::Expr > > & params = inst->params;
+                        const std::vector< ast::ptr< ast::Expr > > & params2 = inst2->params;
+                        auto it = params.begin();
+                        auto jt = params2.begin();
+                        for ( ; it != params.end() && jt != params2.end(); ++it, ++jt ) {
+                                auto param = strict_dynamic_cast< const ast::TypeExpr * >( it->get() );
+                                auto param2 = strict_dynamic_cast< const ast::TypeExpr * >( jt->get() );
+                                ast::ptr< ast::Type > pty = param->type;
+                                ast::ptr< ast::Type > pty2 = param2->type;
+                                bool isTuple = Tuples::isTtype( pty );
+                                bool isTuple2 = Tuples::isTtype( pty2 );
+                                if ( isTuple && isTuple2 ) {
+                                        ++it; ++jt;  // skip ttype parameters before break
+                                } else if ( isTuple ) {
+                                        // bundle remaining params into tuple
+                                        pty2 = tupleFromExprs( param2, jt, params2.end(), pty->qualifiers );
+                                        ++it;  // skip ttype parameter for break
+                                } else if ( isTuple2 ) {
+                                        // bundle remaining params into tuple
+                                        pty = tupleFromExprs( param, it, params.end(), pty2->qualifiers );
+                                        ++jt;  // skip ttype parameter for break
+                                }
+                                if ( ! unifyExact(
+                                                pty, pty2, tenv, need, have, open, noWiden(), symtab ) ) {
+                                        result = false;
+                                        return;
+                                }
+                                // ttype parameter should be last
+                                if ( isTuple || isTuple2 ) break;
+                        }
+                        result = it == params.end() && jt == params2.end();
+                }
+        public:
+                void postvisit( const ast::StructInstType * aggrType ) {
+                        handleGenericRefType( aggrType, type2 );
+                }
+                void postvisit( const ast::UnionInstType * aggrType ) {
+                        handleGenericRefType( aggrType, type2 );
+                }
+                void postvisit( const ast::EnumInstType * aggrType ) {
+                        handleRefType( aggrType, type2 );
+                }
+                void postvisit( const ast::TraitInstType * aggrType ) {
+                        handleRefType( aggrType, type2 );
+                }
+                void postvisit( const ast::TypeInstType * typeInst ) {
+                        assert( open.find( typeInst->name ) == open.end() );
+                        handleRefType( typeInst, type2 );
+                }
+        private:
+                /// Creates a tuple type based on a list of Type
+                static ast::ptr< ast::Type > tupleFromTypes(
+                        const std::vector< ast::ptr< ast::Type > > & tys
+                ) {
+                        std::vector< ast::ptr< ast::Type > > out;
+                        for ( const ast::Type * ty : tys ) {
+                                // it is guaranteed that a ttype variable will be bound to a flat tuple, so ensure
+                                // that this results in a flat tuple
+                                flatten( ty, out );
+                        }
+                        return { new ast::TupleType{ std::move(out) } };
+                }
+                static bool unifyList(
+                        const std::vector< ast::ptr< ast::Type > > & list1,
+                        const std::vector< ast::ptr< ast::Type > > & list2, ast::TypeEnvironment & env,
+                        ast::AssertionSet & need, ast::AssertionSet & have, const ast::OpenVarSet & open,
+                        const ast::SymbolTable & symtab
+                ) {
+                        auto crnt1 = list1.begin();
+                        auto crnt2 = list2.begin();
+                        while ( crnt1 != list1.end() && crnt2 != list2.end() ) {
+                                const ast::Type * t1 = *crnt1;
+                                const ast::Type * t2 = *crnt2;
+                                bool isTuple1 = Tuples::isTtype( t1 );
+                                bool isTuple2 = Tuples::isTtype( t2 );
+                                // assumes ttype must be last parameter
+                                if ( isTuple1 && ! isTuple2 ) {
+                                        // combine entirety of list2, then unify
+                                        return unifyExact(
+                                                t1, tupleFromTypes( list2 ), env, need, have, open,
+                                                noWiden(), symtab );
+                                } else if ( ! isTuple1 && isTuple2 ) {
+                                        // combine entirety of list1, then unify
+                                        return unifyExact(
+                                                tupleFromTypes( list1 ), t2, env, need, have, open,
+                                                noWiden(), symtab );
+                                }
+                                if ( ! unifyExact(
+                                        t1, t2, env, need, have, open, noWiden(), symtab )
+                                ) return false;
+                                ++crnt1; ++crnt2;
+                        }
+                        if ( crnt1 != list1.end() ) {
+                                // try unifying empty tuple type with ttype
+                                const ast::Type * t1 = *crnt1;
+                                if ( ! Tuples::isTtype( t1 ) ) return false;
+                                // xxx - this doesn't generate an empty tuple, contrary to comment; both ported
+                                // from Rob's code
+                                return unifyExact(
+                                                t1, tupleFromTypes( list2 ), env, need, have, open,
+                                                noWiden(), symtab );
+                        } else if ( crnt2 != list2.end() ) {
+                                // try unifying empty tuple with ttype
+                                const ast::Type * t2 = *crnt2;
+                                if ( ! Tuples::isTtype( t2 ) ) return false;
+                                // xxx - this doesn't generate an empty tuple, contrary to comment; both ported
+                                // from Rob's code
+                                return unifyExact(
+                                                tupleFromTypes( list1 ), t2, env, need, have, open,
+                                                noWiden(), symtab );
+                        }
+                        return true;
+                }
+        public:
+                void postvisit( const ast::TupleType * tuple ) {
+                        auto tuple2 = dynamic_cast< const ast::TupleType * >( type2 );
+                        if ( ! tuple2 ) return;
+                        ast::Pass<TtypeExpander_new> expander{ tenv };
+                        const ast::Type * flat = tuple->accept( expander );
+                        const ast::Type * flat2 = tuple2->accept( expander );
+                        auto types = flatten( flat );
+                        auto types2 = flatten( flat2 );
+                        result = unifyList( types, types2, tenv, need, have, open, symtab );
+                }
+                void postvisit( const ast::VarArgsType * ) {
+                        result = dynamic_cast< const ast::VarArgsType * >( type2 );
+                }
+                void postvisit( const ast::ZeroType * ) {
+                        result = dynamic_cast< const ast::ZeroType * >( type2 );
+                }
+                void postvisit( const ast::OneType * ) {
+                        result = dynamic_cast< const ast::OneType * >( type2 );
+                }
+          private:
+                template< typename RefType > void handleRefType( RefType *inst, Type *other );
+                template< typename RefType > void handleGenericRefType( RefType *inst, Type *other );
+        };
+        bool unify(
+                        const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2,
+                        ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
+                        ast::OpenVarSet & open, const ast::SymbolTable & symtab
+        ) {
+                ast::ptr<ast::Type> common;
+                return unify( type1, type2, env, need, have, open, symtab, common );
+        }
+        bool unify(
+                        const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2,
+                        ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
+                        ast::OpenVarSet & open, const ast::SymbolTable & symtab, ast::ptr<ast::Type> & common
+        ) {
+                ast::OpenVarSet closed;
+                findOpenVars( type1, open, closed, need, have, FirstClosed );
+                findOpenVars( type2, open, closed, need, have, FirstOpen );
+                return unifyInexact(
+                        type1, type2, env, need, have, open, WidenMode{ true, true }, symtab, common );
+        }
+        bool unifyExact(
+                        const ast::Type * type1, const ast::Type * type2, ast::TypeEnvironment & env,
+                        ast::AssertionSet & need, ast::AssertionSet & have, const ast::OpenVarSet & open,
+                        WidenMode widen, const ast::SymbolTable & symtab
+        ) {
+                if ( type1->qualifiers != type2->qualifiers ) return false;
+                auto var1 = dynamic_cast< const ast::TypeInstType * >( type1 );
+                auto var2 = dynamic_cast< const ast::TypeInstType * >( type2 );
+                ast::OpenVarSet::const_iterator
+                        entry1 = var1 ? open.find( var1->name ) : open.end(),
+                        entry2 = var2 ? open.find( var2->name ) : open.end();
+                bool isopen1 = entry1 != open.end();
+                bool isopen2 = entry2 != open.end();
+                if ( isopen1 && isopen2 ) {
+                        if ( entry1->second.kind != entry2->second.kind ) return false;
+                        return env.bindVarToVar(
+                                var1, var2, ast::TypeDecl::Data{ entry1->second, entry2->second }, need, have,
+                                open, widen, symtab );
+                } else if ( isopen1 ) {
+                        return env.bindVar( var1, type2, entry1->second, need, have, open, widen, symtab );
+                } else if ( isopen2 ) {
+                        return env.bindVar( var2, type1, entry2->second, need, have, open, widen, symtab );
+                } else {
+                        ast::Pass<Unify_new> comparator{ type2, env, need, have, open, widen, symtab };
+                        type1->accept( comparator );
+                        return comparator.pass.result;
+                }
+        }
+        bool unifyInexact(
+                        const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2,
+                        ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
+                        const ast::OpenVarSet & open, WidenMode widen, const ast::SymbolTable & symtab,
+                        ast::ptr<ast::Type> & common
+        ) {
+                ast::CV::Qualifiers q1 = type1->qualifiers, q2 = type2->qualifiers;
+                // force t1 and t2 to be cloned if their qualifiers must be stripped, so that type1 and
+                // type2 are left unchanged; calling convention forces type{1,2}->strong_ref >= 1
+                ast::ptr<ast::Type> t1{ type1 }, t2{ type2 };
+                reset_qualifiers( t1 );
+                reset_qualifiers( t2 );
+                if ( unifyExact( t1, t2, env, need, have, open, widen, symtab ) ) {
+                        t1 = nullptr; t2 = nullptr; // release t1, t2 to avoid spurious clones
+                        // if exact unification on unqualified types, try to merge qualifiers
+                        if ( q1 == q2 || ( ( q1 > q2 || widen.first ) && ( q2 > q1 || widen.second ) ) ) {
+                                common = type1;
+                                reset_qualifiers( common, q1 | q2 );
+                                return true;
+                        } else {
+                                return false;
+                        }
+                } else if (( common = commonType( t1, t2, widen, symtab, env, open ) )) {
+                        t1 = nullptr; t2 = nullptr; // release t1, t2 to avoid spurious clones
+                        // no exact unification, but common type
+                        reset_qualifiers( common, q1 | q2 );
+                        return true;
+                } else {
+                        return false;
+                }
+        }
+        ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func ) {
+                if ( func->returns.empty() ) return new ast::VoidType{};
+                if ( func->returns.size() == 1 ) return func->returns[0]->get_type();
+                std::vector<ast::ptr<ast::Type>> tys;
+                for ( const ast::DeclWithType * decl : func->returns ) {
+                        tys.emplace_back( decl->get_type() );
+                }
+                return new ast::TupleType{ std::move(tys) };
+        }
 } // namespace ResolvExpr

src/ResolvExpr/Unify.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 13:09:04 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul 21 23:09:34 2017
 // Update Count     : 3
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Mon Jun 18 11:58:00 2018
+// Update Count     : 4
 //
 …
 #include <list>                   // for list
+#include "AST/Node.hpp"             // for ptr
+#include "AST/TypeEnvironment.hpp"  // for TypeEnvironment, AssertionSet, OpenVarSet
 #include "Common/utility.h"       // for deleteAll
 #include "SynTree/Declaration.h"  // for TypeDecl, TypeDecl::Data
 #include "TypeEnvironment.h"      // for AssertionSet, OpenVarSet
+#include "WidenMode.h"              // for WidenMode
 class Type;
 class TypeInstType;
 namespace SymTab {
+class Indexer;
+}  // namespace SymTab
+        class Indexer;
+}
+namespace ast {
+        class SymbolTable;
+        class Type;
+}
 namespace ResolvExpr {
-        struct WidenMode {
-                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
-                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
-                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
-                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
-                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
-                operator bool() { return widenFirst && widenSecond; }
-                bool widenFirst : 1, widenSecond : 1;
-        };
-        bool bindVar( TypeInstType *typeInst, Type *other, const TypeDecl::Data & data, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, Type *&commonType );
         bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
+        bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer, Type *&common );
         template< typename Iterator1, typename Iterator2 >
 …
+        }
+        bool unify(
+                const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2,
+                ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
+                ast::OpenVarSet & open, const ast::SymbolTable & symtab );
+        bool unify(
+                const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2,
+                ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
+                ast::OpenVarSet & open, const ast::SymbolTable & symtab, ast::ptr<ast::Type> & common );
+        bool unifyExact(
+                const ast::Type * type1, const ast::Type * type2, ast::TypeEnvironment & env,
+                ast::AssertionSet & need, ast::AssertionSet & have, const ast::OpenVarSet & open,
+                WidenMode widen, const ast::SymbolTable & symtab );
+        bool unifyInexact(
+                const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2,
+                ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
+                const ast::OpenVarSet & open, WidenMode widen, const ast::SymbolTable & symtab,
+                ast::ptr<ast::Type> & common );
 } // namespace ResolvExpr

src/ResolvExpr/module.mk

-              r7951100
+              rb067d9b
 ###############################################################################
+SRC += ResolvExpr/AlternativeFinder.cc \
+       ResolvExpr/Alternative.cc \
+       ResolvExpr/Unify.cc \
+       ResolvExpr/PtrsAssignable.cc \
+       ResolvExpr/CommonType.cc \
+       ResolvExpr/ConversionCost.cc \
+       ResolvExpr/CastCost.cc \
+       ResolvExpr/PtrsCastable.cc \
+       ResolvExpr/AdjustExprType.cc \
+       ResolvExpr/AlternativePrinter.cc \
+       ResolvExpr/Resolver.cc \
+       ResolvExpr/ResolveTypeof.cc \
+       ResolvExpr/RenameVars.cc \
+       ResolvExpr/FindOpenVars.cc \
+       ResolvExpr/PolyCost.cc \
+       ResolvExpr/Occurs.cc \
+       ResolvExpr/TypeEnvironment.cc \
+       ResolvExpr/CurrentObject.cc \
+       ResolvExpr/ExplodedActual.cc
+SRC_RESOLVEXPR = \
+      ResolvExpr/AdjustExprType.cc \
+      ResolvExpr/Alternative.cc \
+      ResolvExpr/AlternativeFinder.cc \
+      ResolvExpr/Candidate.cpp \
+      ResolvExpr/CandidateFinder.cpp \
+      ResolvExpr/CastCost.cc \
+      ResolvExpr/CommonType.cc \
+      ResolvExpr/ConversionCost.cc \
+      ResolvExpr/CurrentObject.cc \
+      ResolvExpr/ExplodedActual.cc \
+      ResolvExpr/ExplodedArg.cpp \
+      ResolvExpr/FindOpenVars.cc \
+      ResolvExpr/Occurs.cc \
+      ResolvExpr/PolyCost.cc \
+      ResolvExpr/PtrsAssignable.cc \
+      ResolvExpr/PtrsCastable.cc \
+      ResolvExpr/RenameVars.cc \
+      ResolvExpr/ResolveAssertions.cc \
+      ResolvExpr/Resolver.cc \
+      ResolvExpr/ResolveTypeof.cc \
+      ResolvExpr/SatisfyAssertions.cpp \
+      ResolvExpr/SpecCost.cc \
+      ResolvExpr/TypeEnvironment.cc \
+      ResolvExpr/Unify.cc
+SRC += $(SRC_RESOLVEXPR) ResolvExpr/AlternativePrinter.cc
+SRCDEMANGLE += $(SRC_RESOLVEXPR)

src/ResolvExpr/typeops.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 07:28:22 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:36:18 2017
 // Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:36:00 2019
+// Update Count     : 5
 //
 …
 #include <vector>
+#include "Cost.h"
+#include "TypeEnvironment.h"
+#include "WidenMode.h"
+#include "AST/Fwd.hpp"
+#include "AST/Node.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "SynTree/SynTree.h"
 #include "SynTree/Type.h"
+#include "SymTab/Indexer.h"
+#include "Cost.h"
+#include "TypeEnvironment.h"
+namespace SymTab {
+        class Indexer;
+}
 namespace ResolvExpr {
 …
         // in AdjustExprType.cc
         /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function
         void adjustExprType( Type *&type, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+        void adjustExprType( Type *& type, const TypeEnvironment & env, const SymTab::Indexer & indexer );
         /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function using empty TypeEnvironment and Indexer
 …
         template< typename ForwardIterator >
         void adjustExprTypeList( ForwardIterator begin, ForwardIterator end, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+        void adjustExprTypeList( ForwardIterator begin, ForwardIterator end, const TypeEnvironment & env, const SymTab::Indexer & indexer ) {
                 while ( begin != end ) {
                         adjustExprType( *begin++, env, indexer );
 …
+        }
+        /// Replaces array types with equivalent pointer, and function types with a pointer-to-function
+        const ast::Type * adjustExprType(
+                const ast::Type * type, const ast::TypeEnvironment & env, const ast::SymbolTable & symtab );
         // in CastCost.cc
+        Cost castCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
+        Cost castCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        Cost castCost(
+                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+                const ast::TypeEnvironment & env );
         // in ConversionCost.cc
+        Cost conversionCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
+        Cost conversionCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        Cost conversionCost(
+                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+                const ast::TypeEnvironment & env );
+        // in AlternativeFinder.cc
+        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
         // in PtrsAssignable.cc
+        int ptrsAssignable( Type *src, Type *dest, const TypeEnvironment &env );
+        int ptrsAssignable( const Type * src, const Type * dest, const TypeEnvironment & env );
+        int ptrsAssignable( const ast::Type * src, const ast::Type * dst,
+                const ast::TypeEnvironment & env );
         // in PtrsCastable.cc
+        int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+        int ptrsCastable( const Type * src, const Type * dest, const TypeEnvironment & env, const SymTab::Indexer & indexer );
+        int ptrsCastable(
+                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+                const ast::TypeEnvironment & env );
         // in Unify.cc
+        bool isFtype( Type *type );
+        bool typesCompatible( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );
+        bool typesCompatibleIgnoreQualifiers( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );
+        inline bool typesCompatible( Type *t1, Type *t2, const SymTab::Indexer &indexer ) {
+        bool typesCompatible( const Type *, const Type *, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        bool typesCompatibleIgnoreQualifiers( const Type *, const Type *, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        inline bool typesCompatible( const Type * t1, const Type * t2, const SymTab::Indexer & indexer ) {
                 TypeEnvironment env;
                 return typesCompatible( t1, t2, indexer, env );
+        }
         inline bool typesCompatibleIgnoreQualifiers( Type *t1, Type *t2, const SymTab::Indexer &indexer ) {
+        inline bool typesCompatibleIgnoreQualifiers( const Type * t1, const Type * t2, const SymTab::Indexer & indexer ) {
                 TypeEnvironment env;
                 return typesCompatibleIgnoreQualifiers( t1, t2, indexer, env );
+        }
+        bool typesCompatible(
+                const ast::Type *, const ast::Type *, const ast::SymbolTable & symtab = {},
+                const ast::TypeEnvironment & env = {} );
+        bool typesCompatibleIgnoreQualifiers(
+                const ast::Type *, const ast::Type *, const ast::SymbolTable &,
+                const ast::TypeEnvironment & env = {} );
         /// creates the type represented by the list of returnVals in a FunctionType. The caller owns the return value.
         Type * extractResultType( FunctionType * functionType );
+        /// Creates or extracts the type represented by the list of returns in a `FunctionType`.
+        ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func );
         // in CommonType.cc
+        Type *commonType( Type *type1, Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars );
+        Type * commonType( Type * type1, Type * type2, bool widenFirst, bool widenSecond, const SymTab::Indexer & indexer, TypeEnvironment & env, const OpenVarSet & openVars );
+        ast::ptr< ast::Type > commonType(
+                const ast::ptr< ast::Type > & type1, const ast::ptr< ast::Type > & type2, WidenMode widen,
+                const ast::SymbolTable & symtab, ast::TypeEnvironment & env, const ast::OpenVarSet & open );
         // in PolyCost.cc
+        int polyCost( Type *type, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+        int polyCost( Type * type, const TypeEnvironment & env, const SymTab::Indexer & indexer );
+        int polyCost(
+                const ast::Type * type, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
+        // in SpecCost.cc
+        int specCost( Type * type );
+        int specCost( const ast::Type * type );
         // in Occurs.cc
+        bool occurs( Type *type, std::string varName, const TypeEnvironment &env );
+        bool occurs( const Type * type, const std::string & varName, const TypeEnvironment & env );
+        // new AST version in TypeEnvironment.cpp (only place it was used in old AST)
+        template<typename Iter>
+        bool occursIn( Type* ty, Iter begin, Iter end, const TypeEnvironment & env ) {
+                while ( begin != end ) {
+                        if ( occurs( ty, *begin, env ) ) return true;
+                        ++begin;
+                }
+                return false;
+        }
         // in AlternativeFinder.cc
         void referenceToRvalueConversion( Expression *& expr, Cost & cost );
+        // flatten tuple type into list of types
+        // in CandidateFinder.cpp
+        const ast::Expr * referenceToRvalueConversion( const ast::Expr * expr, Cost & cost );
+        /// flatten tuple type into list of types
         template< typename OutputIterator >
         void flatten( Type * type, OutputIterator out ) {
 …
+                }
+        }
+        /// flatten tuple type into existing list of types
+        static inline void flatten(
+                const ast::Type * type, std::vector< ast::ptr< ast::Type > > & out
+        ) {
+                if ( auto tupleType = dynamic_cast< const ast::TupleType * >( type ) ) {
+                        for ( const ast::Type * t : tupleType->types ) {
+                                flatten( t, out );
+                        }
+                } else {
+                        out.emplace_back( type );
+                }
+        }
+        /// flatten tuple type into list of types
+        static inline std::vector< ast::ptr< ast::Type > > flatten( const ast::Type * type ) {
+                std::vector< ast::ptr< ast::Type > > out;
+                out.reserve( type->size() );
+                flatten( type, out );
+                return out;
+        }
+        // in TypeEnvironment.cc
+        bool isFtype( const Type * type );
 } // namespace ResolvExpr
+namespace ast {
+        // in TypeEnvironment.cpp
+        bool isFtype( const ast::Type * type );
+} // namespace ast
 // Local Variables: //

src/SymTab/Autogen.cc

-              r7951100
+              rb067d9b
 #include <vector>                  // for vector
+#include "AST/Decl.hpp"
 #include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
 #include "Common/PassVisitor.h"    // for PassVisitor
 …
 namespace SymTab {
-        Type * SizeType = 0;
         /// Data used to generate functions generically. Specifically, the name of the generated function and a function which generates the routine protoype
         struct FuncData {
                 typedef FunctionType * (*TypeGen)( Type * );
+                typedef FunctionType * (*TypeGen)( Type *, bool );
                 FuncData( const std::string & fname, const TypeGen & genType ) : fname( fname ), genType( genType ) {}
                 std::string fname;
 …
+        }
+        bool isUnnamedBitfield( const ast::ObjectDecl * obj ) {
+                return obj && obj->name.empty() && obj->bitfieldWidth;
+        }
         /// inserts a forward declaration for functionDecl into declsToAdd
         void addForwardDecl( FunctionDecl * functionDecl, std::list< Declaration * > & declsToAdd ) {
 …
         /// given type T, generate type of default ctor/dtor, i.e. function type void (*) (T *)
+        FunctionType * genDefaultType( Type * paramType ) {
+                const auto & typeParams = getGenericParams( paramType );
+        FunctionType * genDefaultType( Type * paramType, bool maybePolymorphic ) {
                 FunctionType *ftype = new FunctionType( Type::Qualifiers(), false );
+                cloneAll( typeParams, ftype->forall );
+                if ( maybePolymorphic ) {
+                        // only copy in
+                        const auto & typeParams = getGenericParams( paramType );
+                        cloneAll( typeParams, ftype->forall );
+                }
                 ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new ReferenceType( Type::Qualifiers(), paramType->clone() ), nullptr );
                 ftype->parameters.push_back( dstParam );
 …
         /// given type T, generate type of copy ctor, i.e. function type void (*) (T *, T)
         FunctionType * genCopyType( Type * paramType ) {
                 FunctionType *ftype = genDefaultType( paramType );
+        FunctionType * genCopyType( Type * paramType, bool maybePolymorphic ) {
+                FunctionType *ftype = genDefaultType( paramType, maybePolymorphic );
                 ObjectDecl *srcParam = new ObjectDecl( "_src", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr );
                 ftype->parameters.push_back( srcParam );
 …
         /// given type T, generate type of assignment, i.e. function type T (*) (T *, T)
         FunctionType * genAssignType( Type * paramType ) {
                 FunctionType *ftype = genCopyType( paramType );
+        FunctionType * genAssignType( Type * paramType, bool maybePolymorphic ) {
+                FunctionType *ftype = genCopyType( paramType, maybePolymorphic );
                 ObjectDecl *returnVal = new ObjectDecl( "_ret", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr );
                 ftype->returnVals.push_back( returnVal );
 …
                 for ( const FuncData & d : data ) {
                         // generate a function (?{}, ?=?, ^?{}) based on the current FuncData.
                         FunctionType * ftype = d.genType( type );
+                        FunctionType * ftype = d.genType( type, true );
                         // destructor for concurrent type must be mutex
 …
         void StructFuncGenerator::makeMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, bool forward ) {
                 InitTweak::InitExpander srcParam( src );
+                InitTweak::InitExpander_old srcParam( src );
                 // assign to destination

src/SymTab/Autogen.h

-              r7951100
+              rb067d9b
 #include <cassert>                // for assert
+#include <iterator>               // for back_inserter
 #include <string>                 // for string
+#include "AST/Decl.hpp"
+#include "AST/Expr.hpp"
+#include "AST/Init.hpp"
+#include "AST/Node.hpp"
+#include "AST/Stmt.hpp"
+#include "AST/Type.hpp"
 #include "CodeGen/OperatorTable.h"
 #include "Common/UniqueName.h"    // for UniqueName
+#include "Common/utility.h"       // for splice
 #include "InitTweak/InitTweak.h"  // for InitExpander
 #include "SynTree/Constant.h"     // for Constant
 …
         /// returns true if obj's name is the empty string and it has a bitfield width
         bool isUnnamedBitfield( ObjectDecl * obj );
+        /// size_t type - set when size_t typedef is seen. Useful in a few places,
+        /// such as in determining array dimension type
+        extern Type * SizeType;
+        /// intrinsic dereference operator for unqualified types - set when *? function is seen in FindSpecialDeclarations.
+        /// Useful for creating dereference ApplicationExprs without a full resolver pass.
+        extern FunctionDecl * dereferenceOperator;
+        // generate the type of an assignment function for paramType
+        FunctionType * genAssignType( Type * paramType );
+        // generate the type of a default constructor or destructor for paramType
+        FunctionType * genDefaultType( Type * paramType );
+        // generate the type of a copy constructor for paramType
+        FunctionType * genCopyType( Type * paramType );
+        bool isUnnamedBitfield( const ast::ObjectDecl * obj );
+        /// generate the type of an assignment function for paramType.
+        /// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic
+        FunctionType * genAssignType( Type * paramType, bool maybePolymorphic = true );
+        /// generate the type of a default constructor or destructor for paramType.
+        /// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic
+        FunctionType * genDefaultType( Type * paramType, bool maybePolymorphic = true );
+        /// generate the type of a copy constructor for paramType.
+        /// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic
+        FunctionType * genCopyType( Type * paramType, bool maybePolymorphic = true );
+        /// Enum for loop direction
+        enum LoopDirection { LoopBackward, LoopForward };
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
         template< typename OutputIterator >
+        Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, Type * addCast = nullptr, bool forward = true );
+        Statement * genCall( InitTweak::InitExpander_old & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, Type * addCast = nullptr, bool forward = true );
+        template< typename OutIter >
+        ast::ptr< ast::Stmt > genCall(
+                InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
+                const CodeLocation & loc, const std::string & fname, OutIter && out,
+                const ast::Type * type, const ast::Type * addCast, LoopDirection forward = LoopForward );
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Should only be called with non-array types.
         /// optionally returns a statement which must be inserted prior to the containing loop, if there is one
         template< typename OutputIterator >
         Statement * genScalarCall( InitTweak::InitExpander & srcParam, Expression * dstParam, std::string fname, OutputIterator out, Type * type, Type * addCast = nullptr ) {
+        Statement * genScalarCall( InitTweak::InitExpander_old & srcParam, Expression * dstParam, std::string fname, OutputIterator out, Type * type, Type * addCast = nullptr ) {
                 bool isReferenceCtorDtor = false;
                 if ( dynamic_cast< ReferenceType * >( type ) && CodeGen::isCtorDtor( fname ) ) {
 …
                         //   type->get_qualifiers() = Type::Qualifiers();
                         Type * castType = addCast->clone();
                         castType->get_qualifiers() -= Type::Qualifiers( Type::Lvalue | Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
+                        castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
                         // castType->set_lvalue( true ); // xxx - might not need this
                         dstParam = new CastExpr( dstParam, new ReferenceType( Type::Qualifiers(), castType ) );
 …
+        }
+        /// inserts into out a generated call expression to function fname with arguments dstParam and
+        /// srcParam. Should only be called with non-array types.
+        /// optionally returns a statement which must be inserted prior to the containing loop, if
+        /// there is one
+        template< typename OutIter >
+        ast::ptr< ast::Stmt > genScalarCall(
+                InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
+                const CodeLocation & loc, std::string fname, OutIter && out, const ast::Type * type,
+                const ast::Type * addCast = nullptr
+        ) {
+                bool isReferenceCtorDtor = false;
+                if ( dynamic_cast< const ast::ReferenceType * >( type ) && CodeGen::isCtorDtor( fname ) ) {
+                        // reference constructors are essentially application of the rebind operator.
+                        // apply & to both arguments, do not need a cast
+                        fname = "?=?";
+                        dstParam = new ast::AddressExpr{ dstParam };
+                        addCast = nullptr;
+                        isReferenceCtorDtor = true;
+                }
+                // want to be able to generate assignment, ctor, and dtor generically, so fname is one of
+                // "?=?", "?{}", or "^?{}"
+                ast::UntypedExpr * fExpr = new ast::UntypedExpr{ loc, new ast::NameExpr{ loc, fname } };
+                if ( addCast ) {
+                        // cast to T& with qualifiers removed, so that qualified objects can be constructed and
+                        // destructed with the same functions as non-qualified objects. Unfortunately, lvalue
+                        // is considered a qualifier - for AddressExpr to resolve, its argument must have an
+                        // lvalue-qualified type, so remove all qualifiers except lvalue.
+                        // xxx -- old code actually removed lvalue too...
+                        ast::ptr< ast::Type > guard = addCast;  // prevent castType from mutating addCast
+                        ast::ptr< ast::Type > castType = addCast;
+                        ast::remove_qualifiers(
+                                castType,
+                                ast::CV::Const | ast::CV::Volatile | ast::CV::Restrict | ast::CV::Atomic );
+                        dstParam = new ast::CastExpr{ dstParam, new ast::ReferenceType{ castType } };
+                }
+                fExpr->args.emplace_back( dstParam );
+                const ast::Stmt * listInit = srcParam.buildListInit( fExpr );
+                // fetch next set of arguments
+                ++srcParam;
+                // return if adding reference fails -- will happen on default ctor and dtor
+                if ( isReferenceCtorDtor && ! srcParam.addReference() ) return listInit;
+                std::vector< ast::ptr< ast::Expr > > args = *srcParam;
+                splice( fExpr->args, args );
+                *out++ = new ast::ExprStmt{ loc, fExpr };
+                srcParam.clearArrayIndices();
+                return listInit;
+        }
         /// Store in out a loop which calls fname on each element of the array with srcParam and dstParam as arguments.
         /// If forward is true, loop goes from 0 to N-1, else N-1 to 0
         template< typename OutputIterator >
         void genArrayCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, Type * addCast = nullptr, bool forward = true ) {
+        void genArrayCall( InitTweak::InitExpander_old & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, Type * addCast = nullptr, bool forward = true ) {
                 static UniqueName indexName( "_index" );
 …
+        }
+        /// Store in out a loop which calls fname on each element of the array with srcParam and
+        /// dstParam as arguments. If forward is true, loop goes from 0 to N-1, else N-1 to 0
+        template< typename OutIter >
+        void genArrayCall(
+                InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
+                const CodeLocation & loc, const std::string & fname, OutIter && out,
+                const ast::ArrayType * array, const ast::Type * addCast = nullptr,
+                LoopDirection forward = LoopForward
+        ) {
+                static UniqueName indexName( "_index" );
+                // for a flexible array member nothing is done -- user must define own assignment
+                if ( ! array->dimension ) return;
+                if ( addCast ) {
+                        // peel off array layer from cast
+                        addCast = strict_dynamic_cast< const ast::ArrayType * >( addCast )->base;
+                }
+                ast::ptr< ast::Expr > begin, end, cmp, update;
+                if ( forward ) {
+                        // generate: for ( int i = 0; i < N; ++i )
+                        begin = ast::ConstantExpr::from_int( loc, 0 );
+                        end = array->dimension;
+                        cmp = new ast::NameExpr{ loc, "?<?" };
+                        update = new ast::NameExpr{ loc, "++?" };
+                } else {
+                        // generate: for ( int i = N-1; i >= 0; --i )
+                        begin = new ast::UntypedExpr{
+                                loc, new ast::NameExpr{ loc, "?-?" },
+                                { array->dimension, ast::ConstantExpr::from_int( loc, 1 ) } };
+                        end = ast::ConstantExpr::from_int( loc, 0 );
+                        cmp = new ast::NameExpr{ loc, "?>=?" };
+                        update = new ast::NameExpr{ loc, "--?" };
+                }
+                ast::ptr< ast::DeclWithType > index = new ast::ObjectDecl{
+                        loc, indexName.newName(), new ast::BasicType{ ast::BasicType::SignedInt },
+                        new ast::SingleInit{ loc, begin } };
+                ast::ptr< ast::Expr > cond = new ast::UntypedExpr{
+                        loc, cmp, { new ast::VariableExpr{ loc, index }, end } };
+                ast::ptr< ast::Expr > inc = new ast::UntypedExpr{
+                        loc, update, { new ast::VariableExpr{ loc, index } } };
+                ast::ptr< ast::Expr > dstIndex = new ast::UntypedExpr{
+                        loc, new ast::NameExpr{ loc, "?[?]" },
+                        { dstParam, new ast::VariableExpr{ loc, index } } };
+                // srcParam must keep track of the array indices to build the source parameter and/or
+                // array list initializer
+                srcParam.addArrayIndex( new ast::VariableExpr{ loc, index }, array->dimension );
+                // for stmt's body, eventually containing call
+                ast::CompoundStmt * body = new ast::CompoundStmt{ loc };
+                ast::ptr< ast::Stmt > listInit = genCall(
+                        srcParam, dstIndex, loc, fname, std::back_inserter( body->kids ), array->base, addCast,
+                        forward );
+                // block containing the stmt and index variable
+                ast::CompoundStmt * block = new ast::CompoundStmt{ loc };
+                block->push_back( new ast::DeclStmt{ loc, index } );
+                if ( listInit ) { block->push_back( listInit ); }
+                block->push_back( new ast::ForStmt{ loc, {}, cond, inc, body } );
+                *out++ = block;
+        }
         template< typename OutputIterator >
         Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, Type * addCast, bool forward ) {
+        Statement * genCall( InitTweak::InitExpander_old & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, Type * addCast, bool forward ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
                         genArrayCall( srcParam, dstParam, fname, out, at, addCast, forward );
 …
+        }
+        template< typename OutIter >
+        ast::ptr< ast::Stmt > genCall(
+                InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
+                const CodeLocation & loc, const std::string & fname, OutIter && out,
+                const ast::Type * type, const ast::Type * addCast, LoopDirection forward
+        ) {
+                if ( auto at = dynamic_cast< const ast::ArrayType * >( type ) ) {
+                        genArrayCall(
+                                srcParam, dstParam, loc, fname, std::forward< OutIter >(out), at, addCast,
+                                forward );
+                        return {};
+                } else {
+                        return genScalarCall(
+                                srcParam, dstParam, loc, fname, std::forward< OutIter >( out ), type, addCast );
+                }
+        }
         /// inserts into out a generated call expression to function fname with arguments dstParam
         /// and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls. decl is the
 …
         /// ImplicitCtorDtorStmt node.
         template< typename OutputIterator >
         void genImplicitCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, DeclarationWithType * decl, bool forward = true ) {
+        void genImplicitCall( InitTweak::InitExpander_old & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, DeclarationWithType * decl, bool forward = true ) {
                 ObjectDecl *obj = dynamic_cast<ObjectDecl *>( decl );
                 assert( obj );
 …
+                }
+        }
+        static inline ast::ptr< ast::Stmt > genImplicitCall(
+                InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
+                const CodeLocation & loc, const std::string & fname, const ast::ObjectDecl * obj,
+                LoopDirection forward = LoopForward
+        ) {
+                // unnamed bit fields are not copied as they cannot be accessed
+                if ( isUnnamedBitfield( obj ) ) return {};
+                ast::ptr< ast::Type > addCast = nullptr;
+                if ( (fname == "?{}" || fname == "^?{}") && ( ! obj || ( obj && ! obj->bitfieldWidth ) ) ) {
+                        assert( dstParam->result );
+                        addCast = dstParam->result;
+                }
+                std::vector< ast::ptr< ast::Stmt > > stmts;
+                genCall(
+                        srcParam, dstParam, loc, fname, back_inserter( stmts ), obj->type, addCast, forward );
+                if ( stmts.empty() ) {
+                        return {};
+                } else if ( stmts.size() == 1 ) {
+                        const ast::Stmt * callStmt = stmts.front();
+                        if ( addCast ) {
+                                // implicitly generated ctor/dtor calls should be wrapped so that later passes are
+                                // aware they were generated.
+                                callStmt = new ast::ImplicitCtorDtorStmt{ callStmt->location, callStmt };
+                        }
+                        return callStmt;
+                } else {
+                        assert( false );
+                        return {};
+                }
+        }
 } // namespace SymTab

src/SymTab/FixFunction.cc

-              r7951100
+              rb067d9b
 #include <list>                   // for list
+#include "Common/utility.h"       // for maybeClone
+#include "AST/Decl.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
+#include "Common/utility.h"       // for maybeClone, copy
 #include "SynTree/Declaration.h"  // for FunctionDecl, ObjectDecl, Declarati...
 #include "SynTree/Expression.h"   // for Expression
 …
 namespace SymTab {
+        FixFunction::FixFunction() : isVoid( false ) {}
+        class FixFunction_old : public WithShortCircuiting {
+                typedef Mutator Parent;
+          public:
+                FixFunction_old() : isVoid( false ) {}
+                void premutate(FunctionDecl *functionDecl);
+                DeclarationWithType* postmutate(FunctionDecl *functionDecl);
+        DeclarationWithType * FixFunction::postmutate(FunctionDecl *functionDecl) {
+                Type * postmutate(ArrayType * arrayType);
+                void premutate(ArrayType * arrayType);
+                void premutate(VoidType * voidType);
+                void premutate(BasicType * basicType);
+                void premutate(PointerType * pointerType);
+                void premutate(StructInstType * aggregateUseType);
+                void premutate(UnionInstType * aggregateUseType);
+                void premutate(EnumInstType * aggregateUseType);
+                void premutate(TraitInstType * aggregateUseType);
+                void premutate(TypeInstType * aggregateUseType);
+                void premutate(TupleType * tupleType);
+                void premutate(VarArgsType * varArgsType);
+                void premutate(ZeroType * zeroType);
+                void premutate(OneType * oneType);
+                bool isVoid;
+        };
+        DeclarationWithType * FixFunction_old::postmutate(FunctionDecl *functionDecl) {
                 // can't delete function type because it may contain assertions, so transfer ownership to new object
                 ObjectDecl *pointer = new ObjectDecl( functionDecl->name, functionDecl->get_storageClasses(), functionDecl->linkage, nullptr, new PointerType( Type::Qualifiers(), functionDecl->type ), nullptr, functionDecl->attributes );
+                pointer->location = functionDecl->location;
                 functionDecl->attributes.clear();
                 functionDecl->type = nullptr;
 …
         // does not cause an error
         Type * FixFunction::postmutate(ArrayType *arrayType) {
+        Type * FixFunction_old::postmutate(ArrayType *arrayType) {
                 // need to recursively mutate the base type in order for multi-dimensional arrays to work.
                 PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base, arrayType->dimension, arrayType->isVarLen, arrayType->isStatic );
+                pointerType->location = arrayType->location;
                 arrayType->base = nullptr;
                 arrayType->dimension = nullptr;
 …
+        }
         void FixFunction::premutate(VoidType *) {
+        void FixFunction_old::premutate(VoidType *) {
                 isVoid = true;
+        }
         void FixFunction::premutate(FunctionDecl *) { visit_children = false; }
         void FixFunction::premutate(ArrayType *) { visit_children = false; }
         void FixFunction::premutate(BasicType *) { visit_children = false; }
         void FixFunction::premutate(PointerType *) { visit_children = false; }
         void FixFunction::premutate(StructInstType *) { visit_children = false; }
         void FixFunction::premutate(UnionInstType *) { visit_children = false; }
         void FixFunction::premutate(EnumInstType *) { visit_children = false; }
         void FixFunction::premutate(TraitInstType *) { visit_children = false; }
         void FixFunction::premutate(TypeInstType *) { visit_children = false; }
         void FixFunction::premutate(TupleType *) { visit_children = false; }
         void FixFunction::premutate(VarArgsType *) { visit_children = false; }
         void FixFunction::premutate(ZeroType *) { visit_children = false; }
         void FixFunction::premutate(OneType *) { visit_children = false; }
+        void FixFunction_old::premutate(FunctionDecl *) { visit_children = false; }
+        void FixFunction_old::premutate(ArrayType *) { visit_children = false; }
+        void FixFunction_old::premutate(BasicType *) { visit_children = false; }
+        void FixFunction_old::premutate(PointerType *) { visit_children = false; }
+        void FixFunction_old::premutate(StructInstType *) { visit_children = false; }
+        void FixFunction_old::premutate(UnionInstType *) { visit_children = false; }
+        void FixFunction_old::premutate(EnumInstType *) { visit_children = false; }
+        void FixFunction_old::premutate(TraitInstType *) { visit_children = false; }
+        void FixFunction_old::premutate(TypeInstType *) { visit_children = false; }
+        void FixFunction_old::premutate(TupleType *) { visit_children = false; }
+        void FixFunction_old::premutate(VarArgsType *) { visit_children = false; }
+        void FixFunction_old::premutate(ZeroType *) { visit_children = false; }
+        void FixFunction_old::premutate(OneType *) { visit_children = false; }
         bool fixFunction( DeclarationWithType *& dwt ) {
                 PassVisitor<FixFunction> fixer;
+                PassVisitor<FixFunction_old> fixer;
                 dwt = dwt->acceptMutator( fixer );
                 return fixer.pass.isVoid;
+        }
+namespace {
+        struct FixFunction_new final : public ast::WithShortCircuiting {
+                bool isVoid = false;
+                void premutate( const ast::FunctionDecl * ) { visit_children = false; }
+                const ast::DeclWithType * postmutate( const ast::FunctionDecl * func ) {
+                        return new ast::ObjectDecl{
+                                func->location, func->name, new ast::PointerType{ func->type }, nullptr,
+                                func->storage, func->linkage, nullptr, copy( func->attributes ) };
+                }
+                void premutate( const ast::ArrayType * ) { visit_children = false; }
+                const ast::Type * postmutate( const ast::ArrayType * array ) {
+                        return new ast::PointerType{
+                                array->base, array->dimension, array->isVarLen, array->isStatic,
+                                array->qualifiers };
+                }
+                void premutate( const ast::VoidType * ) { isVoid = true; }
+                void premutate( const ast::BasicType * ) { visit_children = false; }
+                void premutate( const ast::PointerType * ) { visit_children = false; }
+                void premutate( const ast::StructInstType * ) { visit_children = false; }
+                void premutate( const ast::UnionInstType * ) { visit_children = false; }
+                void premutate( const ast::EnumInstType * ) { visit_children = false; }
+                void premutate( const ast::TraitInstType * ) { visit_children = false; }
+                void premutate( const ast::TypeInstType * ) { visit_children = false; }
+                void premutate( const ast::TupleType * ) { visit_children = false; }
+                void premutate( const ast::VarArgsType * ) { visit_children = false; }
+                void premutate( const ast::ZeroType * ) { visit_children = false; }
+                void premutate( const ast::OneType * ) { visit_children = false; }
+        };
+} // anonymous namespace
+const ast::DeclWithType * fixFunction( const ast::DeclWithType * dwt, bool & isVoid ) {
+        ast::Pass< FixFunction_new > fixer;
+        dwt = dwt->accept( fixer );
+        isVoid |= fixer.pass.isVoid;
+        return dwt;
+}
 } // namespace SymTab

src/SymTab/FixFunction.h

-              r7951100
+              rb067d9b
 #include "SynTree/SynTree.h"    // for Types
+namespace ast {
+        class DeclWithType;
+}
 namespace SymTab {
+        /// Replaces function and array types by equivalent pointer types.
+        class FixFunction : public WithShortCircuiting {
+                typedef Mutator Parent;
+          public:
+                FixFunction();
+        /// Replaces function and array types by equivalent pointer types. Returns true if type is
+        /// void
+        bool fixFunction( DeclarationWithType *& );
+                void premutate(FunctionDecl *functionDecl);
+                DeclarationWithType* postmutate(FunctionDecl *functionDecl);
+                Type * postmutate(ArrayType * arrayType);
+                void premutate(ArrayType * arrayType);
+                void premutate(VoidType * voidType);
+                void premutate(BasicType * basicType);
+                void premutate(PointerType * pointerType);
+                void premutate(StructInstType * aggregateUseType);
+                void premutate(UnionInstType * aggregateUseType);
+                void premutate(EnumInstType * aggregateUseType);
+                void premutate(TraitInstType * aggregateUseType);
+                void premutate(TypeInstType * aggregateUseType);
+                void premutate(TupleType * tupleType);
+                void premutate(VarArgsType * varArgsType);
+                void premutate(ZeroType * zeroType);
+                void premutate(OneType * oneType);
+                bool isVoid;
+        };
+        bool fixFunction( DeclarationWithType *& );
+        /// Returns declaration with function and array types replaced by equivalent pointer types.
+        /// Sets isVoid to true if type is void
+        const ast::DeclWithType * fixFunction( const ast::DeclWithType * dwt, bool & isVoid );
 } // namespace SymTab

src/SymTab/Indexer.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 17 16:08:40 2017
 // Update Count     : 20
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Mar  8 13:55:00 2019
+// Update Count     : 21
 //
 …
 #include <cassert>                 // for assert, strict_dynamic_cast
-#include <iostream>                // for operator<<, basic_ostream, ostream
 #include <string>                  // for string, operator<<, operator!=
+#include <memory>                  // for shared_ptr, make_shared
 #include <unordered_map>           // for operator!=, unordered_map<>::const...
 #include <unordered_set>           // for unordered_set
 #include <utility>                 // for pair, make_pair, move
+#include <vector>                  // for vector
 #include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for cloneAll
+#include "GenPoly/GenPoly.h"
+#include "Common/Stats/Counter.h"  // for counters
+#include "GenPoly/GenPoly.h"       // for getFunctionType
 #include "InitTweak/InitTweak.h"   // for isConstructor, isCopyFunction, isC...
 #include "Mangler.h"               // for Mangler
 …
 #include "SynTree/Type.h"          // for Type, StructInstType, UnionInstType
-#define debugPrint(x) if ( doDebug ) { std::cerr << x; }
 namespace SymTab {
+        std::ostream & operator<<( std::ostream & out, const Indexer::IdData & data ) {
+                return out << "(" << data.id << "," << data.baseExpr << ")";
+        }
+        typedef std::unordered_map< std::string, Indexer::IdData > MangleTable;
+        typedef std::unordered_map< std::string, MangleTable > IdTable;
+        typedef std::unordered_map< std::string, NamedTypeDecl* > TypeTable;
+        typedef std::unordered_map< std::string, StructDecl* > StructTable;
+        typedef std::unordered_map< std::string, EnumDecl* > EnumTable;
+        typedef std::unordered_map< std::string, UnionDecl* > UnionTable;
+        typedef std::unordered_map< std::string, TraitDecl* > TraitTable;
+        void dump( const IdTable &table, std::ostream &os ) {
+                for ( IdTable::const_iterator id = table.begin(); id != table.end(); ++id ) {
+                        for ( MangleTable::const_iterator mangle = id->second.begin(); mangle != id->second.end(); ++mangle ) {
+                                os << mangle->second << std::endl;
+                        }
+                }
+        }
+        template< typename Decl >
+        void dump( const std::unordered_map< std::string, Decl* > &table, std::ostream &os ) {
+                for ( typename std::unordered_map< std::string, Decl* >::const_iterator it = table.begin(); it != table.end(); ++it ) {
+                        os << it->second << std::endl;
+                } // for
+        }
+        struct Indexer::Impl {
+                Impl( unsigned long _scope ) : refCount(1), scope( _scope ), size( 0 ), base(),
+                                idTable(), typeTable(), structTable(), enumTable(), unionTable(), traitTable() {}
+                Impl( unsigned long _scope, Indexer &&_base ) : refCount(1), scope( _scope ), size( 0 ), base( _base ),
+                                idTable(), typeTable(), structTable(), enumTable(), unionTable(), traitTable() {}
+                unsigned long refCount;   ///< Number of references to these tables
+                unsigned long scope;      ///< Scope these tables are associated with
+                unsigned long size;       ///< Number of elements stored in this table
+                const Indexer base;       ///< Base indexer this extends
+                IdTable idTable;          ///< Identifier namespace
+                TypeTable typeTable;      ///< Type namespace
+                StructTable structTable;  ///< Struct namespace
+                EnumTable enumTable;      ///< Enum namespace
+                UnionTable unionTable;    ///< Union namespace
+                TraitTable traitTable;    ///< Trait namespace
+        };
+        Indexer::Impl *Indexer::newRef( Indexer::Impl *toClone ) {
+                if ( ! toClone ) return 0;
+                // shorten the search chain by skipping empty links
+                Indexer::Impl *ret = toClone->size == 0 ? toClone->base.tables : toClone;
+                if ( ret ) { ++ret->refCount; }
+                return ret;
+        }
+        void Indexer::deleteRef( Indexer::Impl *toFree ) {
+                if ( ! toFree ) return;
+                if ( --toFree->refCount == 0 ) delete toFree;
+        }
+        void Indexer::removeSpecialOverrides( const std::string &id, std::list< IdData > & out ) const {
+                // only need to perform this step for constructors, destructors, and assignment functions
+                if ( ! CodeGen::isCtorDtorAssign( id ) ) return;
+                // helpful data structure to organize properties for a type
+                struct ValueType {
+                        struct DeclBall { // properties for this particular decl
+                                IdData decl;
+                                bool isUserDefinedFunc;
+                                bool isCopyFunc;
+        // Statistics block
+        namespace {
+                static inline auto stats() {
+                        using namespace Stats::Counters;
+                        static auto group   = build<CounterGroup>("Indexers");
+                        static struct {
+                                SimpleCounter * count;
+                                AverageCounter<double> * size;
+                                SimpleCounter * new_scopes;
+                                SimpleCounter * lazy_scopes;
+                                AverageCounter<double> * avg_scope_depth;
+                                MaxCounter<size_t> * max_scope_depth;
+                                SimpleCounter * add_calls;
+                                SimpleCounter * lookup_calls;
+                                SimpleCounter * map_lookups;
+                                SimpleCounter * map_mutations;
+                        } ret = {
+                                .count   = build<SimpleCounter>("Count", group),
+                                .size    = build<AverageCounter<double>>("Average Size", group),
+                                .new_scopes = build<SimpleCounter>("Scopes", group),
+                                .lazy_scopes = build<SimpleCounter>("Lazy Scopes", group),
+                                .avg_scope_depth = build<AverageCounter<double>>("Average Scope", group),
+                                .max_scope_depth = build<MaxCounter<size_t>>("Max Scope", group),
+                                .add_calls = build<SimpleCounter>("Add Calls", group),
+                                .lookup_calls = build<SimpleCounter>("Lookup Calls", group),
+                                .map_lookups = build<SimpleCounter>("Map Lookups", group),
+                                .map_mutations = build<SimpleCounter>("Map Mutations", group)
                         };
+                        // properties for this type
+                        bool existsUserDefinedCopyFunc = false;    // user-defined copy ctor found
+                        BaseSyntaxNode * deleteStmt = nullptr;     // non-null if a user-defined function is found
+                        std::list< DeclBall > decls;
+                        // another FunctionDecl for the current type was found - determine
+                        // if it has special properties and update data structure accordingly
+                        ValueType & operator+=( IdData data ) {
+                                DeclarationWithType * function = data.id;
+                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->linkage );
+                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->name );
+                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isCopyFunc } );
+                                existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
+                                if ( isUserDefinedFunc && ! data.deleteStmt ) {
+                                        // any user-defined function can act as an implicit delete statement for generated constructors.
+                                        // a delete stmt should not act as an implicit delete statement.
+                                        deleteStmt = data.id;
+                                }
+                                return *this;
+                        }
+                }; // ValueType
+                std::list< IdData > copy;
+                copy.splice( copy.end(), out );
+                // organize discovered declarations by type
+                std::unordered_map< std::string, ValueType > funcMap;
+                for ( auto decl : copy ) {
+                        if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl.id ) ) {
+                                std::list< DeclarationWithType * > & params = function->type->parameters;
+                                assert( ! params.empty() );
+                                // use base type of pointer, so that qualifiers on the pointer type aren't considered.
+                                Type * base = InitTweak::getPointerBase( params.front()->get_type() );
+                                assert( base );
+                                funcMap[ Mangler::mangle( base ) ] += decl;
+                        } else {
+                                out.push_back( decl );
+                        }
+                }
+                // if a type contains user defined ctor/dtor/assign, then special rules trigger, which determine
+                // the set of ctor/dtor/assign that can be used  by the requester. In particular, if the user defines
+                // a default ctor, then the generated default ctor is unavailable, likewise for copy ctor
+                // and dtor. If the user defines any ctor/dtor, then no generated field ctors are available.
+                // If the user defines any ctor then the generated default ctor is unavailable (intrinsic default
+                // ctor must be overridden exactly). If the user defines anything that looks like a copy constructor,
+                // then the generated copy constructor is unavailable, and likewise for the assignment operator.
+                for ( std::pair< const std::string, ValueType > & pair : funcMap ) {
+                        ValueType & val = pair.second;
+                        for ( ValueType::DeclBall ball : val.decls ) {
+                                bool isNotUserDefinedFunc = ! ball.isUserDefinedFunc && ball.decl.id->linkage != LinkageSpec::Intrinsic;
+                                bool isCopyFunc = ball.isCopyFunc;
+                                bool existsUserDefinedCopyFunc = val.existsUserDefinedCopyFunc;
+                                // only implicitly delete non-user defined functions that are  not intrinsic, and are
+                                // not copy functions (assignment or copy constructor), unless a user-defined copy function exists.
+                                // deleteStmt will be non-null only if a user-defined function is found.
+                                if (isNotUserDefinedFunc && (! isCopyFunc || existsUserDefinedCopyFunc)) {
+                                        ball.decl.deleteStmt = val.deleteStmt;
+                                }
+                                out.push_back( ball.decl );
+                        }
+                }
+        }
+        void Indexer::makeWritable() {
+                if ( ! tables ) {
+                        // create indexer if not yet set
+                        tables = new Indexer::Impl( scope );
+                } else if ( tables->refCount > 1 || tables->scope != scope ) {
+                        // make this indexer the base of a fresh indexer at the current scope
+                        tables = new Indexer::Impl( scope, std::move( *this ) );
+                }
+        }
+        Indexer::Indexer() : tables( 0 ), scope( 0 ) {}
+        Indexer::Indexer( const Indexer &that ) : doDebug( that.doDebug ), tables( newRef( that.tables ) ), scope( that.scope ) {}
+        Indexer::Indexer( Indexer &&that ) : doDebug( that.doDebug ), tables( that.tables ), scope( that.scope ) {
+                that.tables = 0;
+        }
+                        return ret;
+                }
+        }
+        Indexer::Indexer()
+        : idTable(), typeTable(), structTable(), enumTable(), unionTable(), traitTable(),
+          prevScope(), scope( 0 ), repScope( 0 ) { ++* stats().count; }
         Indexer::~Indexer() {
+                deleteRef( tables );
+        }
+        Indexer& Indexer::operator= ( const Indexer &that ) {
+                deleteRef( tables );
+                tables = newRef( that.tables );
+                scope = that.scope;
+                doDebug = that.doDebug;
+                return *this;
+        }
+        Indexer& Indexer::operator= ( Indexer &&that ) {
+                deleteRef( tables );
+                tables = that.tables;
+                scope = that.scope;
+                doDebug = that.doDebug;
+                that.tables = 0;
+                return *this;
+        }
+        void Indexer::lookupId( const std::string &id, std::list< IdData > &out ) const {
+                std::unordered_set< std::string > foundMangleNames;
+                Indexer::Impl *searchTables = tables;
+                while ( searchTables ) {
+                        IdTable::const_iterator decls = searchTables->idTable.find( id );
+                        if ( decls != searchTables->idTable.end() ) {
+                                const MangleTable &mangleTable = decls->second;
+                                for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
+                                        // mark the mangled name as found, skipping this insertion if a declaration for that name has already been found
+                                        if ( foundMangleNames.insert( decl->first ).second == false ) continue;
+                                        out.push_back( decl->second );
+                                }
+                        }
+                        // get declarations from base indexers
+                        searchTables = searchTables->base.tables;
+                }
+                // some special functions, e.g. constructors and destructors
+                // remove autogenerated functions when they are defined so that
+                // they can never be matched
+                removeSpecialOverrides( id, out );
+        }
+        NamedTypeDecl *Indexer::lookupType( const std::string &id ) const {
+                if ( ! tables ) return 0;
+                TypeTable::const_iterator ret = tables->typeTable.find( id );
+                return ret != tables->typeTable.end() ? ret->second : tables->base.lookupType( id );
+        }
+        StructDecl *Indexer::lookupStruct( const std::string &id ) const {
+                if ( ! tables ) return 0;
+                StructTable::const_iterator ret = tables->structTable.find( id );
+                return ret != tables->structTable.end() ? ret->second : tables->base.lookupStruct( id );
+        }
+        EnumDecl *Indexer::lookupEnum( const std::string &id ) const {
+                if ( ! tables ) return 0;
+                EnumTable::const_iterator ret = tables->enumTable.find( id );
+                return ret != tables->enumTable.end() ? ret->second : tables->base.lookupEnum( id );
+        }
+        UnionDecl *Indexer::lookupUnion( const std::string &id ) const {
+                if ( ! tables ) return 0;
+                UnionTable::const_iterator ret = tables->unionTable.find( id );
+                return ret != tables->unionTable.end() ? ret->second : tables->base.lookupUnion( id );
+        }
+        TraitDecl *Indexer::lookupTrait( const std::string &id ) const {
+                if ( ! tables ) return 0;
+                TraitTable::const_iterator ret = tables->traitTable.find( id );
+                return ret != tables->traitTable.end() ? ret->second : tables->base.lookupTrait( id );
+        }
+        const Indexer::IdData * Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
+                if ( ! tables ) return nullptr;
+                if ( tables->scope < scope ) return nullptr;
+                IdTable::const_iterator decls = tables->idTable.find( id );
+                if ( decls != tables->idTable.end() ) {
+                        const MangleTable &mangleTable = decls->second;
+                        MangleTable::const_iterator decl = mangleTable.find( mangleName );
+                        if ( decl != mangleTable.end() ) return &decl->second;
+                }
+                return tables->base.lookupIdAtScope( id, mangleName, scope );
+        }
+        Indexer::IdData * Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) {
+                return const_cast<IdData *>(const_cast<const Indexer *>(this)->lookupIdAtScope( id, mangleName, scope ));
+        }
+        bool Indexer::hasIncompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
+                if ( ! tables ) return false;
+                if ( tables->scope < scope ) return false;
+                IdTable::const_iterator decls = tables->idTable.find( id );
+                if ( decls != tables->idTable.end() ) {
+                        const MangleTable &mangleTable = decls->second;
+                        for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
+                                // check for C decls with the same name, skipping those with a compatible type (by mangleName)
+                                if ( ! LinkageSpec::isMangled( decl->second.id->get_linkage() ) && decl->first != mangleName ) return true;
+                        }
+                }
+                return tables->base.hasIncompatibleCDecl( id, mangleName, scope );
+        }
+        bool Indexer::hasCompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
+                if ( ! tables ) return false;
+                if ( tables->scope < scope ) return false;
+                IdTable::const_iterator decls = tables->idTable.find( id );
+                if ( decls != tables->idTable.end() ) {
+                        const MangleTable &mangleTable = decls->second;
+                        for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
+                                // check for C decls with the same name, skipping
+                                // those with an incompatible type (by mangleName)
+                                if ( ! LinkageSpec::isMangled( decl->second.id->get_linkage() ) && decl->first == mangleName ) return true;
+                        }
+                }
+                return tables->base.hasCompatibleCDecl( id, mangleName, scope );
+        }
+        NamedTypeDecl *Indexer::lookupTypeAtScope( const std::string &id, unsigned long scope ) const {
+                if ( ! tables ) return 0;
+                if ( tables->scope < scope ) return 0;
+                TypeTable::const_iterator ret = tables->typeTable.find( id );
+                return ret != tables->typeTable.end() ? ret->second : tables->base.lookupTypeAtScope( id, scope );
+        }
+        StructDecl *Indexer::lookupStructAtScope( const std::string &id, unsigned long scope ) const {
+                if ( ! tables ) return 0;
+                if ( tables->scope < scope ) return 0;
+                StructTable::const_iterator ret = tables->structTable.find( id );
+                return ret != tables->structTable.end() ? ret->second : tables->base.lookupStructAtScope( id, scope );
+        }
+        EnumDecl *Indexer::lookupEnumAtScope( const std::string &id, unsigned long scope ) const {
+                if ( ! tables ) return 0;
+                if ( tables->scope < scope ) return 0;
+                EnumTable::const_iterator ret = tables->enumTable.find( id );
+                return ret != tables->enumTable.end() ? ret->second : tables->base.lookupEnumAtScope( id, scope );
+        }
+        UnionDecl *Indexer::lookupUnionAtScope( const std::string &id, unsigned long scope ) const {
+                if ( ! tables ) return 0;
+                if ( tables->scope < scope ) return 0;
+                UnionTable::const_iterator ret = tables->unionTable.find( id );
+                return ret != tables->unionTable.end() ? ret->second : tables->base.lookupUnionAtScope( id, scope );
+        }
+        TraitDecl *Indexer::lookupTraitAtScope( const std::string &id, unsigned long scope ) const {
+                if ( ! tables ) return 0;
+                if ( tables->scope < scope ) return 0;
+                TraitTable::const_iterator ret = tables->traitTable.find( id );
+                return ret != tables->traitTable.end() ? ret->second : tables->base.lookupTraitAtScope( id, scope );
+        }
+        bool isFunction( DeclarationWithType * decl ) {
+                stats().size->push( idTable ? idTable->size() : 0 );
+        }
+        void Indexer::lazyInitScope() {
+                if ( repScope < scope ) {
+                        ++* stats().lazy_scopes;
+                        // create rollback
+                        prevScope = std::make_shared<Indexer>( * this );
+                        // update repScope
+                        repScope = scope;
+                }
+        }
+        void Indexer::enterScope() {
+                ++scope;
+                ++* stats().new_scopes;
+                stats().avg_scope_depth->push( scope );
+                stats().max_scope_depth->push( scope );
+        }
+        void Indexer::leaveScope() {
+                if ( repScope == scope ) {
+                        Ptr prev = prevScope;           // make sure prevScope stays live
+                        * this = std::move(* prevScope);  // replace with previous scope
+                }
+                --scope;
+        }
+        void Indexer::lookupId( const std::string & id, std::list< IdData > &out ) const {
+                ++* stats().lookup_calls;
+                if ( ! idTable ) return;
+                ++* stats().map_lookups;
+                auto decls = idTable->find( id );
+                if ( decls == idTable->end() ) return;
+                for ( auto decl : *(decls->second) ) {
+                        out.push_back( decl.second );
+                }
+        }
+        const NamedTypeDecl * Indexer::lookupType( const std::string & id ) const {
+                ++* stats().lookup_calls;
+                if ( ! typeTable ) return nullptr;
+                ++* stats().map_lookups;
+                auto it = typeTable->find( id );
+                return it == typeTable->end() ? nullptr : it->second.decl;
+        }
+        const StructDecl * Indexer::lookupStruct( const std::string & id ) const {
+                ++* stats().lookup_calls;
+                if ( ! structTable ) return nullptr;
+                ++* stats().map_lookups;
+                auto it = structTable->find( id );
+                return it == structTable->end() ? nullptr : it->second.decl;
+        }
+        const EnumDecl * Indexer::lookupEnum( const std::string & id ) const {
+                ++* stats().lookup_calls;
+                if ( ! enumTable ) return nullptr;
+                ++* stats().map_lookups;
+                auto it = enumTable->find( id );
+                return it == enumTable->end() ? nullptr : it->second.decl;
+        }
+        const UnionDecl * Indexer::lookupUnion( const std::string & id ) const {
+                ++* stats().lookup_calls;
+                if ( ! unionTable ) return nullptr;
+                ++* stats().map_lookups;
+                auto it = unionTable->find( id );
+                return it == unionTable->end() ? nullptr : it->second.decl;
+        }
+        const TraitDecl * Indexer::lookupTrait( const std::string & id ) const {
+                ++* stats().lookup_calls;
+                if ( ! traitTable ) return nullptr;
+                ++* stats().map_lookups;
+                auto it = traitTable->find( id );
+                return it == traitTable->end() ? nullptr : it->second.decl;
+        }
+        const Indexer * Indexer::atScope( unsigned long target ) const {
+                // by lazy construction, final indexer in list has repScope 0, cannot be > target
+                // otherwise, will find first scope representing the target
+                const Indexer * indexer = this;
+                while ( indexer->repScope > target ) {
+                        indexer = indexer->prevScope.get();
+                }
+                return indexer;
+        }
+        const NamedTypeDecl * Indexer::globalLookupType( const std::string & id ) const {
+                return atScope( 0 )->lookupType( id );
+        }
+        const StructDecl * Indexer::globalLookupStruct( const std::string & id ) const {
+                return atScope( 0 )->lookupStruct( id );
+        }
+        const UnionDecl * Indexer::globalLookupUnion( const std::string & id ) const {
+                return atScope( 0 )->lookupUnion( id );
+        }
+        const EnumDecl * Indexer::globalLookupEnum( const std::string & id ) const {
+                return atScope( 0 )->lookupEnum( id );
+        }
+        bool isFunction( const DeclarationWithType * decl ) {
                 return GenPoly::getFunctionType( decl->get_type() );
+        }
         bool isObject( DeclarationWithType * decl ) {
+        bool isObject( const DeclarationWithType * decl ) {
                 return ! isFunction( decl );
+        }
         bool isDefinition( DeclarationWithType * decl ) {
                 if ( FunctionDecl * func = dynamic_cast< FunctionDecl * >( decl ) ) {
+        bool isDefinition( const DeclarationWithType * decl ) {
+                if ( const FunctionDecl * func = dynamic_cast< const FunctionDecl * >( decl ) ) {
                         // a function is a definition if it has a body
                         return func->statements;
 …
+        }
+        bool addedIdConflicts( Indexer::IdData & existing, DeclarationWithType *added, BaseSyntaxNode * deleteStmt, Indexer::ConflictFunction handleConflicts ) {
+                // if we're giving the same name mangling to things of different types then there is something wrong
+        bool Indexer::addedIdConflicts(
+                        const Indexer::IdData & existing, const DeclarationWithType * added,
+                        Indexer::OnConflict handleConflicts, const Declaration * deleteStmt ) {
+                // if we're giving the same name mangling to things of different types then there is
+                // something wrong
                 assert( (isObject( added ) && isObject( existing.id ) )
                         || ( isFunction( added ) && isFunction( existing.id ) ) );
                 if ( LinkageSpec::isOverridable( existing.id->get_linkage() ) ) {
+                if ( LinkageSpec::isOverridable( existing.id->linkage ) ) {
                         // new definition shadows the autogenerated one, even at the same scope
                         return false;
+                } else if ( LinkageSpec::isMangled( added->get_linkage() ) || ResolvExpr::typesCompatible( added->get_type(), existing.id->get_type(), Indexer() ) ) {
+                } else if ( LinkageSpec::isMangled( added->linkage )
+                                || ResolvExpr::typesCompatible(
+                                        added->get_type(), existing.id->get_type(), Indexer() ) ) {
                         // it is a conflict if one declaration is deleted and the other is not
                         if ( deleteStmt && ! existing.deleteStmt ) {
+                                return handleConflicts( existing, "deletion of defined identifier " );
+                                if ( handleConflicts.mode == OnConflict::Error ) {
+                                        SemanticError( added, "deletion of defined identifier " );
+                                }
+                                return true;
                         } else if ( ! deleteStmt && existing.deleteStmt ) {
+                                return handleConflicts( existing, "definition of deleted identifier " );
+                                if ( handleConflicts.mode == OnConflict::Error ) {
+                                        SemanticError( added, "definition of deleted identifier " );
+                                }
+                                return true;
+                        }
                         if ( isDefinition( added ) && isDefinition( existing.id ) ) {
+                                if ( isFunction( added ) ) {
+                                        return handleConflicts( existing, "duplicate function definition for " );
+                                if ( handleConflicts.mode == OnConflict::Error ) {
+                                        SemanticError( added,
+                                                isFunction( added ) ?
+                                                        "duplicate function definition for " :
+                                                        "duplicate object definition for " );
+                                }
+                                return true;
+                        } // if
+                } else {
+                        if ( handleConflicts.mode == OnConflict::Error ) {
+                                SemanticError( added, "duplicate definition for " );
+                        }
+                        return true;
+                } // if
+                return true;
+        }
+        bool Indexer::hasCompatibleCDecl( const std::string & id, const std::string &mangleName ) const {
+                if ( ! idTable ) return false;
+                ++* stats().map_lookups;
+                auto decls = idTable->find( id );
+                if ( decls == idTable->end() ) return false;
+                for ( auto decl : *(decls->second) ) {
+                        // skip other scopes (hidden by this decl)
+                        if ( decl.second.scope != scope ) continue;
+                        // check for C decl with compatible type (by mangleName)
+                        if ( ! LinkageSpec::isMangled( decl.second.id->linkage ) && decl.first == mangleName ) {
+                                return true;
+                        }
+                }
+                return false;
+        }
+        bool Indexer::hasIncompatibleCDecl(const std::string & id, const std::string &mangleName ) const {
+                if ( ! idTable ) return false;
+                ++* stats().map_lookups;
+                auto decls = idTable->find( id );
+                if ( decls == idTable->end() ) return false;
+                for ( auto decl : *(decls->second) ) {
+                        // skip other scopes (hidden by this decl)
+                        if ( decl.second.scope != scope ) continue;
+                        // check for C decl with incompatible type (by manglename)
+                        if ( ! LinkageSpec::isMangled( decl.second.id->linkage ) && decl.first != mangleName ) {
+                                return true;
+                        }
+                }
+                return false;
+        }
+        /// gets the base type of the first parameter; decl must be a ctor/dtor/assignment function
+        std::string getOtypeKey( const FunctionDecl * function ) {
+                auto& params = function->type->parameters;
+                assert( ! params.empty() );
+                // use base type of pointer, so that qualifiers on the pointer type aren't considered.
+                Type * base = InitTweak::getPointerBase( params.front()->get_type() );
+                assert( base );
+                return Mangler::mangle( base );
+        }
+        /// gets the declaration for the function acting on a type specified by otype key,
+        /// nullptr if none such
+        const FunctionDecl * getFunctionForOtype( const DeclarationWithType * decl, const std::string& otypeKey ) {
+                const FunctionDecl * func = dynamic_cast< const FunctionDecl * >( decl );
+                if ( ! func || otypeKey != getOtypeKey( func ) ) return nullptr;
+                return func;
+        }
+        bool Indexer::removeSpecialOverrides(Indexer::IdData& data, Indexer::MangleTable::Ptr& mangleTable ) {
+                // if a type contains user defined ctor/dtor/assign, then special rules trigger, which
+                // determinethe set of ctor/dtor/assign that can be used  by the requester. In particular,
+                // if the user defines a default ctor, then the generated default ctor is unavailable,
+                // likewise for copy ctor and dtor. If the user defines any ctor/dtor, then no generated
+                // field ctors are available. If the user defines any ctor then the generated default ctor
+                // is unavailable (intrinsic default ctor must be overridden exactly). If the user defines
+                // anything that looks like a copy constructor, then the generated copy constructor is
+                // unavailable, and likewise for the assignment operator.
+                // only relevant on function declarations
+                const FunctionDecl * function = dynamic_cast< const FunctionDecl * >( data.id );
+                if ( ! function ) return true;
+                // only need to perform this check for constructors, destructors, and assignment functions
+                if ( ! CodeGen::isCtorDtorAssign( data.id->name ) ) return true;
+                // set up information for this type
+                bool dataIsUserDefinedFunc = ! LinkageSpec::isOverridable( function->linkage );
+                bool dataIsCopyFunc = InitTweak::isCopyFunction( function, function->name );
+                std::string dataOtypeKey = getOtypeKey( function );
+                if ( dataIsUserDefinedFunc && dataIsCopyFunc ) {
+                        // this is a user-defined copy function
+                        // if this is the first such, delete/remove non-user-defined overloads as needed
+                        std::vector< std::string > removed;
+                        std::vector< MangleTable::value_type > deleted;
+                        bool alreadyUserDefinedFunc = false;
+                        for ( const auto& entry : * mangleTable ) {
+                                // skip decls that aren't functions or are for the wrong type
+                                const FunctionDecl * decl = getFunctionForOtype( entry.second.id, dataOtypeKey );
+                                if ( ! decl ) continue;
+                                bool isCopyFunc = InitTweak::isCopyFunction( decl, decl->name );
+                                if ( ! LinkageSpec::isOverridable( decl->linkage ) ) {
+                                        // matching user-defined function
+                                        if ( isCopyFunc ) {
+                                                // mutation already performed, return early
+                                                return true;
+                                        } else {
+                                                // note that non-copy deletions already performed
+                                                alreadyUserDefinedFunc = true;
+                                        }
                                 } else {
+                                        return handleConflicts( existing, "duplicate object definition for " );
+                                } // if
+                        } // if
+                } else {
+                        return handleConflicts( existing, "duplicate definition for " );
+                } // if
+                                        // non-user-defined function; mark for deletion/removal as appropriate
+                                        if ( isCopyFunc ) {
+                                                removed.push_back( entry.first );
+                                        } else if ( ! alreadyUserDefinedFunc ) {
+                                                deleted.push_back( entry );
+                                        }
+                                }
+                        }
+                        // perform removals from mangle table, and deletions if necessary
+                        for ( const auto& key : removed ) {
+                                ++* stats().map_mutations;
+                                mangleTable = mangleTable->erase( key );
+                        }
+                        if ( ! alreadyUserDefinedFunc ) for ( const auto& entry : deleted ) {
+                                ++* stats().map_mutations;
+                                mangleTable = mangleTable->set( entry.first, IdData{ entry.second, function } );
+                        }
+                } else if ( dataIsUserDefinedFunc ) {
+                        // this is a user-defined non-copy function
+                        // if this is the first user-defined function, delete non-user-defined overloads
+                        std::vector< MangleTable::value_type > deleted;
+                        for ( const auto& entry : * mangleTable ) {
+                                // skip decls that aren't functions or are for the wrong type
+                                const FunctionDecl * decl = getFunctionForOtype( entry.second.id, dataOtypeKey );
+                                if ( ! decl ) continue;
+                                // exit early if already a matching user-defined function;
+                                // earlier function will have mutated table
+                                if ( ! LinkageSpec::isOverridable( decl->linkage ) ) return true;
+                                // skip mutating intrinsic functions
+                                if ( decl->linkage == LinkageSpec::Intrinsic ) continue;
+                                // user-defined non-copy functions do not override copy functions
+                                if ( InitTweak::isCopyFunction( decl, decl->name ) ) continue;
+                                // this function to be deleted after mangleTable iteration is complete
+                                deleted.push_back( entry );
+                        }
+                        // mark deletions to update mangle table
+                        // this needs to be a separate loop because of iterator invalidation
+                        for ( const auto& entry : deleted ) {
+                                ++* stats().map_mutations;
+                                mangleTable = mangleTable->set( entry.first, IdData{ entry.second, function } );
+                        }
+                } else if ( function->linkage != LinkageSpec::Intrinsic ) {
+                        // this is an overridable generated function
+                        // if there already exists a matching user-defined function, delete this appropriately
+                        for ( const auto& entry : * mangleTable ) {
+                                // skip decls that aren't functions or are for the wrong type
+                                const FunctionDecl * decl = getFunctionForOtype( entry.second.id, dataOtypeKey );
+                                if ( ! decl ) continue;
+                                // skip non-user-defined functions
+                                if ( LinkageSpec::isOverridable( decl->linkage ) ) continue;
+                                if ( dataIsCopyFunc ) {
+                                        // remove current function if exists a user-defined copy function
+                                        // since the signatures for copy functions don't need to match exactly, using
+                                        // a delete statement is the wrong approach
+                                        if ( InitTweak::isCopyFunction( decl, decl->name ) ) return false;
+                                } else {
+                                        // mark current function deleted by first user-defined function found
+                                        data.deleteStmt = decl;
+                                        return true;
+                                }
+                        }
+                }
+                // nothing (more) to fix, return true
                 return true;
+        }
+        void Indexer::addId( DeclarationWithType *decl, ConflictFunction handleConflicts, Expression * baseExpr, BaseSyntaxNode * deleteStmt ) {
+                if ( decl->name == "" ) return;
+                debugPrint( "Adding Id " << decl->name << std::endl );
+                makeWritable();
+        void Indexer::addId(const DeclarationWithType * decl, OnConflict handleConflicts, const Expression * baseExpr,
+                        const Declaration * deleteStmt ) {
+                ++* stats().add_calls;
                 const std::string &name = decl->name;
+                if ( name == "" ) return;
                 std::string mangleName;
                 if ( LinkageSpec::isOverridable( decl->linkage ) ) {
                         // mangle the name without including the appropriate suffix, so overridable routines are placed into the
                         // same "bucket" as their user defined versions.
+                        // mangle the name without including the appropriate suffix, so overridable routines
+                        // are placed into the same "bucket" as their user defined versions.
                         mangleName = Mangler::mangle( decl, false );
                 } else {
 …
                 } // if
+                // this ensures that no two declarations with the same unmangled name at the same scope both have C linkage
+                if ( ! LinkageSpec::isMangled( decl->linkage ) ) {
+                        // NOTE this is broken in Richard's original code in such a way that it never triggers (it
+                        // doesn't check decls that have the same manglename, and all C-linkage decls are defined to
+                        // have their name as their manglename, hence the error can never trigger).
+                        // The code here is closer to correct, but name mangling would have to be completely
+                        // isomorphic to C type-compatibility, which it may not be.
+                        if ( hasIncompatibleCDecl( name, mangleName, scope ) ) {
+                // this ensures that no two declarations with the same unmangled name at the same scope
+                // both have C linkage
+                if ( LinkageSpec::isMangled( decl->linkage ) ) {
+                        // Check that a Cforall declaration doesn't override any C declaration
+                        if ( hasCompatibleCDecl( name, mangleName ) ) {
+                                SemanticError( decl, "Cforall declaration hides C function " );
+                        }
+                } else {
+                        // NOTE: only correct if name mangling is completely isomorphic to C
+                        // type-compatibility, which it may not be.
+                        if ( hasIncompatibleCDecl( name, mangleName ) ) {
                                 SemanticError( decl, "conflicting overload of C function " );
+                        }
+                } else {
+                        // Check that a Cforall declaration doesn't override any C declaration
+                        if ( hasCompatibleCDecl( name, mangleName, scope ) ) {
+                                SemanticError( decl, "Cforall declaration hides C function " );
+                        }
+                }
+                // Skip repeat declarations of the same identifier
+                IdData * existing = lookupIdAtScope( name, mangleName, scope );
+                if ( existing && existing->id && addedIdConflicts( *existing, decl, deleteStmt, handleConflicts ) ) return;
+                // add to indexer
+                tables->idTable[ name ][ mangleName ] = IdData{ decl, baseExpr, deleteStmt };
+                ++tables->size;
+        }
+        void Indexer::addId( DeclarationWithType * decl, Expression * baseExpr ) {
+                }
+                // ensure tables exist and add identifier
+                MangleTable::Ptr mangleTable;
+                if ( ! idTable ) {
+                        idTable = IdTable::new_ptr();
+                        mangleTable = MangleTable::new_ptr();
+                } else {
+                        ++* stats().map_lookups;
+                        auto decls = idTable->find( name );
+                        if ( decls == idTable->end() ) {
+                                mangleTable = MangleTable::new_ptr();
+                        } else {
+                                mangleTable = decls->second;
+                                // skip in-scope repeat declarations of same identifier
+                                ++* stats().map_lookups;
+                                auto existing = mangleTable->find( mangleName );
+                                if ( existing != mangleTable->end()
+                                                && existing->second.scope == scope
+                                                && existing->second.id ) {
+                                        if ( addedIdConflicts( existing->second, decl, handleConflicts, deleteStmt ) ) {
+                                                if ( handleConflicts.mode == OnConflict::Delete ) {
+                                                        // set delete expression for conflicting identifier
+                                                        lazyInitScope();
+                                                        * stats().map_mutations += 2;
+                                                        idTable = idTable->set(
+                                                                name,
+                                                                mangleTable->set(
+                                                                        mangleName,
+                                                                        IdData{ existing->second, handleConflicts.deleteStmt } ) );
+                                                }
+                                                return;
+                                        }
+                                }
+                        }
+                }
+                // add/overwrite with new identifier
+                lazyInitScope();
+                IdData data{ decl, baseExpr, deleteStmt, scope };
+                // Ensure that auto-generated ctor/dtor/assignment are deleted if necessary
+                if ( ! removeSpecialOverrides( data, mangleTable ) ) return;
+                * stats().map_mutations += 2;
+                idTable = idTable->set( name, mangleTable->set( mangleName, std::move(data) ) );
+        }
+        void Indexer::addId( const DeclarationWithType * decl, const Expression * baseExpr ) {
                 // default handling of conflicts is to raise an error
                 addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, baseExpr, decl->isDeleted ? decl : nullptr );
+        }
         void Indexer::addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt ) {
+                addId( decl, OnConflict::error(), baseExpr, decl->isDeleted ? decl : nullptr );
+        }
+        void Indexer::addDeletedId( const DeclarationWithType * decl, const Declaration * deleteStmt ) {
                 // default handling of conflicts is to raise an error
                 addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, nullptr, deleteStmt );
+        }
         bool addedTypeConflicts( NamedTypeDecl *existing, NamedTypeDecl *added ) {
                 if ( existing->get_base() == 0 ) {
+                addId( decl, OnConflict::error(), nullptr, deleteStmt );
+        }
+        bool addedTypeConflicts( const NamedTypeDecl * existing, const NamedTypeDecl * added ) {
+                if ( existing->base == nullptr ) {
                         return false;
                 } else if ( added->get_base() == 0 ) {
+                } else if ( added->base == nullptr ) {
                         return true;
                 } else {
+                        SemanticError( added, "redeclaration of " );
+                }
+        }
+        void Indexer::addType( NamedTypeDecl *decl ) {
+                debugPrint( "Adding type " << decl->name << std::endl );
+                makeWritable();
+                const std::string &id = decl->get_name();
+                TypeTable::iterator existing = tables->typeTable.find( id );
+                if ( existing == tables->typeTable.end() ) {
+                        NamedTypeDecl *parent = tables->base.lookupTypeAtScope( id, scope );
+                        if ( ! parent || ! addedTypeConflicts( parent, decl ) ) {
+                                tables->typeTable.insert( existing, std::make_pair( id, decl ) );
+                                ++tables->size;
+                        }
+                } else {
+                        if ( ! addedTypeConflicts( existing->second, decl ) ) {
+                                existing->second = decl;
+                        }
+                }
+        }
+        bool addedDeclConflicts( AggregateDecl *existing, AggregateDecl *added ) {
+                        assert( existing->base && added->base );
+                        // typedef redeclarations are errors only if types are different
+                        if ( ! ResolvExpr::typesCompatible( existing->base, added->base, Indexer() ) ) {
+                                SemanticError( added->location, "redeclaration of " + added->name );
+                        }
+                }
+                // does not need to be added to the table if both existing and added have a base that are
+                // the same
+                return true;
+        }
+        void Indexer::addType( const NamedTypeDecl * decl ) {
+                ++* stats().add_calls;
+                const std::string & id = decl->name;
+                if ( ! typeTable ) {
+                        typeTable = TypeTable::new_ptr();
+                } else {
+                        ++* stats().map_lookups;
+                        auto existing = typeTable->find( id );
+                        if ( existing != typeTable->end()
+                                && existing->second.scope == scope
+                                && addedTypeConflicts( existing->second.decl, decl ) ) return;
+                }
+                lazyInitScope();
+                ++* stats().map_mutations;
+                typeTable = typeTable->set( id, Scoped<NamedTypeDecl>{ decl, scope } );
+        }
+        bool addedDeclConflicts( const AggregateDecl * existing, const AggregateDecl * added ) {
                 if ( ! existing->body ) {
                         return false;
 …
+        }
+        void Indexer::addStruct( const std::string &id ) {
+                debugPrint( "Adding fwd decl for struct " << id << std::endl );
+        void Indexer::addStruct( const std::string & id ) {
                 addStruct( new StructDecl( id ) );
+        }
+        void Indexer::addStruct( StructDecl *decl ) {
+                debugPrint( "Adding struct " << decl->name << std::endl );
+                makeWritable();
+                const std::string &id = decl->get_name();
+                StructTable::iterator existing = tables->structTable.find( id );
+                if ( existing == tables->structTable.end() ) {
+                        StructDecl *parent = tables->base.lookupStructAtScope( id, scope );
+                        if ( ! parent || ! addedDeclConflicts( parent, decl ) ) {
+                                tables->structTable.insert( existing, std::make_pair( id, decl ) );
+                                ++tables->size;
+                        }
+                } else {
+                        if ( ! addedDeclConflicts( existing->second, decl ) ) {
+                                existing->second = decl;
+                        }
+                }
+        }
+        void Indexer::addEnum( EnumDecl *decl ) {
+                debugPrint( "Adding enum " << decl->name << std::endl );
+                makeWritable();
+                const std::string &id = decl->get_name();
+                EnumTable::iterator existing = tables->enumTable.find( id );
+                if ( existing == tables->enumTable.end() ) {
+                        EnumDecl *parent = tables->base.lookupEnumAtScope( id, scope );
+                        if ( ! parent || ! addedDeclConflicts( parent, decl ) ) {
+                                tables->enumTable.insert( existing, std::make_pair( id, decl ) );
+                                ++tables->size;
+                        }
+                } else {
+                        if ( ! addedDeclConflicts( existing->second, decl ) ) {
+                                existing->second = decl;
+                        }
+                }
+        }
+        void Indexer::addUnion( const std::string &id ) {
+                debugPrint( "Adding fwd decl for union " << id << std::endl );
+        void Indexer::addStruct( const StructDecl * decl ) {
+                ++* stats().add_calls;
+                const std::string & id = decl->name;
+                if ( ! structTable ) {
+                        structTable = StructTable::new_ptr();
+                } else {
+                        ++* stats().map_lookups;
+                        auto existing = structTable->find( id );
+                        if ( existing != structTable->end()
+                                && existing->second.scope == scope
+                                && addedDeclConflicts( existing->second.decl, decl ) ) return;
+                }
+                lazyInitScope();
+                ++* stats().map_mutations;
+                structTable = structTable->set( id, Scoped<StructDecl>{ decl, scope } );
+        }
+        void Indexer::addEnum( const EnumDecl * decl ) {
+                ++* stats().add_calls;
+                const std::string & id = decl->name;
+                if ( ! enumTable ) {
+                        enumTable = EnumTable::new_ptr();
+                } else {
+                        ++* stats().map_lookups;
+                        auto existing = enumTable->find( id );
+                        if ( existing != enumTable->end()
+                                && existing->second.scope == scope
+                                && addedDeclConflicts( existing->second.decl, decl ) ) return;
+                }
+                lazyInitScope();
+                ++* stats().map_mutations;
+                enumTable = enumTable->set( id, Scoped<EnumDecl>{ decl, scope } );
+        }
+        void Indexer::addUnion( const std::string & id ) {
                 addUnion( new UnionDecl( id ) );
+        }
         void Indexer::addUnion( UnionDecl *decl ) {
                 debugPrint( "Adding union " << decl->name << std::endl );
                 makeWritable();
                 const std::string &id = decl->get_name();
                 UnionTable::iterator existing = tables->unionTable.find( id );
                 if ( existing == tables->unionTable.end() ) {
                         UnionDecl *parent = tables->base.lookupUnionAtScope( id, scope );
                         if ( ! parent || ! addedDeclConflicts( parent, decl ) ) {
                                 tables->unionTable.insert( existing, std::make_pair( id, decl ) );
                                 ++tables->size;
+                        }
                 } else {
+                        if ( ! addedDeclConflicts( existing->second, decl ) ) {
                                 existing->second = decl;
+                        }
+                }
+        }
         void Indexer::addTrait( TraitDecl *decl ) {
                 debugPrint( "Adding trait " << decl->name << std::endl );
                 makeWritable();
                 const std::string &id = decl->get_name();
                 TraitTable::iterator existing = tables->traitTable.find( id );
                 if ( existing == tables->traitTable.end() ) {
                         TraitDecl *parent = tables->base.lookupTraitAtScope( id, scope );
                         if ( ! parent || ! addedDeclConflicts( parent, decl ) ) {
                                 tables->traitTable.insert( existing, std::make_pair( id, decl ) );
                                 ++tables->size;
+                        }
                 } else {
+                        if ( ! addedDeclConflicts( existing->second, decl ) ) {
                                 existing->second = decl;
+                        }
+                }
+        }
         void Indexer::addMembers( AggregateDecl * aggr, Expression * expr, ConflictFunction handleConflicts ) {
+        void Indexer::addUnion( const UnionDecl * decl ) {
+                ++* stats().add_calls;
+                const std::string & id = decl->name;
+                if ( ! unionTable ) {
+                        unionTable = UnionTable::new_ptr();
+                } else {
+                        ++* stats().map_lookups;
+                        auto existing = unionTable->find( id );
+                        if ( existing != unionTable->end()
+                                && existing->second.scope == scope
+                                && addedDeclConflicts( existing->second.decl, decl ) ) return;
+                }
+                lazyInitScope();
+                ++* stats().map_mutations;
+                unionTable = unionTable->set( id, Scoped<UnionDecl>{ decl, scope } );
+        }
+        void Indexer::addTrait( const TraitDecl * decl ) {
+                ++* stats().add_calls;
+                const std::string & id = decl->name;
+                if ( ! traitTable ) {
+                        traitTable = TraitTable::new_ptr();
+                } else {
+                        ++* stats().map_lookups;
+                        auto existing = traitTable->find( id );
+                        if ( existing != traitTable->end()
+                                && existing->second.scope == scope
+                                && addedDeclConflicts( existing->second.decl, decl ) ) return;
+                }
+                lazyInitScope();
+                ++* stats().map_mutations;
+                traitTable = traitTable->set( id, Scoped<TraitDecl>{ decl, scope } );
+        }
+        void Indexer::addMembers( const AggregateDecl * aggr, const Expression * expr, OnConflict handleConflicts ) {
                 for ( Declaration * decl : aggr->members ) {
                         if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
                                 addId( dwt, handleConflicts, expr );
                                 if ( dwt->name == "" ) {
                                         Type * t = dwt->get_type()->stripReferences();
                                         if ( dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t ) ) {
+                                        const Type * t = dwt->get_type()->stripReferences();
+                                        if ( dynamic_cast<const StructInstType *>( t ) || dynamic_cast<const UnionInstType *>( t ) ) {
                                                 Expression * base = expr->clone();
                                                 ResolvExpr::Cost cost = ResolvExpr::Cost::zero; // xxx - carry this cost into the indexer as a base cost?
 …
+        }
         void Indexer::addWith( std::list< Expression * > & withExprs, BaseSyntaxNode * withStmt ) {
                 for ( Expression * expr : withExprs ) {
+        void Indexer::addWith( const std::list< Expression * > & withExprs, const Declaration * withStmt ) {
+                for ( const Expression * expr : withExprs ) {
                         if ( expr->result ) {
                                 AggregateDecl * aggr = expr->result->stripReferences()->getAggr();
                                 assertf( aggr, "WithStmt expr has non-aggregate type: %s", toString( expr->result ).c_str() );
+                                addMembers( aggr, expr, [withStmt](IdData & existing, const std::string &) {
+                                        // on conflict, delete the identifier
+                                        existing.deleteStmt = withStmt;
+                                        return true;
+                                });
+                                addMembers( aggr, expr, OnConflict::deleteWith( withStmt ) );
+                        }
+                }
 …
+        }
         void Indexer::addFunctionType( FunctionType * ftype ) {
+        void Indexer::addFunctionType( const FunctionType * ftype ) {
                 addTypes( ftype->forall );
                 addIds( ftype->returnVals );
                 addIds( ftype->parameters );
+        }
-        void Indexer::enterScope() {
-                ++scope;
-                if ( doDebug ) {
-                        std::cerr << "--- Entering scope " << scope << std::endl;
+                }
+        }
-        void Indexer::leaveScope() {
-                using std::cerr;
-                assert( scope > 0 && "cannot leave initial scope" );
-                if ( doDebug ) {
-                        cerr << "--- Leaving scope " << scope << " containing" << std::endl;
+                }
-                --scope;
-                while ( tables && tables->scope > scope ) {
-                        if ( doDebug ) {
-                                dump( tables->idTable, cerr );
-                                dump( tables->typeTable, cerr );
-                                dump( tables->structTable, cerr );
-                                dump( tables->enumTable, cerr );
-                                dump( tables->unionTable, cerr );
-                                dump( tables->traitTable, cerr );
+                        }
-                        // swap tables for base table until we find one at an appropriate scope
-                        Indexer::Impl *base = newRef( tables->base.tables );
-                        deleteRef( tables );
-                        tables = base;
+                }
+        }
-        void Indexer::print( std::ostream &os, int indent ) const {
-                using std::cerr;
-                if ( tables ) {
-                        os << "--- scope " << tables->scope << " ---" << std::endl;
-                        os << "===idTable===" << std::endl;
-                        dump( tables->idTable, os );
-                        os << "===typeTable===" << std::endl;
-                        dump( tables->typeTable, os );
-                        os << "===structTable===" << std::endl;
-                        dump( tables->structTable, os );
-                        os << "===enumTable===" << std::endl;
-                        dump( tables->enumTable, os );
-                        os << "===unionTable===" << std::endl;
-                        dump( tables->unionTable, os );
-                        os << "===contextTable===" << std::endl;
-                        dump( tables->traitTable, os );
-                        tables->base.print( os, indent );
-                } else {
-                        os << "--- end ---" << std::endl;
+                }
+        }
 …
                         Expression * base = baseExpr->clone();
                         ResolvExpr::referenceToRvalueConversion( base, cost );
                         ret = new MemberExpr( id, base );
+                        ret = new MemberExpr( const_cast<DeclarationWithType *>(id), base );
                         // xxx - this introduces hidden environments, for now remove them.
                         // std::swap( base->env, ret->env );
 …
                         base->env = nullptr;
                 } else {
                         ret = new VariableExpr( id );
+                }
                 if ( deleteStmt ) ret = new DeletedExpr( ret, deleteStmt );
+                        ret = new VariableExpr( const_cast<DeclarationWithType *>(id) );
+                }
+                if ( deleteStmt ) ret = new DeletedExpr( ret, const_cast<Declaration *>(deleteStmt) );
                 return ret;
+        }

src/SymTab/Indexer.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:38:55 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug 17 16:09:12 2017
 // Update Count     : 8
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Mar  8 13:55:00 2019
+// Update Count     : 9
 //
 #pragma once
 #include <iosfwd>             // for ostream
 #include <list>               // for list
 #include <string>             // for string
 #include <functional>         // for function
+#include <functional>              // for function
+#include <list>                    // for list
+#include <memory>                  // for shared_ptr, enable_shared_from_this
+#include <string>                  // for string
 #include "SynTree/Visitor.h"  // for Visitor
 #include "SynTree/SynTree.h"  // for AST nodes
+#include "Common/PersistentMap.h"  // for PersistentMap
+#include "SynTree/SynTree.h"       // for AST nodes
 namespace ResolvExpr {
 class Cost;
+        class Cost;
+}
 namespace SymTab {
         class Indexer {
           public:
+        class Indexer : public std::enable_shared_from_this<SymTab::Indexer> {
+        public:
                 explicit Indexer();
+                virtual ~Indexer();
+                Indexer( const Indexer &that );
+                Indexer( Indexer &&that );
+                virtual ~Indexer();
+                Indexer& operator= ( const Indexer &that );
+                Indexer& operator= ( Indexer &&that );
+                // when using an indexer manually (e.g., within a mutator traversal), it is necessary to tell the indexer
+                // explicitly when scopes begin and end
+                // when using an indexer manually (e.g., within a mutator traversal), it is necessary to
+                // tell the indexer explicitly when scopes begin and end
                 void enterScope();
                 void leaveScope();
                 struct IdData {
                         DeclarationWithType * id = nullptr;
                         Expression * baseExpr = nullptr; // WithExpr
+                        const DeclarationWithType * id = nullptr;
+                        const Expression * baseExpr = nullptr; // WithExpr
                         /// non-null if this declaration is deleted
+                        BaseSyntaxNode * deleteStmt = nullptr;
+                        const Declaration * deleteStmt = nullptr;
+                        /// scope of identifier
+                        unsigned long scope = 0;
                         // NOTE: shouldn't need either of these constructors, but gcc-4 does not properly support initializer lists with default members.
                         IdData() = default;
+                        IdData( DeclarationWithType * id, Expression * baseExpr, BaseSyntaxNode * deleteStmt ) : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ) {}
+                        IdData(
+                                const DeclarationWithType * id, const Expression * baseExpr, const Declaration * deleteStmt,
+                                unsigned long scope )
+                                : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ), scope( scope ) {}
+                        IdData( const IdData& o, const Declaration * deleteStmt )
+                                : id( o.id ), baseExpr( o.baseExpr ), deleteStmt( deleteStmt ), scope( o.scope ) {}
                         Expression * combine( ResolvExpr::Cost & cost ) const;
 …
                 /// Gets all declarations with the given ID
                 void lookupId( const std::string &id, std::list< IdData > &out ) const;
+                void lookupId( const std::string & id, std::list< IdData > &out ) const;
                 /// Gets the top-most type declaration with the given ID
                 NamedTypeDecl *lookupType( const std::string &id ) const;
+                const NamedTypeDecl * lookupType( const std::string & id ) const;
                 /// Gets the top-most struct declaration with the given ID
                 StructDecl *lookupStruct( const std::string &id ) const;
+                const StructDecl * lookupStruct( const std::string & id ) const;
                 /// Gets the top-most enum declaration with the given ID
                 EnumDecl *lookupEnum( const std::string &id ) const;
+                const EnumDecl * lookupEnum( const std::string & id ) const;
                 /// Gets the top-most union declaration with the given ID
                 UnionDecl *lookupUnion( const std::string &id ) const;
+                const UnionDecl * lookupUnion( const std::string & id ) const;
                 /// Gets the top-most trait declaration with the given ID
                 TraitDecl *lookupTrait( const std::string &id ) const;
+                const TraitDecl * lookupTrait( const std::string & id ) const;
+                void print( std::ostream &os, int indent = 0 ) const;
+                /// Gets the type declaration with the given ID at global scope
+                const NamedTypeDecl * globalLookupType( const std::string & id ) const;
+                /// Gets the struct declaration with the given ID at global scope
+                const StructDecl * globalLookupStruct( const std::string & id ) const;
+                /// Gets the union declaration with the given ID at global scope
+                const UnionDecl * globalLookupUnion( const std::string & id ) const;
+                /// Gets the enum declaration with the given ID at global scope
+                const EnumDecl * globalLookupEnum( const std::string & id ) const;
+                /// looks up a specific mangled ID at the given scope
+                IdData * lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope );
+                const IdData * lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
+                /// returns true if there exists a declaration with C linkage and the given name with a different mangled name
+                bool hasIncompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
+                /// returns true if there exists a declaration with C linkage and the given name with the same mangled name
+                bool hasCompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
+                // equivalents to lookup functions that only look at tables at scope `scope` (which should be >= tables->scope)
+                NamedTypeDecl *lookupTypeAtScope( const std::string &id, unsigned long scope ) const;
+                StructDecl *lookupStructAtScope( const std::string &id, unsigned long scope ) const;
+                EnumDecl *lookupEnumAtScope( const std::string &id, unsigned long scope ) const;
+                UnionDecl *lookupUnionAtScope( const std::string &id, unsigned long scope ) const;
+                TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
+                void addId( const DeclarationWithType * decl, const Expression * baseExpr = nullptr );
+                void addDeletedId( const DeclarationWithType * decl, const Declaration * deleteStmt );
+                typedef std::function<bool(IdData &, const std::string &)> ConflictFunction;
+                void addId( DeclarationWithType * decl, Expression * baseExpr = nullptr );
+                void addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt );
+                void addType( NamedTypeDecl *decl );
+                void addStruct( const std::string &id );
+                void addStruct( StructDecl *decl );
+                void addEnum( EnumDecl *decl );
+                void addUnion( const std::string &id );
+                void addUnion( UnionDecl *decl );
+                void addTrait( TraitDecl *decl );
+                void addType( const NamedTypeDecl * decl );
+                void addStruct( const std::string & id );
+                void addStruct( const StructDecl * decl );
+                void addEnum( const EnumDecl * decl );
+                void addUnion( const std::string & id );
+                void addUnion( const UnionDecl * decl );
+                void addTrait( const TraitDecl * decl );
                 /// adds all of the IDs from WithStmt exprs
+                void addWith( std::list< Expression * > & withExprs, BaseSyntaxNode * withStmt );
+                /// adds all of the members of the Aggregate (addWith helper)
+                void addMembers( AggregateDecl * aggr, Expression * expr, ConflictFunction );
+                void addWith( const std::list< Expression * > & withExprs, const Declaration * withStmt );
                 /// convenience function for adding a list of Ids to the indexer
 …
                 /// convenience function for adding all of the declarations in a function type to the indexer
                 void addFunctionType( FunctionType * ftype );
+                void addFunctionType( const FunctionType * ftype );
-                bool doDebug = false; ///< Display debugging trace?
           private:
+                struct Impl;
+                /// Wraps a Decl * with a scope
+                template<typename Decl>
+                struct Scoped {
+                        const Decl * decl;           ///< declaration
+                        unsigned long scope;  ///< scope of this declaration
                 Impl *tables;         ///< Copy-on-write instance of table data structure
                 unsigned long scope;  ///< Scope index of this pointer
+                        Scoped(const Decl * d, unsigned long s) : decl(d), scope(s) {}
+                };
+                /// Takes a new ref to a table (returns null if null)
+                static Impl *newRef( Impl *toClone );
+                /// Clears a ref to a table (does nothing if null)
+                static void deleteRef( Impl *toFree );
+                using Ptr = std::shared_ptr<const Indexer>;
+                // Removes matching autogenerated constructors and destructors
+                // so that they will not be selected
+                // void removeSpecialOverrides( FunctionDecl *decl );
+                void removeSpecialOverrides( const std::string &id, std::list< IdData > & out ) const;
+                using MangleTable = PersistentMap< std::string, IdData >;
+                using IdTable = PersistentMap< std::string, MangleTable::Ptr >;
+                using TypeTable = PersistentMap< std::string, Scoped<NamedTypeDecl> >;
+                using StructTable = PersistentMap< std::string, Scoped<StructDecl> >;
+                using EnumTable = PersistentMap< std::string, Scoped<EnumDecl> >;
+                using UnionTable = PersistentMap< std::string, Scoped<UnionDecl> >;
+                using TraitTable = PersistentMap< std::string, Scoped<TraitDecl> >;
+                /// Ensures that tables variable is writable (i.e. allocated, uniquely owned by this Indexer, and at the current scope)
+                void makeWritable();
+                IdTable::Ptr idTable;          ///< identifier namespace
+                TypeTable::Ptr typeTable;      ///< type namespace
+                StructTable::Ptr structTable;  ///< struct namespace
+                EnumTable::Ptr enumTable;      ///< enum namespace
+                UnionTable::Ptr unionTable;    ///< union namespace
+                TraitTable::Ptr traitTable;    ///< trait namespace
+                Ptr prevScope;                 ///< reference to indexer for parent scope
+                unsigned long scope;           ///< Scope index of this indexer
+                unsigned long repScope;        ///< Scope index of currently represented scope
+                /// Ensures that a proper backtracking scope exists before a mutation
+                void lazyInitScope();
+                /// Gets the indexer at the given scope
+                const Indexer * atScope( unsigned long scope ) const;
+                /// Removes matching autogenerated constructors and destructors so that they will not be
+                /// selected. If returns false, passed decl should not be added.
+                bool removeSpecialOverrides( IdData & decl, MangleTable::Ptr & mangleTable );
+                /// Options for handling identifier conflicts
+                struct OnConflict {
+                        enum {
+                                Error,  ///< Throw a semantic error
+                                Delete  ///< Delete the earlier version with the delete statement
+                        } mode;
+                        const Declaration * deleteStmt;  ///< Statement that deletes this expression
+                private:
+                        OnConflict() : mode(Error), deleteStmt(nullptr) {}
+                        OnConflict( const Declaration * d ) : mode(Delete), deleteStmt(d) {}
+                public:
+                        OnConflict( const OnConflict& ) = default;
+                        static OnConflict error() { return {}; }
+                        static OnConflict deleteWith( const Declaration * d ) { return { d }; }
+                };
+                /// true if the existing identifier conflicts with the added identifier
+                bool addedIdConflicts(
+                        const IdData & existing, const DeclarationWithType * added, OnConflict handleConflicts,
+                        const Declaration * deleteStmt );
                 /// common code for addId, addDeletedId, etc.
+                void addId( DeclarationWithType * decl, ConflictFunction, Expression * baseExpr = nullptr, BaseSyntaxNode * deleteStmt = nullptr );
+                void addId(const DeclarationWithType * decl, OnConflict handleConflicts,
+                        const Expression * baseExpr = nullptr, const Declaration * deleteStmt = nullptr );
+                /// adds all of the members of the Aggregate (addWith helper)
+                void addMembers( const AggregateDecl * aggr, const Expression * expr, OnConflict handleConflicts );
+                /// returns true if there exists a declaration with C linkage and the given name with the same mangled name
+                bool hasCompatibleCDecl( const std::string & id, const std::string & mangleName ) const;
+                /// returns true if there exists a declaration with C linkage and the given name with a different mangled name
+                bool hasIncompatibleCDecl( const std::string & id, const std::string & mangleName ) const;
         };
 } // namespace SymTab

src/SymTab/Mangler.cc

-              r7951100
+              rb067d9b
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Sep 25 15:49:26 2017
 // Update Count     : 23
+// Last Modified On : Tue Jul 30 13:46:10 2019
+// Update Count     : 26
 //
 #include "Mangler.h"
 #include <algorithm>                // for copy, transform
 #include <cassert>                  // for assert, assertf
 #include <functional>               // for const_mem_fun_t, mem_fun
 #include <iterator>                 // for ostream_iterator, back_insert_ite...
 #include <list>                     // for _List_iterator, list, _List_const...
 #include <string>                   // for string, char_traits, operator<<
 #include "CodeGen/OperatorTable.h"  // for OperatorInfo, operatorLookup
+#include <algorithm>                     // for copy, transform
+#include <cassert>                       // for assert, assertf
+#include <functional>                    // for const_mem_fun_t, mem_fun
+#include <iterator>                      // for ostream_iterator, back_insert_ite...
+#include <list>                          // for _List_iterator, list, _List_const...
+#include <string>                        // for string, char_traits, operator<<
+#include "CodeGen/OperatorTable.h"       // for OperatorInfo, operatorLookup
 #include "Common/PassVisitor.h"
+#include "Common/SemanticError.h"   // for SemanticError
+#include "Common/utility.h"         // for toString
+#include "Parser/LinkageSpec.h"     // for Spec, isOverridable, AutoGen, Int...
+#include "SynTree/Declaration.h"    // for TypeDecl, DeclarationWithType
+#include "SynTree/Expression.h"     // for TypeExpr, Expression, operator<<
+#include "SynTree/Type.h"           // for Type, ReferenceToType, Type::Fora...
+#include "Common/SemanticError.h"        // for SemanticError
+#include "Common/utility.h"              // for toString
+#include "Parser/LinkageSpec.h"          // for Spec, isOverridable, AutoGen, Int...
+#include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
+#include "SynTree/Declaration.h"         // for TypeDecl, DeclarationWithType
+#include "SynTree/Expression.h"          // for TypeExpr, Expression, operator<<
+#include "SynTree/Type.h"                // for Type, ReferenceToType, Type::Fora...
+#include "AST/Pass.hpp"
 namespace SymTab {
 …
                 namespace {
                         /// Mangles names to a unique C identifier
+                        struct Mangler : public WithShortCircuiting, public WithVisitorRef<Mangler>, public WithGuards {
+                                Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams );
+                                Mangler( const Mangler & ) = delete;
+                                void previsit( BaseSyntaxNode * ) { visit_children = false; }
+                                void postvisit( ObjectDecl * declaration );
+                                void postvisit( FunctionDecl * declaration );
+                                void postvisit( TypeDecl * declaration );
+                                void postvisit( VoidType * voidType );
+                                void postvisit( BasicType * basicType );
+                                void postvisit( PointerType * pointerType );
+                                void postvisit( ArrayType * arrayType );
+                                void postvisit( ReferenceType * refType );
+                                void postvisit( FunctionType * functionType );
+                                void postvisit( StructInstType * aggregateUseType );
+                                void postvisit( UnionInstType * aggregateUseType );
+                                void postvisit( EnumInstType * aggregateUseType );
+                                void postvisit( TypeInstType * aggregateUseType );
+                                void postvisit( TraitInstType * inst );
+                                void postvisit( TupleType * tupleType );
+                                void postvisit( VarArgsType * varArgsType );
+                                void postvisit( ZeroType * zeroType );
+                                void postvisit( OneType * oneType );
+                        struct Mangler_old : public WithShortCircuiting, public WithVisitorRef<Mangler_old>, public WithGuards {
+                                Mangler_old( bool mangleOverridable, bool typeMode, bool mangleGenericParams );
+                                Mangler_old( const Mangler_old & ) = delete;
+                                void previsit( const BaseSyntaxNode * ) { visit_children = false; }
+                                void postvisit( const ObjectDecl * declaration );
+                                void postvisit( const FunctionDecl * declaration );
+                                void postvisit( const TypeDecl * declaration );
+                                void postvisit( const VoidType * voidType );
+                                void postvisit( const BasicType * basicType );
+                                void postvisit( const PointerType * pointerType );
+                                void postvisit( const ArrayType * arrayType );
+                                void postvisit( const ReferenceType * refType );
+                                void postvisit( const FunctionType * functionType );
+                                void postvisit( const StructInstType * aggregateUseType );
+                                void postvisit( const UnionInstType * aggregateUseType );
+                                void postvisit( const EnumInstType * aggregateUseType );
+                                void postvisit( const TypeInstType * aggregateUseType );
+                                void postvisit( const TraitInstType * inst );
+                                void postvisit( const TupleType * tupleType );
+                                void postvisit( const VarArgsType * varArgsType );
+                                void postvisit( const ZeroType * zeroType );
+                                void postvisit( const OneType * oneType );
+                                void postvisit( const QualifiedType * qualType );
                                 std::string get_mangleName() { return mangleName.str(); }
 …
                                 bool mangleGenericParams;       ///< Include generic parameters in name mangling if true
                                 bool inFunctionType = false;    ///< Include type qualifiers if false.
+                                void mangleDecl( DeclarationWithType *declaration );
+                                void mangleRef( ReferenceToType *refType, std::string prefix );
+                                void printQualifiers( Type *type );
+                        }; // Mangler
+                                bool inQualifiedType = false;   ///< Add start/end delimiters around qualified type
+                          public:
+                                Mangler_old( bool mangleOverridable, bool typeMode, bool mangleGenericParams,
+                                        int nextVarNum, const VarMapType& varNums );
+                          private:
+                                void mangleDecl( const DeclarationWithType * declaration );
+                                void mangleRef( const ReferenceToType * refType, std::string prefix );
+                                void printQualifiers( const Type *type );
+                        }; // Mangler_old
                 } // namespace
                 std::string mangle( BaseSyntaxNode * decl, bool mangleOverridable, bool typeMode, bool mangleGenericParams ) {
                         PassVisitor<Mangler> mangler( mangleOverridable, typeMode, mangleGenericParams );
+                std::string mangle( const BaseSyntaxNode * decl, bool mangleOverridable, bool typeMode, bool mangleGenericParams ) {
+                        PassVisitor<Mangler_old> mangler( mangleOverridable, typeMode, mangleGenericParams );
                         maybeAccept( decl, mangler );
                         return mangler.pass.get_mangleName();
+                }
                 std::string mangleType( Type * ty ) {
                         PassVisitor<Mangler> mangler( false, true, true );
+                std::string mangleType( const Type * ty ) {
+                        PassVisitor<Mangler_old> mangler( false, true, true );
                         maybeAccept( ty, mangler );
                         return mangler.pass.get_mangleName();
+                }
                 std::string mangleConcrete( Type * ty ) {
                         PassVisitor<Mangler> mangler( false, false, false );
+                std::string mangleConcrete( const Type * ty ) {
+                        PassVisitor<Mangler_old> mangler( false, false, false );
                         maybeAccept( ty, mangler );
                         return mangler.pass.get_mangleName();
 …
                 namespace {
+                        Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams )
+                                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ), mangleGenericParams( mangleGenericParams ) {}
+                        void Mangler::mangleDecl( DeclarationWithType * declaration ) {
+                        Mangler_old::Mangler_old( bool mangleOverridable, bool typeMode, bool mangleGenericParams )
+                                : nextVarNum( 0 ), isTopLevel( true ),
+                                mangleOverridable( mangleOverridable ), typeMode( typeMode ),
+                                mangleGenericParams( mangleGenericParams ) {}
+                        Mangler_old::Mangler_old( bool mangleOverridable, bool typeMode, bool mangleGenericParams,
+                                int nextVarNum, const VarMapType& varNums )
+                                : varNums( varNums ), nextVarNum( nextVarNum ), isTopLevel( false ),
+                                mangleOverridable( mangleOverridable ), typeMode( typeMode ),
+                                mangleGenericParams( mangleGenericParams ) {}
+                        void Mangler_old::mangleDecl( const DeclarationWithType * declaration ) {
                                 bool wasTopLevel = isTopLevel;
                                 if ( isTopLevel ) {
 …
                                         isTopLevel = false;
                                 } // if
                                 mangleName << "__";
+                                mangleName << Encoding::manglePrefix;
                                 CodeGen::OperatorInfo opInfo;
                                 if ( operatorLookup( declaration->get_name(), opInfo ) ) {
                                         mangleName << opInfo.outputName;
+                                        mangleName << opInfo.outputName.size() << opInfo.outputName;
                                 } else {
+                                        mangleName << declaration->get_name();
+                                } // if
+                                mangleName << "__";
+                                        mangleName << declaration->name.size() << declaration->name;
+                                } // if
                                 maybeAccept( declaration->get_type(), *visitor );
                                 if ( mangleOverridable && LinkageSpec::isOverridable( declaration->get_linkage() ) ) {
 …
                                         // so they need a different name mangling
                                         if ( declaration->get_linkage() == LinkageSpec::AutoGen ) {
                                                 mangleName << "autogen__";
+                                                mangleName << Encoding::autogen;
                                         } else if ( declaration->get_linkage() == LinkageSpec::Intrinsic ) {
                                                 mangleName << "intrinsic__";
+                                                mangleName << Encoding::intrinsic;
                                         } else {
                                                 // if we add another kind of overridable function, this has to change
 …
+                        }
                         void Mangler::postvisit( ObjectDecl * declaration ) {
+                        void Mangler_old::postvisit( const ObjectDecl * declaration ) {
                                 mangleDecl( declaration );
+                        }
                         void Mangler::postvisit( FunctionDecl * declaration ) {
+                        void Mangler_old::postvisit( const FunctionDecl * declaration ) {
                                 mangleDecl( declaration );
+                        }
                         void Mangler::postvisit( VoidType * voidType ) {
+                        void Mangler_old::postvisit( const VoidType * voidType ) {
                                 printQualifiers( voidType );
+                                mangleName << "v";
+                        }
+                        void Mangler::postvisit( BasicType * basicType ) {
+                                static const char *btLetter[] = {
+                                        "b",    // Bool
+                                        "c",    // Char
+                                        "Sc",   // SignedChar
+                                        "Uc",   // UnsignedChar
+                                        "s",    // ShortSignedInt
+                                        "Us",   // ShortUnsignedInt
+                                        "i",    // SignedInt
+                                        "Ui",   // UnsignedInt
+                                        "l",    // LongSignedInt
+                                        "Ul",   // LongUnsignedInt
+                                        "q",    // LongLongSignedInt
+                                        "Uq",   // LongLongUnsignedInt
+                                        "f",    // Float
+                                        "d",    // Double
+                                        "r",    // LongDouble
+                                        "Xf",   // FloatComplex
+                                        "Xd",   // DoubleComplex
+                                        "Xr",   // LongDoubleComplex
+                                        "If",   // FloatImaginary
+                                        "Id",   // DoubleImaginary
+                                        "Ir",   // LongDoubleImaginary
+                                        "w",    // SignedInt128
+                                        "Uw",   // UnsignedInt128
+                                        "x",   // Float80
+                                        "y",   // Float128
+                                };
+                                static_assert(
+                                        sizeof(btLetter)/sizeof(btLetter[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
+                                        "Each basic type kind should have a corresponding mangler letter"
+                                );
+                                mangleName << Encoding::void_t;
+                        }
+                        void Mangler_old::postvisit( const BasicType * basicType ) {
                                 printQualifiers( basicType );
                                 assert( basicType->get_kind() < sizeof(btLetter)/sizeof(btLetter[0]) );
                                 mangleName << btLetter[ basicType->get_kind() ];
+                        }
                         void Mangler::postvisit( PointerType * pointerType ) {
+                                assertf( basicType->kind < BasicType::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind );
+                                mangleName << Encoding::basicTypes[ basicType->kind ];
+                        }
+                        void Mangler_old::postvisit( const PointerType * pointerType ) {
                                 printQualifiers( pointerType );
                                 // mangle void (*f)() and void f() to the same name to prevent overloading on functions and function pointers
                                 if ( ! dynamic_cast<FunctionType *>( pointerType->base ) ) mangleName << "P";
+                                if ( ! dynamic_cast<FunctionType *>( pointerType->base ) ) mangleName << Encoding::pointer;
                                 maybeAccept( pointerType->base, *visitor );
+                        }
                         void Mangler::postvisit( ArrayType * arrayType ) {
+                        void Mangler_old::postvisit( const ArrayType * arrayType ) {
                                 // TODO: encode dimension
                                 printQualifiers( arrayType );
                                 mangleName << "A0";
+                                mangleName << Encoding::array << "0";
                                 maybeAccept( arrayType->base, *visitor );
+                        }
                         void Mangler::postvisit( ReferenceType * refType ) {
+                        void Mangler_old::postvisit( const ReferenceType * refType ) {
                                 // don't print prefix (e.g. 'R') for reference types so that references and non-references do not overload.
                                 // Further, do not print the qualifiers for a reference type (but do run printQualifers because of TypeDecls, etc.),
 …
+                        }
                         void Mangler::postvisit( FunctionType * functionType ) {
+                        void Mangler_old::postvisit( const FunctionType * functionType ) {
                                 printQualifiers( functionType );
                                 mangleName << "F";
+                                mangleName << Encoding::function;
                                 // turn on inFunctionType so that printQualifiers does not print most qualifiers for function parameters,
                                 // since qualifiers on outermost parameter type do not differentiate function types, e.g.,
 …
                                 inFunctionType = true;
                                 std::list< Type* > returnTypes = getTypes( functionType->returnVals );
+                                acceptAll( returnTypes, *visitor );
+                                if (returnTypes.empty()) mangleName << Encoding::void_t;
+                                else acceptAll( returnTypes, *visitor );
                                 mangleName << "_";
                                 std::list< Type* > paramTypes = getTypes( functionType->parameters );
 …
+                        }
                         void Mangler::mangleRef( ReferenceToType * refType, std::string prefix ) {
+                        void Mangler_old::mangleRef( const ReferenceToType * refType, std::string prefix ) {
                                 printQualifiers( refType );
                                 mangleName << ( refType->name.length() + prefix.length() ) << prefix << refType->name;
+                                mangleName << prefix << refType->name.length() << refType->name;
                                 if ( mangleGenericParams ) {
                                         std::list< Expression* >& params = refType->parameters;
+                                        const std::list< Expression* > & params = refType->parameters;
                                         if ( ! params.empty() ) {
                                                 mangleName << "_";
                                                 for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
                                                         TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
                                                         assertf(paramType, "Aggregate parameters should be type expressions: %s", toCString(*param));
+                                                for ( const Expression * param : params ) {
+                                                        const TypeExpr * paramType = dynamic_cast< const TypeExpr * >( param );
+                                                        assertf(paramType, "Aggregate parameters should be type expressions: %s", toCString(param));
                                                         maybeAccept( paramType->type, *visitor );
+                                                }
 …
+                        }
                         void Mangler::postvisit( StructInstType * aggregateUseType ) {
                                 mangleRef( aggregateUseType, "s" );
+                        }
                         void Mangler::postvisit( UnionInstType * aggregateUseType ) {
                                 mangleRef( aggregateUseType, "u" );
+                        }
                         void Mangler::postvisit( EnumInstType * aggregateUseType ) {
                                 mangleRef( aggregateUseType, "e" );
+                        }
                         void Mangler::postvisit( TypeInstType * typeInst ) {
+                        void Mangler_old::postvisit( const StructInstType * aggregateUseType ) {
+                                mangleRef( aggregateUseType, Encoding::struct_t );
+                        }
+                        void Mangler_old::postvisit( const UnionInstType * aggregateUseType ) {
+                                mangleRef( aggregateUseType, Encoding::union_t );
+                        }
+                        void Mangler_old::postvisit( const EnumInstType * aggregateUseType ) {
+                                mangleRef( aggregateUseType, Encoding::enum_t );
+                        }
+                        void Mangler_old::postvisit( const TypeInstType * typeInst ) {
                                 VarMapType::iterator varNum = varNums.find( typeInst->get_name() );
                                 if ( varNum == varNums.end() ) {
                                         mangleRef( typeInst, "t" );
+                                        mangleRef( typeInst, Encoding::type );
                                 } else {
                                         printQualifiers( typeInst );
+                                        std::ostringstream numStream;
+                                        numStream << varNum->second.first;
+                                        switch ( (TypeDecl::Kind )varNum->second.second ) {
+                                          case TypeDecl::Dtype:
+                                                mangleName << "d";
+                                                break;
+                                          case TypeDecl::Ftype:
+                                                mangleName << "f";
+                                                break;
+                                                case TypeDecl::Ttype:
+                                                mangleName << "tVARGS";
+                                                break;
+                                                default:
+                                                assert( false );
+                                        } // switch
+                                        mangleName << numStream.str();
+                                } // if
+                        }
+                        void Mangler::postvisit( TraitInstType * inst ) {
+                                        // Note: Can't use name here, since type variable names do not actually disambiguate a function, e.g.
+                                        //   forall(dtype T) void f(T);
+                                        //   forall(dtype S) void f(S);
+                                        // are equivalent and should mangle the same way. This is accomplished by numbering the type variables when they
+                                        // are first found and prefixing with the appropriate encoding for the type class.
+                                        assertf( varNum->second.second < TypeDecl::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", varNum->second.second );
+                                        mangleName << Encoding::typeVariables[varNum->second.second] << varNum->second.first;
+                                } // if
+                        }
+                        void Mangler_old::postvisit( const TraitInstType * inst ) {
                                 printQualifiers( inst );
                                 mangleName << "_Y" << inst->name << "_";
+                        }
                         void Mangler::postvisit( TupleType * tupleType ) {
+                                mangleName << inst->name.size() << inst->name;
+                        }
+                        void Mangler_old::postvisit( const TupleType * tupleType ) {
                                 printQualifiers( tupleType );
                                 mangleName << "T";
+                                mangleName << Encoding::tuple << tupleType->types.size();
                                 acceptAll( tupleType->types, *visitor );
+                                mangleName << "_";
+                        }
+                        void Mangler::postvisit( VarArgsType * varArgsType ) {
+                        }
+                        void Mangler_old::postvisit( const VarArgsType * varArgsType ) {
                                 printQualifiers( varArgsType );
+                                mangleName << "VARGS";
+                        }
+                        void Mangler::postvisit( ZeroType * ) {
+                                mangleName << "Z";
+                        }
+                        void Mangler::postvisit( OneType * ) {
+                                mangleName << "O";
+                        }
+                        void Mangler::postvisit( TypeDecl * decl ) {
+                                static const char *typePrefix[] = { "BT", "BD", "BF" };
+                                mangleName << typePrefix[ decl->get_kind() ] << ( decl->name.length() + 1 ) << decl->name;
+                                static const std::string vargs = "__builtin_va_list";
+                                mangleName << Encoding::type << vargs.size() << vargs;
+                        }
+                        void Mangler_old::postvisit( const ZeroType * ) {
+                                mangleName << Encoding::zero;
+                        }
+                        void Mangler_old::postvisit( const OneType * ) {
+                                mangleName << Encoding::one;
+                        }
+                        void Mangler_old::postvisit( const QualifiedType * qualType ) {
+                                bool inqual = inQualifiedType;
+                                if (! inqual ) {
+                                        // N marks the start of a qualified type
+                                        inQualifiedType = true;
+                                        mangleName << Encoding::qualifiedTypeStart;
+                                }
+                                maybeAccept( qualType->parent, *visitor );
+                                maybeAccept( qualType->child, *visitor );
+                                if ( ! inqual ) {
+                                        // E marks the end of a qualified type
+                                        inQualifiedType = false;
+                                        mangleName << Encoding::qualifiedTypeEnd;
+                                }
+                        }
+                        void Mangler_old::postvisit( const TypeDecl * decl ) {
+                                // TODO: is there any case where mangling a TypeDecl makes sense? If so, this code needs to be
+                                // fixed to ensure that two TypeDecls mangle to the same name when they are the same type and vice versa.
+                                // Note: The current scheme may already work correctly for this case, I have not thought about this deeply
+                                // and the case has not yet come up in practice. Alternatively, if not then this code can be removed
+                                // aside from the assert false.
+                                assertf(false, "Mangler_old should not visit typedecl: %s", toCString(decl));
+                                assertf( decl->kind < TypeDecl::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
+                                mangleName << Encoding::typeVariables[ decl->kind ] << ( decl->name.length() ) << decl->name;
+                        }
 …
+                        }
                         void Mangler::printQualifiers( Type * type ) {
+                        void Mangler_old::printQualifiers( const Type * type ) {
                                 // skip if not including qualifiers
                                 if ( typeMode ) return;
                                 if ( ! type->get_forall().empty() ) {
+                                if ( ! type->forall.empty() ) {
                                         std::list< std::string > assertionNames;
                                         int tcount = 0, dcount = 0, fcount = 0, vcount = 0;
                                         mangleName << "A";
                                         for ( Type::ForallList::iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
                                                 switch ( (*i)->get_kind() ) {
+                                        int dcount = 0, fcount = 0, vcount = 0, acount = 0;
+                                        mangleName << Encoding::forall;
+                                        for ( const TypeDecl * i : type->forall ) {
+                                                switch ( i->kind ) {
                                                   case TypeDecl::Dtype:
                                                         dcount++;
 …
                                                         assert( false );
                                                 } // switch
+                                                varNums[ (*i)->name ] = std::pair< int, int >( nextVarNum++, (int)(*i)->get_kind() );
+                                                for ( std::list< DeclarationWithType* >::iterator assert = (*i)->assertions.begin(); assert != (*i)->assertions.end(); ++assert ) {
+                                                        PassVisitor<Mangler> sub_mangler( mangleOverridable, typeMode, mangleGenericParams );
+                                                        sub_mangler.pass.nextVarNum = nextVarNum;
+                                                        sub_mangler.pass.isTopLevel = false;
+                                                        sub_mangler.pass.varNums = varNums;
+                                                        (*assert)->accept( sub_mangler );
+                                                        assertionNames.push_back( sub_mangler.pass.mangleName.str() );
+                                                varNums[ i->name ] = std::make_pair( nextVarNum, (int)i->kind );
+                                                for ( const DeclarationWithType * assert : i->assertions ) {
+                                                        PassVisitor<Mangler_old> sub_mangler(
+                                                                mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
+                                                        assert->accept( sub_mangler );
+                                                        assertionNames.push_back( sub_mangler.pass.get_mangleName() );
+                                                        acount++;
                                                 } // for
                                         } // for
                                         mangleName << tcount << "_" << dcount << "_" << fcount << "_" << vcount << "_";
+                                        mangleName << dcount << "_" << fcount << "_" << vcount << "_" << acount << "_";
                                         std::copy( assertionNames.begin(), assertionNames.end(), std::ostream_iterator< std::string >( mangleName, "" ) );
                                         mangleName << "_";
 …
                                         // these qualifiers do not distinguish the outermost type of a function parameter
                                         if ( type->get_const() ) {
                                                 mangleName << "C";
+                                                mangleName << Encoding::qualifiers.at(Type::Const);
                                         } // if
                                         if ( type->get_volatile() ) {
                                                 mangleName << "V";
+                                                mangleName << Encoding::qualifiers.at(Type::Volatile);
                                         } // if
                                         // Removed due to restrict not affecting function compatibility in GCC
 …
                                         // } // if
                                         if ( type->get_atomic() ) {
                                                 mangleName << "A";
+                                                mangleName << Encoding::qualifiers.at(Type::Atomic);
                                         } // if
+                                }
                                 if ( type->get_mutex() ) {
+                                        mangleName << "M";
+                                } // if
+                                if ( type->get_lvalue() ) {
+                                        // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
+                                        mangleName << "L";
+                                }
+                                        mangleName << Encoding::qualifiers.at(Type::Mutex);
+                                } // if
                                 if ( inFunctionType ) {
                                         // turn off inFunctionType so that types can be differentiated for nested qualifiers
 …
 } // namespace SymTab
+namespace Mangle {
+        namespace {
+                /// Mangles names to a unique C identifier
+                struct Mangler_new : public ast::WithShortCircuiting, public ast::WithVisitorRef<Mangler_new>, public ast::WithGuards {
+                        Mangler_new( Mangle::Mode mode );
+                        Mangler_new( const Mangler_new & ) = delete;
+                        void previsit( const ast::Node * ) { visit_children = false; }
+                        void postvisit( const ast::ObjectDecl * declaration );
+                        void postvisit( const ast::FunctionDecl * declaration );
+                        void postvisit( const ast::TypeDecl * declaration );
+                        void postvisit( const ast::VoidType * voidType );
+                        void postvisit( const ast::BasicType * basicType );
+                        void postvisit( const ast::PointerType * pointerType );
+                        void postvisit( const ast::ArrayType * arrayType );
+                        void postvisit( const ast::ReferenceType * refType );
+                        void postvisit( const ast::FunctionType * functionType );
+                        void postvisit( const ast::StructInstType * aggregateUseType );
+                        void postvisit( const ast::UnionInstType * aggregateUseType );
+                        void postvisit( const ast::EnumInstType * aggregateUseType );
+                        void postvisit( const ast::TypeInstType * aggregateUseType );
+                        void postvisit( const ast::TraitInstType * inst );
+                        void postvisit( const ast::TupleType * tupleType );
+                        void postvisit( const ast::VarArgsType * varArgsType );
+                        void postvisit( const ast::ZeroType * zeroType );
+                        void postvisit( const ast::OneType * oneType );
+                        void postvisit( const ast::QualifiedType * qualType );
+                        std::string get_mangleName() { return mangleName.str(); }
+                  private:
+                        std::ostringstream mangleName;  ///< Mangled name being constructed
+                        typedef std::map< std::string, std::pair< int, int > > VarMapType;
+                        VarMapType varNums;             ///< Map of type variables to indices
+                        int nextVarNum;                 ///< Next type variable index
+                        bool isTopLevel;                ///< Is the Mangler at the top level
+                        bool mangleOverridable;         ///< Specially mangle overridable built-in methods
+                        bool typeMode;                  ///< Produce a unique mangled name for a type
+                        bool mangleGenericParams;       ///< Include generic parameters in name mangling if true
+                        bool inFunctionType = false;    ///< Include type qualifiers if false.
+                        bool inQualifiedType = false;   ///< Add start/end delimiters around qualified type
+                  private:
+                        Mangler_new( bool mangleOverridable, bool typeMode, bool mangleGenericParams,
+                                int nextVarNum, const VarMapType& varNums );
+                        friend class ast::Pass<Mangler_new>;
+                  private:
+                        void mangleDecl( const ast::DeclWithType *declaration );
+                        void mangleRef( const ast::ReferenceToType *refType, std::string prefix );
+                        void printQualifiers( const ast::Type *type );
+                }; // Mangler_new
+        } // namespace
+        std::string mangle( const ast::Node * decl, Mangle::Mode mode ) {
+                ast::Pass<Mangler_new> mangler( mode );
+                maybeAccept( decl, mangler );
+                return mangler.pass.get_mangleName();
+        }
+        namespace {
+                Mangler_new::Mangler_new( Mangle::Mode mode )
+                        : nextVarNum( 0 ), isTopLevel( true ),
+                        mangleOverridable  ( ! mode.no_overrideable   ),
+                        typeMode           (   mode.type              ),
+                        mangleGenericParams( ! mode.no_generic_params ) {}
+                Mangler_new::Mangler_new( bool mangleOverridable, bool typeMode, bool mangleGenericParams,
+                        int nextVarNum, const VarMapType& varNums )
+                        : varNums( varNums ), nextVarNum( nextVarNum ), isTopLevel( false ),
+                        mangleOverridable( mangleOverridable ), typeMode( typeMode ),
+                        mangleGenericParams( mangleGenericParams ) {}
+                void Mangler_new::mangleDecl( const ast::DeclWithType * decl ) {
+                        bool wasTopLevel = isTopLevel;
+                        if ( isTopLevel ) {
+                                varNums.clear();
+                                nextVarNum = 0;
+                                isTopLevel = false;
+                        } // if
+                        mangleName << Encoding::manglePrefix;
+                        CodeGen::OperatorInfo opInfo;
+                        if ( operatorLookup( decl->name, opInfo ) ) {
+                                mangleName << opInfo.outputName.size() << opInfo.outputName;
+                        } else {
+                                mangleName << decl->name.size() << decl->name;
+                        } // if
+                        maybeAccept( decl->get_type(), *visitor );
+                        if ( mangleOverridable && decl->linkage.is_overrideable ) {
+                                // want to be able to override autogenerated and intrinsic routines,
+                                // so they need a different name mangling
+                                if ( decl->linkage == ast::Linkage::AutoGen ) {
+                                        mangleName << Encoding::autogen;
+                                } else if ( decl->linkage == ast::Linkage::Intrinsic ) {
+                                        mangleName << Encoding::intrinsic;
+                                } else {
+                                        // if we add another kind of overridable function, this has to change
+                                        assert( false && "unknown overrideable linkage" );
+                                } // if
+                        }
+                        isTopLevel = wasTopLevel;
+                }
+                void Mangler_new::postvisit( const ast::ObjectDecl * decl ) {
+                        mangleDecl( decl );
+                }
+                void Mangler_new::postvisit( const ast::FunctionDecl * decl ) {
+                        mangleDecl( decl );
+                }
+                void Mangler_new::postvisit( const ast::VoidType * voidType ) {
+                        printQualifiers( voidType );
+                        mangleName << Encoding::void_t;
+                }
+                void Mangler_new::postvisit( const ast::BasicType * basicType ) {
+                        printQualifiers( basicType );
+                        assertf( basicType->kind < ast::BasicType::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind );
+                        mangleName << Encoding::basicTypes[ basicType->kind ];
+                }
+                void Mangler_new::postvisit( const ast::PointerType * pointerType ) {
+                        printQualifiers( pointerType );
+                        // mangle void (*f)() and void f() to the same name to prevent overloading on functions and function pointers
+                        if ( ! pointerType->base.as<ast::FunctionType>() ) mangleName << Encoding::pointer;
+                        maybe_accept( pointerType->base.get(), *visitor );
+                }
+                void Mangler_new::postvisit( const ast::ArrayType * arrayType ) {
+                        // TODO: encode dimension
+                        printQualifiers( arrayType );
+                        mangleName << Encoding::array << "0";
+                        maybeAccept( arrayType->base.get(), *visitor );
+                }
+                void Mangler_new::postvisit( const ast::ReferenceType * refType ) {
+                        // don't print prefix (e.g. 'R') for reference types so that references and non-references do not overload.
+                        // Further, do not print the qualifiers for a reference type (but do run printQualifers because of TypeDecls, etc.),
+                        // by pretending every reference type is a function parameter.
+                        GuardValue( inFunctionType );
+                        inFunctionType = true;
+                        printQualifiers( refType );
+                        maybeAccept( refType->base.get(), *visitor );
+                }
+                inline std::vector< ast::ptr< ast::Type > > getTypes( const std::vector< ast::ptr< ast::DeclWithType > > & decls ) {
+                        std::vector< ast::ptr< ast::Type > > ret;
+                        std::transform( decls.begin(), decls.end(), std::back_inserter( ret ),
+                                                        std::mem_fun( &ast::DeclWithType::get_type ) );
+                        return ret;
+                }
+                void Mangler_new::postvisit( const ast::FunctionType * functionType ) {
+                        printQualifiers( functionType );
+                        mangleName << Encoding::function;
+                        // turn on inFunctionType so that printQualifiers does not print most qualifiers for function parameters,
+                        // since qualifiers on outermost parameter type do not differentiate function types, e.g.,
+                        // void (*)(const int) and void (*)(int) are the same type, but void (*)(const int *) and void (*)(int *) are different
+                        GuardValue( inFunctionType );
+                        inFunctionType = true;
+                        std::vector< ast::ptr< ast::Type > > returnTypes = getTypes( functionType->returns );
+                        if (returnTypes.empty()) mangleName << Encoding::void_t;
+                        else accept_each( returnTypes, *visitor );
+                        mangleName << "_";
+                        std::vector< ast::ptr< ast::Type > > paramTypes = getTypes( functionType->params );
+                        accept_each( paramTypes, *visitor );
+                        mangleName << "_";
+                }
+                void Mangler_new::mangleRef( const ast::ReferenceToType * refType, std::string prefix ) {
+                        printQualifiers( refType );
+                        mangleName << prefix << refType->name.length() << refType->name;
+                        if ( mangleGenericParams ) {
+                                if ( ! refType->params.empty() ) {
+                                        mangleName << "_";
+                                        for ( const ast::Expr * param : refType->params ) {
+                                                auto paramType = dynamic_cast< const ast::TypeExpr * >( param );
+                                                assertf(paramType, "Aggregate parameters should be type expressions: %s", toCString(param));
+                                                maybeAccept( paramType->type.get(), *visitor );
+                                        }
+                                        mangleName << "_";
+                                }
+                        }
+                }
+                void Mangler_new::postvisit( const ast::StructInstType * aggregateUseType ) {
+                        mangleRef( aggregateUseType, Encoding::struct_t );
+                }
+                void Mangler_new::postvisit( const ast::UnionInstType * aggregateUseType ) {
+                        mangleRef( aggregateUseType, Encoding::union_t );
+                }
+                void Mangler_new::postvisit( const ast::EnumInstType * aggregateUseType ) {
+                        mangleRef( aggregateUseType, Encoding::enum_t );
+                }
+                void Mangler_new::postvisit( const ast::TypeInstType * typeInst ) {
+                        VarMapType::iterator varNum = varNums.find( typeInst->name );
+                        if ( varNum == varNums.end() ) {
+                                mangleRef( typeInst, Encoding::type );
+                        } else {
+                                printQualifiers( typeInst );
+                                // Note: Can't use name here, since type variable names do not actually disambiguate a function, e.g.
+                                //   forall(dtype T) void f(T);
+                                //   forall(dtype S) void f(S);
+                                // are equivalent and should mangle the same way. This is accomplished by numbering the type variables when they
+                                // are first found and prefixing with the appropriate encoding for the type class.
+                                assertf( varNum->second.second < TypeDecl::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", varNum->second.second );
+                                mangleName << Encoding::typeVariables[varNum->second.second] << varNum->second.first;
+                        } // if
+                }
+                void Mangler_new::postvisit( const ast::TraitInstType * inst ) {
+                        printQualifiers( inst );
+                        mangleName << inst->name.size() << inst->name;
+                }
+                void Mangler_new::postvisit( const ast::TupleType * tupleType ) {
+                        printQualifiers( tupleType );
+                        mangleName << Encoding::tuple << tupleType->types.size();
+                        accept_each( tupleType->types, *visitor );
+                }
+                void Mangler_new::postvisit( const ast::VarArgsType * varArgsType ) {
+                        printQualifiers( varArgsType );
+                        static const std::string vargs = "__builtin_va_list";
+                        mangleName << Encoding::type << vargs.size() << vargs;
+                }
+                void Mangler_new::postvisit( const ast::ZeroType * ) {
+                        mangleName << Encoding::zero;
+                }
+                void Mangler_new::postvisit( const ast::OneType * ) {
+                        mangleName << Encoding::one;
+                }
+                void Mangler_new::postvisit( const ast::QualifiedType * qualType ) {
+                        bool inqual = inQualifiedType;
+                        if (! inqual ) {
+                                // N marks the start of a qualified type
+                                inQualifiedType = true;
+                                mangleName << Encoding::qualifiedTypeStart;
+                        }
+                        maybeAccept( qualType->parent.get(), *visitor );
+                        maybeAccept( qualType->child.get(), *visitor );
+                        if ( ! inqual ) {
+                                // E marks the end of a qualified type
+                                inQualifiedType = false;
+                                mangleName << Encoding::qualifiedTypeEnd;
+                        }
+                }
+                void Mangler_new::postvisit( const ast::TypeDecl * decl ) {
+                        // TODO: is there any case where mangling a TypeDecl makes sense? If so, this code needs to be
+                        // fixed to ensure that two TypeDecls mangle to the same name when they are the same type and vice versa.
+                        // Note: The current scheme may already work correctly for this case, I have not thought about this deeply
+                        // and the case has not yet come up in practice. Alternatively, if not then this code can be removed
+                        // aside from the assert false.
+                        assertf(false, "Mangler_new should not visit typedecl: %s", toCString(decl));
+                        assertf( decl->kind < ast::TypeVar::Kind::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
+                        mangleName << Encoding::typeVariables[ decl->kind ] << ( decl->name.length() ) << decl->name;
+                }
+                __attribute__((unused)) void printVarMap( const std::map< std::string, std::pair< int, int > > &varMap, std::ostream &os ) {
+                        for ( std::map< std::string, std::pair< int, int > >::const_iterator i = varMap.begin(); i != varMap.end(); ++i ) {
+                                os << i->first << "(" << i->second.first << "/" << i->second.second << ")" << std::endl;
+                        } // for
+                }
+                void Mangler_new::printQualifiers( const ast::Type * type ) {
+                        // skip if not including qualifiers
+                        if ( typeMode ) return;
+                        if ( auto ptype = dynamic_cast< const ast::ParameterizedType * >(type) ) {
+                                if ( ! ptype->forall.empty() ) {
+                                        std::list< std::string > assertionNames;
+                                        int dcount = 0, fcount = 0, vcount = 0, acount = 0;
+                                        mangleName << Encoding::forall;
+                                        for ( const ast::TypeDecl * decl : ptype->forall ) {
+                                                switch ( decl->kind ) {
+                                                case ast::TypeVar::Kind::Dtype:
+                                                        dcount++;
+                                                        break;
+                                                case ast::TypeVar::Kind::Ftype:
+                                                        fcount++;
+                                                        break;
+                                                case ast::TypeVar::Kind::Ttype:
+                                                        vcount++;
+                                                        break;
+                                                default:
+                                                        assert( false );
+                                                } // switch
+                                                varNums[ decl->name ] = std::make_pair( nextVarNum, (int)decl->kind );
+                                                for ( const ast::DeclWithType * assert : decl->assertions ) {
+                                                        ast::Pass<Mangler_new> sub_mangler(
+                                                                mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
+                                                        assert->accept( sub_mangler );
+                                                        assertionNames.push_back( sub_mangler.pass.get_mangleName() );
+                                                        acount++;
+                                                } // for
+                                        } // for
+                                        mangleName << dcount << "_" << fcount << "_" << vcount << "_" << acount << "_";
+                                        std::copy( assertionNames.begin(), assertionNames.end(), std::ostream_iterator< std::string >( mangleName, "" ) );
+                                        mangleName << "_";
+                                } // if
+                        } // if
+                        if ( ! inFunctionType ) {
+                                // these qualifiers do not distinguish the outermost type of a function parameter
+                                if ( type->is_const() ) {
+                                        mangleName << Encoding::qualifiers.at(Type::Const);
+                                } // if
+                                if ( type->is_volatile() ) {
+                                        mangleName << Encoding::qualifiers.at(Type::Volatile);
+                                } // if
+                                // Removed due to restrict not affecting function compatibility in GCC
+                                // if ( type->get_isRestrict() ) {
+                                //      mangleName << "E";
+                                // } // if
+                                if ( type->is_atomic() ) {
+                                        mangleName << Encoding::qualifiers.at(Type::Atomic);
+                                } // if
+                        }
+                        if ( type->is_mutex() ) {
+                                mangleName << Encoding::qualifiers.at(Type::Mutex);
+                        } // if
+                        if ( inFunctionType ) {
+                                // turn off inFunctionType so that types can be differentiated for nested qualifiers
+                                GuardValue( inFunctionType );
+                                inFunctionType = false;
+                        }
+                }
+        }       // namespace
+} // namespace Mangle
 // Local Variables: //
 // tab-width: 4 //

src/SymTab/Mangler.h

-              r7951100
+              rb067d9b
 #include <utility>            // for pair
+#include "AST/Bitfield.hpp"
+#include "AST/Fwd.hpp"
 #include "SynTree/SynTree.h"  // for Types
 #include "SynTree/Visitor.h"  // for Visitor, maybeAccept
+// https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling
+// The CFA name mangling scheme is based closely on the itanium C++ name mangling scheme, with the following key differences:
+// * Variable names are also mangled to include type information, not just functions
+// * CFA does not have template expansion, so the rules for function specialization do not apply.
+// * CFA instead has to handle type parameters and assertion parameters.
+// * Currently name compression is not implemented.
+namespace ResolvExpr {
+        class TypeEnvironment;
+}
 namespace SymTab {
         namespace Mangler {
                 /// Mangle syntax tree object; primary interface to clients
                 std::string mangle( BaseSyntaxNode * decl, bool mangleOverridable = true, bool typeMode = false, bool mangleGenericParams = true );
+                std::string mangle( const BaseSyntaxNode * decl, bool mangleOverridable = true, bool typeMode = false, bool mangleGenericParams = true );
                 /// Mangle a type name; secondary interface
                 std::string mangleType( Type* ty );
+                std::string mangleType( const Type * ty );
                 /// Mangle ignoring generic type parameters
+                std::string mangleConcrete( Type* ty );
+                std::string mangleConcrete( const Type * ty );
+                namespace Encoding {
+                        extern const std::string manglePrefix;
+                        extern const std::string basicTypes[];
+                        extern const std::map<int, std::string> qualifiers;
+                        extern const std::string void_t;
+                        extern const std::string zero;
+                        extern const std::string one;
+                        extern const std::string function;
+                        extern const std::string tuple;
+                        extern const std::string pointer;
+                        extern const std::string array;
+                        extern const std::string qualifiedTypeStart;
+                        extern const std::string qualifiedTypeEnd;
+                        extern const std::string forall;
+                        extern const std::string typeVariables[];
+                        extern const std::string struct_t;
+                        extern const std::string union_t;
+                        extern const std::string enum_t;
+                        extern const std::string type;
+                        extern const std::string autogen;
+                        extern const std::string intrinsic;
+                };
         } // Mangler
 } // SymTab
+namespace Mangle {
+        /// Bitflags for mangle modes
+        enum {
+                NoOverrideable  = 1 << 0,
+                Type            = 1 << 1,
+                NoGenericParams = 1 << 2
+        };
+        /// Bitflag type for mangler modes
+        struct mangle_flags {
+                union {
+                        unsigned int val;
+                        struct {
+                                bool no_overrideable   : 1;
+                                bool type              : 1;
+                                bool no_generic_params : 1;
+                        };
+                };
+                constexpr mangle_flags( unsigned int val ) : val(val) {}
+        };
+        using Mode = bitfield<mangle_flags>;
+        static inline Mode typeMode() { return NoOverrideable | Type; }
+        /// Mangle declaration name
+        std::string mangle( const ast::Node * decl, Mode mode = {} );
+        namespace Encoding {
+                using namespace SymTab::Mangler::Encoding;
+        };
+}
+extern "C" {
+        char * cforall_demangle(const char *, int);
+}
 // Local Variables: //

src/SymTab/Validate.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Aug 28 13:47:23 2017
 // Update Count     : 359
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug  7 6:42:00 2019
+// Update Count     : 360
 //
 …
 #include <list>                        // for list
 #include <string>                      // for string
+#include <unordered_map>               // for unordered_map
 #include <utility>                     // for pair
+#include "AST/Chain.hpp"
+#include "AST/Decl.hpp"
+#include "AST/Node.hpp"
+#include "AST/Pass.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeSubstitution.hpp"
 #include "CodeGen/CodeGenerator.h"     // for genName
 #include "CodeGen/OperatorTable.h"     // for isCtorDtor, isCtorDtorAssign
 #include "ControlStruct/Mutate.h"      // for ForExprMutator
+#include "Common/CodeLocation.h"       // for CodeLocation
+#include "Common/Stats.h"              // for Stats::Heap
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
 …
 #include "Parser/LinkageSpec.h"        // for C
 #include "ResolvExpr/typeops.h"        // for typesCompatible
+#include "ResolvExpr/Resolver.h"       // for findSingleExpression
+#include "ResolvExpr/ResolveTypeof.h"  // for resolveTypeof
 #include "SymTab/Autogen.h"            // for SizeType
 #include "SynTree/Attribute.h"         // for noAttributes, Attribute
 …
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 #include "SynTree/Visitor.h"           // for Visitor
+#include "Validate/HandleAttributes.h" // for handleAttributes
+#include "Validate/FindSpecialDecls.h" // for FindSpecialDecls
 class CompoundStmt;
 …
 class SwitchStmt;
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
+#define debugPrint( x ) if ( doDebug ) x
 namespace SymTab {
+        /// hoists declarations that are difficult to hoist while parsing
+        struct HoistTypeDecls final : public WithDeclsToAdd {
+                void previsit( SizeofExpr * );
+                void previsit( AlignofExpr * );
+                void previsit( UntypedOffsetofExpr * );
+                void previsit( CompoundLiteralExpr * );
+                void handleType( Type * );
+        };
+        struct FixQualifiedTypes final : public WithIndexer {
+                Type * postmutate( QualifiedType * );
+        };
         struct HoistStruct final : public WithDeclsToAdd, public WithGuards {
                 /// Flattens nested struct types
                 static void hoistStruct( std::list< Declaration * > &translationUnit );
-                void previsit( EnumInstType * enumInstType );
-                void previsit( StructInstType * structInstType );
-                void previsit( UnionInstType * unionInstType );
                 void previsit( StructDecl * aggregateDecl );
                 void previsit( UnionDecl * aggregateDecl );
                 void previsit( StaticAssertDecl * assertDecl );
+                void previsit( StructInstType * type );
+                void previsit( UnionInstType * type );
+                void previsit( EnumInstType * type );
           private:
                 template< typename AggDecl > void handleAggregate( AggDecl *aggregateDecl );
+                template< typename AggDecl > void handleAggregate( AggDecl * aggregateDecl );
                 AggregateDecl * parentAggr = nullptr;
 …
         /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers.
         struct EnumAndPointerDecay {
                 void previsit( EnumDecl *aggregateDecl );
                 void previsit( FunctionType *func );
+        struct EnumAndPointerDecay_old {
+                void previsit( EnumDecl * aggregateDecl );
+                void previsit( FunctionType * func );
         };
         /// Associates forward declarations of aggregates with their definitions
+        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards {
+                LinkReferenceToTypes( const Indexer *indexer );
+                void postvisit( TypeInstType *typeInst );
+                void postvisit( EnumInstType *enumInst );
+                void postvisit( StructInstType *structInst );
+                void postvisit( UnionInstType *unionInst );
+                void postvisit( TraitInstType *traitInst );
+                void postvisit( EnumDecl *enumDecl );
+                void postvisit( StructDecl *structDecl );
+                void postvisit( UnionDecl *unionDecl );
+        struct LinkReferenceToTypes_old final : public WithIndexer, public WithGuards, public WithVisitorRef<LinkReferenceToTypes_old>, public WithShortCircuiting {
+                LinkReferenceToTypes_old( const Indexer * indexer );
+                void postvisit( TypeInstType * typeInst );
+                void postvisit( EnumInstType * enumInst );
+                void postvisit( StructInstType * structInst );
+                void postvisit( UnionInstType * unionInst );
+                void postvisit( TraitInstType * traitInst );
+                void previsit( QualifiedType * qualType );
+                void postvisit( QualifiedType * qualType );
+                void postvisit( EnumDecl * enumDecl );
+                void postvisit( StructDecl * structDecl );
+                void postvisit( UnionDecl * unionDecl );
                 void postvisit( TraitDecl * traitDecl );
                 void previsit( StructDecl *structDecl );
                 void previsit( UnionDecl *unionDecl );
+                void previsit( StructDecl * structDecl );
+                void previsit( UnionDecl * unionDecl );
                 void renameGenericParams( std::list< TypeDecl * > & params );
           private:
                 const Indexer *local_indexer;
+                const Indexer * local_indexer;
                 typedef std::map< std::string, std::list< EnumInstType * > > ForwardEnumsType;
 …
         /// Replaces array and function types in forall lists by appropriate pointer type and assigns each Object and Function declaration a unique ID.
         struct ForallPointerDecay final {
+        struct ForallPointerDecay_old final {
                 void previsit( ObjectDecl * object );
                 void previsit( FunctionDecl * func );
 …
         };
         struct EliminateTypedef final : public WithVisitorRef<EliminateTypedef>, public WithGuards {
                 EliminateTypedef() : scopeLevel( 0 ) {}
+        struct ReplaceTypedef final : public WithVisitorRef<ReplaceTypedef>, public WithGuards, public WithShortCircuiting, public WithDeclsToAdd {
+                ReplaceTypedef() : scopeLevel( 0 ) {}
                 /// Replaces typedefs by forward declarations
+                static void eliminateTypedef( std::list< Declaration * > &translationUnit );
+                static void replaceTypedef( std::list< Declaration * > &translationUnit );
+                void premutate( QualifiedType * );
+                Type * postmutate( QualifiedType * qualType );
                 Type * postmutate( TypeInstType * aggregateUseType );
                 Declaration * postmutate( TypedefDecl * typeDecl );
 …
                 void premutate( CompoundStmt * compoundStmt );
-                CompoundStmt * postmutate( CompoundStmt * compoundStmt );
                 void premutate( StructDecl * structDecl );
-                Declaration * postmutate( StructDecl * structDecl );
                 void premutate( UnionDecl * unionDecl );
-                Declaration * postmutate( UnionDecl * unionDecl );
                 void premutate( EnumDecl * enumDecl );
+                Declaration * postmutate( EnumDecl * enumDecl );
+                Declaration * postmutate( TraitDecl * contextDecl );
+                void premutate( TraitDecl * );
                 void premutate( FunctionType * ftype );
 …
           private:
                 template<typename AggDecl>
-                AggDecl *handleAggregate( AggDecl * aggDecl );
-                template<typename AggDecl>
                 void addImplicitTypedef( AggDecl * aggDecl );
+                template< typename AggDecl >
+                void handleAggregate( AggDecl * aggr );
                 typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
                 typedef ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
                 typedef std::map< std::string, TypeDecl * > TypeDeclMap;
+                typedef ScopedMap< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
                 TypeDeclMap typedeclNames;
                 int scopeLevel;
                 bool inFunctionType = false;
+        };
+        struct EliminateTypedef {
+                /// removes TypedefDecls from the AST
+                static void eliminateTypedef( std::list< Declaration * > &translationUnit );
+                template<typename AggDecl>
+                void handleAggregate( AggDecl * aggregateDecl );
+                void previsit( StructDecl * aggregateDecl );
+                void previsit( UnionDecl * aggregateDecl );
+                void previsit( CompoundStmt * compoundStmt );
         };
 …
                 static void verify( std::list< Declaration * > &translationUnit );
                 void previsit( FunctionDecl *funcDecl );
+                void previsit( FunctionDecl * funcDecl );
         };
 …
         };
+        struct ArrayLength {
+        struct FixObjectType : public WithIndexer {
+                /// resolves typeof type in object, function, and type declarations
+                static void fix( std::list< Declaration * > & translationUnit );
+                void previsit( ObjectDecl * );
+                void previsit( FunctionDecl * );
+                void previsit( TypeDecl * );
+        };
+        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,
 …
                 void previsit( ObjectDecl * objDecl );
+                void previsit( ArrayType * arrayType );
         };
 …
                 Type::StorageClasses storageClasses;
                 void premutate( ObjectDecl *objectDecl );
                 Expression * postmutate( CompoundLiteralExpr *compLitExpr );
+                void premutate( ObjectDecl * objectDecl );
+                Expression * postmutate( CompoundLiteralExpr * compLitExpr );
         };
 …
         };
-        FunctionDecl * dereferenceOperator = nullptr;
-        struct FindSpecialDeclarations final {
-                void previsit( FunctionDecl * funcDecl );
-        };
         void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
                 PassVisitor<EnumAndPointerDecay> epc;
                 PassVisitor<LinkReferenceToTypes> lrt( nullptr );
                 PassVisitor<ForallPointerDecay> fpd;
+                PassVisitor<EnumAndPointerDecay_old> epc;
+                PassVisitor<LinkReferenceToTypes_old> lrt( nullptr );
+                PassVisitor<ForallPointerDecay_old> fpd;
                 PassVisitor<CompoundLiteral> compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
-                PassVisitor<FindSpecialDeclarations> finder;
                 PassVisitor<LabelAddressFixer> labelAddrFixer;
+                EliminateTypedef::eliminateTypedef( translationUnit );
+                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
+                ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
+                acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes because it is an indexer and needs correct types for mangling
+                acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
+                VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
+                ReturnChecker::checkFunctionReturns( translationUnit );
+                InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
+                Concurrency::applyKeywords( translationUnit );
+                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
+                ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
+                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
+                Concurrency::implementMutexFuncs( translationUnit );
+                Concurrency::implementThreadStarter( translationUnit );
+                mutateAll( translationUnit, compoundliteral );
+                ArrayLength::computeLength( translationUnit );
+                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
+                mutateAll( translationUnit, labelAddrFixer );
+        }
+        void validateType( Type *type, const Indexer *indexer ) {
+                PassVisitor<EnumAndPointerDecay> epc;
+                PassVisitor<LinkReferenceToTypes> lrt( indexer );
+                PassVisitor<ForallPointerDecay> fpd;
+                PassVisitor<HoistTypeDecls> hoistDecls;
+                PassVisitor<FixQualifiedTypes> fixQual;
+                {
+                        Stats::Heap::newPass("validate-A");
+                        Stats::Time::BlockGuard guard("validate-A");
+                        acceptAll( translationUnit, hoistDecls );
+                        ReplaceTypedef::replaceTypedef( translationUnit );
+                        ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
+                        acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes_old because it is an indexer and needs correct types for mangling
+                }
+                {
+                        Stats::Heap::newPass("validate-B");
+                        Stats::Time::BlockGuard guard("validate-B");
+                        Stats::Time::TimeBlock("Link Reference To Types", [&]() {
+                                acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                        });
+                        Stats::Time::TimeBlock("Fix Qualified Types", [&]() {
+                                mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes_old, because aggregate members are accessed
+                        });
+                        Stats::Time::TimeBlock("Hoist Structs", [&]() {
+                                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
+                        });
+                        Stats::Time::TimeBlock("Eliminate Typedefs", [&]() {
+                                EliminateTypedef::eliminateTypedef( translationUnit ); //
+                        });
+                }
+                {
+                        Stats::Heap::newPass("validate-C");
+                        Stats::Time::BlockGuard guard("validate-C");
+                        acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes_old
+                        VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
+                        ReturnChecker::checkFunctionReturns( translationUnit );
+                        InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
+                }
+                {
+                        Stats::Heap::newPass("validate-D");
+                        Stats::Time::BlockGuard guard("validate-D");
+                        Stats::Time::TimeBlock("Apply Concurrent Keywords", [&]() {
+                                Concurrency::applyKeywords( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Forall Pointer Decay", [&]() {
+                                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
+                        });
+                        Stats::Time::TimeBlock("Hoist Control Declarations", [&]() {
+                                ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
+                        });
+                        Stats::Time::TimeBlock("Generate Autogen routines", [&]() {
+                                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay_old
+                        });
+                }
+                {
+                        Stats::Heap::newPass("validate-E");
+                        Stats::Time::BlockGuard guard("validate-E");
+                        Stats::Time::TimeBlock("Implement Mutex Func", [&]() {
+                                Concurrency::implementMutexFuncs( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Implement Thread Start", [&]() {
+                                Concurrency::implementThreadStarter( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Compound Literal", [&]() {
+                                mutateAll( translationUnit, compoundliteral );
+                        });
+                        Stats::Time::TimeBlock("Resolve With Expressions", [&]() {
+                                ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
+                        });
+                }
+                {
+                        Stats::Heap::newPass("validate-F");
+                        Stats::Time::BlockGuard guard("validate-F");
+                        Stats::Time::TimeBlock("Fix Object Type", [&]() {
+                                FixObjectType::fix( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Array Length", [&]() {
+                                ArrayLength::computeLength( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Find Special Declarations", [&]() {
+                                Validate::findSpecialDecls( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Fix Label Address", [&]() {
+                                mutateAll( translationUnit, labelAddrFixer );
+                        });
+                        Stats::Time::TimeBlock("Handle Attributes", [&]() {
+                                Validate::handleAttributes( translationUnit );
+                        });
+                }
+        }
+        void validateType( Type * type, const Indexer * indexer ) {
+                PassVisitor<EnumAndPointerDecay_old> epc;
+                PassVisitor<LinkReferenceToTypes_old> lrt( indexer );
+                PassVisitor<ForallPointerDecay_old> fpd;
                 type->accept( epc );
                 type->accept( lrt );
 …
+        }
+        void HoistTypeDecls::handleType( Type * type ) {
+                // some type declarations are buried in expressions and not easy to hoist during parsing; hoist them here
+                AggregateDecl * aggr = nullptr;
+                if ( StructInstType * inst = dynamic_cast< StructInstType * >( type ) ) {
+                        aggr = inst->baseStruct;
+                } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( type ) ) {
+                        aggr = inst->baseUnion;
+                } else if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( type ) ) {
+                        aggr = inst->baseEnum;
+                }
+                if ( aggr && aggr->body ) {
+                        declsToAddBefore.push_front( aggr );
+                }
+        }
+        void HoistTypeDecls::previsit( SizeofExpr * expr ) {
+                handleType( expr->type );
+        }
+        void HoistTypeDecls::previsit( AlignofExpr * expr ) {
+                handleType( expr->type );
+        }
+        void HoistTypeDecls::previsit( UntypedOffsetofExpr * expr ) {
+                handleType( expr->type );
+        }
+        void HoistTypeDecls::previsit( CompoundLiteralExpr * expr ) {
+                handleType( expr->result );
+        }
+        Type * FixQualifiedTypes::postmutate( QualifiedType * qualType ) {
+                Type * parent = qualType->parent;
+                Type * child = qualType->child;
+                if ( dynamic_cast< GlobalScopeType * >( qualType->parent ) ) {
+                        // .T => lookup T at global scope
+                        if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
+                                auto td = indexer.globalLookupType( inst->name );
+                                if ( ! td ) {
+                                        SemanticError( qualType->location, toString("Use of undefined global type ", inst->name) );
+                                }
+                                auto base = td->base;
+                                assert( base );
+                                Type * ret = base->clone();
+                                ret->get_qualifiers() = qualType->get_qualifiers();
+                                return ret;
+                        } else {
+                                // .T => T is not a type name
+                                assertf( false, "unhandled global qualified child type: %s", toCString(child) );
+                        }
+                } else {
+                        // S.T => S must be an aggregate type, find the declaration for T in S.
+                        AggregateDecl * aggr = nullptr;
+                        if ( StructInstType * inst = dynamic_cast< StructInstType * >( parent ) ) {
+                                aggr = inst->baseStruct;
+                        } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * > ( parent ) ) {
+                                aggr = inst->baseUnion;
+                        } else {
+                                SemanticError( qualType->location, toString("Qualified type requires an aggregate on the left, but has: ", parent) );
+                        }
+                        assert( aggr ); // TODO: need to handle forward declarations
+                        for ( Declaration * member : aggr->members ) {
+                                if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
+                                        // name on the right is a typedef
+                                        if ( NamedTypeDecl * aggr = dynamic_cast< NamedTypeDecl * > ( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        assert( aggr->base );
+                                                        Type * ret = aggr->base->clone();
+                                                        ret->get_qualifiers() = qualType->get_qualifiers();
+                                                        TypeSubstitution sub = parent->genericSubstitution();
+                                                        sub.apply(ret);
+                                                        return ret;
+                                                }
+                                        }
+                                } else {
+                                        // S.T - S is not an aggregate => error
+                                        assertf( false, "unhandled qualified child type: %s", toCString(qualType) );
+                                }
+                        }
+                        // failed to find a satisfying definition of type
+                        SemanticError( qualType->location, toString("Undefined type in qualified type: ", qualType) );
+                }
+                // ... may want to link canonical SUE definition to each forward decl so that it becomes easier to lookup?
+        }
         void HoistStruct::hoistStruct( std::list< Declaration * > &translationUnit ) {
                 PassVisitor<HoistStruct> hoister;
 …
+        }
         bool shouldHoist( Declaration *decl ) {
+        bool shouldHoist( Declaration * decl ) {
                 return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( decl ) || dynamic_cast< StaticAssertDecl * >( decl );
+        }
+        namespace {
+                void qualifiedName( AggregateDecl * aggr, std::ostringstream & ss ) {
+                        if ( aggr->parent ) qualifiedName( aggr->parent, ss );
+                        ss << "__" << aggr->name;
+                }
+                // mangle nested type names using entire parent chain
+                std::string qualifiedName( AggregateDecl * aggr ) {
+                        std::ostringstream ss;
+                        qualifiedName( aggr, ss );
+                        return ss.str();
+                }
+        }
         template< typename AggDecl >
         void HoistStruct::handleAggregate( AggDecl *aggregateDecl ) {
+        void HoistStruct::handleAggregate( AggDecl * aggregateDecl ) {
                 if ( parentAggr ) {
+                        aggregateDecl->parent = parentAggr;
+                        aggregateDecl->name = qualifiedName( aggregateDecl );
                         // Add elements in stack order corresponding to nesting structure.
                         declsToAddBefore.push_front( aggregateDecl );
 …
+        }
-        void HoistStruct::previsit( EnumInstType * inst ) {
-                if ( inst->baseEnum && inst->baseEnum->body ) {
-                        declsToAddBefore.push_front( inst->baseEnum );
+                }
+        }
-        void HoistStruct::previsit( StructInstType * inst ) {
-                if ( inst->baseStruct && inst->baseStruct->body ) {
-                        declsToAddBefore.push_front( inst->baseStruct );
+                }
+        }
-        void HoistStruct::previsit( UnionInstType * inst ) {
-                if ( inst->baseUnion && inst->baseUnion->body ) {
-                        declsToAddBefore.push_front( inst->baseUnion );
+                }
+        }
         void HoistStruct::previsit( StaticAssertDecl * assertDecl ) {
                 if ( parentAggr ) {
 …
+        }
+        void EnumAndPointerDecay::previsit( EnumDecl *enumDecl ) {
+        void HoistStruct::previsit( StructInstType * type ) {
+                // need to reset type name after expanding to qualified name
+                assert( type->baseStruct );
+                type->name = type->baseStruct->name;
+        }
+        void HoistStruct::previsit( UnionInstType * type ) {
+                assert( type->baseUnion );
+                type->name = type->baseUnion->name;
+        }
+        void HoistStruct::previsit( EnumInstType * type ) {
+                assert( type->baseEnum );
+                type->name = type->baseEnum->name;
+        }
+        bool isTypedef( Declaration * decl ) {
+                return dynamic_cast< TypedefDecl * >( decl );
+        }
+        void EliminateTypedef::eliminateTypedef( std::list< Declaration * > &translationUnit ) {
+                PassVisitor<EliminateTypedef> eliminator;
+                acceptAll( translationUnit, eliminator );
+                filter( translationUnit, isTypedef, true );
+        }
+        template< typename AggDecl >
+        void EliminateTypedef::handleAggregate( AggDecl * aggregateDecl ) {
+                filter( aggregateDecl->members, isTypedef, true );
+        }
+        void EliminateTypedef::previsit( StructDecl * aggregateDecl ) {
+                handleAggregate( aggregateDecl );
+        }
+        void EliminateTypedef::previsit( UnionDecl * aggregateDecl ) {
+                handleAggregate( aggregateDecl );
+        }
+        void EliminateTypedef::previsit( CompoundStmt * compoundStmt ) {
+                // remove and delete decl stmts
+                filter( compoundStmt->kids, [](Statement * stmt) {
+                        if ( DeclStmt * declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
+                                if ( dynamic_cast< TypedefDecl * >( declStmt->decl ) ) {
+                                        return true;
+                                } // if
+                        } // if
+                        return false;
+                }, true);
+        }
+        void EnumAndPointerDecay_old::previsit( EnumDecl * enumDecl ) {
                 // Set the type of each member of the enumeration to be EnumConstant
                 for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
                         ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
+                for ( std::list< Declaration * >::iterator i = enumDecl->members.begin(); i != enumDecl->members.end(); ++i ) {
+                        ObjectDecl * obj = dynamic_cast< ObjectDecl * >( * i );
                         assert( obj );
                         obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->get_name() ) );
+                        obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->name ) );
                 } // for
+        }
 …
+        }
         void EnumAndPointerDecay::previsit( FunctionType *func ) {
+        void EnumAndPointerDecay_old::previsit( FunctionType * func ) {
                 // Fix up parameters and return types
                 fixFunctionList( func->parameters, func->isVarArgs, func );
 …
+        }
         LinkReferenceToTypes::LinkReferenceToTypes( const Indexer *other_indexer ) {
+        LinkReferenceToTypes_old::LinkReferenceToTypes_old( const Indexer * other_indexer ) {
                 if ( other_indexer ) {
                         local_indexer = other_indexer;
 …
+        }
         void LinkReferenceToTypes::postvisit( EnumInstType *enumInst ) {
                 EnumDecl *st = local_indexer->lookupEnum( enumInst->get_name() );
+        void LinkReferenceToTypes_old::postvisit( EnumInstType * enumInst ) {
+                const EnumDecl * st = local_indexer->lookupEnum( enumInst->name );
                 // it's not a semantic error if the enum is not found, just an implicit forward declaration
                 if ( st ) {
+                        //assert( ! enumInst->get_baseEnum() || enumInst->get_baseEnum()->get_members().empty() || ! st->get_members().empty() );
+                        enumInst->set_baseEnum( st );
+                } // if
+                if ( ! st || st->get_members().empty() ) {
+                        enumInst->baseEnum = const_cast<EnumDecl *>(st); // Just linking in the node
+                } // if
+                if ( ! st || ! st->body ) {
                         // use of forward declaration
                         forwardEnums[ enumInst->get_name() ].push_back( enumInst );
+                        forwardEnums[ enumInst->name ].push_back( enumInst );
                 } // if
+        }
 …
+        }
         void LinkReferenceToTypes::postvisit( StructInstType *structInst ) {
                 StructDecl *st = local_indexer->lookupStruct( structInst->get_name() );
+        void LinkReferenceToTypes_old::postvisit( StructInstType * structInst ) {
+                const StructDecl * st = local_indexer->lookupStruct( structInst->name );
                 // it's not a semantic error if the struct is not found, just an implicit forward declaration
                 if ( st ) {
+                        //assert( ! structInst->get_baseStruct() || structInst->get_baseStruct()->get_members().empty() || ! st->get_members().empty() );
+                        structInst->set_baseStruct( st );
+                } // if
+                if ( ! st || st->get_members().empty() ) {
+                        structInst->baseStruct = const_cast<StructDecl *>(st); // Just linking in the node
+                } // if
+                if ( ! st || ! st->body ) {
                         // use of forward declaration
                         forwardStructs[ structInst->get_name() ].push_back( structInst );
+                        forwardStructs[ structInst->name ].push_back( structInst );
                 } // if
                 checkGenericParameters( structInst );
+        }
         void LinkReferenceToTypes::postvisit( UnionInstType *unionInst ) {
                 UnionDecl *un = local_indexer->lookupUnion( unionInst->get_name() );
+        void LinkReferenceToTypes_old::postvisit( UnionInstType * unionInst ) {
+                const UnionDecl * un = local_indexer->lookupUnion( unionInst->name );
                 // it's not a semantic error if the union is not found, just an implicit forward declaration
                 if ( un ) {
                         unionInst->set_baseUnion( un );
                 } // if
                 if ( ! un || un->get_members().empty() ) {
+                        unionInst->baseUnion = const_cast<UnionDecl *>(un); // Just linking in the node
+                } // if
+                if ( ! un || ! un->body ) {
                         // use of forward declaration
                         forwardUnions[ unionInst->get_name() ].push_back( unionInst );
+                        forwardUnions[ unionInst->name ].push_back( unionInst );
                 } // if
                 checkGenericParameters( unionInst );
+        }
+        void LinkReferenceToTypes_old::previsit( QualifiedType * ) {
+                visit_children = false;
+        }
+        void LinkReferenceToTypes_old::postvisit( QualifiedType * qualType ) {
+                // linking only makes sense for the 'oldest ancestor' of the qualified type
+                qualType->parent->accept( * visitor );
+        }
 …
                         DeclarationWithType * dwt2 = dynamic_cast<DeclarationWithType *>( d2 );
                         if ( dwt1 && dwt2 ) {
                                 if ( dwt1->get_name() == dwt2->get_name() && ResolvExpr::typesCompatible( dwt1->get_type(), dwt2->get_type(), SymTab::Indexer() ) ) {
+                                if ( dwt1->name == dwt2->name && ResolvExpr::typesCompatible( dwt1->get_type(), dwt2->get_type(), SymTab::Indexer() ) ) {
                                         // std::cerr << "=========== equal:" << std::endl;
                                         // std::cerr << "d1: " << d1 << std::endl;
 …
         template< typename Iterator >
         void expandAssertions( TraitInstType * inst, Iterator out ) {
                 assertf( inst->baseTrait, "Trait instance not linked to base trait: %s", toString( inst ).c_str() );
+                assertf( inst->baseTrait, "Trait instance not linked to base trait: %s", toCString( inst ) );
                 std::list< DeclarationWithType * > asserts;
                 for ( Declaration * decl : inst->baseTrait->members ) {
 …
+        }
         void LinkReferenceToTypes::postvisit( TraitDecl * traitDecl ) {
+        void LinkReferenceToTypes_old::postvisit( TraitDecl * traitDecl ) {
                 if ( traitDecl->name == "sized" ) {
                         // "sized" is a special trait - flick the sized status on for the type variable
 …
+        }
         void LinkReferenceToTypes::postvisit( TraitInstType * traitInst ) {
+        void LinkReferenceToTypes_old::postvisit( TraitInstType * traitInst ) {
                 // handle other traits
                 TraitDecl *traitDecl = local_indexer->lookupTrait( traitInst->name );
+                const TraitDecl * traitDecl = local_indexer->lookupTrait( traitInst->name );
                 if ( ! traitDecl ) {
                         SemanticError( traitInst->location, "use of undeclared trait " + traitInst->name );
                 } // if
                 if ( traitDecl->get_parameters().size() != traitInst->get_parameters().size() ) {
+                if ( traitDecl->parameters.size() != traitInst->parameters.size() ) {
                         SemanticError( traitInst, "incorrect number of trait parameters: " );
                 } // if
                 traitInst->baseTrait = traitDecl;
+                traitInst->baseTrait = const_cast<TraitDecl *>(traitDecl); // Just linking in the node
                 // need to carry over the 'sized' status of each decl in the instance
                 for ( auto p : group_iterate( traitDecl->get_parameters(), traitInst->get_parameters() ) ) {
+                for ( auto p : group_iterate( traitDecl->parameters, traitInst->parameters ) ) {
                         TypeExpr * expr = dynamic_cast< TypeExpr * >( std::get<1>(p) );
                         if ( ! expr ) {
 …
                         if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( expr->get_type() ) ) {
                                 TypeDecl * formalDecl = std::get<0>(p);
                                 TypeDecl * instDecl = inst->get_baseType();
+                                TypeDecl * instDecl = inst->baseType;
                                 if ( formalDecl->get_sized() ) instDecl->set_sized( true );
+                        }
 …
+        }
         void LinkReferenceToTypes::postvisit( EnumDecl *enumDecl ) {
+        void LinkReferenceToTypes_old::postvisit( EnumDecl * enumDecl ) {
                 // visit enum members first so that the types of self-referencing members are updated properly
                 if ( ! enumDecl->get_members().empty() ) {
                         ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->get_name() );
+                if ( enumDecl->body ) {
+                        ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->name );
                         if ( fwds != forwardEnums.end() ) {
                                 for ( std::list< EnumInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
                                         (*inst )->set_baseEnum( enumDecl );
+                                        (* inst)->baseEnum = enumDecl;
                                 } // for
                                 forwardEnums.erase( fwds );
                         } // if
+                } // if
+        }
+        void LinkReferenceToTypes::renameGenericParams( std::list< TypeDecl * > & params ) {
+                        for ( Declaration * member : enumDecl->members ) {
+                                ObjectDecl * field = strict_dynamic_cast<ObjectDecl *>( member );
+                                if ( field->init ) {
+                                        // need to resolve enumerator initializers early so that other passes that determine if an expression is constexpr have the appropriate information.
+                                        SingleInit * init = strict_dynamic_cast<SingleInit *>( field->init );
+                                        ResolvExpr::findSingleExpression( init->value, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), indexer );
+                                }
+                        }
+                } // if
+        }
+        void LinkReferenceToTypes_old::renameGenericParams( std::list< TypeDecl * > & params ) {
                 // rename generic type parameters uniquely so that they do not conflict with user-defined function forall parameters, e.g.
                 //   forall(otype T)
 …
+        }
         void LinkReferenceToTypes::previsit( StructDecl * structDecl ) {
+        void LinkReferenceToTypes_old::previsit( StructDecl * structDecl ) {
                 renameGenericParams( structDecl->parameters );
+        }
         void LinkReferenceToTypes::previsit( UnionDecl * unionDecl ) {
+        void LinkReferenceToTypes_old::previsit( UnionDecl * unionDecl ) {
                 renameGenericParams( unionDecl->parameters );
+        }
         void LinkReferenceToTypes::postvisit( StructDecl *structDecl ) {
+        void LinkReferenceToTypes_old::postvisit( StructDecl * structDecl ) {
                 // visit struct members first so that the types of self-referencing members are updated properly
                 // xxx - need to ensure that type parameters match up between forward declarations and definition (most importantly, number of type parameters and their defaults)
                 if ( ! structDecl->get_members().empty() ) {
                         ForwardStructsType::iterator fwds = forwardStructs.find( structDecl->get_name() );
+                if ( structDecl->body ) {
+                        ForwardStructsType::iterator fwds = forwardStructs.find( structDecl->name );
                         if ( fwds != forwardStructs.end() ) {
                                 for ( std::list< StructInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
                                         (*inst )->set_baseStruct( structDecl );
+                                        (* inst)->baseStruct = structDecl;
                                 } // for
                                 forwardStructs.erase( fwds );
 …
+        }
         void LinkReferenceToTypes::postvisit( UnionDecl *unionDecl ) {
                 if ( ! unionDecl->get_members().empty() ) {
                         ForwardUnionsType::iterator fwds = forwardUnions.find( unionDecl->get_name() );
+        void LinkReferenceToTypes_old::postvisit( UnionDecl * unionDecl ) {
+                if ( unionDecl->body ) {
+                        ForwardUnionsType::iterator fwds = forwardUnions.find( unionDecl->name );
                         if ( fwds != forwardUnions.end() ) {
                                 for ( std::list< UnionInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
                                         (*inst )->set_baseUnion( unionDecl );
+                                        (* inst)->baseUnion = unionDecl;
                                 } // for
                                 forwardUnions.erase( fwds );
 …
+        }
         void LinkReferenceToTypes::postvisit( TypeInstType *typeInst ) {
+        void LinkReferenceToTypes_old::postvisit( TypeInstType * typeInst ) {
                 // ensure generic parameter instances are renamed like the base type
                 if ( inGeneric && typeInst->baseType ) typeInst->name = typeInst->baseType->name;
                 if ( NamedTypeDecl *namedTypeDecl = local_indexer->lookupType( typeInst->get_name() ) ) {
                         if ( TypeDecl *typeDecl = dynamic_cast< TypeDecl * >( namedTypeDecl ) ) {
                                 typeInst->set_isFtype( typeDecl->get_kind() == TypeDecl::Ftype );
+                if ( const NamedTypeDecl * namedTypeDecl = local_indexer->lookupType( typeInst->name ) ) {
+                        if ( const TypeDecl * typeDecl = dynamic_cast< const TypeDecl * >( namedTypeDecl ) ) {
+                                typeInst->set_isFtype( typeDecl->kind == TypeDecl::Ftype );
                         } // if
                 } // if
 …
                         // expand trait instances into their members
                         for ( DeclarationWithType * assertion : asserts ) {
                                 if ( TraitInstType *traitInst = dynamic_cast< TraitInstType * >( assertion->get_type() ) ) {
+                                if ( TraitInstType * traitInst = dynamic_cast< TraitInstType * >( assertion->get_type() ) ) {
                                         // expand trait instance into all of its members
                                         expandAssertions( traitInst, back_inserter( type->assertions ) );
 …
+        }
         void ForallPointerDecay::previsit( ObjectDecl *object ) {
+        void ForallPointerDecay_old::previsit( ObjectDecl * object ) {
                 // ensure that operator names only apply to functions or function pointers
                 if ( CodeGen::isOperator( object->name ) && ! dynamic_cast< FunctionType * >( object->type->stripDeclarator() ) ) {
 …
+        }
         void ForallPointerDecay::previsit( FunctionDecl *func ) {
+        void ForallPointerDecay_old::previsit( FunctionDecl * func ) {
                 func->fixUniqueId();
+        }
         void ForallPointerDecay::previsit( FunctionType * ftype ) {
+        void ForallPointerDecay_old::previsit( FunctionType * ftype ) {
                 forallFixer( ftype->forall, ftype );
+        }
         void ForallPointerDecay::previsit( StructDecl * aggrDecl ) {
+        void ForallPointerDecay_old::previsit( StructDecl * aggrDecl ) {
                 forallFixer( aggrDecl->parameters, aggrDecl );
+        }
         void ForallPointerDecay::previsit( UnionDecl * aggrDecl ) {
+        void ForallPointerDecay_old::previsit( UnionDecl * aggrDecl ) {
                 forallFixer( aggrDecl->parameters, aggrDecl );
+        }
 …
+        bool isTypedef( Declaration *decl ) {
+                return dynamic_cast< TypedefDecl * >( decl );
+        }
+        void EliminateTypedef::eliminateTypedef( std::list< Declaration * > &translationUnit ) {
+                PassVisitor<EliminateTypedef> eliminator;
+        void ReplaceTypedef::replaceTypedef( std::list< Declaration * > &translationUnit ) {
+                PassVisitor<ReplaceTypedef> eliminator;
                 mutateAll( translationUnit, eliminator );
                 if ( eliminator.pass.typedefNames.count( "size_t" ) ) {
                         // grab and remember declaration of size_t
                         SizeType = eliminator.pass.typedefNames["size_t"].first->get_base()->clone();
+                        Validate::SizeType = eliminator.pass.typedefNames["size_t"].first->base->clone();
                 } else {
                         // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
                         // eventually should have a warning for this case.
+                        SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+                }
+                filter( translationUnit, isTypedef, true );
+        }
+        Type * EliminateTypedef::postmutate( TypeInstType * typeInst ) {
+                        Validate::SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+                }
+        }
+        void ReplaceTypedef::premutate( QualifiedType * ) {
+                visit_children = false;
+        }
+        Type * ReplaceTypedef::postmutate( QualifiedType * qualType ) {
+                // replacing typedefs only makes sense for the 'oldest ancestor' of the qualified type
+                qualType->parent = qualType->parent->acceptMutator( * visitor );
+                return qualType;
+        }
+        Type * ReplaceTypedef::postmutate( TypeInstType * typeInst ) {
                 // instances of typedef types will come here. If it is an instance
                 // of a typdef type, link the instance to its actual type.
                 TypedefMap::const_iterator def = typedefNames.find( typeInst->get_name() );
+                TypedefMap::const_iterator def = typedefNames.find( typeInst->name );
                 if ( def != typedefNames.end() ) {
+                        Type *ret = def->second.first->base->clone();
+                        Type * ret = def->second.first->base->clone();
+                        ret->location = typeInst->location;
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
                         // attributes are not carried over from typedef to function parameters/return values
 …
                         // place instance parameters on the typedef'd type
                         if ( ! typeInst->parameters.empty() ) {
                                 ReferenceToType *rtt = dynamic_cast<ReferenceToType*>(ret);
+                                ReferenceToType * rtt = dynamic_cast<ReferenceToType *>(ret);
                                 if ( ! rtt ) {
                                         SemanticError( typeInst->location, "Cannot apply type parameters to base type of " + typeInst->name );
+                                }
                                 rtt->get_parameters().clear();
+                                rtt->parameters.clear();
                                 cloneAll( typeInst->parameters, rtt->parameters );
                                 mutateAll( rtt->parameters, *visitor );  // recursively fix typedefs on parameters
+                                mutateAll( rtt->parameters, * visitor );  // recursively fix typedefs on parameters
                         } // if
                         delete typeInst;
                         return ret;
                 } else {
+                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
+                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->name.c_str() );
+                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->name );
+                        if ( base == typedeclNames.end() ) {
+                                SemanticError( typeInst->location, toString("Use of undefined type ", typeInst->name) );
+                        }
                         typeInst->set_baseType( base->second );
+                } // if
+                return typeInst;
+                        return typeInst;
+                } // if
+                assert( false );
+        }
 …
+        }
         Declaration *EliminateTypedef::postmutate( TypedefDecl * tyDecl ) {
                 if ( typedefNames.count( tyDecl->get_name() ) == 1 && typedefNames[ tyDecl->get_name() ].second == scopeLevel ) {
+        Declaration * ReplaceTypedef::postmutate( TypedefDecl * tyDecl ) {
+                if ( typedefNames.count( tyDecl->name ) == 1 && typedefNames[ tyDecl->name ].second == scopeLevel ) {
                         // typedef to the same name from the same scope
                         // must be from the same type
                         Type * t1 = tyDecl->get_base();
                         Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base();
+                        Type * t1 = tyDecl->base;
+                        Type * t2 = typedefNames[ tyDecl->name ].first->base;
                         if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) {
                                 SemanticError( tyDecl->location, "Cannot redefine typedef: " + tyDecl->name );
 …
+                        }
                 } else {
                         typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
+                        typedefNames[ tyDecl->name ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
                 } // if
 …
                 //    struct screen;
                 // because the expansion of the typedef is:
                 //    void rtn( SCREEN *p ) => void rtn( struct screen *p )
+                //    void rtn( SCREEN * p ) => void rtn( struct screen * p )
                 // hence the type-name "screen" must be defined.
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
+                Type *designatorType = tyDecl->get_base()->stripDeclarator();
+                if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( designatorType ) ) {
+                        return new StructDecl( aggDecl->get_name(), DeclarationNode::Struct, noAttributes, tyDecl->get_linkage() );
+                } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
+                        return new UnionDecl( aggDecl->get_name(), noAttributes, tyDecl->get_linkage() );
+                } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( designatorType ) ) {
+                        return new EnumDecl( enumDecl->get_name(), noAttributes, tyDecl->get_linkage() );
+                } else {
+                        return tyDecl->clone();
+                } // if
+        }
+        void EliminateTypedef::premutate( TypeDecl * typeDecl ) {
+                TypedefMap::iterator i = typedefNames.find( typeDecl->get_name() );
+                Type * designatorType = tyDecl->base->stripDeclarator();
+                if ( StructInstType * aggDecl = dynamic_cast< StructInstType * >( designatorType ) ) {
+                        declsToAddBefore.push_back( new StructDecl( aggDecl->name, DeclarationNode::Struct, noAttributes, tyDecl->linkage ) );
+                } else if ( UnionInstType * aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
+                        declsToAddBefore.push_back( new UnionDecl( aggDecl->name, noAttributes, tyDecl->linkage ) );
+                } else if ( EnumInstType * enumDecl = dynamic_cast< EnumInstType * >( designatorType ) ) {
+                        declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage ) );
+                } // if
+                return tyDecl->clone();
+        }
+        void ReplaceTypedef::premutate( TypeDecl * typeDecl ) {
+                TypedefMap::iterator i = typedefNames.find( typeDecl->name );
                 if ( i != typedefNames.end() ) {
                         typedefNames.erase( i ) ;
                 } // if
                 typedeclNames[ typeDecl->get_name() ] = typeDecl;
+        }
         void EliminateTypedef::premutate( FunctionDecl * ) {
+                typedeclNames.insert( typeDecl->name, typeDecl );
+        }
+        void ReplaceTypedef::premutate( FunctionDecl * ) {
                 GuardScope( typedefNames );
+        }
+        void EliminateTypedef::premutate( ObjectDecl * ) {
+                GuardScope( typedeclNames );
+        }
+        void ReplaceTypedef::premutate( ObjectDecl * ) {
                 GuardScope( typedefNames );
+        }
+        DeclarationWithType *EliminateTypedef::postmutate( ObjectDecl * objDecl ) {
+                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->get_type() ) ) { // function type?
+                GuardScope( typedeclNames );
+        }
+        DeclarationWithType * ReplaceTypedef::postmutate( ObjectDecl * objDecl ) {
+                if ( FunctionType * funtype = dynamic_cast<FunctionType *>( objDecl->type ) ) { // function type?
                         // replace the current object declaration with a function declaration
                         FunctionDecl * newDecl = new FunctionDecl( objDecl->get_name(), objDecl->get_storageClasses(), objDecl->get_linkage(), funtype, 0, objDecl->get_attributes(), objDecl->get_funcSpec() );
                         objDecl->get_attributes().clear();
+                        FunctionDecl * newDecl = new FunctionDecl( objDecl->name, objDecl->get_storageClasses(), objDecl->linkage, funtype, 0, objDecl->attributes, objDecl->get_funcSpec() );
+                        objDecl->attributes.clear();
                         objDecl->set_type( nullptr );
                         delete objDecl;
 …
+        }
         void EliminateTypedef::premutate( CastExpr * ) {
+        void ReplaceTypedef::premutate( CastExpr * ) {
                 GuardScope( typedefNames );
+        }
+        void EliminateTypedef::premutate( CompoundStmt * ) {
+                GuardScope( typedeclNames );
+        }
+        void ReplaceTypedef::premutate( CompoundStmt * ) {
                 GuardScope( typedefNames );
+                GuardScope( typedeclNames );
                 scopeLevel += 1;
                 GuardAction( [this](){ scopeLevel -= 1; } );
+        }
-        CompoundStmt *EliminateTypedef::postmutate( CompoundStmt * compoundStmt ) {
-                // remove and delete decl stmts
-                filter( compoundStmt->kids, [](Statement * stmt) {
-                        if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
-                                if ( dynamic_cast< TypedefDecl * >( declStmt->get_decl() ) ) {
-                                        return true;
-                                } // if
-                        } // if
-                        return false;
-                }, true);
-                return compoundStmt;
+        }
-        // there may be typedefs nested within aggregates. in order for everything to work properly, these should be removed
-        // as well
         template<typename AggDecl>
+        AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
+                filter( aggDecl->members, isTypedef, true );
+                return aggDecl;
+        }
+        template<typename AggDecl>
+        void EliminateTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
+        void ReplaceTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
                 if ( typedefNames.count( aggDecl->get_name() ) == 0 ) {
                         Type *type = nullptr;
+                        Type * type = nullptr;
                         if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( aggDecl ) ) {
                                 type = new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() );
 …
                         TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type, aggDecl->get_linkage() ) );
                         typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel );
+                } // if
+        }
+        void EliminateTypedef::premutate( StructDecl * structDecl ) {
+                        // add the implicit typedef to the AST
+                        declsToAddBefore.push_back( new TypedefDecl( aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type->clone(), aggDecl->get_linkage() ) );
+                } // if
+        }
+        template< typename AggDecl >
+        void ReplaceTypedef::handleAggregate( AggDecl * aggr ) {
+                SemanticErrorException errors;
+                ValueGuard< std::list<Declaration * > > oldBeforeDecls( declsToAddBefore );
+                ValueGuard< std::list<Declaration * > > oldAfterDecls ( declsToAddAfter  );
+                declsToAddBefore.clear();
+                declsToAddAfter.clear();
+                GuardScope( typedefNames );
+                GuardScope( typedeclNames );
+                mutateAll( aggr->parameters, * visitor );
+                // unroll mutateAll for aggr->members so that implicit typedefs for nested types are added to the aggregate body.
+                for ( std::list< Declaration * >::iterator i = aggr->members.begin(); i != aggr->members.end(); ++i ) {
+                        if ( !declsToAddAfter.empty() ) { aggr->members.splice( i, declsToAddAfter ); }
+                        try {
+                                * i = maybeMutate( * i, * visitor );
+                        } catch ( SemanticErrorException &e ) {
+                                errors.append( e );
+                        }
+                        if ( !declsToAddBefore.empty() ) { aggr->members.splice( i, declsToAddBefore ); }
+                }
+                if ( !declsToAddAfter.empty() ) { aggr->members.splice( aggr->members.end(), declsToAddAfter ); }
+                if ( !errors.isEmpty() ) { throw errors; }
+        }
+        void ReplaceTypedef::premutate( StructDecl * structDecl ) {
+                visit_children = false;
                 addImplicitTypedef( structDecl );
+        }
+        Declaration *EliminateTypedef::postmutate( StructDecl * structDecl ) {
+                return handleAggregate( structDecl );
+        }
+        void EliminateTypedef::premutate( UnionDecl * unionDecl ) {
+                handleAggregate( structDecl );
+        }
+        void ReplaceTypedef::premutate( UnionDecl * unionDecl ) {
+                visit_children = false;
                 addImplicitTypedef( unionDecl );
+        }
+        Declaration *EliminateTypedef::postmutate( UnionDecl * unionDecl ) {
+                return handleAggregate( unionDecl );
+        }
+        void EliminateTypedef::premutate( EnumDecl * enumDecl ) {
+                handleAggregate( unionDecl );
+        }
+        void ReplaceTypedef::premutate( EnumDecl * enumDecl ) {
                 addImplicitTypedef( enumDecl );
+        }
+        Declaration *EliminateTypedef::postmutate( EnumDecl * enumDecl ) {
+                return handleAggregate( enumDecl );
+        }
+        Declaration *EliminateTypedef::postmutate( TraitDecl * traitDecl ) {
+                return handleAggregate( traitDecl );
+        }
+        void EliminateTypedef::premutate( FunctionType * ) {
+        void ReplaceTypedef::premutate( FunctionType * ) {
                 GuardValue( inFunctionType );
                 inFunctionType = true;
+        }
+        void ReplaceTypedef::premutate( TraitDecl * ) {
+                GuardScope( typedefNames );
+                GuardScope( typedeclNames);
+        }
 …
                         for ( size_t i = 0; paramIter != params->end(); ++paramIter, ++i ) {
                                 if ( i < args.size() ) {
                                         TypeExpr * expr = strict_dynamic_cast< TypeExpr * >( *std::next( args.begin(), i ) );
                                         sub.add( (*paramIter)->get_name(), expr->get_type()->clone() );
+                                        TypeExpr * expr = strict_dynamic_cast< TypeExpr * >( * std::next( args.begin(), i ) );
+                                        sub.add( (* paramIter)->get_name(), expr->get_type()->clone() );
                                 } else if ( i == args.size() ) {
                                         Type * defaultType = (*paramIter)->get_init();
+                                        Type * defaultType = (* paramIter)->get_init();
                                         if ( defaultType ) {
                                                 args.push_back( new TypeExpr( defaultType->clone() ) );
                                                 sub.add( (*paramIter)->get_name(), defaultType->clone() );
+                                                sub.add( (* paramIter)->get_name(), defaultType->clone() );
+                                        }
+                                }
 …
+        }
         void CompoundLiteral::premutate( ObjectDecl *objectDecl ) {
+        void CompoundLiteral::premutate( ObjectDecl * objectDecl ) {
                 storageClasses = objectDecl->get_storageClasses();
+        }
         Expression *CompoundLiteral::postmutate( CompoundLiteralExpr *compLitExpr ) {
+        Expression * CompoundLiteral::postmutate( CompoundLiteralExpr * compLitExpr ) {
                 // transform [storage_class] ... (struct S){ 3, ... };
                 // into [storage_class] struct S temp =  { 3, ... };
                 static UniqueName indexName( "_compLit" );
                 ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, nullptr, compLitExpr->get_result(), compLitExpr->get_initializer() );
+                ObjectDecl * tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, nullptr, compLitExpr->get_result(), compLitExpr->get_initializer() );
                 compLitExpr->set_result( nullptr );
                 compLitExpr->set_initializer( nullptr );
 …
                         TupleType * tupleType = strict_dynamic_cast< TupleType * >( ResolvExpr::extractResultType( ftype ) );
                         // ensure return value is not destructed by explicitly creating an empty ListInit node wherein maybeConstruct is false.
                         ObjectDecl * newRet = new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, tupleType, new ListInit( std::list<Initializer*>(), noDesignators, false ) );
+                        ObjectDecl * newRet = new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, tupleType, new ListInit( std::list<Initializer *>(), noDesignators, false ) );
                         deleteAll( retVals );
                         retVals.clear();
 …
+        }
+        void FixObjectType::fix( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<FixObjectType> fixer;
+                acceptAll( translationUnit, fixer );
+        }
+        void FixObjectType::previsit( ObjectDecl * objDecl ) {
+                Type * new_type = ResolvExpr::resolveTypeof( objDecl->get_type(), indexer );
+                objDecl->set_type( new_type );
+        }
+        void FixObjectType::previsit( FunctionDecl * funcDecl ) {
+                Type * new_type = ResolvExpr::resolveTypeof( funcDecl->type, indexer );
+                funcDecl->set_type( new_type );
+        }
+        void FixObjectType::previsit( TypeDecl * typeDecl ) {
+                if ( typeDecl->get_base() ) {
+                        Type * new_type = ResolvExpr::resolveTypeof( typeDecl->get_base(), indexer );
+                        typeDecl->set_base( new_type );
+                } // if
+        }
         void ArrayLength::computeLength( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<ArrayLength> len;
 …
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
+                        if ( at->get_dimension() ) return;
+                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->get_init() ) ) {
+                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->get_initializers().size() ) ) );
+                        }
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
+                        if ( at->dimension ) return;
+                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
+                                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, Validate::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 );
+                }
+        }
 …
+        }
+        void FindSpecialDeclarations::previsit( FunctionDecl * funcDecl ) {
+                if ( ! dereferenceOperator ) {
+                        if ( funcDecl->get_name() == "*?" && funcDecl->get_linkage() == LinkageSpec::Intrinsic ) {
+                                FunctionType * ftype = funcDecl->get_functionType();
+                                if ( ftype->get_parameters().size() == 1 && ftype->get_parameters().front()->get_type()->get_qualifiers() == Type::Qualifiers() ) {
+                                        dereferenceOperator = funcDecl;
+namespace {
+        /// Replaces enum types by int, and function/array types in function parameter and return
+        /// lists by appropriate pointers
+        struct EnumAndPointerDecay_new {
+                const ast::EnumDecl * previsit( const ast::EnumDecl * enumDecl ) {
+                        // set the type of each member of the enumeration to be EnumConstant
+                        for ( unsigned i = 0; i < enumDecl->members.size(); ++i ) {
+                                // build new version of object with EnumConstant
+                                ast::ptr< ast::ObjectDecl > obj =
+                                        enumDecl->members[i].strict_as< ast::ObjectDecl >();
+                                obj.get_and_mutate()->type =
+                                        new ast::EnumInstType{ enumDecl->name, ast::CV::Const };
+                                // set into decl
+                                ast::EnumDecl * mut = mutate( enumDecl );
+                                mut->members[i] = obj.get();
+                                enumDecl = mut;
+                        }
+                        return enumDecl;
+                }
+                static const ast::FunctionType * fixFunctionList(
+                        const ast::FunctionType * func,
+                        std::vector< ast::ptr< ast::DeclWithType > > ast::FunctionType::* field,
+                        ast::ArgumentFlag isVarArgs = ast::FixedArgs
+                ) {
+                        const auto & dwts = func->* field;
+                        unsigned nvals = dwts.size();
+                        bool hasVoid = false;
+                        for ( unsigned i = 0; i < nvals; ++i ) {
+                                func = ast::mutate_field_index( func, field, i, fixFunction( dwts[i], hasVoid ) );
+                        }
+                        // the only case in which "void" is valid is where it is the only one in the list
+                        if ( hasVoid && ( nvals > 1 || isVarArgs ) ) {
+                                SemanticError(
+                                        dwts.front()->location, func, "invalid type void in function type" );
+                        }
+                        // one void is the only thing in the list, remove it
+                        if ( hasVoid ) {
+                                func = ast::mutate_field(
+                                        func, field, std::vector< ast::ptr< ast::DeclWithType > >{} );
+                        }
+                        return func;
+                }
+                const ast::FunctionType * previsit( const ast::FunctionType * func ) {
+                        func = fixFunctionList( func, &ast::FunctionType::params, func->isVarArgs );
+                        return fixFunctionList( func, &ast::FunctionType::returns );
+                }
+        };
+        /// expand assertions from a trait instance, performing appropriate type variable substitutions
+        void expandAssertions(
+                const ast::TraitInstType * inst, std::vector< ast::ptr< ast::DeclWithType > > & out
+        ) {
+                assertf( inst->base, "Trait instance not linked to base trait: %s", toCString( inst ) );
+                // build list of trait members, substituting trait decl parameters for instance parameters
+                ast::TypeSubstitution sub{
+                        inst->base->params.begin(), inst->base->params.end(), inst->params.begin() };
+                // deliberately take ast::ptr by-value to ensure this does not mutate inst->base
+                for ( ast::ptr< ast::Decl > decl : inst->base->members ) {
+                        auto member = decl.strict_as< ast::DeclWithType >();
+                        sub.apply( member );
+                        out.emplace_back( member );
+                }
+        }
+        /// Associates forward declarations of aggregates with their definitions
+        class LinkReferenceToTypes_new final
+        : public ast::WithSymbolTable, public ast::WithGuards, public
+          ast::WithVisitorRef<LinkReferenceToTypes_new>, public ast::WithShortCircuiting {
+                // these maps of uses of forward declarations of types need to have the actual type
+                // declaration switched in * after * they have been traversed. To enable this in the
+                // ast::Pass framework, any node that needs to be so mutated has mutate() called on it
+                // before it is placed in the map, properly updating its parents in the usual traversal,
+                // then can have the actual mutation applied later
+                using ForwardEnumsType = std::unordered_multimap< std::string, ast::EnumInstType * >;
+                using ForwardStructsType = std::unordered_multimap< std::string, ast::StructInstType * >;
+                using ForwardUnionsType = std::unordered_multimap< std::string, ast::UnionInstType * >;
+                const CodeLocation & location;
+                const ast::SymbolTable * localSymtab;
+                ForwardEnumsType forwardEnums;
+                ForwardStructsType forwardStructs;
+                ForwardUnionsType forwardUnions;
+                /// true if currently in a generic type body, so that type parameter instances can be
+                /// renamed appropriately
+                bool inGeneric = false;
+        public:
+                /// contstruct using running symbol table
+                LinkReferenceToTypes_new( const CodeLocation & loc )
+                : location( loc ), localSymtab( &symtab ) {}
+                /// construct using provided symbol table
+                LinkReferenceToTypes_new( const CodeLocation & loc, const ast::SymbolTable & syms )
+                : location( loc ), localSymtab( &syms ) {}
+                const ast::Type * postvisit( const ast::TypeInstType * typeInst ) {
+                        // ensure generic parameter instances are renamed like the base type
+                        if ( inGeneric && typeInst->base ) {
+                                typeInst = ast::mutate_field(
+                                        typeInst, &ast::TypeInstType::name, typeInst->base->name );
+                        }
+                        if (
+                                auto typeDecl = dynamic_cast< const ast::TypeDecl * >(
+                                        localSymtab->lookupType( typeInst->name ) )
+                        ) {
+                                typeInst = ast::mutate_field( typeInst, &ast::TypeInstType::kind, typeDecl->kind );
+                        }
+                        return typeInst;
+                }
+                const ast::Type * postvisit( const ast::EnumInstType * inst ) {
+                        const ast::EnumDecl * decl = localSymtab->lookupEnum( inst->name );
+                        // not a semantic error if the enum is not found, just an implicit forward declaration
+                        if ( decl ) {
+                                inst = ast::mutate_field( inst, &ast::EnumInstType::base, decl );
+                        }
+                        if ( ! decl || ! decl->body ) {
+                                // forward declaration
+                                auto mut = mutate( inst );
+                                forwardEnums.emplace( inst->name, mut );
+                                inst = mut;
+                        }
+                        return inst;
+                }
+                void checkGenericParameters( const ast::ReferenceToType * inst ) {
+                        for ( const ast::Expr * param : inst->params ) {
+                                if ( ! dynamic_cast< const ast::TypeExpr * >( param ) ) {
+                                        SemanticError(
+                                                location, inst, "Expression parameters for generic types are currently "
+                                                "unsupported: " );
+                                }
+                        }
+                }
+        }
+                const ast::StructInstType * postvisit( const ast::StructInstType * inst ) {
+                        const ast::StructDecl * decl = localSymtab->lookupStruct( inst->name );
+                        // not a semantic error if the struct is not found, just an implicit forward declaration
+                        if ( decl ) {
+                                inst = ast::mutate_field( inst, &ast::StructInstType::base, decl );
+                        }
+                        if ( ! decl || ! decl->body ) {
+                                // forward declaration
+                                auto mut = mutate( inst );
+                                forwardStructs.emplace( inst->name, mut );
+                                inst = mut;
+                        }
+                        checkGenericParameters( inst );
+                        return inst;
+                }
+                const ast::UnionInstType * postvisit( const ast::UnionInstType * inst ) {
+                        const ast::UnionDecl * decl = localSymtab->lookupUnion( inst->name );
+                        // not a semantic error if the struct is not found, just an implicit forward declaration
+                        if ( decl ) {
+                                inst = ast::mutate_field( inst, &ast::UnionInstType::base, decl );
+                        }
+                        if ( ! decl || ! decl->body ) {
+                                // forward declaration
+                                auto mut = mutate( inst );
+                                forwardUnions.emplace( inst->name, mut );
+                                inst = mut;
+                        }
+                        checkGenericParameters( inst );
+                        return inst;
+                }
+                const ast::Type * postvisit( const ast::TraitInstType * traitInst ) {
+                        // handle other traits
+                        const ast::TraitDecl * traitDecl = localSymtab->lookupTrait( traitInst->name );
+                        if ( ! traitDecl )       {
+                                SemanticError( location, "use of undeclared trait " + traitInst->name );
+                        }
+                        if ( traitDecl->params.size() != traitInst->params.size() ) {
+                                SemanticError( location, traitInst, "incorrect number of trait parameters: " );
+                        }
+                        traitInst = ast::mutate_field( traitInst, &ast::TraitInstType::base, traitDecl );
+                        // need to carry over the "sized" status of each decl in the instance
+                        for ( unsigned i = 0; i < traitDecl->params.size(); ++i ) {
+                                auto expr = traitInst->params[i].as< ast::TypeExpr >();
+                                if ( ! expr ) {
+                                        SemanticError(
+                                                traitInst->params[i].get(), "Expression parameters for trait instances "
+                                                "are currently unsupported: " );
+                                }
+                                if ( auto inst = expr->type.as< ast::TypeInstType >() ) {
+                                        if ( traitDecl->params[i]->sized && ! inst->base->sized ) {
+                                                // traitInst = ast::mutate_field_index(
+                                                //      traitInst, &ast::TraitInstType::params, i,
+                                                //      ...
+                                                // );
+                                                ast::TraitInstType * mut = ast::mutate( traitInst );
+                                                ast::chain_mutate( mut->params[i] )
+                                                        ( &ast::TypeExpr::type )
+                                                                ( &ast::TypeInstType::base )->sized = true;
+                                                traitInst = mut;
+                                        }
+                                }
+                        }
+                        return traitInst;
+                }
+                void previsit( const ast::QualifiedType * ) { visit_children = false; }
+                const ast::Type * postvisit( const ast::QualifiedType * qualType ) {
+                        // linking only makes sense for the "oldest ancestor" of the qualified type
+                        return ast::mutate_field(
+                                qualType, &ast::QualifiedType::parent, qualType->parent->accept( * visitor ) );
+                }
+                const ast::Decl * postvisit( const ast::EnumDecl * enumDecl ) {
+                        // visit enum members first so that the types of self-referencing members are updated
+                        // properly
+                        if ( ! enumDecl->body ) return enumDecl;
+                        // update forward declarations to point here
+                        auto fwds = forwardEnums.equal_range( enumDecl->name );
+                        if ( fwds.first != fwds.second ) {
+                                auto inst = fwds.first;
+                                do {
+                                        // forward decl is stored * mutably * in map, can thus be updated
+                                        inst->second->base = enumDecl;
+                                } while ( ++inst != fwds.second );
+                                forwardEnums.erase( fwds.first, fwds.second );
+                        }
+                        // ensure that enumerator initializers are properly set
+                        for ( unsigned i = 0; i < enumDecl->members.size(); ++i ) {
+                                auto field = enumDecl->members[i].strict_as< ast::ObjectDecl >();
+                                if ( field->init ) {
+                                        // need to resolve enumerator initializers early so that other passes that
+                                        // determine if an expression is constexpr have appropriate information
+                                        auto init = field->init.strict_as< ast::SingleInit >();
+                                        enumDecl = ast::mutate_field_index(
+                                                enumDecl, &ast::EnumDecl::members, i,
+                                                ast::mutate_field( field, &ast::ObjectDecl::init,
+                                                        ast::mutate_field( init, &ast::SingleInit::value,
+                                                                ResolvExpr::findSingleExpression(
+                                                                        init->value, new ast::BasicType{ ast::BasicType::SignedInt },
+                                                                        symtab ) ) ) );
+                                }
+                        }
+                        return enumDecl;
+                }
+                /// rename generic type parameters uniquely so that they do not conflict with user defined
+                /// function forall parameters, e.g. the T in Box and the T in f, below
+                ///   forall(otype T)
+                ///   struct Box {
+                ///     T x;
+                ///   };
+                ///   forall(otype T)
+                ///   void f(Box(T) b) {
+                ///     ...
+                ///   }
+                template< typename AggrDecl >
+                const AggrDecl * renameGenericParams( const AggrDecl * aggr ) {
+                        GuardValue( inGeneric );
+                        inGeneric = ! aggr->params.empty();
+                        for ( unsigned i = 0; i < aggr->params.size(); ++i ) {
+                                const ast::TypeDecl * td = aggr->params[i];
+                                aggr = ast::mutate_field_index(
+                                        aggr, &AggrDecl::params, i,
+                                        ast::mutate_field( td, &ast::TypeDecl::name, "__" + td->name + "_generic_" ) );
+                        }
+                        return aggr;
+                }
+                const ast::StructDecl * previsit( const ast::StructDecl * structDecl ) {
+                        return renameGenericParams( structDecl );
+                }
+                void postvisit( const ast::StructDecl * structDecl ) {
+                        // visit struct members first so that the types of self-referencing members are
+                        // updated properly
+                        if ( ! structDecl->body ) return;
+                        // update forward declarations to point here
+                        auto fwds = forwardStructs.equal_range( structDecl->name );
+                        if ( fwds.first != fwds.second ) {
+                                auto inst = fwds.first;
+                                do {
+                                        // forward decl is stored * mutably * in map, can thus be updated
+                                        inst->second->base = structDecl;
+                                } while ( ++inst != fwds.second );
+                                forwardStructs.erase( fwds.first, fwds.second );
+                        }
+                }
+                const ast::UnionDecl * previsit( const ast::UnionDecl * unionDecl ) {
+                        return renameGenericParams( unionDecl );
+                }
+                void postvisit( const ast::UnionDecl * unionDecl ) {
+                        // visit union members first so that the types of self-referencing members are updated
+                        // properly
+                        if ( ! unionDecl->body ) return;
+                        // update forward declarations to point here
+                        auto fwds = forwardUnions.equal_range( unionDecl->name );
+                        if ( fwds.first != fwds.second ) {
+                                auto inst = fwds.first;
+                                do {
+                                        // forward decl is stored * mutably * in map, can thus be updated
+                                        inst->second->base = unionDecl;
+                                } while ( ++inst != fwds.second );
+                                forwardUnions.erase( fwds.first, fwds.second );
+                        }
+                }
+                const ast::Decl * postvisit( const ast::TraitDecl * traitDecl ) {
+                        // set the "sized" status for the special "sized" trait
+                        if ( traitDecl->name == "sized" ) {
+                                assertf( traitDecl->params.size() == 1, "Built-in trait 'sized' has incorrect "
+                                        "number of parameters: %zd", traitDecl->params.size() );
+                                traitDecl = ast::mutate_field_index(
+                                        traitDecl, &ast::TraitDecl::params, 0,
+                                        ast::mutate_field(
+                                                traitDecl->params.front().get(), &ast::TypeDecl::sized, true ) );
+                        }
+                        // move assertions from type parameters into the body of the trait
+                        std::vector< ast::ptr< ast::DeclWithType > > added;
+                        for ( const ast::TypeDecl * td : traitDecl->params ) {
+                                for ( const ast::DeclWithType * assn : td->assertions ) {
+                                        auto inst = dynamic_cast< const ast::TraitInstType * >( assn->get_type() );
+                                        if ( inst ) {
+                                                expandAssertions( inst, added );
+                                        } else {
+                                                added.emplace_back( assn );
+                                        }
+                                }
+                        }
+                        if ( ! added.empty() ) {
+                                auto mut = mutate( traitDecl );
+                                for ( const ast::DeclWithType * decl : added ) {
+                                        mut->members.emplace_back( decl );
+                                }
+                                traitDecl = mut;
+                        }
+                        return traitDecl;
+                }
+        };
+        /// Replaces array and function types in forall lists by appropriate pointer type and assigns
+        /// each object and function declaration a unique ID
+        class ForallPointerDecay_new {
+                const CodeLocation & location;
+        public:
+                ForallPointerDecay_new( const CodeLocation & loc ) : location( loc ) {}
+                const ast::ObjectDecl * previsit( const ast::ObjectDecl * obj ) {
+                        // ensure that operator names only apply to functions or function pointers
+                        if (
+                                CodeGen::isOperator( obj->name )
+                                && ! dynamic_cast< const ast::FunctionType * >( obj->type->stripDeclarator() )
+                        ) {
+                                SemanticError( obj->location, toCString( "operator ", obj->name.c_str(), " is not "
+                                        "a function or function pointer." )  );
+                        }
+                        // ensure object has unique ID
+                        if ( obj->uniqueId ) return obj;
+                        auto mut = mutate( obj );
+                        mut->fixUniqueId();
+                        return mut;
+                }
+                const ast::FunctionDecl * previsit( const ast::FunctionDecl * func ) {
+                        // ensure function has unique ID
+                        if ( func->uniqueId ) return func;
+                        auto mut = mutate( func );
+                        mut->fixUniqueId();
+                        return mut;
+                }
+                /// Fix up assertions -- flattens assertion lists, removing all trait instances
+                template< typename node_t, typename parent_t >
+                static const node_t * forallFixer(
+                        const CodeLocation & loc, const node_t * node,
+                        ast::ParameterizedType::ForallList parent_t::* forallField
+                ) {
+                        for ( unsigned i = 0; i < (node->* forallField).size(); ++i ) {
+                                const ast::TypeDecl * type = (node->* forallField)[i];
+                                if ( type->assertions.empty() ) continue;
+                                std::vector< ast::ptr< ast::DeclWithType > > asserts;
+                                asserts.reserve( type->assertions.size() );
+                                // expand trait instances into their members
+                                for ( const ast::DeclWithType * assn : type->assertions ) {
+                                        auto traitInst =
+                                                dynamic_cast< const ast::TraitInstType * >( assn->get_type() );
+                                        if ( traitInst ) {
+                                                // expand trait instance to all its members
+                                                expandAssertions( traitInst, asserts );
+                                        } else {
+                                                // pass other assertions through
+                                                asserts.emplace_back( assn );
+                                        }
+                                }
+                                // apply FixFunction to every assertion to check for invalid void type
+                                for ( ast::ptr< ast::DeclWithType > & assn : asserts ) {
+                                        bool isVoid = false;
+                                        assn = fixFunction( assn, isVoid );
+                                        if ( isVoid ) {
+                                                SemanticError( loc, node, "invalid type void in assertion of function " );
+                                        }
+                                }
+                                // place mutated assertion list in node
+                                auto mut = mutate( type );
+                                mut->assertions = move( asserts );
+                                node = ast::mutate_field_index( node, forallField, i, mut );
+                        }
+                        return node;
+                }
+                const ast::FunctionType * previsit( const ast::FunctionType * ftype ) {
+                        return forallFixer( location, ftype, &ast::FunctionType::forall );
+                }
+                const ast::StructDecl * previsit( const ast::StructDecl * aggrDecl ) {
+                        return forallFixer( aggrDecl->location, aggrDecl, &ast::StructDecl::params );
+                }
+                const ast::UnionDecl * previsit( const ast::UnionDecl * aggrDecl ) {
+                        return forallFixer( aggrDecl->location, aggrDecl, &ast::UnionDecl::params );
+                }
+        };
+} // anonymous namespace
+const ast::Type * validateType(
+                const CodeLocation & loc, const ast::Type * type, const ast::SymbolTable & symtab ) {
+        ast::Pass< EnumAndPointerDecay_new > epc;
+        ast::Pass< LinkReferenceToTypes_new > lrt{ loc, symtab };
+        ast::Pass< ForallPointerDecay_new > fpd{ loc };
+        return type->accept( epc )->accept( lrt )->accept( fpd );
+}
 } // namespace SymTab

src/SymTab/Validate.h

-              r7951100
+              rb067d9b
 #include <list>  // for list
+class Declaration;
+class Type;
+struct CodeLocation;
+class  Declaration;
+class  Type;
+namespace ast {
+        class Type;
+        class SymbolTable;
+}
 namespace SymTab {
 …
         void validate( std::list< Declaration * > &translationUnit, bool doDebug = false );
         void validateType( Type *type, const Indexer *indexer );
+        const ast::Type * validateType(
+                const CodeLocation & loc, const ast::Type * type, const ast::SymbolTable & symtab );
 } // namespace SymTab

src/SymTab/module.mk

-              r7951100
+              rb067d9b
 ###############################################################################
+SRC += SymTab/Indexer.cc \
+       SymTab/Mangler.cc \
+       SymTab/Validate.cc \
+       SymTab/FixFunction.cc \
+       SymTab/Autogen.cc
+SRC_SYMTAB = \
+      SymTab/Autogen.cc \
+      SymTab/FixFunction.cc \
+      SymTab/Indexer.cc \
+      SymTab/Mangler.cc \
+      SymTab/ManglerCommon.cc \
+      SymTab/Validate.cc
+SRC += $(SRC_SYMTAB)
+SRCDEMANGLE += $(SRC_SYMTAB) SymTab/Demangle.cc

src/SynTree/AddressExpr.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 23:54:44 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Tue Apr 26 12:35:13 2016
 // Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Feb 28 13:13:38 2019
+// Update Count     : 10
 //
 …
 AddressExpr::AddressExpr( Expression *arg ) : Expression(), arg( arg ) {
         if ( arg->result ) {
                 if ( arg->result->get_lvalue() ) {
+                if ( arg->get_lvalue() ) {
                         // lvalue, retains all layers of reference and gains a pointer inside the references
                         set_result( addrType( arg->result ) );
                 } else {
                         // taking address of non-lvalue -- must be a reference, loses one layer of reference
+                        ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( arg->result );
+                        set_result( addrType( refType->base ) );
+                        if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( arg->result ) ) {
+                                set_result( addrType( refType->base ) );
+                        } else {
+                                SemanticError( arg->result, "Attempt to take address of non-lvalue expression: " );
+                        } // if
+                }
-                // result of & is never an lvalue
-                get_result()->set_lvalue( false );
+        }
+}

src/SynTree/AggregateDecl.cc

-              r7951100
+              rb067d9b
 std::string TraitDecl::typeString() const { return "trait"; }
-namespace {
-        long long int getConstValue( Expression * expr ) {
-                if ( CastExpr * castExpr = dynamic_cast< CastExpr * > ( expr ) ) {
-                        return getConstValue( castExpr->arg );
-                } else if ( ConstantExpr * constExpr = dynamic_cast< ConstantExpr * >( expr ) ) {
-                        return constExpr->intValue();
-                // can be -1, +1, etc.
-                // } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( expr ) ) {
-                //      if ( untypedExpr-> )
-                } else {
-                        assertf( false, "Unhandled expression type in getConstValue for enumerators: %s", toString( expr ).c_str() );
+                }
+        }
+}
 bool EnumDecl::valueOf( Declaration * enumerator, long long int & value ) {
         if ( enumValues.empty() ) {
 …
                         if ( field->init ) {
                                 SingleInit * init = strict_dynamic_cast< SingleInit * >( field->init );
+                                currentValue = getConstValue( init->value );
+                                auto result = eval( init->value );
+                                if ( ! result.second ) SemanticError( init->location, toString( "Non-constexpr in initialization of enumerator: ", field ) );
+                                currentValue = result.first;
+                        }
                         assertf( enumValues.count( field->name ) == 0, "Enum %s has multiple members with the name %s", name.c_str(), field->name.c_str() );

src/SynTree/ApplicationExpr.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Tue Apr 26 12:41:06 2016
 // Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Aug 12 14:28:00 2019
+// Update Count     : 5
 //
 …
 #include "Declaration.h"         // for Declaration
 #include "Expression.h"          // for ParamEntry, ApplicationExpr, Expression
+#include "InitTweak/InitTweak.h" // for getFunction
 #include "ResolvExpr/typeops.h"  // for extractResultType
 #include "Type.h"                // for Type, PointerType, FunctionType
+ParamEntry::ParamEntry( UniqueId decl, Declaration * declptr, Type * actualType, Type * formalType, Expression* expr )
+                : decl( decl ), declptr( declptr ), actualType( actualType ), formalType( formalType ), expr( expr ) {
+        }
 ParamEntry::ParamEntry( const ParamEntry &other ) :
+                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ), inferParams( new InferredParams( *other.inferParams ) ) {
+}
+ParamEntry &ParamEntry::operator=( const ParamEntry &other ) {
+        if ( &other == this ) return *this;
+        decl = other.decl;
+        // xxx - this looks like a memory leak
+        actualType = maybeClone( other.actualType );
+        formalType = maybeClone( other.formalType );
+        expr = maybeClone( other.expr );
+        *inferParams = *other.inferParams;
+        return *this;
+                decl( other.decl ), declptr( maybeClone( other.declptr ) ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ) {
+}
 ParamEntry::~ParamEntry() {
+        delete declptr;
         delete actualType;
         delete formalType;
 …
 ParamEntry::ParamEntry( ParamEntry && other ) :
+                decl( other.decl ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr ), inferParams( std::move( other.inferParams ) ) {
+        other.actualType = nullptr;
+        other.formalType = nullptr;
+        other.expr = nullptr;
+                decl( other.decl ), declptr( other.declptr ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr ) {
+        new (&other) ParamEntry();
+}
 ParamEntry & ParamEntry::operator=( ParamEntry && other ) {
         if ( &other == this ) return *this;
+        delete actualType;
+        delete formalType;
+        delete expr;
+        decl = other.decl;
+        actualType = other.actualType;
+        formalType = other.formalType;
+        expr = other.expr;
+        other.actualType = nullptr;
+        other.formalType = nullptr;
+        other.expr = nullptr;
+        inferParams = std::move( other.inferParams );
+        this->~ParamEntry();
+        new (this) ParamEntry(other.decl, other.declptr, other.actualType, other.formalType, other.expr);
+        new (&other) ParamEntry();
         return *this;
+}
 …
+}
+bool ApplicationExpr::get_lvalue() const {
+        // from src/GenPoly/Lvalue.cc: isIntrinsicReference
+        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
+        if ( const DeclarationWithType * func = InitTweak::getFunction( this ) ) {
+                return func->linkage == LinkageSpec::Intrinsic && lvalueFunctions.count(func->name);
+        }
+        return false;
+}
 void ApplicationExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Application of" << std::endl << indent+1;

src/SynTree/ArrayType.cc

r7951100	rb067d9b
26	26	ArrayType::ArrayType( const Type::Qualifiers &tq, Type base, Expression dimension, bool isVarLen, bool isStatic, const std::list< Attribute * > & attributes )
27	27	: Type( tq, attributes ), base( base ), dimension( dimension ), isVarLen( isVarLen ), isStatic( isStatic ) {
28		~~base->set_lvalue( false );~~
29	28	}
30	29

src/SynTree/Attribute.cc

r7951100	rb067d9b
21	21	#include "Expression.h" // for Expression
22	22
23		Attribute::Attribute( const Attribute &other ) : name( other.name ) {
	23	Attribute::Attribute( const Attribute &other ) : BaseSyntaxNode( other ), name( other.name ) {
24	24	cloneAll( other.parameters, parameters );
25	25	}

src/SynTree/Attribute.h

r7951100	rb067d9b
50	50	Attribute * clone() const override { return new Attribute( *this ); }
51	51	virtual void accept( Visitor & v ) override { v.visit( this ); }
	52	virtual void accept( Visitor & v ) const override { v.visit( this ); }
52	53	virtual Attribute * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
53	54	virtual void print( std::ostream & os, Indenter indent = {} ) const override;

src/SynTree/BaseSyntaxNode.h

-              r7951100
+              rb067d9b
 // Author           : Thierry Delisle
 // Created On       : Tue Feb 14 07:44:20 2017
 // Last Modified By : Andrew Beach
 // Last Modified On : Thr Aug 17 13:44:00
 // Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 10 16:13:49 2019
+// Update Count     : 4
 //
 …
 #include "Common/CodeLocation.h"
 #include "Common/Indenter.h"
+#include "Common/Stats.h"
 class Visitor;
 class Mutator;
 …
 class BaseSyntaxNode {
   public:
+        static Stats::Counters::SimpleCounter* new_nodes;
         CodeLocation location;
+        BaseSyntaxNode() { ++*new_nodes; }
+        BaseSyntaxNode( const BaseSyntaxNode & o ) : location(o.location) { ++*new_nodes; }
+        BaseSyntaxNode & operator=( const BaseSyntaxNode & ) = default;
         virtual ~BaseSyntaxNode() {}
 …
         virtual BaseSyntaxNode * clone() const = 0;
         virtual void accept( Visitor & v ) = 0;
+        virtual void accept( Visitor & v ) const = 0;
         virtual BaseSyntaxNode * acceptMutator( Mutator & m ) = 0;
   /// Notes:
   /// * each node is responsible for indenting its children.
   /// * Expressions should not finish with a newline, since the expression's parent has better information.
+        /// Notes:
+        /// * each node is responsible for indenting its children.
+        /// * Expressions should not finish with a newline, since the expression's parent has better information.
         virtual void print( std::ostream & os, Indenter indent = {} ) const = 0;
-  void print( std::ostream & os, unsigned int indent ) {
-    print( os, Indenter{ Indenter::tabsize, indent });
+  }
 };

src/SynTree/BasicType.cc

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Sep 25 14:14:03 2017
 // Update Count     : 11
+// Last Modified On : Sun Aug  4 21:07:44 2019
+// Update Count     : 13
 //
 …
 bool BasicType::isInteger() const {
+        switch ( kind ) {
+          case Bool:
+          case Char:
+          case SignedChar:
+          case UnsignedChar:
+          case ShortSignedInt:
+          case ShortUnsignedInt:
+          case SignedInt:
+          case UnsignedInt:
+          case LongSignedInt:
+          case LongUnsignedInt:
+          case LongLongSignedInt:
+          case LongLongUnsignedInt:
+          case SignedInt128:
+          case UnsignedInt128:
+                return true;
+          case Float:
+          case Double:
+          case LongDouble:
+          case FloatComplex:
+          case DoubleComplex:
+          case LongDoubleComplex:
+          case FloatImaginary:
+          case DoubleImaginary:
+          case LongDoubleImaginary:
+          case Float80:
+          case Float128:
+                return false;
+          case NUMBER_OF_BASIC_TYPES:
+                assert( false );
+        } // switch
+        assert( false );
+        return false;
+        return kind <= UnsignedInt128;
+}

src/SynTree/CommaExpr.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Mon May 02 15:19:44 2016
 // Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Arg 12 16:11:00 2016
+// Update Count     : 2
 //
 …
 CommaExpr::CommaExpr( Expression *arg1, Expression *arg2 )
                 : Expression(), arg1( arg1 ), arg2( arg2 ) {
-        // xxx - result of a comma expression is never an lvalue, so should set lvalue
-        // to false on all result types. Actually doing this causes some strange things
-        // to happen in later passes (particularly, Specialize, Lvalue, and Box). This needs to be looked into.
         set_result( maybeClone( arg2->get_result() ) );
-        // get_type->set_isLvalue( false );
+}
 …
         delete arg1;
         delete arg2;
+}
+bool CommaExpr::get_lvalue() const {
+        // This is wrong by C, but the current implementation uses it.
+        // (ex: Specialize, Lvalue and Box)
+        return arg2->get_lvalue();
+}

src/SynTree/Constant.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul 14 14:50:00 2017
 // Update Count     : 29
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Feb 13 18:11:22 2019
+// Update Count     : 32
 //
 …
 #include "Constant.h"
+#include "Expression.h" // for ConstantExpr
 #include "Type.h"    // for BasicType, Type, Type::Qualifiers, PointerType
+Constant::Constant( Type * type, std::string rep, unsigned long long val ) : type( type ), rep( rep ), val( val ) {}
+Constant::Constant( Type * type, std::string rep, double val ) : type( type ), rep( rep ), val( val ) {}
+Constant::Constant( Type * type, std::string rep, std::optional<unsigned long long> ival ) : type( type ), rep( rep ), ival( ival ) {}
 Constant::Constant( const Constant &other ) : rep( other.rep ), val( other.val ) {
+Constant::Constant( const Constant &other ) : BaseSyntaxNode( other ), rep( other.rep ), ival( other.ival ) {
         type = other.type->clone();
+}
 …
+}
-Constant Constant::from_char( char c ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::Char ), std::to_string( c ), (unsigned long long int)c );
+}
 Constant Constant::from_int( int i ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), std::to_string( i ), (unsigned long long int)i );
 …
 Constant Constant::from_ulong( unsigned long i ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), std::to_string( i ), (unsigned long long int)i );
+}
-Constant Constant::from_double( double d ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ), d );
+}
 …
 unsigned long long Constant::get_ival() const {
         assertf( strict_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." );
+        return val.ival;
+}
+double Constant::get_dval() const {
+        assertf( ! strict_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve dval from integer constant." );
+        return val.dval;
+        return ival.value();
+}
 void Constant::print( std::ostream &os, Indenter ) const {
         os << "(" << rep << " " << val.ival;
+        os << "(" << rep << " " << (ival ? toString(ival.value()) : "") ;
         if ( type ) {
                 os << ": ";

src/SynTree/Constant.h

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:54:46 2017
 // Update Count     : 17
+// Last Modified On : Wed Jul 10 15:57:38 2019
+// Update Count     : 19
 //
 …
 #include <iosfwd>     // for ostream
 #include <string>     // for string
+#include <optional>   // for optional
 #include "BaseSyntaxNode.h"
 …
 class Constant : public BaseSyntaxNode {
   public:
+        Constant( Type * type, std::string rep, unsigned long long val );
+        Constant( Type * type, std::string rep, double val );
+        Constant( Type * type, std::string rep, std::optional<unsigned long long> i );
         Constant( const Constant & other );
+        Constant & operator=( const Constant & ) = default;
         virtual ~Constant();
         virtual Constant * clone() const { return new Constant( *this ); }
+        virtual Constant * clone() const override { return new Constant( *this ); }
         Type * get_type() { return type; }
 …
         void set_value( std::string newValue ) { rep = newValue; }
         unsigned long long get_ival() const;
-        double get_dval() const;
         /// generates a boolean constant of the given bool
         static Constant from_bool( bool b );
-        /// generates a char constant of the given char
-        static Constant from_char( char c );
         /// generates an integer constant of the given int
         static Constant from_int( int i );
         /// generates an integer constant of the given unsigned long int
         static Constant from_ulong( unsigned long i );
-        /// generates a floating point constant of the given double
-        static Constant from_double( double d );
         /// generates a null pointer value for the given type. void * if omitted.
         static Constant null( Type * ptrtype = nullptr );
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Constant * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = 0 ) const;
+  private:
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Constant * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = 0 ) const override;
         Type * type;
         std::string rep;
+        union Val {
+                unsigned long long ival;
+                double dval;
+                Val( unsigned long long ival ) : ival( ival ) {}
+                Val( double dval ) : dval( dval ) {}
+        } val;
+        std::optional<unsigned long long> ival;
 };

src/SynTree/DeclReplacer.cc

-              r7951100
+              rb067d9b
                         bool debug;
                 public:
+                        size_t replaced;
+                public:
                         DeclReplacer( const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
 …
                         void previsit( TypeInstType * inst );
                 };
+                /// Mutator that replaces uses of declarations with arbitrary expressions, according to the supplied mapping
+                struct ExprDeclReplacer {
+                private:
+                        const ExprMap & exprMap;
+                        bool debug;
+                public:
+                        size_t replaced;
+                public:
+                        ExprDeclReplacer( const ExprMap & exprMap, bool debug = false );
+                        // replace variable with new node from expr map
+                        Expression * postmutate( VariableExpr * varExpr );
+                };
+        }
         void replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug ) {
+        size_t replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug ) {
                 PassVisitor<DeclReplacer> replacer( declMap, typeMap, debug );
                 maybeAccept( node, replacer );
+                return replacer.pass.replaced;
+        }
         void replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug ) {
+        size_t replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug ) {
                 TypeMap typeMap;
                 replace( node, declMap, typeMap, debug );
+                return replace( node, declMap, typeMap, debug );
+        }
         void replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug ) {
+        size_t replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug ) {
                 DeclMap declMap;
+                replace( node, declMap, typeMap, debug );
+                return replace( node, declMap, typeMap, debug );
+        }
+        size_t replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool debug ) {
+                PassVisitor<ExprDeclReplacer> replacer( exprMap, debug );
+                node = maybeMutate( node, replacer );
+                return replacer.pass.replaced;
+        }
         namespace {
                 DeclReplacer::DeclReplacer( const DeclMap & declMap, const TypeMap & typeMap, bool debug ) : declMap( declMap ), typeMap( typeMap ) , debug( debug ) {}
+                DeclReplacer::DeclReplacer( const DeclMap & declMap, const TypeMap & typeMap, bool debug ) : declMap( declMap ), typeMap( typeMap ) , debug( debug ), replaced( 0 ) {}
                 // replace variable with new node from decl map
 …
                         // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are)
                         if ( declMap.count( varExpr->var ) ) {
+                                replaced++;
                                 auto replacement = declMap.at( varExpr->var );
                                 if ( debug ) {
 …
                 void DeclReplacer::previsit( TypeInstType * inst ) {
                         if ( typeMap.count( inst->baseType ) ) {
+                                replaced++;
                                 auto replacement = typeMap.at( inst->baseType );
                                 if ( debug ) {
 …
+                        }
+                }
+                ExprDeclReplacer::ExprDeclReplacer( const ExprMap & exprMap, bool debug ) : exprMap( exprMap ), debug( debug ), replaced( 0 ) {}
+                Expression * ExprDeclReplacer::postmutate( VariableExpr * varExpr ) {
+                        if ( exprMap.count( varExpr->var ) ) {
+                                replaced++;
+                                Expression * replacement = exprMap.at( varExpr->var )->clone();
+                                if ( debug ) {
+                                        std::cerr << "replacing variable reference: " << (void*)varExpr->var << " " << varExpr->var << " with " << (void*)replacement << " " << replacement << std::endl;
+                                }
+                                std::swap( varExpr->env, replacement->env );
+                                delete varExpr;
+                                return replacement;
+                        }
+                        return varExpr;
+                }
+        }
 } // namespace VarExprReplacer

src/SynTree/DeclReplacer.h

-              r7951100
+              rb067d9b
         typedef std::map< DeclarationWithType *, DeclarationWithType * > DeclMap;
         typedef std::map< TypeDecl *, TypeDecl * > TypeMap;
+        typedef std::map< DeclarationWithType *, Expression * > ExprMap;
+        void replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug = false );
+        void replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug = false );
+        void replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
+        size_t replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug = false );
+        size_t replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug = false );
+        size_t replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
+        size_t replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool debug = false);
+        template<typename T>
+        size_t replace( T *& node, const ExprMap & exprMap, bool debug = false ) {
+                if ( ! node ) return 0ul;
+                BaseSyntaxNode * arg = node;
+                size_t replaced = replace( arg, exprMap, debug );
+                node = dynamic_cast<T *>( arg );
+                assertf( node, "DeclReplacer fundamentally changed the type of its argument." );
+                return replaced;
+        }
+}

src/SynTree/Declaration.cc

-              r7951100
+              rb067d9b
 static UniqueId lastUniqueId = 0;
-typedef std::map< UniqueId, Declaration* > IdMapType;
-static IdMapType idMap;
 Declaration::Declaration( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage )
                 : name( name ), linkage( linkage ), storageClasses( scs ), uniqueId( 0 ) {
+                : name( name ), linkage( linkage ), uniqueId( 0 ), storageClasses( scs ) {
+}
 Declaration::Declaration( const Declaration &other )
         : BaseSyntaxNode( other ), name( other.name ), linkage( other.linkage ), extension( other.extension ), storageClasses( other.storageClasses ), uniqueId( other.uniqueId ) {
+        : BaseSyntaxNode( other ), name( other.name ), linkage( other.linkage ), extension( other.extension ), uniqueId( other.uniqueId ), storageClasses( other.storageClasses ) {
+}
 …
         if ( uniqueId ) return;
         uniqueId = ++lastUniqueId;
-        idMap[ uniqueId ] = this;
+}
-Declaration *Declaration::declFromId( UniqueId id ) {
-        IdMapType::const_iterator i = idMap.find( id );
-        return i != idMap.end() ? i->second : 0;
+}
-void Declaration::dumpIds( std::ostream &os ) {
-        for ( IdMapType::const_iterator i = idMap.begin(); i != idMap.end(); ++i ) {
-                os << i->first << " -> ";
-                i->second->printShort( os );
-                os << std::endl;
-        } // for
+}
 AsmDecl::AsmDecl( AsmStmt *stmt ) : Declaration( "", Type::StorageClasses(), LinkageSpec::C ), stmt( stmt ) {

src/SynTree/Declaration.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Sep  3 19:24:06 2017
 // Update Count     : 131
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr May  2 10:47:00 2019
+// Update Count     : 135
 //
 …
 #include <iosfwd>                // for ostream
 #include <list>                  // for list
+#include <unordered_map>         // for unordered_map
 #include <string>                // for string, operator+, allocator, to_string
 …
         void fixUniqueId( void );
         virtual Declaration *clone() const override = 0;
+        virtual void accept( Visitor &v ) override = 0;
+        virtual void accept( Visitor & v ) override = 0;
+        virtual void accept( Visitor & v ) const override = 0;
         virtual Declaration *acceptMutator( Mutator &m ) override = 0;
         virtual void print( std::ostream &os, Indenter indent = {} ) const override = 0;
         virtual void printShort( std::ostream &os, Indenter indent = {} ) const = 0;
+        static void dumpIds( std::ostream &os );
+        static Declaration *declFromId( UniqueId id );
+  private:
+        UniqueId uniqueId;
         Type::StorageClasses storageClasses;
+        UniqueId uniqueId;
+  private:
 };
 …
         virtual ObjectDecl *clone() const override { return new ObjectDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual DeclarationWithType *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 …
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
+        bool has_body() const { return NULL != statements; }
         static FunctionDecl * newFunction( const std::string & name, FunctionType * type, CompoundStmt * statements );
         virtual FunctionDecl *clone() const override { return new FunctionDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual DeclarationWithType *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 …
         typedef NamedTypeDecl Parent;
   public:
         enum Kind { Dtype, Ftype, Ttype };
+        enum Kind { Dtype, Ftype, Ttype, NUMBER_OF_KINDS };
         Type * init;
 …
                 TypeDecl::Kind kind;
                 bool isComplete;
                 Data() : kind( (TypeDecl::Kind)-1 ), isComplete( false ) {}
                 Data( TypeDecl * typeDecl ) : Data( typeDecl->get_kind(), typeDecl->isComplete() ) {}
                 Data( Kind kind, bool isComplete ) : kind( kind ), isComplete( isComplete ) {}
+                Data( const Data& d1, const Data& d2 )
+                : kind( d1.kind ), isComplete ( d1.isComplete || d2.isComplete ) {}
                 bool operator==(const Data & other) const { return kind == other.kind && isComplete == other.isComplete; }
                 bool operator!=(const Data & other) const { return !(*this == other);}
 …
         virtual TypeDecl *clone() const override { return new TypeDecl( *this ); }
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+  private:
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
         Kind kind;
 };
 …
         virtual TypedefDecl *clone() const override { return new TypedefDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
 …
         bool body;
         std::list< Attribute * > attributes;
+        AggregateDecl * parent = nullptr;
         AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall );
 …
         AggregateDecl * set_body( bool body ) { AggregateDecl::body = body; return this; }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override final;
         virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
   protected:
 …
         virtual StructDecl *clone() const override { return new StructDecl( *this ); }
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+  private:
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         DeclarationNode::Aggregate kind;
+  private:
         virtual std::string typeString() const override;
 };
 …
         virtual UnionDecl *clone() const override { return new UnionDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
 …
         virtual EnumDecl *clone() const override { return new EnumDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+  private:
+        std::map< std::string, long long int > enumValues;
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+  private:
+        std::unordered_map< std::string, long long int > enumValues;
         virtual std::string typeString() const override;
 };
 …
         virtual TraitDecl *clone() const override { return new TraitDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+  private:
+        virtual std::string typeString() const override;
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+  private:
+        virtual std::string typeString() const override;
+};
+class WithStmt : public Declaration {
+public:
+        std::list< Expression * > exprs;
+        Statement * stmt;
+        WithStmt( const std::list< Expression * > & exprs, Statement * stmt );
+        WithStmt( const WithStmt & other );
+        virtual ~WithStmt();
+        virtual WithStmt * clone() const override { return new WithStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Declaration * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream & os, Indenter indent = {} ) const override { print(os, indent); }
 };
 …
         virtual AsmDecl *clone() const override { return new AsmDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual AsmDecl *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 …
         virtual StaticAssertDecl * clone() const override { return new StaticAssertDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual StaticAssertDecl * acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;

src/SynTree/Expression.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Jul 25 14:15:47 2017
 // Update Count     : 54
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 15 13:43:00 2019
+// Update Count     : 64
 //
 …
 #include <iostream>                  // for ostream, operator<<, basic_ostream
 #include <list>                      // for list, _List_iterator, list<>::co...
+#include <set>                       // for set
 #include "Common/utility.h"          // for maybeClone, cloneAll, deleteAll
 …
 #include "GenPoly/Lvalue.h"
 void printInferParams( const InferredParams & inferParams, std::ostream &os, Indenter indent, int level ) {
+void printInferParams( const InferredParams & inferParams, std::ostream & os, Indenter indent, int level ) {
         if ( ! inferParams.empty() ) {
                 os << indent << "with inferred parameters " << level << ":" << std::endl;
                 for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
                         os << indent+1;
+                        Declaration::declFromId( i->second.decl )->printShort( os, indent+1 );
+                        assert(i->second.declptr);
+                        i->second.declptr->printShort( os, indent+1 );
                         os << std::endl;
                         printInferParams( *i->second.inferParams, os, indent+1, level+1 );
+                        printInferParams( i->second.expr->inferParams, os, indent+1, level+1 );
                 } // for
         } // if
 …
 Expression::Expression() : result( 0 ), env( 0 ) {}
+Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ), inferParams( other.inferParams ) {
+}
+Expression::Expression( const Expression & other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ), inferParams( other.inferParams ), resnSlots( other.resnSlots ) {}
 void Expression::spliceInferParams( Expression * other ) {
 …
                 inferParams[p.first] = std::move( p.second );
+        }
+        resnSlots.insert( resnSlots.end(), other->resnSlots.begin(), other->resnSlots.end() );
+}
 …
+}
+void Expression::print( std::ostream &os, Indenter indent ) const {
+bool Expression::get_lvalue() const {
+        return false;
+}
+void Expression::print( std::ostream & os, Indenter indent ) const {
         printInferParams( inferParams, os, indent+1, 0 );
 …
+}
 ConstantExpr::ConstantExpr( const ConstantExpr &other) : Expression( other ), constant( other.constant ) {
+ConstantExpr::ConstantExpr( const ConstantExpr & other) : Expression( other ), constant( other.constant ) {
+}
 ConstantExpr::~ConstantExpr() {}
 void ConstantExpr::print( std::ostream &os, Indenter indent ) const {
+void ConstantExpr::print( std::ostream & os, Indenter indent ) const {
         os << "constant expression " ;
         constant.print( os );
 …
+}
+VariableExpr::VariableExpr() : Expression(), var( nullptr ) {}
 VariableExpr::VariableExpr( DeclarationWithType *_var ) : Expression(), var( _var ) {
         assert( var );
         assert( var->get_type() );
         Type * type = var->get_type()->clone();
-        type->set_lvalue( true );
         // xxx - doesn't quite work yet - get different alternatives with the same cost
 …
         //      long long int value;
         //      if ( decl->valueOf( var, value ) ) {
         //              type->set_lvalue( false );
+        //              type->set_lvalue( false ); // Would have to move to get_lvalue.
         //      }
         // }
 …
+}
 VariableExpr::VariableExpr( const VariableExpr &other ) : Expression( other ), var( other.var ) {
+VariableExpr::VariableExpr( const VariableExpr & other ) : Expression( other ), var( other.var ) {
+}
 VariableExpr::~VariableExpr() {
         // don't delete the declaration, since it points somewhere else in the tree
+}
+bool VariableExpr::get_lvalue() const {
+        // It isn't always an lvalue, but it is never an rvalue.
+        return true;
+}
 …
+}
 void VariableExpr::print( std::ostream &os, Indenter indent ) const {
+void VariableExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Variable Expression: ";
         var->printShort(os, indent);
 …
+}
 SizeofExpr::SizeofExpr( Expression *expr_ ) :
+SizeofExpr::SizeofExpr( Expression * expr_ ) :
                 Expression(), expr(expr_), type(0), isType(false) {
         set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+}
 SizeofExpr::SizeofExpr( Type *type_ ) :
+SizeofExpr::SizeofExpr( Type * type_ ) :
                 Expression(), expr(0), type(type_), isType(true) {
         set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+}
 SizeofExpr::SizeofExpr( const SizeofExpr &other ) :
+SizeofExpr::SizeofExpr( const SizeofExpr & other ) :
         Expression( other ), expr( maybeClone( other.expr ) ), type( maybeClone( other.type ) ), isType( other.isType ) {
+}
 …
+}
 void SizeofExpr::print( std::ostream &os, Indenter indent) const {
+void SizeofExpr::print( std::ostream & os, Indenter indent) const {
         os << "Sizeof Expression on: ";
         if (isType) type->print(os, indent+1);
 …
+}
 AlignofExpr::AlignofExpr( Expression *expr_ ) :
+AlignofExpr::AlignofExpr( Expression * expr_ ) :
                 Expression(), expr(expr_), type(0), isType(false) {
         set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+}
 AlignofExpr::AlignofExpr( Type *type_ ) :
+AlignofExpr::AlignofExpr( Type * type_ ) :
                 Expression(), expr(0), type(type_), isType(true) {
         set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+}
 AlignofExpr::AlignofExpr( const AlignofExpr &other ) :
+AlignofExpr::AlignofExpr( const AlignofExpr & other ) :
         Expression( other ), expr( maybeClone( other.expr ) ), type( maybeClone( other.type ) ), isType( other.isType ) {
+}
 …
+}
 void AlignofExpr::print( std::ostream &os, Indenter indent) const {
+void AlignofExpr::print( std::ostream & os, Indenter indent) const {
         os << "Alignof Expression on: ";
         if (isType) type->print(os, indent+1);
 …
+}
 UntypedOffsetofExpr::UntypedOffsetofExpr( Type *type, const std::string &member ) :
+UntypedOffsetofExpr::UntypedOffsetofExpr( Type * type, const std::string & member ) :
                 Expression(), type(type), member(member) {
         assert( type );
 …
+}
 UntypedOffsetofExpr::UntypedOffsetofExpr( const UntypedOffsetofExpr &other ) :
+UntypedOffsetofExpr::UntypedOffsetofExpr( const UntypedOffsetofExpr & other ) :
         Expression( other ), type( maybeClone( other.type ) ), member( other.member ) {}
 …
+}
 void UntypedOffsetofExpr::print( std::ostream &os, Indenter indent) const {
+void UntypedOffsetofExpr::print( std::ostream & os, Indenter indent) const {
         os << "Untyped Offsetof Expression on member " << member << " of ";
         type->print(os, indent+1);
 …
+}
 OffsetofExpr::OffsetofExpr( Type *type, DeclarationWithType *member ) :
+OffsetofExpr::OffsetofExpr( Type * type, DeclarationWithType * member ) :
                 Expression(), type(type), member(member) {
         assert( member );
 …
+}
 OffsetofExpr::OffsetofExpr( const OffsetofExpr &other ) :
+OffsetofExpr::OffsetofExpr( const OffsetofExpr & other ) :
         Expression( other ), type( maybeClone( other.type ) ), member( other.member ) {}
 …
+}
 void OffsetofExpr::print( std::ostream &os, Indenter indent) const {
+void OffsetofExpr::print( std::ostream & os, Indenter indent) const {
         os << "Offsetof Expression on member " << member->name << " of ";
         type->print(os, indent+1);
 …
+}
 OffsetPackExpr::OffsetPackExpr( StructInstType *type ) : Expression(), type( type ) {
+OffsetPackExpr::OffsetPackExpr( StructInstType * type ) : Expression(), type( type ) {
         assert( type );
         set_result( new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0, false, false ) );
+}
 OffsetPackExpr::OffsetPackExpr( const OffsetPackExpr &other ) : Expression( other ), type( maybeClone( other.type ) ) {}
+OffsetPackExpr::OffsetPackExpr( const OffsetPackExpr & other ) : Expression( other ), type( maybeClone( other.type ) ) {}
 OffsetPackExpr::~OffsetPackExpr() { delete type; }
 void OffsetPackExpr::print( std::ostream &os, Indenter indent ) const {
+void OffsetPackExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Offset pack expression on ";
         type->print(os, indent+1);
 …
+}
+AttrExpr::AttrExpr( Expression *attr, Expression *expr_ ) :
+                Expression(), attr( attr ), expr(expr_), type(0), isType(false) {
+}
+AttrExpr::AttrExpr( Expression *attr, Type *type_ ) :
+                Expression(), attr( attr ), expr(0), type(type_), isType(true) {
+}
+AttrExpr::AttrExpr( const AttrExpr &other ) :
+                Expression( other ), attr( maybeClone( other.attr ) ), expr( maybeClone( other.expr ) ), type( maybeClone( other.type ) ), isType( other.isType ) {
+}
+AttrExpr::~AttrExpr() {
+        delete attr;
+        delete expr;
+        delete type;
+}
+void AttrExpr::print( std::ostream &os, Indenter indent) const {
+        os << "Attr ";
+        attr->print( os, indent+1);
+        if ( isType || expr ) {
+                os << "applied to: ";
+                if (isType) type->print(os, indent+1);
+                else expr->print(os, indent+1);
+        } // if
+        Expression::print( os, indent );
+}
+CastExpr::CastExpr( Expression *arg, Type *toType, bool isGenerated ) : Expression(), arg(arg), isGenerated( isGenerated ) {
+CastExpr::CastExpr( Expression * arg, Type * toType, bool isGenerated ) : arg(arg), isGenerated( isGenerated ) {
         set_result(toType);
+}
 CastExpr::CastExpr( Expression *arg, bool isGenerated ) : Expression(), arg(arg), isGenerated( isGenerated ) {
+CastExpr::CastExpr( Expression * arg, bool isGenerated ) : arg(arg), isGenerated( isGenerated ) {
         set_result( new VoidType( Type::Qualifiers() ) );
+}
 CastExpr::CastExpr( const CastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ), isGenerated( other.isGenerated ) {
+CastExpr::CastExpr( const CastExpr & other ) : Expression( other ), arg( maybeClone( other.arg ) ), isGenerated( other.isGenerated ) {
+}
 …
+}
+void CastExpr::print( std::ostream &os, Indenter indent ) const {
+        os << "Cast of:" << std::endl << indent+1;
+bool CastExpr::get_lvalue() const {
+        // This is actually wrong by C, but it works with our current set-up.
+        return arg->get_lvalue();
+}
+void CastExpr::print( std::ostream & os, Indenter indent ) const {
+        os << (isGenerated ? "Generated " : "Explicit ") << "Cast of:" << std::endl << indent+1;
         arg->print(os, indent+1);
         os << std::endl << indent << "... to:";
 …
+}
 KeywordCastExpr::KeywordCastExpr( Expression *arg, Target target ) : Expression(), arg(arg), target( target ) {
+}
 KeywordCastExpr::KeywordCastExpr( const KeywordCastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ), target( other.target ) {
+KeywordCastExpr::KeywordCastExpr( Expression * arg, Target target ) : Expression(), arg(arg), target( target ) {
+}
+KeywordCastExpr::KeywordCastExpr( const KeywordCastExpr & other ) : Expression( other ), arg( maybeClone( other.arg ) ), target( other.target ) {
+}
 …
+}
 void KeywordCastExpr::print( std::ostream &os, Indenter indent ) const {
+void KeywordCastExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Keyword Cast of:" << std::endl << indent+1;
         arg->print(os, indent+1);
 …
+}
 VirtualCastExpr::VirtualCastExpr( Expression *arg_, Type *toType ) : Expression(), arg(arg_) {
+VirtualCastExpr::VirtualCastExpr( Expression * arg_, Type * toType ) : Expression(), arg(arg_) {
         set_result(toType);
+}
 VirtualCastExpr::VirtualCastExpr( const VirtualCastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ) {
+VirtualCastExpr::VirtualCastExpr( const VirtualCastExpr & other ) : Expression( other ), arg( maybeClone( other.arg ) ) {
+}
 …
+}
 void VirtualCastExpr::print( std::ostream &os, Indenter indent ) const {
+void VirtualCastExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Virtual Cast of:" << std::endl << indent+1;
         arg->print(os, indent+1);
 …
+}
 UntypedMemberExpr::UntypedMemberExpr( Expression * member, Expression *aggregate ) :
+UntypedMemberExpr::UntypedMemberExpr( Expression * member, Expression * aggregate ) :
                 Expression(), member(member), aggregate(aggregate) {
         assert( aggregate );
+}
 UntypedMemberExpr::UntypedMemberExpr( const UntypedMemberExpr &other ) :
+UntypedMemberExpr::UntypedMemberExpr( const UntypedMemberExpr & other ) :
                 Expression( other ), member( maybeClone( other.member ) ), aggregate( maybeClone( other.aggregate ) ) {
+}
 …
+}
+void UntypedMemberExpr::print( std::ostream &os, Indenter indent ) const {
+bool UntypedMemberExpr::get_lvalue() const {
+        return aggregate->get_lvalue();
+}
+void UntypedMemberExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Untyped Member Expression, with field: " << std::endl << indent+1;
         member->print(os, indent+1 );
         os << indent << "... from aggregate: " << std::endl << indent+1;
+        os << indent << "... from aggregate:" << std::endl << indent+1;
         aggregate->print(os, indent+1);
         Expression::print( os, indent );
+}
 MemberExpr::MemberExpr( DeclarationWithType *member, Expression *aggregate ) :
+MemberExpr::MemberExpr( DeclarationWithType * member, Expression * aggregate ) :
                 Expression(), member(member), aggregate(aggregate) {
         assert( member );
 …
         sub.apply( res );
         result = res;
-        result->set_lvalue( true );
         result->get_qualifiers() |= aggregate->result->get_qualifiers();
+}
 MemberExpr::MemberExpr( const MemberExpr &other ) :
+MemberExpr::MemberExpr( const MemberExpr & other ) :
                 Expression( other ), member( other.member ), aggregate( maybeClone( other.aggregate ) ) {
+}
 …
+}
+void MemberExpr::print( std::ostream &os, Indenter indent ) const {
+        os << "Member Expression, with field: " << std::endl;
+bool MemberExpr::get_lvalue() const {
+        // This is actually wrong by C, but it works with our current set-up.
+        return true;
+}
+void MemberExpr::print( std::ostream & os, Indenter indent ) const {
+        os << "Member Expression, with field:" << std::endl;
         os << indent+1;
         member->print( os, indent+1 );
         os << std::endl << indent << "... from aggregate: " << std::endl << indent+1;
+        os << std::endl << indent << "... from aggregate:" << std::endl << indent+1;
         aggregate->print(os, indent + 1);
         Expression::print( os, indent );
+}
 UntypedExpr::UntypedExpr( Expression *function, const std::list<Expression *> &args ) :
+UntypedExpr::UntypedExpr( Expression * function, const std::list<Expression *> & args ) :
                 Expression(), function(function), args(args) {}
 UntypedExpr::UntypedExpr( const UntypedExpr &other ) :
+UntypedExpr::UntypedExpr( const UntypedExpr & other ) :
                 Expression( other ), function( maybeClone( other.function ) ) {
         cloneAll( other.args, args );
 …
                         // if references are still allowed in the AST, dereference returns a reference
                         ret->set_result( new ReferenceType( Type::Qualifiers(), ret->get_result() ) );
-                } else {
-                        // references have been removed, in which case dereference returns an lvalue of the base type.
-                        ret->result->set_lvalue( true );
+                }
+        }
 …
+}
+void UntypedExpr::print( std::ostream &os, Indenter indent ) const {
+        os << "Applying untyped: " << std::endl;
+bool UntypedExpr::get_lvalue() const {
+        // from src/GenPoly/Lvalue.cc: isIntrinsicReference
+        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
+        std::string fname = InitTweak::getFunctionName( const_cast< UntypedExpr * >( this ) );
+        return lvalueFunctions.count(fname);
+}
+void UntypedExpr::print( std::ostream & os, Indenter indent ) const {
+        os << "Applying untyped:" << std::endl;
         os << indent+1;
         function->print(os, indent+1);
         os << std::endl << indent << "...to: " << std::endl;
+        os << std::endl << indent << "...to:" << std::endl;
         printAll(args, os, indent+1);
         Expression::print( os, indent );
 …
+}
 NameExpr::NameExpr( const NameExpr &other ) : Expression( other ), name( other.name ) {
+NameExpr::NameExpr( const NameExpr & other ) : Expression( other ), name( other.name ) {
+}
 NameExpr::~NameExpr() {}
 void NameExpr::print( std::ostream &os, Indenter indent ) const {
+void NameExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Name: " << get_name();
         Expression::print( os, indent );
+}
 LogicalExpr::LogicalExpr( Expression *arg1_, Expression *arg2_, bool andp ) :
+LogicalExpr::LogicalExpr( Expression * arg1_, Expression * arg2_, bool andp ) :
                 Expression(), arg1(arg1_), arg2(arg2_), isAnd(andp) {
         set_result( new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
+}
 LogicalExpr::LogicalExpr( const LogicalExpr &other ) :
+LogicalExpr::LogicalExpr( const LogicalExpr & other ) :
                 Expression( other ), arg1( maybeClone( other.arg1 ) ), arg2( maybeClone( other.arg2 ) ), isAnd( other.isAnd ) {
+}
 …
+}
 void LogicalExpr::print( std::ostream &os, Indenter indent )const {
+void LogicalExpr::print( std::ostream & os, Indenter indent )const {
         os << "Short-circuited operation (" << (isAnd ? "and" : "or") << ") on: ";
         arg1->print(os);
 …
                 Expression(), arg1(arg1), arg2(arg2), arg3(arg3) {}
 ConditionalExpr::ConditionalExpr( const ConditionalExpr &other ) :
+ConditionalExpr::ConditionalExpr( const ConditionalExpr & other ) :
                 Expression( other ), arg1( maybeClone( other.arg1 ) ), arg2( maybeClone( other.arg2 ) ), arg3( maybeClone( other.arg3 ) ) {
+}
 …
+}
+void ConditionalExpr::print( std::ostream &os, Indenter indent ) const {
+bool ConditionalExpr::get_lvalue() const {
+        return false;
+}
+void ConditionalExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Conditional expression on: " << std::endl << indent+1;
         arg1->print( os, indent+1 );
 …
 void AsmExpr::print( std::ostream &os, Indenter indent ) const {
+void AsmExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Asm Expression: " << std::endl;
         if ( inout ) inout->print( os, indent+1 );
 …
         assert( callExpr );
         assert( callExpr->result );
         set_result( callExpr->get_result()->clone() );
+        set_result( callExpr->result->clone() );
+}
 ImplicitCopyCtorExpr::ImplicitCopyCtorExpr( const ImplicitCopyCtorExpr & other ) : Expression( other ), callExpr( maybeClone( other.callExpr ) ) {
-        cloneAll( other.tempDecls, tempDecls );
-        cloneAll( other.returnDecls, returnDecls );
-        cloneAll( other.dtors, dtors );
+}
 …
         set_env( nullptr ); // ImplicitCopyCtorExpr does not take ownership of an environment
         delete callExpr;
+        deleteAll( tempDecls );
+        deleteAll( returnDecls );
+        deleteAll( dtors );
+}
+void ImplicitCopyCtorExpr::print( std::ostream &os, Indenter indent ) const {
+}
+void ImplicitCopyCtorExpr::print( std::ostream & os, Indenter indent ) const {
         os <<  "Implicit Copy Constructor Expression: " << std::endl << indent+1;
         callExpr->print( os, indent+1 );
-        os << std::endl << indent << "... with temporaries:" << std::endl;
-        printAll( tempDecls, os, indent+1 );
-        os << std::endl << indent << "... with return temporaries:" << std::endl;
-        printAll( returnDecls, os, indent+1 );
-        Expression::print( os, indent );
+}
 …
+}
+void ConstructorExpr::print( std::ostream &os, Indenter indent ) const {
+bool ConstructorExpr::get_lvalue() const {
+        return false;
+}
+void ConstructorExpr::print( std::ostream & os, Indenter indent ) const {
         os <<  "Constructor Expression: " << std::endl << indent+1;
         callExpr->print( os, indent + 2 );
 …
 CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : initializer( initializer ) {
         assert( type && initializer );
-        type->set_lvalue( true );
         set_result( type );
+}
 CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr &other ) : Expression( other ), initializer( other.initializer->clone() ) {}
+CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr & other ) : Expression( other ), initializer( other.initializer->clone() ) {}
 CompoundLiteralExpr::~CompoundLiteralExpr() {
 …
+}
+void CompoundLiteralExpr::print( std::ostream &os, Indenter indent ) const {
+bool CompoundLiteralExpr::get_lvalue() const {
+        return true;
+}
+void CompoundLiteralExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Compound Literal Expression: " << std::endl << indent+1;
         result->print( os, indent+1 );
 …
+}
 RangeExpr::RangeExpr( Expression *low, Expression *high ) : low( low ), high( high ) {}
 RangeExpr::RangeExpr( const RangeExpr &other ) : Expression( other ), low( other.low->clone() ), high( other.high->clone() ) {}
 void RangeExpr::print( std::ostream &os, Indenter indent ) const {
+RangeExpr::RangeExpr( Expression * low, Expression * high ) : low( low ), high( high ) {}
+RangeExpr::RangeExpr( const RangeExpr & other ) : Expression( other ), low( other.low->clone() ), high( other.high->clone() ) {}
+void RangeExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Range Expression: ";
         low->print( os, indent );
 …
+}
 StmtExpr::StmtExpr( CompoundStmt *statements ) : statements( statements ) {
+StmtExpr::StmtExpr( CompoundStmt * statements ) : statements( statements ) {
         computeResult();
+}
 StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {
+StmtExpr::StmtExpr( const StmtExpr & other ) : Expression( other ), statements( other.statements->clone() ), resultExpr( other.resultExpr ) {
         cloneAll( other.returnDecls, returnDecls );
         cloneAll( other.dtors, dtors );
 …
+        }
+}
+void StmtExpr::print( std::ostream &os, Indenter indent ) const {
+bool StmtExpr::get_lvalue() const {
+        return false;
+}
+void StmtExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Statement Expression: " << std::endl << indent+1;
         statements->print( os, indent+1 );
 …
 long long UniqueExpr::count = 0;
 UniqueExpr::UniqueExpr( Expression *expr, long long idVal ) : expr( expr ), object( nullptr ), var( nullptr ), id( idVal ) {
+UniqueExpr::UniqueExpr( Expression * expr, long long idVal ) : expr( expr ), object( nullptr ), var( nullptr ), id( idVal ) {
         assert( expr );
         assert( count != -1 );
 …
+        }
+}
 UniqueExpr::UniqueExpr( const UniqueExpr &other ) : Expression( other ), expr( maybeClone( other.expr ) ), object( maybeClone( other.object ) ), var( maybeClone( other.var ) ), id( other.id ) {
+UniqueExpr::UniqueExpr( const UniqueExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), object( maybeClone( other.object ) ), var( maybeClone( other.var ) ), id( other.id ) {
+}
 UniqueExpr::~UniqueExpr() {
 …
         delete var;
+}
 void UniqueExpr::print( std::ostream &os, Indenter indent ) const {
+void UniqueExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Unique Expression with id:" << id << std::endl << indent+1;
         expr->print( os, indent+1 );
 …
+}
 DeletedExpr::DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt ) : expr( expr ), deleteStmt( deleteStmt ) {
+DeletedExpr::DeletedExpr( Expression * expr, Declaration * deleteStmt ) : expr( expr ), deleteStmt( deleteStmt ) {
         assert( expr->result );
         result = expr->result->clone();
 …
         os << std::endl << indent+1 << "... deleted by: ";
         deleteStmt->print( os, indent+1 );
+}
+DefaultArgExpr::DefaultArgExpr( Expression * expr ) : expr( expr ) {
+        assert( expr->result );
+        result = expr->result->clone();
+}
+DefaultArgExpr::DefaultArgExpr( const DefaultArgExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ) {}
+DefaultArgExpr::~DefaultArgExpr() {
+        delete expr;
+}
+void DefaultArgExpr::print( std::ostream & os, Indenter indent ) const {
+        os << "Default Argument Expression" << std::endl << indent+1;
+        expr->print( os, indent+1 );
+}

src/SynTree/Expression.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Sep  3 19:23:46 2017
 // Update Count     : 48
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 15 13:46:00 2019
+// Update Count     : 54
 //
 …
 #include <memory>                 // for allocator, unique_ptr
 #include <string>                 // for string
+#include <vector>                 // for vector
 #include "BaseSyntaxNode.h"       // for BaseSyntaxNode
 …
 /// but subject to decay-to-pointer and type parameter renaming
 struct ParamEntry {
         ParamEntry(): decl( 0 ), actualType( 0 ), formalType( 0 ), expr( 0 ), inferParams( new InferredParams ) {}
         ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr ), inferParams( new InferredParams ) {}
+        ParamEntry(): decl( 0 ), declptr( nullptr ), actualType( nullptr ), formalType( nullptr ), expr( nullptr ) {}
+        ParamEntry( UniqueId decl, Declaration * declptr, Type * actualType, Type * formalType, Expression* expr );
         ParamEntry( const ParamEntry & other );
         ParamEntry( ParamEntry && other );
         ~ParamEntry();
-        ParamEntry & operator=( const ParamEntry & other );
         ParamEntry & operator=( ParamEntry && other );
+        UniqueId decl;
+        Type * actualType;
+        Type * formalType;
+        UniqueId const decl;
+        Declaration * const declptr;
+        Type * const actualType;
+        Type * const formalType;
         Expression * expr;
-        std::unique_ptr< InferredParams > inferParams;
 };
 …
         TypeSubstitution * env;
         bool extension = false;
+        InferredParams inferParams;
+        InferredParams inferParams;       ///< Post-resolution inferred parameter slots
+        std::vector<UniqueId> resnSlots;  ///< Pre-resolution inferred parameter slots
+        // xxx - should turn inferParams+resnSlots into a union to save some memory
         Expression();
 …
         const Type * get_result() const { return result; }
         void set_result( Type * newValue ) { result = newValue; }
+        virtual bool get_lvalue() const;
         TypeSubstitution * get_env() const { return env; }
 …
         Expression * set_extension( bool exten ) { extension = exten; return this; }
-        InferredParams & get_inferParams() { return inferParams; }
         // move other's inferParams to this
         void spliceInferParams( Expression * other );
 …
         virtual Expression * clone() const override = 0;
         virtual void accept( Visitor & v ) override = 0;
+        virtual void accept( Visitor & v ) const override = 0;
         virtual Expression * acceptMutator( Mutator & m ) override = 0;
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual ~ApplicationExpr();
+        bool get_lvalue() const final;
         Expression * get_function() const { return function; }
         void set_function( Expression * newValue ) { function = newValue; }
         std::list<Expression *>& get_args() { return args; }
+        virtual ApplicationExpr * clone() const { return new ApplicationExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual ApplicationExpr * clone() const override { return new ApplicationExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         virtual ~UntypedExpr();
+        bool get_lvalue() const final;
         Expression * get_function() const { return function; }
         void set_function( Expression * newValue ) { function = newValue; }
 …
         static UntypedExpr * createAssign( Expression * arg1, Expression * arg2 );
+        virtual UntypedExpr * clone() const { return new UntypedExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual UntypedExpr * clone() const override { return new UntypedExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_name( std::string newValue ) { name = newValue; }
+        virtual NameExpr * clone() const { return new NameExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual NameExpr * clone() const override { return new NameExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_arg(Expression * newValue ) { arg = newValue; }
+        virtual AddressExpr * clone() const { return new AddressExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual AddressExpr * clone() const override { return new AddressExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         virtual ~LabelAddressExpr();
+        virtual LabelAddressExpr * clone() const { return new LabelAddressExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual LabelAddressExpr * clone() const override { return new LabelAddressExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
   public:
         Expression * arg;
         bool isGenerated = true; // whether this cast appeared in the source program
+        bool isGenerated = true; // cast generated implicitly by code generation or explicit in program
         CastExpr( Expression * arg, bool isGenerated = true );
 …
         virtual ~CastExpr();
+        bool get_lvalue() const final;
         Expression * get_arg() const { return arg; }
         void set_arg( Expression * newValue ) { arg = newValue; }
+        virtual CastExpr * clone() const { return new CastExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual CastExpr * clone() const override { return new CastExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         const std::string & targetString() const;
+        virtual KeywordCastExpr * clone() const { return new KeywordCastExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual KeywordCastExpr * clone() const override { return new KeywordCastExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_arg( Expression * newValue ) { arg = newValue; }
+        virtual VirtualCastExpr * clone() const { return new VirtualCastExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual VirtualCastExpr * clone() const override { return new VirtualCastExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         UntypedMemberExpr( const UntypedMemberExpr & other );
         virtual ~UntypedMemberExpr();
+        bool get_lvalue() const final;
         Expression * get_member() const { return member; }
 …
         void set_aggregate( Expression * newValue ) { aggregate = newValue; }
+        virtual UntypedMemberExpr * clone() const { return new UntypedMemberExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual UntypedMemberExpr * clone() const override { return new UntypedMemberExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         MemberExpr( const MemberExpr & other );
         virtual ~MemberExpr();
+        bool get_lvalue() const final;
         DeclarationWithType * get_member() const { return member; }
 …
         void set_aggregate( Expression * newValue ) { aggregate = newValue; }
+        virtual MemberExpr * clone() const { return new MemberExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual MemberExpr * clone() const override { return new MemberExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         DeclarationWithType * var;
+        VariableExpr();
         VariableExpr( DeclarationWithType * var );
         VariableExpr( const VariableExpr & other );
         virtual ~VariableExpr();
+        bool get_lvalue() const final;
         DeclarationWithType * get_var() const { return var; }
         void set_var( DeclarationWithType * newValue ) { var = newValue; }
 …
         static VariableExpr * functionPointer( FunctionDecl * decl );
+        virtual VariableExpr * clone() const { return new VariableExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual VariableExpr * clone() const override { return new VariableExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         long long int intValue() const;
+        virtual ConstantExpr * clone() const { return new ConstantExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual ConstantExpr * clone() const override { return new ConstantExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_isType( bool newValue ) { isType = newValue; }
+        virtual SizeofExpr * clone() const { return new SizeofExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual SizeofExpr * clone() const override { return new SizeofExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_isType( bool newValue ) { isType = newValue; }
+        virtual AlignofExpr * clone() const { return new AlignofExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual AlignofExpr * clone() const override { return new AlignofExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_type( Type * newValue ) { type = newValue; }
+        virtual UntypedOffsetofExpr * clone() const { return new UntypedOffsetofExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual UntypedOffsetofExpr * clone() const override { return new UntypedOffsetofExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_member( DeclarationWithType * newValue ) { member = newValue; }
+        virtual OffsetofExpr * clone() const { return new OffsetofExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual OffsetofExpr * clone() const override { return new OffsetofExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_type( StructInstType * newValue ) { type = newValue; }
+        virtual OffsetPackExpr * clone() const { return new OffsetPackExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+};
+/// AttrExpr represents an @attribute expression (like sizeof, but user-defined)
+class AttrExpr : public Expression {
+  public:
+        Expression * attr;
+        Expression * expr;
+        Type * type;
+        bool isType;
+        AttrExpr(Expression * attr, Expression * expr );
+        AttrExpr( const AttrExpr & other );
+        AttrExpr( Expression * attr, Type * type );
+        virtual ~AttrExpr();
+        Expression * get_attr() const { return attr; }
+        void set_attr( Expression * newValue ) { attr = newValue; }
+        Expression * get_expr() const { return expr; }
+        void set_expr( Expression * newValue ) { expr = newValue; }
+        Type * get_type() const { return type; }
+        void set_type( Type * newValue ) { type = newValue; }
+        bool get_isType() const { return isType; }
+        void set_isType( bool newValue ) { isType = newValue; }
+        virtual AttrExpr * clone() const { return new AttrExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual OffsetPackExpr * clone() const override { return new OffsetPackExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_arg2( Expression * newValue ) { arg2 = newValue; }
+        virtual LogicalExpr * clone() const { return new LogicalExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual LogicalExpr * clone() const override { return new LogicalExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
   private:
 …
         ConditionalExpr( const ConditionalExpr & other );
         virtual ~ConditionalExpr();
+        bool get_lvalue() const final;
         Expression * get_arg1() const { return arg1; }
 …
         void set_arg3( Expression * newValue ) { arg3 = newValue; }
+        virtual ConditionalExpr * clone() const { return new ConditionalExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual ConditionalExpr * clone() const override { return new ConditionalExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         CommaExpr( const CommaExpr & other );
         virtual ~CommaExpr();
+        bool get_lvalue() const final;
         Expression * get_arg1() const { return arg1; }
 …
         void set_arg2( Expression * newValue ) { arg2 = newValue; }
+        virtual CommaExpr * clone() const { return new CommaExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual CommaExpr * clone() const override { return new CommaExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_type( Type * newValue ) { type = newValue; }
+        virtual TypeExpr * clone() const { return new TypeExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual TypeExpr * clone() const override { return new TypeExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         void set_operand( Expression * newValue ) { operand = newValue; }
+        virtual AsmExpr * clone() const { return new AsmExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual AsmExpr * clone() const override { return new AsmExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
         // https://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Machine-Constraints.html#Machine-Constraints
 …
 class ImplicitCopyCtorExpr : public Expression {
 public:
+        ApplicationExpr * callExpr;
+        std::list< ObjectDecl * > tempDecls;
+        std::list< ObjectDecl * > returnDecls;
+        std::list< Expression * > dtors;
+        ApplicationExpr * callExpr = nullptr;
         ImplicitCopyCtorExpr( ApplicationExpr * callExpr );
 …
         virtual ~ImplicitCopyCtorExpr();
+        ApplicationExpr * get_callExpr() const { return callExpr; }
+        void set_callExpr( ApplicationExpr * newValue ) { callExpr = newValue; }
+        std::list< ObjectDecl * > & get_tempDecls() { return tempDecls; }
+        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
+        std::list< Expression * > & get_dtors() { return dtors; }
+        virtual ImplicitCopyCtorExpr * clone() const { return new ImplicitCopyCtorExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual ImplicitCopyCtorExpr * clone() const override { return new ImplicitCopyCtorExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         ~ConstructorExpr();
+        bool get_lvalue() const final;
         Expression * get_callExpr() const { return callExpr; }
         void set_callExpr( Expression * newValue ) { callExpr = newValue; }
+        virtual ConstructorExpr * clone() const { return new ConstructorExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual ConstructorExpr * clone() const override { return new ConstructorExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         virtual ~CompoundLiteralExpr();
+        bool get_lvalue() const final;
         Initializer * get_initializer() const { return initializer; }
         void set_initializer( Initializer * i ) { initializer = i; }
+        virtual CompoundLiteralExpr * clone() const { return new CompoundLiteralExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual CompoundLiteralExpr * clone() const override { return new CompoundLiteralExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         RangeExpr * set_high( Expression * high ) { RangeExpr::high = high; return this; }
+        virtual RangeExpr * clone() const { return new RangeExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual RangeExpr * clone() const override { return new RangeExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         std::list<Expression*>& get_exprs() { return exprs; }
+        virtual UntypedTupleExpr * clone() const { return new UntypedTupleExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual UntypedTupleExpr * clone() const override { return new UntypedTupleExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         virtual ~TupleExpr();
+        bool get_lvalue() const final;
         std::list<Expression*>& get_exprs() { return exprs; }
+        virtual TupleExpr * clone() const { return new TupleExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual TupleExpr * clone() const override { return new TupleExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         TupleIndexExpr( const TupleIndexExpr & other );
         virtual ~TupleIndexExpr();
+        bool get_lvalue() const final;
         Expression * get_tuple() const { return tuple; }
 …
         TupleIndexExpr * set_index( unsigned int newValue ) { index = newValue; return this; }
+        virtual TupleIndexExpr * clone() const { return new TupleIndexExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual TupleIndexExpr * clone() const override { return new TupleIndexExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         StmtExpr * get_stmtExpr() const { return stmtExpr; }
+        virtual TupleAssignExpr * clone() const { return new TupleAssignExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual TupleAssignExpr * clone() const override { return new TupleAssignExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+        friend class ConverterNewToOld;
+  private:
+    TupleAssignExpr( StmtExpr * stmts );
 };
 …
         std::list< Expression * > dtors; // destructor(s) for return variable(s)
+        // readonly
+        ExprStmt * resultExpr = nullptr;
         StmtExpr( CompoundStmt * statements );
         StmtExpr( const StmtExpr & other );
         virtual ~StmtExpr();
+        bool get_lvalue() const final;
         CompoundStmt * get_statements() const { return statements; }
         StmtExpr * set_statements( CompoundStmt * newValue ) { statements = newValue; return this; }
 …
         std::list< Expression * > & get_dtors() { return dtors; }
+        virtual StmtExpr * clone() const { return new StmtExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual StmtExpr * clone() const override { return new StmtExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         int get_id() const { return id; }
+        virtual UniqueExpr * clone() const { return new UniqueExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual UniqueExpr * clone() const override { return new UniqueExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 private:
 …
         std::list<InitAlternative> & get_initAlts() { return initAlts; }
+        virtual UntypedInitExpr * clone() const { return new UntypedInitExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual UntypedInitExpr * clone() const override { return new UntypedInitExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         InitExpr * set_designation( Designation * newValue ) { designation = newValue; return this; }
+        virtual InitExpr * clone() const { return new InitExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual InitExpr * clone() const override { return new InitExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
 public:
         Expression * expr;
         BaseSyntaxNode * deleteStmt;
         DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt );
+        Declaration * deleteStmt;
+        DeletedExpr( Expression * expr, Declaration * deleteStmt );
         DeletedExpr( const DeletedExpr & other );
         ~DeletedExpr();
+        virtual DeletedExpr * clone() const { return new DeletedExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual DeletedExpr * clone() const override { return new DeletedExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+/// expression wrapping the use of a default argument - should never make it past the resolver.
+class DefaultArgExpr : public Expression {
+public:
+        Expression * expr;
+        DefaultArgExpr( Expression * expr );
+        DefaultArgExpr( const DefaultArgExpr & other );
+        ~DefaultArgExpr();
+        virtual DefaultArgExpr * clone() const override { return new DefaultArgExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         virtual ~GenericExpr();
+        virtual GenericExpr * clone() const { return new GenericExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual GenericExpr * clone() const override { return new GenericExpr( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };

src/SynTree/FunctionDecl.cc

r7951100	rb067d9b
87	87
88	88	if ( statements ) {
89		os << indent << "... with body " << endl << indent+1;
	89	os << indent << "... with body" << endl << indent+1;
90	90	statements->print( os, indent+1 );
91	91	} // if

src/SynTree/FunctionType.cc

-              r7951100
+              rb067d9b
                 os << indent+1 << "accepting unspecified arguments" << endl;
         } // if
         os << indent << "... returning ";
+        os << indent << "... returning";
         if ( returnVals.empty() ) {
                 os << "nothing " << endl;
+                os << " nothing" << endl;
         } else {
                 os << endl;

src/SynTree/Initializer.h

-              r7951100
+              rb067d9b
         virtual Designation * clone() const override { return new Designation( *this ); };
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Designation * acceptMutator( Mutator &m ) override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 …
         virtual ~Initializer();
         bool get_maybeConstructed() { return maybeConstructed; }
+        bool get_maybeConstructed() const { return maybeConstructed; }
         virtual Initializer *clone() const override = 0;
+        virtual void accept( Visitor &v ) override = 0;
+        virtual void accept( Visitor & v ) override = 0;
+        virtual void accept( Visitor & v ) const override = 0;
         virtual Initializer *acceptMutator( Mutator &m ) override = 0;
         virtual void print( std::ostream &os, Indenter indent = {} ) const override = 0;
 …
         virtual SingleInit *clone() const override { return new SingleInit( *this); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 …
         virtual ListInit *clone() const override { return new ListInit( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 …
         ConstructorInit *clone() const override { return new ConstructorInit( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;

src/SynTree/Label.h

r7951100	rb067d9b
35	35	operator std::string() const { return name; }
36	36	bool empty() { return name.empty(); }
37		private:
	37
38	38	std::string name;
39	39	Statement * labelled;

src/SynTree/Mutator.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Mon Jul 24 16:31:00 2017
 // Update Count     : 16
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:37:46 2019
+// Update Count     : 17
 //
 #pragma once
 …
         virtual Statement * mutate( FinallyStmt * catchStmt ) = 0;
         virtual Statement * mutate( WaitForStmt * waitforStmt ) = 0;
         virtual Statement * mutate( WithStmt * withStmt ) = 0;
+        virtual Declaration * mutate( WithStmt * withStmt ) = 0;
         virtual NullStmt * mutate( NullStmt * nullStmt ) = 0;
         virtual Statement * mutate( DeclStmt * declStmt ) = 0;
 …
         virtual Expression * mutate( OffsetofExpr * offsetofExpr ) = 0;
         virtual Expression * mutate( OffsetPackExpr * offsetPackExpr ) = 0;
-        virtual Expression * mutate( AttrExpr * attrExpr ) = 0;
         virtual Expression * mutate( LogicalExpr * logicalExpr ) = 0;
         virtual Expression * mutate( ConditionalExpr * conditionalExpr ) = 0;
 …
         virtual Expression * mutate( InitExpr  * initExpr ) = 0;
         virtual Expression * mutate( DeletedExpr * delExpr ) = 0;
+        virtual Expression * mutate( DefaultArgExpr * argExpr ) = 0;
         virtual Expression * mutate( GenericExpr * genExpr ) = 0;
 …
         virtual Type * mutate( ArrayType * arrayType ) = 0;
         virtual Type * mutate( ReferenceType * refType ) = 0;
+        virtual Type * mutate( QualifiedType * qualType ) = 0;
         virtual Type * mutate( FunctionType * functionType ) = 0;
         virtual Type * mutate( StructInstType * aggregateUseType ) = 0;
 …
         virtual Type * mutate( ZeroType * zeroType ) = 0;
         virtual Type * mutate( OneType * oneType ) = 0;
+        virtual Type * mutate( GlobalScopeType * globalType ) = 0;
         virtual Designation * mutate( Designation * designation ) = 0 ;
 …
         virtual Initializer * mutate( ListInit * listInit ) = 0 ;
         virtual Initializer * mutate( ConstructorInit * ctorInit ) = 0 ;
-        virtual Subrange * mutate( Subrange * subrange ) = 0;
         virtual Constant * mutate( Constant * constant ) = 0;

src/SynTree/ObjectDecl.cc

r7951100	rb067d9b
66	66
67	67	if ( ! attributes.empty() ) {
68		os << std::endl << indent << "... with attributes: " << std::endl;
	68	os << std::endl << indent << "... with attributes:" << std::endl;
69	69	printAll( attributes, os, indent+1 );
70	70	}

src/SynTree/ReferenceToType.cc

-              r7951100
+              rb067d9b
 bool StructInstType::isComplete() const { return baseStruct ? baseStruct->has_body() : false; }
 AggregateDecl * StructInstType::getAggr() { return baseStruct; }
+AggregateDecl * StructInstType::getAggr() const { return baseStruct; }
 TypeSubstitution StructInstType::genericSubstitution() const {
 …
         else {
                 Type::print( os, indent );
                 os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body();
                 if ( ! parameters.empty() ) {
                         os << endl << indent << "... with parameters" << endl;
 …
 bool UnionInstType::isComplete() const { return baseUnion ? baseUnion->has_body() : false; }
 AggregateDecl * UnionInstType::getAggr() { return baseUnion; }
+AggregateDecl * UnionInstType::getAggr() const { return baseUnion; }
 TypeSubstitution UnionInstType::genericSubstitution() const {
 …
         else {
                 Type::print( os, indent );
                 os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body();
                 if ( ! parameters.empty() ) {
                         os << endl << indent << "... with parameters" << endl;
 …
 bool EnumInstType::isComplete() const { return baseEnum ? baseEnum->has_body() : false; }
+AggregateDecl * EnumInstType::getAggr() const { return baseEnum; }
 void EnumInstType::print( std::ostream &os, Indenter indent ) const {
         using std::endl;
 …
         else {
                 Type::print( os, indent );
                 os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body();
         } // if
+}
 …
         Type::print( os, indent );
         os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type) ";
+        os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type)";
         if ( ! parameters.empty() ) {
                 os << endl << indent << "... with parameters" << endl;

src/SynTree/Statement.cc

-              r7951100
+              rb067d9b
 WithStmt::WithStmt( const std::list< Expression * > & exprs, Statement * stmt ) : Statement(), exprs( exprs ), stmt( stmt ) {}
 WithStmt::WithStmt( const WithStmt & other ) : Statement( other ), stmt( maybeClone( other.stmt ) ) {
+WithStmt::WithStmt( const std::list< Expression * > & exprs, Statement * stmt ) : Declaration("", noStorageClasses, LinkageSpec::Cforall), exprs( exprs ), stmt( stmt ) {}
+WithStmt::WithStmt( const WithStmt & other ) : Declaration( other ), stmt( maybeClone( other.stmt ) ) {
         cloneAll( other.exprs, exprs );
+}

src/SynTree/Statement.h

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 14:53:02 2018
 // Update Count     : 78
+// Last Modified On : Tue Mar 12 09:01:53 2019
+// Update Count     : 83
 //
 …
 #include <list>                    // for list
 #include <memory>                  // for allocator
 #include <vector>                        // for vector
+#include <vector>                                  // for vector
 #include "BaseSyntaxNode.h"        // for BaseSyntaxNode
 …
         const std::list<Label> & get_labels() const { return labels; }
+        virtual Statement *clone() const override = 0;
+        virtual void accept( Visitor &v ) override = 0;
+        virtual Statement *acceptMutator( Mutator &m ) override = 0;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual Statement * clone() const override = 0;
+        virtual void accept( Visitor & v ) override = 0;
+        virtual void accept( Visitor & v ) const override = 0;
+        virtual Statement * acceptMutator( Mutator & m ) override = 0;
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         CompoundStmt();
         CompoundStmt( std::list<Statement *> stmts );
         CompoundStmt( const CompoundStmt &other );
+        CompoundStmt( const CompoundStmt & other );
         virtual ~CompoundStmt();
 …
         void push_front( Statement * stmt ) { kids.push_front( stmt ); }
+        virtual CompoundStmt *clone() const override { return new CompoundStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual CompoundStmt *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual CompoundStmt * clone() const override { return new CompoundStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual CompoundStmt * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         NullStmt( const std::list<Label> & labels = {} );
+        virtual NullStmt *clone() const override { return new NullStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual NullStmt *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual NullStmt * clone() const override { return new NullStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual NullStmt * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 class ExprStmt : public Statement {
   public:
         Expression *expr;
         ExprStmt( Expression *expr );
         ExprStmt( const ExprStmt &other );
+        Expression * expr;
+        ExprStmt( Expression * expr );
+        ExprStmt( const ExprStmt & other );
         virtual ~ExprStmt();
+        Expression *get_expr() { return expr; }
+        void set_expr( Expression *newValue ) { expr = newValue; }
+        virtual ExprStmt *clone() const override { return new ExprStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        Expression * get_expr() { return expr; }
+        void set_expr( Expression * newValue ) { expr = newValue; }
+        virtual ExprStmt * clone() const override { return new ExprStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
   public:
         bool voltile;
         Expression *instruction;
+        Expression * instruction;
         std::list<Expression *> output, input;
         std::list<ConstantExpr *> clobber;
         std::list<Label> gotolabels;
         AsmStmt( bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
         AsmStmt( const AsmStmt &other );
+        AsmStmt( bool voltile, Expression * instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
+        AsmStmt( const AsmStmt & other );
         virtual ~AsmStmt();
 …
         void set_output( const std::list<Expression *> & newValue ) { output = newValue; }
         std::list<Expression *> & get_input() { return input; }
         void set_input( const std::list<Expression *> &newValue ) { input = newValue; }
+        void set_input( const std::list<Expression *> & newValue ) { input = newValue; }
         std::list<ConstantExpr *> & get_clobber() { return clobber; }
         void set_clobber( const std::list<ConstantExpr *> &newValue ) { clobber = newValue; }
+        void set_clobber( const std::list<ConstantExpr *> & newValue ) { clobber = newValue; }
         std::list<Label> & get_gotolabels() { return gotolabels; }
+        void set_gotolabels( const std::list<Label> &newValue ) { gotolabels = newValue; }
+        virtual AsmStmt * clone() const { return new AsmStmt( *this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        void set_gotolabels( const std::list<Label> & newValue ) { gotolabels = newValue; }
+        virtual AsmStmt * clone() const override { return new AsmStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         virtual ~DirectiveStmt(){}
+        virtual DirectiveStmt * clone() const { return new DirectiveStmt( *this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+        virtual DirectiveStmt * clone() const override { return new DirectiveStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 class IfStmt : public Statement {
   public:
         Expression *condition;
         Statement *thenPart;
         Statement *elsePart;
+        Expression * condition;
+        Statement * thenPart;
+        Statement * elsePart;
         std::list<Statement *> initialization;
         IfStmt( Expression *condition, Statement *thenPart, Statement *elsePart,
+        IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart,
                         std::list<Statement *> initialization = std::list<Statement *>() );
         IfStmt( const IfStmt &other );
+        IfStmt( const IfStmt & other );
         virtual ~IfStmt();
+        std::list<Statement *> &get_initialization() { return initialization; }
+        Expression *get_condition() { return condition; }
+        void set_condition( Expression *newValue ) { condition = newValue; }
+        Statement *get_thenPart() { return thenPart; }
+        void set_thenPart( Statement *newValue ) { thenPart = newValue; }
+        Statement *get_elsePart() { return elsePart; }
+        void set_elsePart( Statement *newValue ) { elsePart = newValue; }
+        virtual IfStmt *clone() const override { return new IfStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        std::list<Statement *> & get_initialization() { return initialization; }
+        Expression * get_condition() { return condition; }
+        void set_condition( Expression * newValue ) { condition = newValue; }
+        Statement * get_thenPart() { return thenPart; }
+        void set_thenPart( Statement * newValue ) { thenPart = newValue; }
+        Statement * get_elsePart() { return elsePart; }
+        void set_elsePart( Statement * newValue ) { elsePart = newValue; }
+        virtual IfStmt * clone() const override { return new IfStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         std::list<Statement *> statements;
         SwitchStmt( Expression *condition, const std::list<Statement *> &statements );
         SwitchStmt( const SwitchStmt &other );
+        SwitchStmt( Expression * condition, const std::list<Statement *> & statements );
+        SwitchStmt( const SwitchStmt & other );
         virtual ~SwitchStmt();
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }
+        Expression * get_condition() { return condition; }
+        void set_condition( Expression * newValue ) { condition = newValue; }
         std::list<Statement *> & get_statements() { return statements; }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual SwitchStmt *clone() const override { return new SwitchStmt( *this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual SwitchStmt * clone() const override { return new SwitchStmt( *this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         std::list<Statement *> stmts;
         CaseStmt( Expression *conditions, const std::list<Statement *> &stmts, bool isdef = false ) throw (SemanticErrorException);
         CaseStmt( const CaseStmt &other );
+        CaseStmt( Expression * conditions, const std::list<Statement *> & stmts, bool isdef = false ) throw (SemanticErrorException);
+        CaseStmt( const CaseStmt & other );
         virtual ~CaseStmt();
 …
         void set_default(bool b) { _isDefault = b; }
+        Expression * &get_condition() { return condition; }
+        void set_condition( Expression *newValue ) { condition = newValue; }
+        std::list<Statement *> &get_statements() { return stmts; }
+        void set_statements( std::list<Statement *> &newValue ) { stmts = newValue; }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual CaseStmt *clone() const override { return new CaseStmt( *this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        Expression * & get_condition() { return condition; }
+        void set_condition( Expression * newValue ) { condition = newValue; }
+        std::list<Statement *> & get_statements() { return stmts; }
+        void set_statements( std::list<Statement *> & newValue ) { stmts = newValue; }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual CaseStmt * clone() const override { return new CaseStmt( *this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
   private:
         bool _isDefault;
 …
 class WhileStmt : public Statement {
   public:
         Expression *condition;
         Statement *body;
+        Expression * condition;
+        Statement * body;
         std::list<Statement *> initialization;
         bool isDoWhile;
+        WhileStmt( Expression *condition,
+               Statement *body, std::list<Statement *> & initialization, bool isDoWhile = false );
+        WhileStmt( const WhileStmt &other );
+        WhileStmt( Expression * condition, Statement * body, std::list<Statement *> & initialization, bool isDoWhile = false );
+        WhileStmt( const WhileStmt & other );
         virtual ~WhileStmt();
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }
         Statement *get_body() { return body; }
         void set_body( Statement *newValue ) { body = newValue; }
+        Expression * get_condition() { return condition; }
+        void set_condition( Expression * newValue ) { condition = newValue; }
+        Statement * get_body() { return body; }
+        void set_body( Statement * newValue ) { body = newValue; }
         bool get_isDoWhile() { return isDoWhile; }
         void set_isDoWhile( bool newValue ) { isDoWhile = newValue; }
+        virtual WhileStmt *clone() const override { return new WhileStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual WhileStmt * clone() const override { return new WhileStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
   public:
         std::list<Statement *> initialization;
+        Expression *condition;
+        Expression *increment;
+        Statement *body;
+        ForStmt( std::list<Statement *> initialization,
+             Expression *condition = 0, Expression *increment = 0, Statement *body = 0 );
+        ForStmt( const ForStmt &other );
+        Expression * condition;
+        Expression * increment;
+        Statement * body;
+        ForStmt( std::list<Statement *> initialization, Expression * condition = 0, Expression * increment = 0, Statement * body = 0 );
+        ForStmt( const ForStmt & other );
         virtual ~ForStmt();
+        std::list<Statement *> &get_initialization() { return initialization; }
+        Expression *get_condition() { return condition; }
+        void set_condition( Expression *newValue ) { condition = newValue; }
+        Expression *get_increment() { return increment; }
+        void set_increment( Expression *newValue ) { increment = newValue; }
+        Statement *get_body() { return body; }
+        void set_body( Statement *newValue ) { body = newValue; }
+        virtual ForStmt *clone() const override { return new ForStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        std::list<Statement *> & get_initialization() { return initialization; }
+        Expression * get_condition() { return condition; }
+        void set_condition( Expression * newValue ) { condition = newValue; }
+        Expression * get_increment() { return increment; }
+        void set_increment( Expression * newValue ) { increment = newValue; }
+        Statement * get_body() { return body; }
+        void set_body( Statement * newValue ) { body = newValue; }
+        virtual ForStmt * clone() const override { return new ForStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         const Label originalTarget;
         Label target;
         Expression *computedTarget;
+        Expression * computedTarget;
         Type type;
         BranchStmt( Label target, Type ) throw (SemanticErrorException);
         BranchStmt( Expression *computedTarget, Type ) throw (SemanticErrorException);
+        BranchStmt( Expression * computedTarget, Type ) throw (SemanticErrorException);
         Label get_originalTarget() { return originalTarget; }
 …
         void set_target( Label newValue ) { target = newValue; }
         Expression *get_computedTarget() { return computedTarget; }
+        Expression * get_computedTarget() { return computedTarget; }
         void set_target( Expression * newValue ) { computedTarget = newValue; }
         Type get_type() { return type; }
+        const char *get_typename() { return brType[ type ]; }
+        virtual BranchStmt *clone() const override { return new BranchStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        const char * get_typename() { return brType[ type ]; }
+        virtual BranchStmt * clone() const override { return new BranchStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
   private:
         static const char *brType[];
+        static const char * brType[];
 };
 class ReturnStmt : public Statement {
   public:
         Expression *expr;
         ReturnStmt( Expression *expr );
         ReturnStmt( const ReturnStmt &other );
+        Expression * expr;
+        ReturnStmt( Expression * expr );
+        ReturnStmt( const ReturnStmt & other );
         virtual ~ReturnStmt();
+        Expression *get_expr() { return expr; }
+        void set_expr( Expression *newValue ) { expr = newValue; }
+        virtual ReturnStmt *clone() const override { return new ReturnStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        Expression * get_expr() { return expr; }
+        void set_expr( Expression * newValue ) { expr = newValue; }
+        virtual ReturnStmt * clone() const override { return new ReturnStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         ThrowStmt( Kind kind, Expression * expr, Expression * target = nullptr );
         ThrowStmt( const ThrowStmt &other );
+        ThrowStmt( const ThrowStmt & other );
         virtual ~ThrowStmt();
 …
         void set_target( Expression * newTarget ) { target = newTarget; }
+        virtual ThrowStmt *clone() const override { return new ThrowStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual ThrowStmt * clone() const override { return new ThrowStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         FinallyStmt * finallyBlock;
         TryStmt( CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );
         TryStmt( const TryStmt &other );
+        TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = 0 );
+        TryStmt( const TryStmt & other );
         virtual ~TryStmt();
         CompoundStmt *get_block() const { return block; }
         void set_block( CompoundStmt *newValue ) { block = newValue; }
+        CompoundStmt * get_block() const { return block; }
+        void set_block( CompoundStmt * newValue ) { block = newValue; }
         std::list<CatchStmt *>& get_catchers() { return handlers; }
+        FinallyStmt *get_finally() const { return finallyBlock; }
+        void set_finally( FinallyStmt *newValue ) { finallyBlock = newValue; }
+        virtual TryStmt *clone() const override { return new TryStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        FinallyStmt * get_finally() const { return finallyBlock; }
+        void set_finally( FinallyStmt * newValue ) { finallyBlock = newValue; }
+        virtual TryStmt * clone() const override { return new TryStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         const Kind kind;
         Declaration *decl;
         Expression *cond;
         Statement *body;
         CatchStmt( Kind kind, Declaration *decl,
                    Expression *cond, Statement *body );
         CatchStmt( const CatchStmt &other );
+        Declaration * decl;
+        Expression * cond;
+        Statement * body;
+        CatchStmt( Kind kind, Declaration * decl,
+                   Expression * cond, Statement * body );
+        CatchStmt( const CatchStmt & other );
         virtual ~CatchStmt();
         Kind get_kind() { return kind; }
+        Declaration *get_decl() { return decl; }
+        void set_decl( Declaration *newValue ) { decl = newValue; }
+        Expression *get_cond() { return cond; }
+        void set_cond( Expression *newCond ) { cond = newCond; }
+        Statement *get_body() { return body; }
+        void set_body( Statement *newValue ) { body = newValue; }
+        virtual CatchStmt *clone() const override { return new CatchStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        Declaration * get_decl() { return decl; }
+        void set_decl( Declaration * newValue ) { decl = newValue; }
+        Expression * get_cond() { return cond; }
+        void set_cond( Expression * newCond ) { cond = newCond; }
+        Statement * get_body() { return body; }
+        void set_body( Statement * newValue ) { body = newValue; }
+        virtual CatchStmt * clone() const override { return new CatchStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 class FinallyStmt : public Statement {
   public:
         CompoundStmt *block;
         FinallyStmt( CompoundStmt *block );
         FinallyStmt( const FinallyStmt &other );
+        CompoundStmt * block;
+        FinallyStmt( CompoundStmt * block );
+        FinallyStmt( const FinallyStmt & other );
         virtual ~FinallyStmt();
+        CompoundStmt *get_block() const { return block; }
+        void set_block( CompoundStmt *newValue ) { block = newValue; }
+        virtual FinallyStmt *clone() const override { return new FinallyStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        CompoundStmt * get_block() const { return block; }
+        void set_block( CompoundStmt * newValue ) { block = newValue; }
+        virtual FinallyStmt * clone() const override { return new FinallyStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 …
         } orelse;
+        virtual WaitForStmt *clone() const override { return new WaitForStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+};
+class WithStmt : public Statement {
+public:
+        std::list< Expression * > exprs;
+        Statement * stmt;
+        WithStmt( const std::list< Expression * > & exprs, Statement * stmt );
+        WithStmt( const WithStmt & other );
+        virtual ~WithStmt();
+        virtual WithStmt * clone() const override { return new WithStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+        virtual WaitForStmt * clone() const override { return new WaitForStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+// class WithStmt : public Statement {
+// public:
+//      std::list< Expression * > exprs;
+//      Statement * stmt;
+//      WithStmt( const std::list< Expression * > & exprs, Statement * stmt );
+//      WithStmt( const WithStmt & other );
+//      virtual ~WithStmt();
+//      virtual WithStmt * clone() const override { return new WithStmt( *this ); }
+//      virtual void accept( Visitor & v ) override { v.visit( this ); }
+//      virtual void accept( Visitor & v ) const override { v.visit( this ); }
+//      virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+//      virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+// };
 …
 class DeclStmt : public Statement {
   public:
         Declaration *decl;
         DeclStmt( Declaration *decl );
         DeclStmt( const DeclStmt &other );
+        Declaration * decl;
+        DeclStmt( Declaration * decl );
+        DeclStmt( const DeclStmt & other );
         virtual ~DeclStmt();
         Declaration *get_decl() const { return decl; }
         void set_decl( Declaration *newValue ) { decl = newValue; }
         virtual DeclStmt *clone() const override { return new DeclStmt( *this ); }
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
+/// represents an implicit application of a constructor or destructor. Qualifiers are replaced
 /// immediately before and after the call so that qualified objects can be constructed
 /// with the same functions as unqualified objects.
+        Declaration * get_decl() const { return decl; }
+        void set_decl( Declaration * newValue ) { decl = newValue; }
+        virtual DeclStmt * clone() const override { return new DeclStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+/// represents an implicit application of a constructor or destructor. Qualifiers are replaced immediately before and
+/// after the call so that qualified objects can be constructed with the same functions as unqualified objects.
 class ImplicitCtorDtorStmt : public Statement {
   public:
 …
         virtual ~ImplicitCtorDtorStmt();
         Statement *get_callStmt() const { return callStmt; }
+        Statement * get_callStmt() const { return callStmt; }
         void set_callStmt( Statement * newValue ) { callStmt = newValue; }
+        virtual ImplicitCtorDtorStmt *clone() const override { return new ImplicitCtorDtorStmt( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual ImplicitCtorDtorStmt * clone() const override { return new ImplicitCtorDtorStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };

src/SynTree/SynTree.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Mon Jul 24 16:54:00 2017
 // Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:37:45 2019
+// Update Count     : 12
 //
 …
 class NamedTypeDecl;
 class TypeDecl;
-class FtypeDecl;
-class DtypeDecl;
 class TypedefDecl;
 class AsmDecl;
 …
 class OffsetofExpr;
 class OffsetPackExpr;
-class AttrExpr;
 class LogicalExpr;
 class ConditionalExpr;
 …
 class ConstructorExpr;
 class CompoundLiteralExpr;
-class UntypedValofExpr;
 class RangeExpr;
 class UntypedTupleExpr;
 …
 class InitExpr;
 class DeletedExpr;
+class DefaultArgExpr;
 class GenericExpr;
 …
 class ArrayType;
 class ReferenceType;
+class QualifiedType;
 class FunctionType;
 class ReferenceToType;
 …
 class ZeroType;
 class OneType;
+class GlobalScopeType;
 class Designation;
 …
 class ListInit;
 class ConstructorInit;
-class Subrange;
 //template <class T>    // emulate a union with templates?

src/SynTree/TupleExpr.cc

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 17 09:42:29 2017
 // Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug 14 14:34:00 2019
+// Update Count     : 5
 //
 …
+}
+bool TupleExpr::get_lvalue() const {
+        return false;
+}
 void TupleExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Tuple:" << std::endl;
 …
         assertf( type->size() > index, "TupleIndexExpr index out of bounds: tuple size %d, requested index %d in expr %s", type->size(), index, toString( tuple ).c_str() );
         set_result( (*std::next( type->get_types().begin(), index ))->clone() );
-        // like MemberExpr, TupleIndexExpr is always an lvalue
-        get_result()->set_lvalue( true );
+}
 …
 TupleIndexExpr::~TupleIndexExpr() {
         delete tuple;
+}
+bool TupleIndexExpr::get_lvalue() const {
+        return tuple->get_lvalue();
+}
 …
+}
+TupleAssignExpr::TupleAssignExpr(
+        StmtExpr * s )
+: Expression(), stmtExpr(s) {
+}
 TupleAssignExpr::~TupleAssignExpr() {
         delete stmtExpr;

src/SynTree/Type.cc

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Sep 25 15:16:32 2017
 // Update Count     : 38
+// Last Modified On : Sun Aug  4 21:05:07 2019
+// Update Count     : 45
 //
 #include "Type.h"
 …
 using namespace std;
 const char *BasicType::typeNames[] = {
+const char * BasicType::typeNames[] = {
         "_Bool",
         "char",
 …
         "signed long long int",
         "unsigned long long int",
-        "float",
-        "double",
-        "long double",
-        "float _Complex",
-        "double _Complex",
-        "long double _Complex",
-        "float _Imaginary",
-        "double _Imaginary",
-        "long double _Imaginary",
         "__int128",
         "unsigned __int128",
+        "_Float16",
+        "_Float16 _Complex",
+        "_Float32",
+        "_Float32 _Complex",
+        "float",
+        "float _Complex",
+        //"float _Imaginary",
+        "_Float32x",
+        "_Float32x _Complex",
+        "_Float64",
+        "_Float64 _Complex",
+        "double",
+        "double _Complex",
+        //"double _Imaginary",
+        "_Float64x",
+        "_Float64x _Complex",
         "__float80",
+        "__float128"
+        "_Float128",
+        "_Float128 _Complex",
+        "__float128",
+        "long double",
+        "long double _Complex",
+        //"long double _Imaginary",
+        "_Float128x",
+        "_Float128x _Complex",
 };
 static_assert(
         sizeof(BasicType::typeNames)/sizeof(BasicType::typeNames[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
+        sizeof(BasicType::typeNames) / sizeof(BasicType::typeNames[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
         "Each basic type name should have a corresponding kind enum value"
 );
 …
 // These must remain in the same order as the corresponding bit fields.
 const char * Type::FuncSpecifiersNames[] = { "inline", "fortran", "_Noreturn" };
+const char * Type::FuncSpecifiersNames[] = { "inline", "_Noreturn", "fortran" };
 const char * Type::StorageClassesNames[] = { "extern", "static", "auto", "register", "_Thread_local" };
 const char * Type::QualifiersNames[] = { "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic" };
+const char * Type::QualifiersNames[] = { "const", "restrict", "volatile", "mutex", "_Atomic" };
 Type * Type::stripDeclarator() {
 …
+}
+const Type * Type::stripReferences() const {
+        const Type * type;
+        const ReferenceType * ref;
+        for ( type = this; (ref = dynamic_cast<const ReferenceType *>( type )); type = ref->base );
+        return type;
+}
 int Type::referenceDepth() const { return 0; }
 TypeSubstitution Type::genericSubstitution() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
 void Type::print( std::ostream &os, Indenter indent ) const {
+void Type::print( std::ostream & os, Indenter indent ) const {
         if ( ! forall.empty() ) {
                 os << "forall" << std::endl;
 …
+}
+QualifiedType::QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child ) : Type( tq, {} ), parent( parent ), child( child ) {
+}
+QualifiedType::QualifiedType( const QualifiedType & other ) : Type( other ), parent( maybeClone( other.parent ) ), child( maybeClone( other.child ) ) {
+}
+QualifiedType::~QualifiedType() {
+        delete parent;
+        delete child;
+}
+void QualifiedType::print( std::ostream & os, Indenter indent ) const {
+        os << "Qualified Type:" << endl;
+        os << indent+1;
+        parent->print( os, indent+1 );
+        os << endl << indent+1;
+        child->print( os, indent+1 );
+        os << endl;
+        Type::print( os, indent+1 );
+}
+GlobalScopeType::GlobalScopeType() : Type( Type::Qualifiers(), {} ) {}
+void GlobalScopeType::print( std::ostream & os, Indenter ) const {
+        os << "Global Scope Type" << endl;
+}
 // Empty Variable declarations:
 const Type::FuncSpecifiers noFuncSpecifiers;

src/SynTree/Type.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Sep 25 14:14:01 2017
 // Update Count     : 154
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Sep  4 09:58:00 2019
+// Update Count     : 170
 //
 …
         }; // StorageClasses
         enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Lvalue = 1 << 3, Mutex = 1 << 4, Atomic = 1 << 5, NumTypeQualifier = 6 };
+        enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Mutex = 1 << 3, Atomic = 1 << 4, NumTypeQualifier = 5 };
         static const char * QualifiersNames[];
         union Qualifiers {
                 enum { Mask = ~(Restrict | Lvalue) };
+                enum { Mask = ~Restrict };
                 unsigned int val;
                 struct {
 …
                         bool is_restrict : 1;
                         bool is_volatile : 1;
-                        bool is_lvalue : 1;
                         bool is_mutex : 1;
                         bool is_atomic : 1;
 …
                 bool operator>( Qualifiers other ) const { return *this != other && *this >= other; }
                 BFCommon( Qualifiers, NumTypeQualifier )
+                Qualifiers unify( Qualifiers const & other ) const {
+                        int or_flags = Mask & (val | other.val);
+                        int and_flags = val & other.val;
+                        return Qualifiers( or_flags | and_flags );
+                }
         }; // Qualifiers
 …
         Qualifiers & get_qualifiers() { return tq; }
+        bool get_const() { return tq.is_const; }
+        bool get_volatile() { return tq.is_volatile; }
+        bool get_restrict() { return tq.is_restrict; }
+        bool get_lvalue() { return tq.is_lvalue; }
+        bool get_mutex() { return tq.is_mutex; }
+        bool get_atomic() { return tq.is_atomic; }
+        bool get_const() const { return tq.is_const; }
+        bool get_volatile() const { return tq.is_volatile; }
+        bool get_restrict() const { return tq.is_restrict; }
+        bool get_mutex() const { return tq.is_mutex; }
+        bool get_atomic() const { return tq.is_atomic; }
         void set_const( bool newValue ) { tq.is_const = newValue; }
         void set_volatile( bool newValue ) { tq.is_volatile = newValue; }
         void set_restrict( bool newValue ) { tq.is_restrict = newValue; }
-        void set_lvalue( bool newValue ) { tq.is_lvalue = newValue; }
         void set_mutex( bool newValue ) { tq.is_mutex = newValue; }
         void set_atomic( bool newValue ) { tq.is_atomic = newValue; }
 …
         /// return type without outer references
         Type * stripReferences();
+        const Type * stripReferences() const;
         /// return the number of references occuring consecutively on the outermost layer of this type (i.e. do not count references nested within other types)
 …
         virtual bool isComplete() const { return true; }
         virtual AggregateDecl * getAggr() { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
+        virtual AggregateDecl * getAggr() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
         virtual TypeSubstitution genericSubstitution() const;
 …
         virtual Type *clone() const = 0;
         virtual void accept( Visitor & v ) = 0;
+        virtual void accept( Visitor & v ) const = 0;
         virtual Type *acceptMutator( Mutator & m ) = 0;
         virtual void print( std::ostream & os, Indenter indent = {} ) const;
 …
         virtual VoidType *clone() const override { return new VoidType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
 class BasicType : public Type {
   public:
+        // GENERATED START, DO NOT EDIT
+        // GENERATED BY BasicTypes-gen.cc
         enum Kind {
                 Bool,
 …
                 LongLongSignedInt,
                 LongLongUnsignedInt,
-                Float,
-                Double,
-                LongDouble,
-                FloatComplex,
-                DoubleComplex,
-                LongDoubleComplex,
-                FloatImaginary,
-                DoubleImaginary,
-                LongDoubleImaginary,
                 SignedInt128,
                 UnsignedInt128,
+                Float80,
+                Float128,
+                uFloat16,
+                uFloat16Complex,
+                uFloat32,
+                uFloat32Complex,
+                Float,
+                FloatComplex,
+                uFloat32x,
+                uFloat32xComplex,
+                uFloat64,
+                uFloat64Complex,
+                Double,
+                DoubleComplex,
+                uFloat64x,
+                uFloat64xComplex,
+                uuFloat80,
+                uFloat128,
+                uFloat128Complex,
+                uuFloat128,
+                LongDouble,
+                LongDoubleComplex,
+                uFloat128x,
+                uFloat128xComplex,
                 NUMBER_OF_BASIC_TYPES
         } kind;
+        // GENERATED END
         static const char *typeNames[];                                         // string names for basic types, MUST MATCH with Kind
 …
         BasicType( const Type::Qualifiers & tq, Kind bt, const std::list< Attribute * > & attributes = std::list< Attribute * >() );
         Kind get_kind() { return kind; }
+        Kind get_kind() const { return kind; }
         void set_kind( Kind newValue ) { kind = newValue; }
         virtual BasicType *clone() const override { return new BasicType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual PointerType *clone() const override { return new PointerType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual ArrayType *clone() const override { return new ArrayType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+class QualifiedType : public Type {
+public:
+        Type * parent;
+        Type * child;
+        QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child );
+        QualifiedType( const QualifiedType & tq );
+        virtual ~QualifiedType();
+        virtual QualifiedType *clone() const override { return new QualifiedType( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual ReferenceType *clone() const override { return new ReferenceType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual FunctionType *clone() const override { return new FunctionType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual bool isComplete() const override;
         virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
         virtual TypeSubstitution genericSubstitution() const override;
 …
         virtual StructInstType *clone() const override { return new StructInstType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
 …
         virtual bool isComplete() const override;
         virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
         virtual TypeSubstitution genericSubstitution() const override;
 …
         virtual UnionInstType *clone() const override { return new UnionInstType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
 …
         virtual bool isComplete() const override;
+        virtual AggregateDecl * getAggr() const override;
         virtual EnumInstType *clone() const override { return new EnumInstType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
 …
         virtual TraitInstType *clone() const override { return new TraitInstType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
   private:
 …
         virtual TypeInstType *clone() const override { return new TypeInstType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual TupleType *clone() const override { return new TupleType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
 class TypeofType : public Type {
   public:
+        Expression *expr;
+        TypeofType( const Type::Qualifiers & tq, Expression *expr, const std::list< Attribute * > & attributes = std::list< Attribute * >()  );
+        Expression *expr;    ///< expression to take the type of
+        bool is_basetypeof;  ///< true iff is basetypeof type
+        TypeofType( const Type::Qualifiers & tq, Expression *expr, const std::list< Attribute * > & attributes = std::list< Attribute * >() );
+        TypeofType( const Type::Qualifiers & tq, Expression *expr, bool is_basetypeof,
+                const std::list< Attribute * > & attributes = std::list< Attribute * >() );
         TypeofType( const TypeofType& );
         virtual ~TypeofType();
 …
         virtual TypeofType *clone() const override { return new TypeofType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual AttrType *clone() const override { return new AttrType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual VarArgsType *clone() const override { return new VarArgsType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual ZeroType *clone() const override { return new ZeroType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 …
         virtual OneType *clone() const override { return new OneType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+class GlobalScopeType : public Type {
+  public:
+        GlobalScopeType();
+        virtual GlobalScopeType *clone() const override { return new GlobalScopeType( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;

src/SynTree/TypeSubstitution.cc

-              r7951100
+              rb067d9b
+}
+void TypeSubstitution::addVar( std::string formalExpr, Expression *actualExpr ) {
+        varEnv[ formalExpr ] = actualExpr;
+}
 void TypeSubstitution::remove( std::string formalType ) {
         TypeEnvType::iterator i = typeEnv.find( formalType );
 …
 namespace {
         struct EnvTrimmer {
+                TypeSubstitution * env, * newEnv;
+                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
+                const TypeSubstitution * env;
+                TypeSubstitution * newEnv;
+                EnvTrimmer( const TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
                 void previsit( TypeDecl * tyDecl ) {
                         // transfer known bindings for seen type variables
 …
 /// reduce environment to just the parts that are referenced in a given expression
 TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, TypeSubstitution * env ) {
+TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, const TypeSubstitution * env ) {
         if ( env ) {
                 TypeSubstitution * newEnv = new TypeSubstitution();

src/SynTree/TypeSubstitution.h

-              r7951100
+              rb067d9b
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:52:24 2017
 // Update Count     : 3
+// Last Modified On : Tue Apr 30 22:52:47 2019
+// Update Count     : 9
 //
 …
 #include <iosfwd>                  // for ostream
 #include <list>                    // for list<>::iterator, _List_iterator
 #include <map>                     // for _Rb_tree_iterator, map, map<>::val...
 #include <set>                     // for set
+#include <unordered_map>
+#include <unordered_set>
 #include <string>                  // for string, operator!=
 #include <utility>                 // for pair
 …
         TypeSubstitution &operator=( const TypeSubstitution &other );
         template< typename SynTreeClass > int apply( SynTreeClass *&input );
         template< typename SynTreeClass > int applyFree( SynTreeClass *&input );
+        template< typename SynTreeClass > int apply( SynTreeClass *&input ) const;
+        template< typename SynTreeClass > int applyFree( SynTreeClass *&input ) const;
         void add( std::string formalType, Type *actualType );
 …
         bool empty() const;
+        void addVar( std::string formalExpr, Expression *actualExpr );
         template< typename FormalIterator, typename ActualIterator >
         void add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
 …
         /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
         static TypeSubstitution * newFromExpr( Expression * expr, TypeSubstitution * env );
+        static TypeSubstitution * newFromExpr( Expression * expr, const TypeSubstitution * env );
         void normalize();
 …
         friend class PassVisitor;
         typedef std::map< std::string, Type* > TypeEnvType;
         typedef std::map< std::string, Expression* > VarEnvType;
+        typedef std::unordered_map< std::string, Type * > TypeEnvType;
+        typedef std::unordered_map< std::string, Expression * > VarEnvType;
         TypeEnvType typeEnv;
         VarEnvType varEnv;
 …
         auto begin() const -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
         auto   end() const -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
+        auto beginVar()       -> decltype( varEnv.begin() ) { return varEnv.begin(); }
+        auto   endVar()       -> decltype( varEnv.  end() ) { return varEnv.  end(); }
+        auto beginVar() const -> decltype( varEnv.begin() ) { return varEnv.begin(); }
+        auto   endVar() const -> decltype( varEnv.  end() ) { return varEnv.  end(); }
 };
 …
         ActualIterator actualIt = actualBegin;
         for ( ; formalIt != formalEnd; ++formalIt, ++actualIt ) {
                 if ( TypeDecl *formal = dynamic_cast< TypeDecl* >( *formalIt ) ) {
                         if ( TypeExpr *actual = dynamic_cast< TypeExpr* >( *actualIt ) ) {
+                if ( TypeDecl *formal = dynamic_cast< TypeDecl * >( *formalIt ) ) {
+                        if ( TypeExpr *actual = dynamic_cast< TypeExpr * >( *actualIt ) ) {
                                 if ( formal->get_name() != "" ) {
                                         TypeEnvType::iterator i = typeEnv.find( formal->get_name() );
 …
 // definitition must happen after PassVisitor is included so that WithGuards can be used
 struct TypeSubstitution::Substituter : public WithGuards, public WithVisitorRef<Substituter> {
                 Substituter( TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
+                Substituter( const TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
                 Type * postmutate( TypeInstType * aggregateUseType );
 …
                 void premutate( UnionInstType * aggregateUseType );
                 TypeSubstitution & sub;
+                const TypeSubstitution & sub;
                 int subCount = 0;
                 bool freeOnly;
                 typedef std::set< std::string > BoundVarsType;
+                typedef std::unordered_set< std::string > BoundVarsType;
                 BoundVarsType boundVars;
 };
 template< typename SynTreeClass >
 int TypeSubstitution::apply( SynTreeClass *&input ) {
+int TypeSubstitution::apply( SynTreeClass *&input ) const {
         assert( input );
         PassVisitor<Substituter> sub( *this, false );
 …
 template< typename SynTreeClass >
 int TypeSubstitution::applyFree( SynTreeClass *&input ) {
+int TypeSubstitution::applyFree( SynTreeClass *&input ) const {
         assert( input );
         PassVisitor<Substituter> sub( *this, true );

src/SynTree/TypeofType.cc

-              r7951100
+              rb067d9b
 class Attribute;
+TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), expr( expr ) {
+}
+TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr,
+        const std::list< Attribute * > & attributes )
+: Type( tq, attributes ), expr( expr ), is_basetypeof(false) {}
+TypeofType::TypeofType( const TypeofType &other ) : Type( other ), expr( maybeClone( other.expr ) ) {
+}
+TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr, bool is_basetypeof,
+        const std::list< Attribute * > & attributes )
+: Type( tq, attributes ), expr( expr ), is_basetypeof( is_basetypeof ) {}
+TypeofType::TypeofType( const TypeofType &other )
+: Type( other ), expr( maybeClone( other.expr ) ), is_basetypeof( other.is_basetypeof ) {}
 TypeofType::~TypeofType() {
 …
 void TypeofType::print( std::ostream &os, Indenter indent ) const {
         Type::print( os, indent );
+        if ( is_basetypeof ) { os << "base-"; }
         os << "type-of expression ";
         if ( expr ) {

src/SynTree/Visitor.h

-              r7951100
+              rb067d9b
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Mon Jul 24 16:28:00 2017
 // Update Count     : 13
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:21:49 2019
+// Update Count     : 14
 //
 …
         // of the given syntax node, but performs no other action.
+        virtual void visit( ObjectDecl * objectDecl ) = 0;
+        virtual void visit( FunctionDecl * functionDecl ) = 0;
+        virtual void visit( StructDecl * aggregateDecl ) = 0;
+        virtual void visit( UnionDecl * aggregateDecl ) = 0;
+        virtual void visit( EnumDecl * aggregateDecl ) = 0;
+        virtual void visit( TraitDecl * aggregateDecl ) = 0;
+        virtual void visit( TypeDecl * typeDecl ) = 0;
+        virtual void visit( TypedefDecl * typeDecl ) = 0;
+        virtual void visit( AsmDecl * asmDecl ) = 0;
+        virtual void visit( StaticAssertDecl * assertDecl ) = 0;
+        virtual void visit( CompoundStmt * compoundStmt ) = 0;
+        virtual void visit( ExprStmt * exprStmt ) = 0;
+        virtual void visit( AsmStmt * asmStmt ) = 0;
+        virtual void visit( DirectiveStmt * directiveStmt ) = 0;
+        virtual void visit( IfStmt * ifStmt ) = 0;
+        virtual void visit( WhileStmt * whileStmt ) = 0;
+        virtual void visit( ForStmt * forStmt ) = 0;
+        virtual void visit( SwitchStmt * switchStmt ) = 0;
+        virtual void visit( CaseStmt * caseStmt ) = 0;
+        virtual void visit( BranchStmt * branchStmt ) = 0;
+        virtual void visit( ReturnStmt * returnStmt ) = 0;
+        virtual void visit( ThrowStmt * throwStmt ) = 0;
+        virtual void visit( TryStmt * tryStmt ) = 0;
+        virtual void visit( CatchStmt * catchStmt ) = 0;
+        virtual void visit( FinallyStmt * finallyStmt ) = 0;
+        virtual void visit( WaitForStmt * waitforStmt ) = 0;
+        virtual void visit( WithStmt * withStmt ) = 0;
+        virtual void visit( NullStmt * nullStmt ) = 0;
+        virtual void visit( DeclStmt * declStmt ) = 0;
+        virtual void visit( ImplicitCtorDtorStmt * impCtorDtorStmt ) = 0;
+        virtual void visit( ApplicationExpr * applicationExpr ) = 0;
+        virtual void visit( UntypedExpr * untypedExpr ) = 0;
+        virtual void visit( NameExpr * nameExpr ) = 0;
+        virtual void visit( CastExpr * castExpr ) = 0;
+        virtual void visit( KeywordCastExpr * castExpr ) = 0;
+        virtual void visit( VirtualCastExpr * castExpr ) = 0;
+        virtual void visit( AddressExpr * addressExpr ) = 0;
+        virtual void visit( LabelAddressExpr * labAddressExpr ) = 0;
+        virtual void visit( UntypedMemberExpr * memberExpr ) = 0;
+        virtual void visit( MemberExpr * memberExpr ) = 0;
+        virtual void visit( VariableExpr * variableExpr ) = 0;
+        virtual void visit( ConstantExpr * constantExpr ) = 0;
+        virtual void visit( SizeofExpr * sizeofExpr ) = 0;
+        virtual void visit( AlignofExpr * alignofExpr ) = 0;
+        virtual void visit( UntypedOffsetofExpr * offsetofExpr ) = 0;
+        virtual void visit( OffsetofExpr * offsetofExpr ) = 0;
+        virtual void visit( OffsetPackExpr * offsetPackExpr ) = 0;
+        virtual void visit( AttrExpr * attrExpr ) = 0;
+        virtual void visit( LogicalExpr * logicalExpr ) = 0;
+        virtual void visit( ConditionalExpr * conditionalExpr ) = 0;
+        virtual void visit( CommaExpr * commaExpr ) = 0;
+        virtual void visit( TypeExpr * typeExpr ) = 0;
+        virtual void visit( AsmExpr * asmExpr ) = 0;
+        virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr ) = 0;
+        virtual void visit( ConstructorExpr *  ctorExpr ) = 0;
+        virtual void visit( CompoundLiteralExpr * compLitExpr ) = 0;
+        virtual void visit( RangeExpr * rangeExpr ) = 0;
+        virtual void visit( UntypedTupleExpr * tupleExpr ) = 0;
+        virtual void visit( TupleExpr * tupleExpr ) = 0;
+        virtual void visit( TupleIndexExpr * tupleExpr ) = 0;
+        virtual void visit( TupleAssignExpr * assignExpr ) = 0;
+        virtual void visit( StmtExpr *  stmtExpr ) = 0;
+        virtual void visit( UniqueExpr *  uniqueExpr ) = 0;
+        virtual void visit( UntypedInitExpr *  initExpr ) = 0;
+        virtual void visit( InitExpr *  initExpr ) = 0;
+        virtual void visit( DeletedExpr * delExpr ) = 0;
+        virtual void visit( GenericExpr * genExpr ) = 0;
+        virtual void visit( VoidType * basicType ) = 0;
+        virtual void visit( BasicType * basicType ) = 0;
+        virtual void visit( PointerType * pointerType ) = 0;
+        virtual void visit( ArrayType * arrayType ) = 0;
+        virtual void visit( ReferenceType * refType ) = 0;
+        virtual void visit( FunctionType * functionType ) = 0;
+        virtual void visit( StructInstType * aggregateUseType ) = 0;
+        virtual void visit( UnionInstType * aggregateUseType ) = 0;
+        virtual void visit( EnumInstType * aggregateUseType ) = 0;
+        virtual void visit( TraitInstType * aggregateUseType ) = 0;
+        virtual void visit( TypeInstType * aggregateUseType ) = 0;
+        virtual void visit( TupleType * tupleType ) = 0;
+        virtual void visit( TypeofType * typeofType ) = 0;
+        virtual void visit( AttrType * attrType ) = 0;
+        virtual void visit( VarArgsType * varArgsType ) = 0;
+        virtual void visit( ZeroType * zeroType ) = 0;
+        virtual void visit( OneType * oneType ) = 0;
+        virtual void visit( Designation * designation ) = 0;
+        virtual void visit( SingleInit * singleInit ) = 0;
+        virtual void visit( ListInit * listInit ) = 0;
+        virtual void visit( ConstructorInit * ctorInit ) = 0;
+        virtual void visit( Subrange * subrange ) = 0;
+        virtual void visit( Constant * constant ) = 0;
+        virtual void visit( Attribute * attribute ) = 0;
+        virtual void visit( ObjectDecl * node ) { visit( const_cast<const ObjectDecl *>(node) ); }
+        virtual void visit( const ObjectDecl * objectDecl ) = 0;
+        virtual void visit( FunctionDecl * node ) { visit( const_cast<const FunctionDecl *>(node) ); }
+        virtual void visit( const FunctionDecl * functionDecl ) = 0;
+        virtual void visit( StructDecl * node ) { visit( const_cast<const StructDecl *>(node) ); }
+        virtual void visit( const StructDecl * aggregateDecl ) = 0;
+        virtual void visit( UnionDecl * node ) { visit( const_cast<const UnionDecl *>(node) ); }
+        virtual void visit( const UnionDecl * aggregateDecl ) = 0;
+        virtual void visit( EnumDecl * node ) { visit( const_cast<const EnumDecl *>(node) ); }
+        virtual void visit( const EnumDecl * aggregateDecl ) = 0;
+        virtual void visit( TraitDecl * node ) { visit( const_cast<const TraitDecl *>(node) ); }
+        virtual void visit( const TraitDecl * aggregateDecl ) = 0;
+        virtual void visit( TypeDecl * node ) { visit( const_cast<const TypeDecl *>(node) ); }
+        virtual void visit( const TypeDecl * typeDecl ) = 0;
+        virtual void visit( TypedefDecl * node ) { visit( const_cast<const TypedefDecl *>(node) ); }
+        virtual void visit( const TypedefDecl * typeDecl ) = 0;
+        virtual void visit( AsmDecl * node ) { visit( const_cast<const AsmDecl *>(node) ); }
+        virtual void visit( const AsmDecl * asmDecl ) = 0;
+        virtual void visit( StaticAssertDecl * node ) { visit( const_cast<const StaticAssertDecl *>(node) ); }
+        virtual void visit( const StaticAssertDecl * assertDecl ) = 0;
+        virtual void visit( CompoundStmt * node ) { visit( const_cast<const CompoundStmt *>(node) ); }
+        virtual void visit( const CompoundStmt * compoundStmt ) = 0;
+        virtual void visit( ExprStmt * node ) { visit( const_cast<const ExprStmt *>(node) ); }
+        virtual void visit( const ExprStmt * exprStmt ) = 0;
+        virtual void visit( AsmStmt * node ) { visit( const_cast<const AsmStmt *>(node) ); }
+        virtual void visit( const AsmStmt * asmStmt ) = 0;
+        virtual void visit( DirectiveStmt * node ) { visit( const_cast<const DirectiveStmt *>(node) ); }
+        virtual void visit( const DirectiveStmt * directiveStmt ) = 0;
+        virtual void visit( IfStmt * node ) { visit( const_cast<const IfStmt *>(node) ); }
+        virtual void visit( const IfStmt * ifStmt ) = 0;
+        virtual void visit( WhileStmt * node ) { visit( const_cast<const WhileStmt *>(node) ); }
+        virtual void visit( const WhileStmt * whileStmt ) = 0;
+        virtual void visit( ForStmt * node ) { visit( const_cast<const ForStmt *>(node) ); }
+        virtual void visit( const ForStmt * forStmt ) = 0;
+        virtual void visit( SwitchStmt * node ) { visit( const_cast<const SwitchStmt *>(node) ); }
+        virtual void visit( const SwitchStmt * switchStmt ) = 0;
+        virtual void visit( CaseStmt * node ) { visit( const_cast<const CaseStmt *>(node) ); }
+        virtual void visit( const CaseStmt * caseStmt ) = 0;
+        virtual void visit( BranchStmt * node ) { visit( const_cast<const BranchStmt *>(node) ); }
+        virtual void visit( const BranchStmt * branchStmt ) = 0;
+        virtual void visit( ReturnStmt * node ) { visit( const_cast<const ReturnStmt *>(node) ); }
+        virtual void visit( const ReturnStmt * returnStmt ) = 0;
+        virtual void visit( ThrowStmt * node ) { visit( const_cast<const ThrowStmt *>(node) ); }
+        virtual void visit( const ThrowStmt * throwStmt ) = 0;
+        virtual void visit( TryStmt * node ) { visit( const_cast<const TryStmt *>(node) ); }
+        virtual void visit( const TryStmt * tryStmt ) = 0;
+        virtual void visit( CatchStmt * node ) { visit( const_cast<const CatchStmt *>(node) ); }
+        virtual void visit( const CatchStmt * catchStmt ) = 0;
+        virtual void visit( FinallyStmt * node ) { visit( const_cast<const FinallyStmt *>(node) ); }
+        virtual void visit( const FinallyStmt * finallyStmt ) = 0;
+        virtual void visit( WaitForStmt * node ) { visit( const_cast<const WaitForStmt *>(node) ); }
+        virtual void visit( const WaitForStmt * waitforStmt ) = 0;
+        virtual void visit( WithStmt * node ) { visit( const_cast<const WithStmt *>(node) ); }
+        virtual void visit( const WithStmt * withStmt ) = 0;
+        virtual void visit( NullStmt * node ) { visit( const_cast<const NullStmt *>(node) ); }
+        virtual void visit( const NullStmt * nullStmt ) = 0;
+        virtual void visit( DeclStmt * node ) { visit( const_cast<const DeclStmt *>(node) ); }
+        virtual void visit( const DeclStmt * declStmt ) = 0;
+        virtual void visit( ImplicitCtorDtorStmt * node ) { visit( const_cast<const ImplicitCtorDtorStmt *>(node) ); }
+        virtual void visit( const ImplicitCtorDtorStmt * impCtorDtorStmt ) = 0;
+        virtual void visit( ApplicationExpr * node ) { visit( const_cast<const ApplicationExpr *>(node) ); }
+        virtual void visit( const ApplicationExpr * applicationExpr ) = 0;
+        virtual void visit( UntypedExpr * node ) { visit( const_cast<const UntypedExpr *>(node) ); }
+        virtual void visit( const UntypedExpr * untypedExpr ) = 0;
+        virtual void visit( NameExpr * node ) { visit( const_cast<const NameExpr *>(node) ); }
+        virtual void visit( const NameExpr * nameExpr ) = 0;
+        virtual void visit( CastExpr * node ) { visit( const_cast<const CastExpr *>(node) ); }
+        virtual void visit( const CastExpr * castExpr ) = 0;
+        virtual void visit( KeywordCastExpr * node ) { visit( const_cast<const KeywordCastExpr *>(node) ); }
+        virtual void visit( const KeywordCastExpr * castExpr ) = 0;
+        virtual void visit( VirtualCastExpr * node ) { visit( const_cast<const VirtualCastExpr *>(node) ); }
+        virtual void visit( const VirtualCastExpr * castExpr ) = 0;
+        virtual void visit( AddressExpr * node ) { visit( const_cast<const AddressExpr *>(node) ); }
+        virtual void visit( const AddressExpr * addressExpr ) = 0;
+        virtual void visit( LabelAddressExpr * node ) { visit( const_cast<const LabelAddressExpr *>(node) ); }
+        virtual void visit( const LabelAddressExpr * labAddressExpr ) = 0;
+        virtual void visit( UntypedMemberExpr * node ) { visit( const_cast<const UntypedMemberExpr *>(node) ); }
+        virtual void visit( const UntypedMemberExpr * memberExpr ) = 0;
+        virtual void visit( MemberExpr * node ) { visit( const_cast<const MemberExpr *>(node) ); }
+        virtual void visit( const MemberExpr * memberExpr ) = 0;
+        virtual void visit( VariableExpr * node ) { visit( const_cast<const VariableExpr *>(node) ); }
+        virtual void visit( const VariableExpr * variableExpr ) = 0;
+        virtual void visit( ConstantExpr * node ) { visit( const_cast<const ConstantExpr *>(node) ); }
+        virtual void visit( const ConstantExpr * constantExpr ) = 0;
+        virtual void visit( SizeofExpr * node ) { visit( const_cast<const SizeofExpr *>(node) ); }
+        virtual void visit( const SizeofExpr * sizeofExpr ) = 0;
+        virtual void visit( AlignofExpr * node ) { visit( const_cast<const AlignofExpr *>(node) ); }
+        virtual void visit( const AlignofExpr * alignofExpr ) = 0;
+        virtual void visit( UntypedOffsetofExpr * node ) { visit( const_cast<const UntypedOffsetofExpr *>(node) ); }
+        virtual void visit( const UntypedOffsetofExpr * offsetofExpr ) = 0;
+        virtual void visit( OffsetofExpr * node ) { visit( const_cast<const OffsetofExpr *>(node) ); }
+        virtual void visit( const OffsetofExpr * offsetofExpr ) = 0;
+        virtual void visit( OffsetPackExpr * node ) { visit( const_cast<const OffsetPackExpr *>(node) ); }
+        virtual void visit( const OffsetPackExpr * offsetPackExpr ) = 0;
+        virtual void visit( LogicalExpr * node ) { visit( const_cast<const LogicalExpr *>(node) ); }
+        virtual void visit( const LogicalExpr * logicalExpr ) = 0;
+        virtual void visit( ConditionalExpr * node ) { visit( const_cast<const ConditionalExpr *>(node) ); }
+        virtual void visit( const ConditionalExpr * conditionalExpr ) = 0;
+        virtual void visit( CommaExpr * node ) { visit( const_cast<const CommaExpr *>(node) ); }
+        virtual void visit( const CommaExpr * commaExpr ) = 0;
+        virtual void visit( TypeExpr * node ) { visit( const_cast<const TypeExpr *>(node) ); }
+        virtual void visit( const TypeExpr * typeExpr ) = 0;
+        virtual void visit( AsmExpr * node ) { visit( const_cast<const AsmExpr *>(node) ); }
+        virtual void visit( const AsmExpr * asmExpr ) = 0;
+        virtual void visit( ImplicitCopyCtorExpr * node ) { visit( const_cast<const ImplicitCopyCtorExpr *>(node) ); }
+        virtual void visit( const ImplicitCopyCtorExpr * impCpCtorExpr ) = 0;
+        virtual void visit( ConstructorExpr * node ) { visit( const_cast<const ConstructorExpr *>(node) ); }
+        virtual void visit( const ConstructorExpr *  ctorExpr ) = 0;
+        virtual void visit( CompoundLiteralExpr * node ) { visit( const_cast<const CompoundLiteralExpr *>(node) ); }
+        virtual void visit( const CompoundLiteralExpr * compLitExpr ) = 0;
+        virtual void visit( RangeExpr * node ) { visit( const_cast<const RangeExpr *>(node) ); }
+        virtual void visit( const RangeExpr * rangeExpr ) = 0;
+        virtual void visit( UntypedTupleExpr * node ) { visit( const_cast<const UntypedTupleExpr *>(node) ); }
+        virtual void visit( const UntypedTupleExpr * tupleExpr ) = 0;
+        virtual void visit( TupleExpr * node ) { visit( const_cast<const TupleExpr *>(node) ); }
+        virtual void visit( const TupleExpr * tupleExpr ) = 0;
+        virtual void visit( TupleIndexExpr * node ) { visit( const_cast<const TupleIndexExpr *>(node) ); }
+        virtual void visit( const TupleIndexExpr * tupleExpr ) = 0;
+        virtual void visit( TupleAssignExpr * node ) { visit( const_cast<const TupleAssignExpr *>(node) ); }
+        virtual void visit( const TupleAssignExpr * assignExpr ) = 0;
+        virtual void visit( StmtExpr * node ) { visit( const_cast<const StmtExpr *>(node) ); }
+        virtual void visit( const StmtExpr *  stmtExpr ) = 0;
+        virtual void visit( UniqueExpr * node ) { visit( const_cast<const UniqueExpr *>(node) ); }
+        virtual void visit( const UniqueExpr *  uniqueExpr ) = 0;
+        virtual void visit( UntypedInitExpr * node ) { visit( const_cast<const UntypedInitExpr *>(node) ); }
+        virtual void visit( const UntypedInitExpr *  initExpr ) = 0;
+        virtual void visit( InitExpr * node ) { visit( const_cast<const InitExpr *>(node) ); }
+        virtual void visit( const InitExpr *  initExpr ) = 0;
+        virtual void visit( DeletedExpr * node ) { visit( const_cast<const DeletedExpr *>(node) ); }
+        virtual void visit( const DeletedExpr * delExpr ) = 0;
+        virtual void visit( DefaultArgExpr * node ) { visit( const_cast<const DefaultArgExpr *>(node) ); }
+        virtual void visit( const DefaultArgExpr * argExpr ) = 0;
+        virtual void visit( GenericExpr * node ) { visit( const_cast<const GenericExpr *>(node) ); }
+        virtual void visit( const GenericExpr * genExpr ) = 0;
+        virtual void visit( VoidType * node ) { visit( const_cast<const VoidType *>(node) ); }
+        virtual void visit( const VoidType * basicType ) = 0;
+        virtual void visit( BasicType * node ) { visit( const_cast<const BasicType *>(node) ); }
+        virtual void visit( const BasicType * basicType ) = 0;
+        virtual void visit( PointerType * node ) { visit( const_cast<const PointerType *>(node) ); }
+        virtual void visit( const PointerType * pointerType ) = 0;
+        virtual void visit( ArrayType * node ) { visit( const_cast<const ArrayType *>(node) ); }
+        virtual void visit( const ArrayType * arrayType ) = 0;
+        virtual void visit( ReferenceType * node ) { visit( const_cast<const ReferenceType *>(node) ); }
+        virtual void visit( const ReferenceType * refType ) = 0;
+        virtual void visit( QualifiedType * node ) { visit( const_cast<const QualifiedType *>(node) ); }
+        virtual void visit( const QualifiedType * qualType ) = 0;
+        virtual void visit( FunctionType * node ) { visit( const_cast<const FunctionType *>(node) ); }
+        virtual void visit( const FunctionType * functionType ) = 0;
+        virtual void visit( StructInstType * node ) { visit( const_cast<const StructInstType *>(node) ); }
+        virtual void visit( const StructInstType * aggregateUseType ) = 0;
+        virtual void visit( UnionInstType * node ) { visit( const_cast<const UnionInstType *>(node) ); }
+        virtual void visit( const UnionInstType * aggregateUseType ) = 0;
+        virtual void visit( EnumInstType * node ) { visit( const_cast<const EnumInstType *>(node) ); }
+        virtual void visit( const EnumInstType * aggregateUseType ) = 0;
+        virtual void visit( TraitInstType * node ) { visit( const_cast<const TraitInstType *>(node) ); }
+        virtual void visit( const TraitInstType * aggregateUseType ) = 0;
+        virtual void visit( TypeInstType * node ) { visit( const_cast<const TypeInstType *>(node) ); }
+        virtual void visit( const TypeInstType * aggregateUseType ) = 0;
+        virtual void visit( TupleType * node ) { visit( const_cast<const TupleType *>(node) ); }
+        virtual void visit( const TupleType * tupleType ) = 0;
+        virtual void visit( TypeofType * node ) { visit( const_cast<const TypeofType *>(node) ); }
+        virtual void visit( const TypeofType * typeofType ) = 0;
+        virtual void visit( AttrType * node ) { visit( const_cast<const AttrType *>(node) ); }
+        virtual void visit( const AttrType * attrType ) = 0;
+        virtual void visit( VarArgsType * node ) { visit( const_cast<const VarArgsType *>(node) ); }
+        virtual void visit( const VarArgsType * varArgsType ) = 0;
+        virtual void visit( ZeroType * node ) { visit( const_cast<const ZeroType *>(node) ); }
+        virtual void visit( const ZeroType * zeroType ) = 0;
+        virtual void visit( OneType * node ) { visit( const_cast<const OneType *>(node) ); }
+        virtual void visit( const OneType * oneType ) = 0;
+        virtual void visit( GlobalScopeType * node ) { visit( const_cast<const GlobalScopeType *>(node) ); }
+        virtual void visit( const GlobalScopeType * globalType ) = 0;
+        virtual void visit( Designation * node ) { visit( const_cast<const Designation *>(node) ); }
+        virtual void visit( const Designation * designation ) = 0;
+        virtual void visit( SingleInit * node ) { visit( const_cast<const SingleInit *>(node) ); }
+        virtual void visit( const SingleInit * singleInit ) = 0;
+        virtual void visit( ListInit * node ) { visit( const_cast<const ListInit *>(node) ); }
+        virtual void visit( const ListInit * listInit ) = 0;
+        virtual void visit( ConstructorInit * node ) { visit( const_cast<const ConstructorInit *>(node) ); }
+        virtual void visit( const ConstructorInit * ctorInit ) = 0;
+        virtual void visit( Constant * node ) { visit( const_cast<const Constant *>(node) ); }
+        virtual void visit( const Constant * constant ) = 0;
+        virtual void visit( Attribute * node ) { visit( const_cast<const Attribute *>(node) ); }
+        virtual void visit( const Attribute * attribute ) = 0;
 };
 template< typename TreeType, typename VisitorType >
 inline void maybeAccept( TreeType *tree, VisitorType &visitor ) {
+inline void maybeAccept( TreeType * tree, VisitorType & visitor ) {
         if ( tree ) {
                 tree->accept( visitor );
 …
+}
+template< typename TreeType, typename VisitorType >
+inline void maybeAccept( const TreeType * tree, VisitorType & visitor ) {
+        if ( tree ) {
+                tree->accept( visitor );
+        }
+}
 template< typename Container, typename VisitorType >
 inline void acceptAll( Container &container, VisitorType &visitor ) {
+inline void acceptAll( Container & container, VisitorType & visitor ) {
         SemanticErrorException errors;
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
+        for ( auto * i : container ) {
                 try {
+                        if ( *i ) {
+                                (*i)->accept( visitor );
+                        if ( i ) {
+                                i->accept( visitor );
+                        }
+                } catch( SemanticErrorException & e ) {
+                        errors.append( e );
+                }
+        }
+        if ( ! errors.isEmpty() ) {
+                throw errors;
+        }
+}
+template< typename Container, typename VisitorType >
+inline void acceptAll( const Container & container, VisitorType & visitor ) {
+        SemanticErrorException errors;
+        for ( const auto * i : container ) {
+                try {
+                        if ( i ) {
+                                i->accept( visitor );
+                        }
                 } catch( SemanticErrorException &e ) {

src/SynTree/module.mk

-              r7951100
+              rb067d9b
 ###############################################################################
+SRC += SynTree/Type.cc \
+       SynTree/VoidType.cc \
+       SynTree/BasicType.cc \
+       SynTree/PointerType.cc \
+       SynTree/ArrayType.cc \
+       SynTree/ReferenceType.cc \
+       SynTree/FunctionType.cc \
+       SynTree/ReferenceToType.cc \
+       SynTree/TupleType.cc \
+       SynTree/TypeofType.cc \
+       SynTree/AttrType.cc \
+       SynTree/VarArgsType.cc \
+       SynTree/ZeroOneType.cc \
+       SynTree/Constant.cc \
+       SynTree/Expression.cc \
+       SynTree/TupleExpr.cc \
+       SynTree/CommaExpr.cc \
+       SynTree/TypeExpr.cc \
+       SynTree/ApplicationExpr.cc \
+       SynTree/AddressExpr.cc \
+       SynTree/Statement.cc \
+       SynTree/CompoundStmt.cc \
+       SynTree/DeclStmt.cc \
+       SynTree/Declaration.cc \
+       SynTree/DeclarationWithType.cc \
+       SynTree/ObjectDecl.cc \
+       SynTree/FunctionDecl.cc \
+       SynTree/AggregateDecl.cc \
+       SynTree/NamedTypeDecl.cc \
+       SynTree/TypeDecl.cc \
+       SynTree/Initializer.cc \
+       SynTree/TypeSubstitution.cc \
+       SynTree/Attribute.cc \
+       SynTree/DeclReplacer.cc
+SRC_SYNTREE = \
+      SynTree/Type.cc \
+      SynTree/VoidType.cc \
+      SynTree/BasicType.cc \
+      SynTree/PointerType.cc \
+      SynTree/ArrayType.cc \
+      SynTree/ReferenceType.cc \
+      SynTree/FunctionType.cc \
+      SynTree/ReferenceToType.cc \
+      SynTree/TupleType.cc \
+      SynTree/TypeofType.cc \
+      SynTree/AttrType.cc \
+      SynTree/VarArgsType.cc \
+      SynTree/ZeroOneType.cc \
+      SynTree/Constant.cc \
+      SynTree/Expression.cc \
+      SynTree/TupleExpr.cc \
+      SynTree/CommaExpr.cc \
+      SynTree/TypeExpr.cc \
+      SynTree/ApplicationExpr.cc \
+      SynTree/AddressExpr.cc \
+      SynTree/Statement.cc \
+      SynTree/CompoundStmt.cc \
+      SynTree/DeclStmt.cc \
+      SynTree/Declaration.cc \
+      SynTree/DeclarationWithType.cc \
+      SynTree/ObjectDecl.cc \
+      SynTree/FunctionDecl.cc \
+      SynTree/AggregateDecl.cc \
+      SynTree/NamedTypeDecl.cc \
+      SynTree/TypeDecl.cc \
+      SynTree/Initializer.cc \
+      SynTree/TypeSubstitution.cc \
+      SynTree/Attribute.cc \
+      SynTree/DeclReplacer.cc
+SRC += $(SRC_SYNTREE)
+SRCDEMANGLE += $(SRC_SYNTREE)

src/Tuples/Explode.cc

-              r7951100
+              rb067d9b
 // Author           : Rob Schluntz
 // Created On       : Wed Nov 9 13:12:24 2016
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed Nov 9 13:20:24 2016
 // Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 12 16:40:00 2016
+// Update Count     : 3
 //
 …
                 return expr;
+        }
+namespace {
+// Remove one level of reference from a reference type.
+const ast::Type * getReferenceBase( const ast::Type * t ) {
+        if ( const ast::ReferenceType * ref = dynamic_cast< const ast::ReferenceType * >( t ) ) {
+                return ref->base;
+        } else {
+                assertf( false, "getReferenceBase for non-ref: %s", toString( t ).c_str() );
+                return nullptr;
+        }
+}
+struct CastExploderCore {
+        bool castAdded = false;
+        bool foundUniqueExpr = false;
+        const ast::Expr * applyCast( const ast::Expr * expr, bool first = true ) {
+                // On tuple push the cast down.
+                if ( const ast::TupleExpr * tupleExpr = dynamic_cast< const ast::TupleExpr * >( expr ) ) {
+                        foundUniqueExpr = true;
+                        std::vector< ast::ptr< ast::Expr > > exprs;
+                        for ( const ast::Expr * expr : tupleExpr->exprs ) {
+                                exprs.emplace_back( applyCast( expr, false ) );
+                                //exprs.emplace_back( ast::ptr< ast::Expr >( applyCast( expr, false ) ) );
+                        }
+                        if ( first ) {
+                                castAdded = true;
+                                const ast::Expr * tuple = new ast::TupleExpr{
+                                        tupleExpr->location, std::move( exprs ) };
+                                return new ast::CastExpr{ tuple, new ast::ReferenceType{ tuple->result } };
+                        } else {
+                                return new ast::TupleExpr( tupleExpr->location, std::move( exprs ) );
+                        }
+                }
+                if ( dynamic_cast< const ast::ReferenceType * >( expr->result.get() ) ) {
+                        return expr;
+                } else {
+                        castAdded = true;
+                        return new ast::CastExpr{ expr, new ast::ReferenceType{ expr->result } };
+                }
+        }
+        const ast::Expr * postmutate( const ast::UniqueExpr * node ) {
+                // move cast into unique expr so that the unique expr has type T& rather than
+                // type T. In particular, this transformation helps with generating the
+                // correct code for reference-cast member tuple expressions, since the result
+                // should now be a tuple of references rather than a reference to a tuple.
+                // Still, this code is a bit awkward, and could use some improvement.
+                const ast::UniqueExpr * newNode = new ast::UniqueExpr( node->location,
+                                applyCast( node->expr ), node->id );
+                if ( castAdded ) {
+                        // if a cast was added by applyCast, then unique expr now has one more layer of reference
+                        // than it had coming into this function. To ensure types still match correctly, need to cast
+                        //  to reference base so that outer expressions are still correct.
+                        castAdded = false;
+                        const ast::Type * newType = getReferenceBase( newNode->result );
+                        return new ast::CastExpr{ newNode->location, node, newType };
+                }
+                return newNode;
+        }
+        const ast::Expr * postmutate( const ast::TupleIndexExpr * tupleExpr ) {
+                // tuple index expr needs to be rebuilt to ensure that the type of the
+                // field is consistent with the type of the tuple expr, since the field
+                // may have changed from type T to T&.
+                return new ast::TupleIndexExpr( tupleExpr->location, tupleExpr->tuple, tupleExpr->index );
+        }
+};
+} // namespace
+const ast::Expr * distributeReference( const ast::Expr * expr ) {
+        ast::Pass<CastExploderCore> exploder;
+        expr = expr->accept( exploder );
+        if ( ! exploder.pass.foundUniqueExpr ) {
+                expr = new ast::CastExpr{ expr, new ast::ReferenceType{ expr->result } };
+        }
+        return expr;
+}
 } // namespace Tuples

src/Tuples/Explode.h

-              r7951100
+              rb067d9b
 // Author           : Rob Schluntz
 // Created On       : Wed Nov 9 13:12:24 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:55:16 2017
 // Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 17 14:36:00 2019
+// Update Count     : 4
 //
 …
 #include <utility>                      // for forward
+#include "AST/Expr.hpp"
 #include "ResolvExpr/Alternative.h"     // for Alternative, AltList
+#include "ResolvExpr/Candidate.hpp"     // for Candidate, CandidateList
 #include "ResolvExpr/ExplodedActual.h"  // for ExplodedActual
+#include "ResolvExpr/ExplodedArg.hpp"   // for ExplodedArg
 #include "SynTree/Expression.h"         // for Expression, UniqueExpr, AddressExpr
 #include "SynTree/Type.h"               // for TupleType, Type
 #include "Tuples.h"                     // for maybeImpure
+namespace ast {
+        class SymbolTable;
+}
 namespace SymTab {
 …
         template<typename OutputIterator>
         void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env,
+                        const ResolvExpr::OpenVarSet& openVars, const ResolvExpr::AssertionList& need,
                         const ResolvExpr::Cost& cost, const ResolvExpr::Cost& cvtCost ) {
                 *out++ = ResolvExpr::Alternative{ expr, env, cost, cvtCost };
+                *out++ = ResolvExpr::Alternative{ expr, env, openVars, need, cost, cvtCost };
+        }
         /// Append alternative to an ExplodedActual
         static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr,
+                        const ResolvExpr::TypeEnvironment&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
+                        const ResolvExpr::TypeEnvironment&, const ResolvExpr::OpenVarSet&,
+                        const ResolvExpr::AssertionList&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
                 ea.exprs.emplace_back( expr );
                 /// xxx -- merge environment, cost?
+                /// xxx -- merge environment, openVars, need, cost?
+        }
 …
                                         // distribute reference cast over all components
                                         append( std::forward<Output>(out), distributeReference( alt.release_expr() ),
                                                 alt.env, alt.cost, alt.cvtCost );
+                                                alt.env, alt.openVars, alt.need, alt.cost, alt.cvtCost );
+                                }
                                 // in tuple assignment, still need to handle the other cases, but only if not already handled here (don't want to output too many alternatives)
 …
                 } else {
                         // atomic (non-tuple) type - output a clone of the expression in a new alternative
+                        append( std::forward<Output>(out), expr->clone(), alt.env, alt.cost, alt.cvtCost );
+                        append( std::forward<Output>(out), expr->clone(), alt.env, alt.openVars, alt.need,
+                                alt.cost, alt.cvtCost );
+                }
+        }
 …
                 explode( alts.begin(), alts.end(), indexer, std::forward<Output>(out), isTupleAssign );
+        }
+const ast::Expr * distributeReference( const ast::Expr * );
+/// Append candidate to an OutputIterator of Candidates.
+template<typename OutputIterator>
+void append( OutputIterator out, const ast::Expr * expr, const ast::TypeEnvironment & env,
+                const ast::OpenVarSet & open, const ast::AssertionList & need,
+                const ResolvExpr::Cost & cost, const ResolvExpr::Cost & cvtCost ) {
+        ast::TypeEnvironment copyEnv = env;
+        ast::OpenVarSet copyOpen = open;
+        ast::AssertionSet set;
+        mergeAssertionSet( set, need );
+        *out++ = std::make_shared<ResolvExpr::Candidate>( expr, std::move( copyEnv ),
+                std::move( copyOpen ), std::move( set ), cost, cvtCost );
+}
+/// Append candidate to an ExplodedArg.
+static inline void append( ResolvExpr::ExplodedArg& ea, const ast::Expr * expr,
+                const ast::TypeEnvironment&, const ast::OpenVarSet&,
+                const ast::AssertionList&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
+        // I'm not sure why most of the arguments are unused. But they were in the old version.
+        ea.exprs.emplace_back( expr );
+}
+/// Check if the expression is a cast to a reference type, return it if it is.
+static inline const ast::CastExpr * isReferenceCast( const ast::Expr * expr ) {
+        if ( const ast::CastExpr * cast = dynamic_cast< const ast::CastExpr * >( expr ) ) {
+                if ( dynamic_cast< const ast::ReferenceType * >( cast->result.get() ) ) {
+                        return cast;
+                }
+        }
+        return nullptr;
+}
+/// helper function (indirectely) used by explode
+template< typename Output >
+void explodeRecursive(
+        const ast::CastExpr *, const ResolvExpr::Candidate &,
+        const ast::SymbolTable &, Output &&
+) {
+}
+/// helper function used by explode
+template< typename Output >
+void explodeUnique(
+        const ast::ptr< ast::Expr > & expr, const ResolvExpr::Candidate & arg,
+        const ast::SymbolTable & symtab, Output && out, bool isTupleAssign
+) {
+        // Tuple assignment can use a faster method if it is cast. Uses recursive exploding.
+        if ( isTupleAssign ) if ( const ast::CastExpr * castExpr = isReferenceCast( expr ) ) {
+                ResolvExpr::CandidateList candidates;
+                explodeUnique( castExpr->arg, arg, symtab, back_inserter( candidates ), true );
+                for ( ResolvExpr::CandidateRef & cand : candidates ) {
+                        // Distribute the reference cast over all components of the candidate.
+                        append( std::forward<Output>(out), distributeReference( cand->expr ), cand->env,
+                                cand->open, cand->need, cand->cost, cand->cvtCost );
+                }
+                return;
+        }
+        const ast::Type * res = expr->result->stripReferences();
+        if ( const ast::TupleType * tupleType = dynamic_cast< const ast::TupleType * >( res ) ) {
+                if ( const ast::ptr< ast::TupleExpr > & tupleExpr = expr.as< ast::TupleExpr >() ) {
+                        // Open the tuple expr and continue on its components.
+                        for ( const ast::Expr * expr : tupleExpr->exprs ) {
+                                explodeUnique( expr, arg, symtab, std::forward<Output>(out), isTupleAssign );
+                        }
+                } else {
+                        ast::ptr< ast::Expr > local = expr;
+                        // Expressions which may have side effects require a single unique instance.
+                        if ( Tuples::maybeImpureIgnoreUnique( local ) ) {
+                                local = new ast::UniqueExpr( local->location, local );
+                        }
+                        // Cast a reference away to a value-type to allow further explosion.
+                        if ( dynamic_cast< const ast::ReferenceType *>( local->result.get() ) ) {
+                                local = new ast::CastExpr{ local, tupleType };
+                        }
+                        // Now we have to go across the tuple via indexing.
+                        for ( unsigned int i = 0 ; i < tupleType->size() ; ++i ) {
+                                ast::TupleIndexExpr * idx = new ast::TupleIndexExpr( local->location, local, i );
+                                explodeUnique( idx, arg, symtab, std::forward<Output>(out), isTupleAssign );
+                                // TODO: We need more input to figure out the exact lifetimes of these types.
+                                // delete idx;
+                        }
+                        // delete local;
+                }
+        } else {
+                // For atomic/non-tuple types, no explosion is used.
+                append( std::forward<Output>(out), expr, arg.env, arg.open, arg.need, arg.cost,
+                        arg.cvtCost );
+        }
+}
+/// expands a tuple-valued candidate into multiple candidates, each with a non-tuple type
+template< typename Output >
+void explode(
+        const ResolvExpr::Candidate & arg, const ast::SymbolTable & symtab, Output && out,
+        bool isTupleAssign = false
+) {
+        explodeUnique( arg.expr, arg, symtab, std::forward< Output >( out ), isTupleAssign );
+}
+/// explode list of candidates into flattened list of candidates
+template< typename Output >
+void explode(
+        const ResolvExpr::CandidateList & cands, const ast::SymbolTable & symtab, Output && out,
+        bool isTupleAssign = false
+) {
+        for ( const ResolvExpr::CandidateRef & cand : cands ) {
+                explode( *cand, symtab, std::forward< Output >( out ), isTupleAssign );
+        }
+}
 } // namespace Tuples

src/Tuples/TupleAssignment.cc

-              r7951100
+              rb067d9b
 #include <vector>
+#include "AST/Decl.hpp"
+#include "AST/Init.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Stmt.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"
 #include "Common/UniqueName.h"             // for UniqueName
 #include "Common/utility.h"                // for zipWith
+#include "Common/utility.h"                // for splice, zipWith
 #include "Explode.h"                       // for explode
 #include "InitTweak/GenInit.h"             // for genCtorInit
 …
 namespace Tuples {
         class TupleAssignSpotter {
+        class TupleAssignSpotter_old {
           public:
                 // dispatcher for Tuple (multiple and mass) assignment operations
                 TupleAssignSpotter( ResolvExpr::AlternativeFinder & );
+                TupleAssignSpotter_old( ResolvExpr::AlternativeFinder & );
                 void spot( UntypedExpr * expr, std::vector<ResolvExpr::AlternativeFinder> &args );
 …
                 struct Matcher {
                   public:
                         Matcher( TupleAssignSpotter &spotter, const ResolvExpr::AltList& lhs, const
                                 ResolvExpr::AltList& rhs );
+                        Matcher( TupleAssignSpotter_old &spotter, const ResolvExpr::AltList& lhs,
+                                const ResolvExpr::AltList& rhs );
                         virtual ~Matcher() {}
                         virtual void match( std::list< Expression * > &out ) = 0;
                         ObjectDecl * newObject( UniqueName & namer, Expression * expr );
+                        void combineState( const ResolvExpr::Alternative& alt ) {
+                                compositeEnv.simpleCombine( alt.env );
+                                ResolvExpr::mergeOpenVars( openVars, alt.openVars );
+                                cloneAll( alt.need, need );
+                        }
+                        void combineState( const ResolvExpr::AltList& alts ) {
+                                for ( const ResolvExpr::Alternative& alt : alts ) { combineState( alt ); }
+                        }
                         ResolvExpr::AltList lhs, rhs;
                         TupleAssignSpotter &spotter;
+                        TupleAssignSpotter_old &spotter;
                         ResolvExpr::Cost baseCost;
                         std::list< ObjectDecl * > tmpDecls;
                         ResolvExpr::TypeEnvironment compositeEnv;
+                        ResolvExpr::OpenVarSet openVars;
+                        ResolvExpr::AssertionSet need;
                 };
                 struct MassAssignMatcher : public Matcher {
                   public:
                         MassAssignMatcher( TupleAssignSpotter &spotter, const ResolvExpr::AltList& lhs,
+                        MassAssignMatcher( TupleAssignSpotter_old &spotter, const ResolvExpr::AltList& lhs,
                                 const ResolvExpr::AltList& rhs ) : Matcher(spotter, lhs, rhs) {}
                         virtual void match( std::list< Expression * > &out );
 …
                 struct MultipleAssignMatcher : public Matcher {
                   public:
                         MultipleAssignMatcher( TupleAssignSpotter &spotter, const ResolvExpr::AltList& lhs,
+                        MultipleAssignMatcher( TupleAssignSpotter_old &spotter, const ResolvExpr::AltList& lhs,
                                 const ResolvExpr::AltList& rhs ) : Matcher(spotter, lhs, rhs) {}
                         virtual void match( std::list< Expression * > &out );
 …
         void handleTupleAssignment( ResolvExpr::AlternativeFinder & currentFinder, UntypedExpr * expr,
                                 std::vector<ResolvExpr::AlternativeFinder> &args ) {
                 TupleAssignSpotter spotter( currentFinder );
+                TupleAssignSpotter_old spotter( currentFinder );
                 spotter.spot( expr, args );
+        }
         TupleAssignSpotter::TupleAssignSpotter( ResolvExpr::AlternativeFinder &f )
+        TupleAssignSpotter_old::TupleAssignSpotter_old( ResolvExpr::AlternativeFinder &f )
                 : currentFinder(f) {}
         void TupleAssignSpotter::spot( UntypedExpr * expr,
+        void TupleAssignSpotter_old::spot( UntypedExpr * expr,
                         std::vector<ResolvExpr::AlternativeFinder> &args ) {
                 if (  NameExpr *op = dynamic_cast< NameExpr * >(expr->get_function()) ) {
 …
+        }
         void TupleAssignSpotter::match() {
+        void TupleAssignSpotter_old::match() {
                 assert ( matcher != 0 );
 …
+                }
                 // extract expressions from the assignment alternatives to produce a list of assignments that
                 // together form a single alternative
+                // extract expressions from the assignment alternatives to produce a list of assignments
+                // that together form a single alternative
                 std::list< Expression *> solved_assigns;
                 for ( ResolvExpr::Alternative & alt : current ) {
                         solved_assigns.push_back( alt.expr->clone() );
+                }
                 // combine assignment environments into combined expression environment
+                simpleCombineEnvironments( current.begin(), current.end(), matcher->compositeEnv );
+                        matcher->combineState( alt );
+                }
                 // xxx -- was push_front
+                currentFinder.get_alternatives().push_back( ResolvExpr::Alternative(
+                        new TupleAssignExpr(solved_assigns, matcher->tmpDecls), matcher->compositeEnv,
+                        ResolvExpr::sumCost( current ) + matcher->baseCost ) );
+        }
+        TupleAssignSpotter::Matcher::Matcher( TupleAssignSpotter &spotter,
+                currentFinder.get_alternatives().push_back( ResolvExpr::Alternative{
+                        new TupleAssignExpr{ solved_assigns, matcher->tmpDecls }, matcher->compositeEnv,
+                        matcher->openVars,
+                        ResolvExpr::AssertionList( matcher->need.begin(), matcher->need.end() ),
+                        ResolvExpr::sumCost( current ) + matcher->baseCost } );
+        }
+        TupleAssignSpotter_old::Matcher::Matcher( TupleAssignSpotter_old &spotter,
                 const ResolvExpr::AltList &lhs, const ResolvExpr::AltList &rhs )
         : lhs(lhs), rhs(rhs), spotter(spotter),
           baseCost( ResolvExpr::sumCost( lhs ) + ResolvExpr::sumCost( rhs ) ) {
                 simpleCombineEnvironments( lhs.begin(), lhs.end(), compositeEnv );
                 simpleCombineEnvironments( rhs.begin(), rhs.end(), compositeEnv );
+                combineState( lhs );
+                combineState( rhs );
+        }
 …
         };
         ObjectDecl * TupleAssignSpotter::Matcher::newObject( UniqueName & namer, Expression * expr ) {
+        ObjectDecl * TupleAssignSpotter_old::Matcher::newObject( UniqueName & namer, Expression * expr ) {
                 assert( expr->result && ! expr->get_result()->isVoid() );
                 ObjectDecl * ret = new ObjectDecl( namer.newName(), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, expr->result->clone(), new SingleInit( expr->clone() ) );
 …
+        }
         void TupleAssignSpotter::MassAssignMatcher::match( std::list< Expression * > &out ) {
+        void TupleAssignSpotter_old::MassAssignMatcher::match( std::list< Expression * > &out ) {
                 static UniqueName lhsNamer( "__massassign_L" );
                 static UniqueName rhsNamer( "__massassign_R" );
 …
+        }
         void TupleAssignSpotter::MultipleAssignMatcher::match( std::list< Expression * > &out ) {
+        void TupleAssignSpotter_old::MultipleAssignMatcher::match( std::list< Expression * > &out ) {
                 static UniqueName lhsNamer( "__multassign_L" );
                 static UniqueName rhsNamer( "__multassign_R" );
 …
+                }
+        }
+namespace {
+        /// true if `expr` is of tuple type
+        bool isTuple( const ast::Expr * expr ) {
+                if ( ! expr ) return false;
+                assert( expr->result );
+                return dynamic_cast< const ast::TupleType * >( expr->result->stripReferences() );
+        }
+        /// true if `expr` is of tuple type or a reference to one
+        bool refToTuple( const ast::Expr * expr ) {
+                assert( expr->result );
+                // check for function returning tuple of reference types
+                if ( auto castExpr = dynamic_cast< const ast::CastExpr * >( expr ) ) {
+                        return refToTuple( castExpr->arg );
+                } else {
+                        return isTuple( expr );
+                }
+        }
+        /// Dispatcher for tuple (multiple and mass) assignment operations
+        class TupleAssignSpotter_new final {
+                /// Actually finds tuple assignment operations, by subclass
+                struct Matcher {
+                        ResolvExpr::CandidateList lhs, rhs;
+                        TupleAssignSpotter_new & spotter;
+                        CodeLocation location;
+                        ResolvExpr::Cost baseCost;
+                        std::vector< ast::ptr< ast::ObjectDecl > > tmpDecls;
+                        ast::TypeEnvironment env;
+                        ast::OpenVarSet open;
+                        ast::AssertionSet need;
+                        void combineState( const ResolvExpr::Candidate & cand ) {
+                                env.simpleCombine( cand.env );
+                                ast::mergeOpenVars( open, cand.open );
+                                need.insert( cand.need.begin(), cand.need.end() );
+                        }
+                        Matcher(
+                                TupleAssignSpotter_new & s, const CodeLocation & loc,
+                                const ResolvExpr::CandidateList & l, const ResolvExpr::CandidateList & r )
+                        : lhs( l ), rhs( r ), spotter( s ), location( loc ),
+                          baseCost( ResolvExpr::sumCost( lhs ) + ResolvExpr::sumCost( rhs ) ), tmpDecls(),
+                          env(), open(), need() {
+                                for ( auto & cand : lhs ) combineState( *cand );
+                                for ( auto & cand : rhs ) combineState( *cand );
+                        }
+                        virtual ~Matcher() = default;
+                        virtual std::vector< ast::ptr< ast::Expr > > match() = 0;
+                        /// removes environments from subexpressions within statement expressions, which could
+                        /// throw off later passes like those in Box which rely on PolyMutator, and adds the
+                        /// bindings to the env
+                        struct EnvRemover {
+                                /// environment to hoist ExprStmt environments to
+                                ast::TypeEnvironment & tenv;
+                                EnvRemover( ast::TypeEnvironment & e ) : tenv( e ) {}
+                                const ast::ExprStmt * previsit( const ast::ExprStmt * stmt ) {
+                                        if ( stmt->expr->env ) {
+                                                tenv.add( *stmt->expr->env );
+                                                ast::ExprStmt * mut = mutate( stmt );
+                                                mut->expr.get_and_mutate()->env = nullptr;
+                                                return mut;
+                                        }
+                                        return stmt;
+                                }
+                        };
+                        ast::ObjectDecl * newObject( UniqueName & namer, const ast::Expr * expr ) {
+                                assert( expr->result && ! expr->result->isVoid() );
+                                ast::ObjectDecl * ret = new ast::ObjectDecl{
+                                        location, namer.newName(), expr->result, new ast::SingleInit{ location, expr },
+                                        ast::Storage::Classes{}, ast::Linkage::Cforall };
+                                // if expression type is a reference, just need an initializer, otherwise construct
+                                if ( ! expr->result.as< ast::ReferenceType >() ) {
+                                        // resolve ctor/dtor for the new object
+                                        ast::ptr< ast::Init > ctorInit = ResolvExpr::resolveCtorInit(
+                                                        InitTweak::genCtorInit( location, ret ), spotter.crntFinder.symtab );
+                                        // remove environments from subexpressions of stmtExpr
+                                        ast::Pass< EnvRemover > rm{ env };
+                                        ret->init = ctorInit->accept( rm );
+                                }
+                                PRINT( std::cerr << "new object: " << ret << std::endl; )
+                                return ret;
+                        }
+                        ast::UntypedExpr * createFunc(
+                                const std::string & fname, const ast::ObjectDecl * left,
+                                const ast::ObjectDecl * right
+                        ) {
+                                assert( left );
+                                std::vector< ast::ptr< ast::Expr > > args;
+                                args.emplace_back( new ast::VariableExpr{ location, left } );
+                                if ( right ) { args.emplace_back( new ast::VariableExpr{ location, right } ); }
+                                if ( left->type->referenceDepth() > 1 && CodeGen::isConstructor( fname ) ) {
+                                        args.front() = new ast::AddressExpr{ location, args.front() };
+                                        if ( right ) { args.back() = new ast::AddressExpr{ location, args.back() }; }
+                                        return new ast::UntypedExpr{
+                                                location, new ast::NameExpr{ location, "?=?" }, std::move(args) };
+                                } else {
+                                        return new ast::UntypedExpr{
+                                                location, new ast::NameExpr{ location, fname }, std::move(args) };
+                                }
+                        }
+                };
+                /// Finds mass-assignment operations
+                struct MassAssignMatcher final : public Matcher {
+                        MassAssignMatcher(
+                                TupleAssignSpotter_new & s, const CodeLocation & loc,
+                                const ResolvExpr::CandidateList & l, const ResolvExpr::CandidateList & r )
+                        : Matcher( s, loc, l, r ) {}
+                        std::vector< ast::ptr< ast::Expr > > match() override {
+                                static UniqueName lhsNamer( "__massassign_L" );
+                                static UniqueName rhsNamer( "__massassign_R" );
+                                // empty tuple case falls into this matcher
+                                assert( lhs.empty() ? rhs.empty() : rhs.size() <= 1 );
+                                ast::ptr< ast::ObjectDecl > rtmp =
+                                        rhs.size() == 1 ? newObject( rhsNamer, rhs.front()->expr ) : nullptr;
+                                std::vector< ast::ptr< ast::Expr > > out;
+                                for ( ResolvExpr::CandidateRef & lhsCand : lhs ) {
+                                        // create a temporary object for each value in the LHS and create a call
+                                        // involving the RHS
+                                        ast::ptr< ast::ObjectDecl > ltmp = newObject( lhsNamer, lhsCand->expr );
+                                        out.emplace_back( createFunc( spotter.fname, ltmp, rtmp ) );
+                                        tmpDecls.emplace_back( std::move( ltmp ) );
+                                }
+                                if ( rtmp ) tmpDecls.emplace_back( std::move( rtmp ) );
+                                return out;
+                        }
+                };
+                /// Finds multiple-assignment operations
+                struct MultipleAssignMatcher final : public Matcher {
+                        MultipleAssignMatcher(
+                                TupleAssignSpotter_new & s, const CodeLocation & loc,
+                                const ResolvExpr::CandidateList & l, const ResolvExpr::CandidateList & r )
+                        : Matcher( s, loc, l, r ) {}
+                        std::vector< ast::ptr< ast::Expr > > match() override {
+                                static UniqueName lhsNamer( "__multassign_L" );
+                                static UniqueName rhsNamer( "__multassign_R" );
+                                if ( lhs.size() != rhs.size() ) return {};
+                                // produce a new temporary object for each value in the LHS and RHS and pairwise
+                                // create the calls
+                                std::vector< ast::ptr< ast::ObjectDecl > > ltmp, rtmp;
+                                std::vector< ast::ptr< ast::Expr > > out;
+                                for ( unsigned i = 0; i < lhs.size(); ++i ) {
+                                        ResolvExpr::CandidateRef & lhsCand = lhs[i];
+                                        ResolvExpr::CandidateRef & rhsCand = rhs[i];
+                                        // convert RHS to LHS type minus one reference -- important for case where LHS
+                                        // is && and RHS is lvalue
+                                        auto lhsType = lhsCand->expr->result.strict_as< ast::ReferenceType >();
+                                        rhsCand->expr = new ast::CastExpr{ rhsCand->expr, lhsType->base };
+                                        ast::ptr< ast::ObjectDecl > lobj = newObject( lhsNamer, lhsCand->expr );
+                                        ast::ptr< ast::ObjectDecl > robj = newObject( rhsNamer, rhsCand->expr );
+                                        out.emplace_back( createFunc( spotter.fname, lobj, robj ) );
+                                        ltmp.emplace_back( std::move( lobj ) );
+                                        rtmp.emplace_back( std::move( robj ) );
+                                        // resolve the cast expression so that rhsCand return type is bound by the cast
+                                        // type as needed, and transfer the resulting environment
+                                        ResolvExpr::CandidateFinder finder{ spotter.crntFinder.symtab, env };
+                                        finder.find( rhsCand->expr, ResolvExpr::ResolvMode::withAdjustment() );
+                                        assert( finder.candidates.size() == 1 );
+                                        env = std::move( finder.candidates.front()->env );
+                                }
+                                splice( tmpDecls, ltmp );
+                                splice( tmpDecls, rtmp );
+                                return out;
+                        }
+                };
+                ResolvExpr::CandidateFinder & crntFinder;
+                std::string fname;
+                std::unique_ptr< Matcher > matcher;
+        public:
+                TupleAssignSpotter_new( ResolvExpr::CandidateFinder & f )
+                : crntFinder( f ), fname(), matcher() {}
+                // find left- and right-hand-sides for mass or multiple assignment
+                void spot(
+                        const ast::UntypedExpr * expr, std::vector< ResolvExpr::CandidateFinder > & args
+                ) {
+                        if ( auto op = expr->func.as< ast::NameExpr >() ) {
+                                // skip non-assignment functions
+                                if ( ! CodeGen::isCtorDtorAssign( op->name ) ) return;
+                                fname = op->name;
+                                // handled by CandidateFinder if applicable (both odd cases)
+                                if ( args.empty() || ( args.size() == 1 && CodeGen::isAssignment( fname ) ) ) {
+                                        return;
+                                }
+                                // look over all possible left-hand-side
+                                for ( ResolvExpr::CandidateRef & lhsCand : args[0] ) {
+                                        // skip non-tuple LHS
+                                        if ( ! refToTuple( lhsCand->expr ) ) continue;
+                                        // explode is aware of casts - ensure every LHS is sent into explode with a
+                                        // reference cast
+                                        if ( ! lhsCand->expr.as< ast::CastExpr >() ) {
+                                                lhsCand->expr = new ast::CastExpr{
+                                                        lhsCand->expr, new ast::ReferenceType{ lhsCand->expr->result } };
+                                        }
+                                        // explode the LHS so that each field of a tuple-valued expr is assigned
+                                        ResolvExpr::CandidateList lhs;
+                                        explode( *lhsCand, crntFinder.symtab, back_inserter(lhs), true );
+                                        for ( ResolvExpr::CandidateRef & cand : lhs ) {
+                                                // each LHS value must be a reference - some come in with a cast, if not
+                                                // just cast to reference here
+                                                if ( ! cand->expr->result.as< ast::ReferenceType >() ) {
+                                                        cand->expr = new ast::CastExpr{
+                                                                cand->expr, new ast::ReferenceType{ cand->expr->result } };
+                                                }
+                                        }
+                                        if ( args.size() == 1 ) {
+                                                // mass default-initialization/destruction
+                                                ResolvExpr::CandidateList rhs{};
+                                                matcher.reset( new MassAssignMatcher{ *this, expr->location, lhs, rhs } );
+                                                match();
+                                        } else if ( args.size() == 2 ) {
+                                                for ( const ResolvExpr::CandidateRef & rhsCand : args[1] ) {
+                                                        ResolvExpr::CandidateList rhs;
+                                                        if ( isTuple( rhsCand->expr ) ) {
+                                                                // multiple assignment
+                                                                explode( *rhsCand, crntFinder.symtab, back_inserter(rhs), true );
+                                                                matcher.reset(
+                                                                        new MultipleAssignMatcher{ *this, expr->location, lhs, rhs } );
+                                                        } else {
+                                                                // mass assignment
+                                                                rhs.emplace_back( rhsCand );
+                                                                matcher.reset(
+                                                                        new MassAssignMatcher{ *this, expr->location, lhs, rhs } );
+                                                        }
+                                                        match();
+                                                }
+                                        } else {
+                                                // expand all possible RHS possibilities
+                                                std::vector< ResolvExpr::CandidateList > rhsCands;
+                                                combos(
+                                                        std::next( args.begin(), 1 ), args.end(), back_inserter( rhsCands ) );
+                                                for ( const ResolvExpr::CandidateList & rhsCand : rhsCands ) {
+                                                        // multiple assignment
+                                                        ResolvExpr::CandidateList rhs;
+                                                        explode( rhsCand, crntFinder.symtab, back_inserter(rhs), true );
+                                                        matcher.reset(
+                                                                new MultipleAssignMatcher{ *this, expr->location, lhs, rhs } );
+                                                        match();
+                                                }
+                                        }
+                                }
+                        }
+                }
+                void match() {
+                        assert( matcher );
+                        std::vector< ast::ptr< ast::Expr > > newAssigns = matcher->match();
+                        if ( ! ( matcher->lhs.empty() && matcher->rhs.empty() ) ) {
+                                // if both LHS and RHS are empty than this is the empty tuple case, wherein it's
+                                // okay for newAssigns to be empty. Otherwise, return early so that no new
+                                // candidates are generated
+                                if ( newAssigns.empty() ) return;
+                        }
+                        ResolvExpr::CandidateList crnt;
+                        // now resolve new assignments
+                        for ( const ast::Expr * expr : newAssigns ) {
+                                PRINT(
+                                        std::cerr << "== resolving tuple assign ==" << std::endl;
+                                        std::cerr << expr << std::endl;
+                                )
+                                ResolvExpr::CandidateFinder finder{ crntFinder.symtab, matcher->env };
+                                try {
+                                        finder.find( expr, ResolvExpr::ResolvMode::withAdjustment() );
+                                } catch (...) {
+                                        // no match is not failure, just that this tuple assignment is invalid
+                                        return;
+                                }
+                                ResolvExpr::CandidateList & cands = finder.candidates;
+                                assert( cands.size() == 1 );
+                                assert( cands.front()->expr );
+                                crnt.emplace_back( std::move( cands.front() ) );
+                        }
+                        // extract expressions from the assignment candidates to produce a list of assignments
+                        // that together form a sigle candidate
+                        std::vector< ast::ptr< ast::Expr > > solved;
+                        for ( ResolvExpr::CandidateRef & cand : crnt ) {
+                                solved.emplace_back( cand->expr );
+                                matcher->combineState( *cand );
+                        }
+                        crntFinder.candidates.emplace_back( std::make_shared< ResolvExpr::Candidate >(
+                                new ast::TupleAssignExpr{
+                                        matcher->location, std::move( solved ), std::move( matcher->tmpDecls ) },
+                                std::move( matcher->env ), std::move( matcher->open ), std::move( matcher->need ),
+                                ResolvExpr::sumCost( crnt ) + matcher->baseCost ) );
+                }
+        };
+} // anonymous namespace
+void handleTupleAssignment(
+        ResolvExpr::CandidateFinder & finder, const ast::UntypedExpr * assign,
+        std::vector< ResolvExpr::CandidateFinder > & args
+) {
+        TupleAssignSpotter_new spotter{ finder };
+        spotter.spot( assign, args );
+}
 } // namespace Tuples

src/Tuples/TupleExpansion.cc

-              r7951100
+              rb067d9b
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jun 21 17:35:04 2017
 // Update Count     : 19
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jul 19 14:39:00 2019
+// Update Count     : 22
 //
 …
 #include <cassert>                // for assert
 #include <list>                   // for list
+#include <vector>
+#include "AST/CVQualifiers.hpp"
+#include "AST/Expr.hpp"
+#include "AST/Node.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"   // for PassVisitor, WithDeclsToAdd, WithGu...
 #include "Common/ScopedMap.h"     // for ScopedMap
 …
                 };
                 struct TupleTypeReplacer : public WithDeclsToAdd, public WithGuards, public WithTypeSubstitution {
+                struct TupleTypeReplacer : public WithDeclsToAdd, public WithGuards, public WithConstTypeSubstitution {
                         Type * postmutate( TupleType * tupleType );
 …
                 // produce the TupleType which aggregates the types of the exprs
                 std::list< Type * > types;
                 Type::Qualifiers qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Lvalue | Type::Atomic | Type::Mutex );
+                Type::Qualifiers qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic | Type::Mutex );
                 for ( Expression * expr : exprs ) {
                         assert( expr->get_result() );
 …
                 return new TupleType( qualifiers, types );
+        }
+        const ast::Type * makeTupleType( const std::vector<ast::ptr<ast::Expr>> & exprs ) {
+                // produce the TupleType which aggregates the types of the exprs
+                std::vector<ast::ptr<ast::Type>> types;
+                ast::CV::Qualifiers quals{
+                        ast::CV::Const | ast::CV::Volatile | ast::CV::Restrict | ast::CV::Lvalue |
+                        ast::CV::Atomic | ast::CV::Mutex };
+                for ( const ast::Expr * expr : exprs ) {
+                        assert( expr->result );
+                        // if the type of any expr is void, the type of the entire tuple is void
+                        if ( expr->result->isVoid() ) return new ast::VoidType{};
+                        // qualifiers on the tuple type are the qualifiers that exist on all components
+                        quals &= expr->result->qualifiers;
+                        types.emplace_back( expr->result );
+                }
+                if ( exprs.empty() ) { quals = ast::CV::Qualifiers{}; }
+                return new ast::TupleType{ std::move(types), quals };
+        }
         TypeInstType * isTtype( Type * type ) {
 …
+        }
+        const TypeInstType * isTtype( const Type * type ) {
+                if ( const TypeInstType * inst = dynamic_cast< const TypeInstType * >( type ) ) {
+                        if ( inst->baseType && inst->baseType->kind == TypeDecl::Ttype ) {
+                                return inst;
+                        }
+                }
+                return nullptr;
+        }
+        const ast::TypeInstType * isTtype( const ast::Type * type ) {
+                if ( const ast::TypeInstType * inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
+                        if ( inst->base && inst->base->kind == ast::TypeVar::Ttype ) {
+                                return inst;
+                        }
+                }
+                return nullptr;
+        }
         namespace {
                 /// determines if impurity (read: side-effects) may exist in a piece of code. Currently gives a very crude approximation, wherein any function call expression means the code may be impure
 …
                         ImpurityDetector( bool ignoreUnique ) : ignoreUnique( ignoreUnique ) {}
                         void previsit( ApplicationExpr * appExpr ) {
+                        void previsit( const ApplicationExpr * appExpr ) {
                                 visit_children = false;
                                 if ( DeclarationWithType * function = InitTweak::getFunction( appExpr ) ) {
                                         if ( function->get_linkage() == LinkageSpec::Intrinsic ) {
                                                 if ( function->get_name() == "*?" || function->get_name() == "?[?]" ) {
+                                if ( const DeclarationWithType * function = InitTweak::getFunction( appExpr ) ) {
+                                        if ( function->linkage == LinkageSpec::Intrinsic ) {
+                                                if ( function->name == "*?" || function->name == "?[?]" ) {
                                                         // intrinsic dereference, subscript are pure, but need to recursively look for impurity
                                                         visit_children = true;
 …
                                 maybeImpure = true;
+                        }
                         void previsit( UntypedExpr * ) { maybeImpure = true; visit_children = false; }
                         void previsit( UniqueExpr * ) {
+                        void previsit( const UntypedExpr * ) { maybeImpure = true; visit_children = false; }
+                        void previsit( const UniqueExpr * ) {
                                 if ( ignoreUnique ) {
                                         // bottom out at unique expression.
 …
         } // namespace
         bool maybeImpure( Expression * expr ) {
+        bool maybeImpure( const Expression * expr ) {
                 PassVisitor<ImpurityDetector> detector( false );
                 expr->accept( detector );
 …
+        }
         bool maybeImpureIgnoreUnique( Expression * expr ) {
+        bool maybeImpureIgnoreUnique( const Expression * expr ) {
                 PassVisitor<ImpurityDetector> detector( true );
                 expr->accept( detector );

src/Tuples/Tuples.h

-              r7951100
+              rb067d9b
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:55:00 2017
 // Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jun 18 09:36:00 2019
+// Update Count     : 18
 //
 …
 #include <vector>
+#include "AST/Fwd.hpp"
+#include "AST/Node.hpp"
 #include "SynTree/Expression.h"
 #include "SynTree/Declaration.h"
 …
 #include "ResolvExpr/AlternativeFinder.h"
+#include "ResolvExpr/CandidateFinder.hpp"
 namespace Tuples {
         // TupleAssignment.cc
         void handleTupleAssignment( ResolvExpr::AlternativeFinder & currentFinder, UntypedExpr * assign,
+        void handleTupleAssignment( ResolvExpr::AlternativeFinder & currentFinder, UntypedExpr * assign,
                 std::vector< ResolvExpr::AlternativeFinder >& args );
+        void handleTupleAssignment(
+                ResolvExpr::CandidateFinder & finder, const ast::UntypedExpr * assign,
+                std::vector< ResolvExpr::CandidateFinder > & args );
         // TupleExpansion.cc
         /// expands z.[a, b.[x, y], c] into [z.a, z.b.x, z.b.y, z.c], inserting UniqueExprs as appropriate
 …
         /// returns VoidType if any of the expressions have Voidtype, otherwise TupleType of the Expression result types
         Type * makeTupleType( const std::list< Expression * > & exprs );
+        const ast::Type * makeTupleType( const std::vector<ast::ptr<ast::Expr>> & exprs );
         /// returns a TypeInstType if `type` is a ttype, nullptr otherwise
         TypeInstType * isTtype( Type * type );
+        const TypeInstType * isTtype( const Type * type );
+        const ast::TypeInstType * isTtype( const ast::Type * type );
         /// returns true if the expression may contain side-effects.
+        bool maybeImpure( Expression * expr );
+        bool maybeImpure( const Expression * expr );
+        bool maybeImpure( const ast::Expr * expr );
+        /// returns true if the expression may contain side-effect, ignoring the presence of unique expressions.
+        bool maybeImpureIgnoreUnique( Expression * expr );
+        /// Returns true if the expression may contain side-effect,
+        /// ignoring the presence of unique expressions.
+        bool maybeImpureIgnoreUnique( const Expression * expr );
+        bool maybeImpureIgnoreUnique( const ast::Expr * expr );
 } // namespace Tuples

src/Tuples/module.mk

-              r7951100
+              rb067d9b
 ###############################################################################
+SRC +=  Tuples/TupleAssignment.cc \
+        Tuples/TupleExpansion.cc \
+        Tuples/Explode.cc
+SRC += Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc Tuples/Explode.cc \
+        Tuples/Tuples.cc
+SRCDEMANGLE += Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc Tuples/Explode.cc \
+        Tuples/Tuples.cc

src/Virtual/ExpandCasts.cc

-              r7951100
+              rb067d9b
                                 //              )
                                 //      ),
                         new UntypedExpr( new NameExpr( "__cfa__virtual_cast" ), {
+                        new ApplicationExpr( VariableExpr::functionPointer( vcast_decl ), {
                                         new CastExpr(
                                                 new AddressExpr( new VariableExpr( table ) ),
                                                 pointer_to_pvt(1)
                                                 ),
+                                        ),
                                         new CastExpr(
                                                 castExpr->get_arg(),
                                                 pointer_to_pvt(2)
+                                                )
                                 } ),
+                                        )
+                        } ),
                         castExpr->get_result()->clone()
                         );
+                );
                 castExpr->set_arg( nullptr );

src/include/cassert

-              r7951100
+              rb067d9b
 // Author           : Peter A. Buhr
 // Created On       : Thu Aug 18 13:19:26 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Aug  1 11:56:01 2017
 // Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun  3 13:11:00 2017
+// Update Count     : 18
 //
 …
 #include_next <cassert>
+#include <string>
+template < typename ... Params >
+std::string toString( const Params & ... params );
 #ifdef NDEBUG
 …
 template<typename T, typename U>
 static inline T strict_dynamic_cast( const U & src ) {
+        assert(src);
         T ret = dynamic_cast<T>(src);
         assertf(ret, "%s", toString(src).c_str());
 …
+}
+template<typename T, decltype(nullptr) null, typename U>
+static inline T strict_dynamic_cast( const U & src ) {
+        return src ? strict_dynamic_cast<T, U>( src ) : nullptr;
+}
+extern void abort(const char *fmt, ...  ) noexcept __attribute__((noreturn, format(printf, 1, 2)));
 // Local Variables: //
 // tab-width: 4 //

src/main.cc

-              r7951100
+              rb067d9b
 // main.cc --
 //
 // Author           : Richard C. Bilson
+// Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jun  6 15:51:47 2018
 // Update Count     : 498
+// Last Modified On : Fri Aug 23 06:50:08 2019
+// Update Count     : 607
 //
 …
 #include <execinfo.h>                       // for backtrace, backtrace_symbols
 #include <getopt.h>                         // for no_argument, optind, geto...
-#include <signal.h>                         // for signal, SIGABRT, SIGSEGV
 #include <cassert>                          // for assertf
 #include <cstdio>                           // for fopen, FILE, fclose, stdin
 #include <cstdlib>                          // for exit, free, abort, EXIT_F...
+#include <csignal>                         // for signal, SIGABRT, SIGSEGV
 #include <cstring>                          // for index
 #include <fstream>                          // for ofstream
 #include <iostream>                         // for operator<<, basic_ostream
+#include <iomanip>
 #include <iterator>                         // for back_inserter
 #include <list>                             // for list
 #include <string>                           // for char_traits, operator<<
+#include "CompilationState.h"
 #include "../config.h"                      // for CFA_LIBDIR
 #include "CodeGen/FixMain.h"                // for FixMain
 …
 #include "CodeGen/Generate.h"               // for generate
 #include "CodeTools/DeclStats.h"            // for printDeclStats
+#include "CodeTools/ResolvProtoDump.h"      // for dumpAsResolvProto
 #include "CodeTools/TrackLoc.h"             // for fillLocations
 #include "Common/CompilerError.h"           // for CompilerError
 #include "Common/Heap.h"
+#include "Common/Stats.h"
 #include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"           // for SemanticError
 …
 #include "Virtual/ExpandCasts.h"            // for expandCasts
 using namespace std;
+#define PASS(name, pass)                   \
+static void NewPass( const char * const name ) {
+        Stats::Heap::newPass( name );
+        using namespace Stats::Counters;
+        {
+                static auto group = build<CounterGroup>( "Pass Visitor" );
+                auto pass = build<CounterGroup>( name, group );
+                pass_visitor_stats.depth = 0;
+                pass_visitor_stats.avg = build<AverageCounter<double>>( "Average Depth", pass );
+                pass_visitor_stats.max = build<MaxCounter<double>>( "Max Depth", pass );
+        }
+        {
+                static auto group = build<CounterGroup>( "Syntax Node" );
+                auto pass = build<CounterGroup>( name, group );
+                BaseSyntaxNode::new_nodes = build<SimpleCounter>( "Allocs", pass );
+        }
+}
+#define PASS( name, pass )                  \
         if ( errorp ) { cerr << name << endl; } \
+        HeapStats::newPass(name);               \
+        pass;
+        NewPass(name);                          \
+        Stats::Time::StartBlock(name);          \
+        pass;                                   \
+        Stats::Time::StopBlock();
 LinkageSpec::Spec linkage = LinkageSpec::Cforall;
 …
 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,
+        resolvep = false,                                                                       // used in AlternativeFinder
+        symtabp = false,
+        treep = false,
+        tuplep = false,
+        validp = false,
+        errorp = false,
+        codegenp = false,
+        prettycodegenp = false,
+        linemarks = false;
+static void parse_cmdline( int argc, char *argv[], const char *& filename );
+static bool waiting_for_gdb = false;                                    // flag to set cfa-cpp to wait for gdb on start
+static std::string PreludeDirector = "";
+static void parse_cmdline( int argc, char *argv[] );
 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
 …
 } // backtrace
 void sigSegvBusHandler( int sig_num ) {
+static void sigSegvBusHandler( int sig_num ) {
         cerr << "*CFA runtime error* program cfa-cpp terminated with "
                  <<     (sig_num == SIGSEGV ? "segment fault" : "bus error")
 …
         backtrace( 2 );                                                                         // skip first 2 stack frames
         //_exit( EXIT_FAILURE );
         abort();
+        abort();                                                                                        // cause core dump for debugging
 } // sigSegvBusHandler
 void sigAbortHandler( __attribute__((unused)) int sig_num ) {
+static void sigAbortHandler( __attribute__((unused)) int sig_num ) {
         backtrace( 6 );                                                                         // skip first 6 stack frames
         signal( SIGABRT, SIG_DFL);                                                      // reset default signal handler
     raise( SIGABRT );                                                                   // reraise SIGABRT
+        raise( SIGABRT );                                                                       // reraise SIGABRT
 } // sigAbortHandler
 int main( int argc, char * argv[] ) {
         FILE * input;                                                                           // use FILE rather than istream because yyin is FILE
+        ostream *output = & cout;
+        const char *filename = nullptr;
+        ostream * output = & cout;
         list< Declaration * > translationUnit;
 …
         // } // for
         parse_cmdline( argc, argv, filename );                          // process command-line arguments
+        parse_cmdline( argc, argv );                                            // process command-line arguments
         CodeGen::FixMain::setReplaceMain( !nomainp );
+        if ( waiting_for_gdb ) {
+                std::cerr << "Waiting for gdb" << std::endl;
+                std::cerr << "run :" << std::endl;
+                std::cerr << "  gdb attach " << getpid() << std::endl;
+                raise(SIGSTOP);
+        } // if
         try {
 …
                 if ( optind < argc ) {                                                  // any commands after the flags ? => input file name
                         input = fopen( argv[ optind ], "r" );
+                        assertf( input, "cannot open %s\n", argv[ optind ] );
+                        // if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
+                        if ( filename == nullptr ) filename = argv[ optind ];
+                        // prelude filename comes in differently
+                        if ( libcfap ) filename = "prelude.cf";
+                        assertf( input, "cannot open %s because %s\n", argv[ optind ], strerror( errno ) );
                         optind += 1;
                 } else {                                                                                // no input file name
                         input = stdin;
+                        // if running cfa-cpp directly, might forget to pass -F option. Since this takes from stdin, pass
+                        // a fake name along
+                        if ( filename == nullptr ) filename = "stdin";
+                } // if
+                } // if
+                Stats::Time::StartGlobal();
+                NewPass("Parse");
+                Stats::Time::StartBlock("Parse");
                 // read in the builtins, extras, and the prelude
 …
                         // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
+                        assertf( !PreludeDirector.empty(), "Can't find prelude without option --prelude-dir must be used." );
                         // 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( (PreludeDirector + "/gcc-builtins.cf").c_str(), "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( (PreludeDirector + "/extras.cf").c_str(), "r" );
                         assertf( extras, "cannot open extras.cf\n" );
                         parse( extras, LinkageSpec::BuiltinC );
 …
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
                                 FILE * prelude = fopen( treep ? "../prelude/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
                                 assertf( prelude, "cannot open prelude.cf\n" );
+                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cfa").c_str(), "r" );
+                                assertf( prelude, "cannot open prelude.cfa\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( (PreludeDirector + "/builtins.cf").c_str(), "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
                                 parse( builtins, LinkageSpec::BuiltinCFA );
 …
                         parseTree->printList( cout );
                         delete parseTree;
                         return 0;
+                        return EXIT_SUCCESS;
                 } // if
 …
                 if ( astp ) {
                         dump( translationUnit );
+                        return 0;
+                } // if
+                        return EXIT_SUCCESS;
+                } // if
+                // Temporary: fill locations after parsing so that every node has a location, for early error messages.
+                // Eventually we should pass the locations from the parser to every node, but this quick and dirty solution
+                // works okay for now.
+                CodeTools::fillLocations( translationUnit );
+                Stats::Time::StopBlock();
                 // add the assignment statement after the initialization of a type parameter
                 PASS( "validate", SymTab::validate( translationUnit, symtabp ) );
+                PASS( "Validate", SymTab::validate( translationUnit, symtabp ) );
                 if ( symtabp ) {
                         deleteAll( translationUnit );
                         return 0;
+                        return EXIT_SUCCESS;
                 } // if
 …
                         PassVisitor<ResolvExpr::AlternativePrinter> printer( cout );
                         acceptAll( translationUnit, printer );
                         return 0;
+                        return EXIT_SUCCESS;
                 } // if
                 if ( validp ) {
                         dump( translationUnit );
                         return 0;
                 } // if
                 PASS( "fixLabels", ControlStruct::fixLabels( translationUnit ) );
                 PASS( "fixNames", CodeGen::fixNames( translationUnit ) );
                 PASS( "genInit", InitTweak::genInit( translationUnit ) );
                 PASS( "expandMemberTuples" , Tuples::expandMemberTuples( translationUnit ) );
+                        return EXIT_SUCCESS;
+                } // if
+                PASS( "Fix Labels", ControlStruct::fixLabels( translationUnit ) );
+                PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );
+                PASS( "Gen Init", InitTweak::genInit( translationUnit ) );
+                PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
                 if ( libcfap ) {
                         // generate the bodies of cfa library functions
 …
                         CodeTools::printDeclStats( translationUnit );
                         deleteAll( translationUnit );
                         return 0;
+                }
+                        return EXIT_SUCCESS;
+                } // if
                 if ( bresolvep ) {
                         dump( translationUnit );
                         return 0;
+                        return EXIT_SUCCESS;
                 } // if
                 CodeTools::fillLocations( translationUnit );
+                PASS( "resolve", ResolvExpr::resolve( translationUnit ) );
+                if ( resolvprotop ) {
+                        CodeTools::dumpAsResolvProto( translationUnit );
+                        return EXIT_SUCCESS;
+                } // if
+                PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
                 if ( exprp ) {
                         dump( translationUnit );
                         return 0;
+                        return EXIT_SUCCESS;
                 } // if
                 // fix ObjectDecl - replaces ConstructorInit nodes
                 PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
+                PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
                         return 0;
                 } // if
                 PASS( "expandUniqueExpr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
                 PASS( "translateEHM" , ControlStruct::translateEHM( translationUnit ) );
                 PASS( "generateWaitfor" , Concurrency::generateWaitFor( translationUnit ) );
                 PASS( "convertSpecializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded
                 PASS( "expandTuples", Tuples::expandTuples( translationUnit ) ); // xxx - is this the right place for this?
+                        return EXIT_SUCCESS;
+                } // if
+                PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
+                PASS( "Translate EHM" , ControlStruct::translateEHM( translationUnit ) );
+                PASS( "Gen Waitfor" , Concurrency::generateWaitFor( translationUnit ) );
+                PASS( "Convert Specializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded
+                PASS( "Expand Tuples", Tuples::expandTuples( translationUnit ) ); // xxx - is this the right place for this?
                 if ( tuplep ) {
                         dump( translationUnit );
                         return 0;
+                }
                 PASS( "virtual expandCasts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
                 PASS( "instantiateGenerics", GenPoly::instantiateGeneric( translationUnit ) );
+                        return EXIT_SUCCESS;
+                } // if
+                PASS( "Virtual Expand Casts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
+                PASS( "Instantiate Generics", GenPoly::instantiateGeneric( translationUnit ) );
                 if ( genericsp ) {
                         dump( translationUnit );
                         return 0;
+                }
+                PASS( "convertLvalue", GenPoly::convertLvalue( translationUnit ) );
+                        return EXIT_SUCCESS;
+                } // if
+                PASS( "Convert L-Value", GenPoly::convertLvalue( translationUnit ) );
                 if ( bboxp ) {
                         dump( translationUnit );
                         return 0;
                 } // if
                 PASS( "box", GenPoly::box( translationUnit ) );
+                        return EXIT_SUCCESS;
+                } // if
+                PASS( "Box", GenPoly::box( translationUnit ) );
                 if ( bcodegenp ) {
                         dump( translationUnit );
                         return 0;
+                }
+                        return EXIT_SUCCESS;
+                } // if
                 if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
 …
                 CodeTools::fillLocations( translationUnit );
                 PASS( "codegen", CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks ) );
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
+                PASS( "Code Gen", CodeGen::generate( translationUnit, *output, ! genproto, prettycodegenp, true, linemarks ) );
+                CodeGen::FixMain::fix( *output, (PreludeDirector + "/bootloader.c").c_str() );
                 if ( output != &cout ) {
                         delete output;
 …
                         delete output;
                 } // if
                 return 1;
+                return EXIT_FAILURE;
         } catch ( UnimplementedError &e ) {
                 cout << "Sorry, " << e.get_what() << " is not currently implemented" << endl;
 …
                         delete output;
                 } // if
                 return 1;
+                return EXIT_FAILURE;
         } catch ( CompilerError &e ) {
                 cerr << "Compiler Error: " << e.get_what() << endl;
 …
                         delete output;
                 } // if
                 return 1;
         } catch(...) {
+                return EXIT_FAILURE;
+        } catch ( ... ) {
                 std::exception_ptr eptr = std::current_exception();
                 try {
                         if (eptr) {
                                 std::rethrow_exception(eptr);
+                        }
+                        else {
+                                std::cerr << "Exception Uncaught and Unkown" << std::endl;
+                        }
+                        } else {
+                                std::cerr << "Exception Uncaught and Unknown" << std::endl;
+                        } // if
                 } catch(const std::exception& e) {
                         std::cerr << "Unaught Exception \"" << e.what() << "\"\n";
+                }
                 return 1;
         }// try
+                        std::cerr << "Uncaught Exception \"" << e.what() << "\"\n";
+                } // try
+                return EXIT_FAILURE;
+        } // try
         deleteAll( translationUnit );
         if(!libcfap && !treep) HeapStats::printStats();
         return 0;
+        Stats::print();
+        return EXIT_SUCCESS;
 } // main
+void parse_cmdline( int argc, char * argv[], const char *& filename ) {
+        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
+        static struct option long_opts[] = {
+                { "ast", no_argument, 0, Ast },
+                { "before-box", no_argument, 0, Bbox },
+                { "before-resolver", no_argument, 0, Bresolver },
+                { "ctorinitfix", no_argument, 0, CtorInitFix },
+                { "decl-stats", no_argument, 0, DeclStats },
+                { "expr", no_argument, 0, Expr },
+                { "expralt", no_argument, 0, ExprAlt },
+                { "grammar", no_argument, 0, Grammar },
+                { "libcfa", no_argument, 0, LibCFA },
+                { "line-marks", no_argument, 0, Linemarks },
+                { "no-line-marks", no_argument, 0, Nolinemarks },
+                { "no-preamble", no_argument, 0, Nopreamble },
+                { "parse", no_argument, 0, Parse },
+                { "no-prototypes", no_argument, 0, Prototypes },
+                { "resolver", no_argument, 0, Resolver },
+                { "symbol", no_argument, 0, Symbol },
+                { "tree", no_argument, 0, Tree },
+                { "tuple-expansion", no_argument, 0, TupleExpansion },
+                { "validate", no_argument, 0, Validate },
+                { 0, 0, 0, 0 }
+        }; // long_opts
+        int long_index;
+static const char optstring[] = ":hlLmNnpP:S:twW:D:";
+enum { PreludeDir = 128 };
+static struct option long_opts[] = {
+        { "help", no_argument, nullptr, 'h' },
+        { "libcfa", no_argument, nullptr, 'l' },
+        { "linemarks", no_argument, nullptr, 'L' },
+        { "no-main", no_argument, 0, 'm' },
+        { "no-linemarks", no_argument, nullptr, 'N' },
+        { "no-prelude", no_argument, nullptr, 'n' },
+        { "prototypes", no_argument, nullptr, 'p' },
+        { "print", required_argument, nullptr, 'P' },
+        { "prelude-dir", required_argument, nullptr, PreludeDir },
+        { "statistics", required_argument, nullptr, 'S' },
+        { "tree", no_argument, nullptr, 't' },
+        { "gdb", no_argument, nullptr, 'g' },
+        { "", no_argument, nullptr, 0 },                                        // -w
+        { "", no_argument, nullptr, 0 },                                        // -W
+        { "", no_argument, nullptr, 0 },                                        // -D
+        { nullptr, 0, nullptr, 0 }
+}; // long_opts
+static const char * description[] = {
+        "print help message",                                                           // -h
+        "generate libcfa.c",                                                            // -l
+        "generate line marks",                                                          // -L
+        "do not replace main",                                                          // -m
+        "do not generate line marks",                                           // -N
+        "do not read prelude",                                                          // -n
+        "generate prototypes for prelude functions",            // -p
+        "print",                                                                                        // -P
+        "<directory> prelude directory for debug/nodebug",      // no flag
+        "<option-list> enable profiling information:\n          counters,heap,time,all,none", // -S
+        "building cfa standard lib",                                                                    // -t
+        "wait for gdb to attach",                                                                       // -g
+        "",                                                                                                     // -w
+        "",                                                                                                     // -W
+        "",                                                                                                     // -D
+}; // description
+static_assert( sizeof( long_opts ) / sizeof( long_opts[0] ) - 1 == sizeof( description ) / sizeof( description[0] ), "Long opts and description must match" );
+static struct Printopts {
+        const char * name;
+        int & flag;
+        int val;
+        const char * descript;
+} printopts[] = {
+        { "ascodegen", codegenp, true, "print AST as codegen rather than AST" },
+        { "asterr", errorp, true, "print AST on error" },
+        { "declstats", declstatsp, true, "code property statistics" },
+        { "parse", yydebug, true, "yacc (parsing) debug information" },
+        { "pretty", prettycodegenp, true, "prettyprint for ascodegen flag" },
+        { "rproto", resolvprotop, true, "resolver-proto instance" },
+        { "rsteps", resolvep, true, "print resolver steps" },
+        { "tree", parsep, true, "print parse tree" },
+        // code dumps
+        { "ast", astp, true, "print AST after parsing" },
+        { "symevt", symtabp, true, "print AST after symbol table events" },
+        { "altexpr", expraltp, true, "print alternatives for expressions" },
+        { "astdecl", validp, true, "print AST after declaration validation pass" },
+        { "resolver", bresolvep, true, "print AST before resolver step" },
+        { "astexpr", exprp, true, "print AST after expression analysis" },
+        { "ctordtor", ctorinitp, true, "print AST after ctor/dtor are replaced" },
+        { "tuple", tuplep, true, "print AST after tuple expansion" },
+        { "astgen", genericsp, true, "print AST after instantiate generics" },
+        { "box", bboxp, true, "print AST before box step" },
+        { "codegen", bcodegenp, true, "print AST before code generation" },
+};
+enum { printoptsSize = sizeof( printopts ) / sizeof( printopts[0] ) };
+static void usage( char *argv[] ) {
+    cout << "Usage: " << argv[0] << " [options] [input-file (default stdin)] [output-file (default stdout)], where options are:" << endl;
+        int i = 0, j = 1;                                                                       // j skips starting colon
+        for ( ; long_opts[i].name != 0 && optstring[j] != '\0'; i += 1, j += 1 ) {
+                if ( long_opts[i].name[0] != '\0' ) {                   // hidden option, internal usage only
+                        if ( strcmp( long_opts[i].name, "prelude-dir" ) != 0 ) { // flag
+                                cout << "  -" << optstring[j] << ",";
+                        } else {                                                                        // no flag
+                                j -= 1;                                                                 // compensate
+                                cout << "     ";
+                        } // if
+                        cout << " --" << left << setw(12) << long_opts[i].name << "  ";
+                        if ( strcmp( long_opts[i].name, "print" ) == 0 ) {
+                                cout << "one of: " << endl;
+                                for ( int i = 0; i < printoptsSize; i += 1 ) {
+                                        cout << setw(10) << " " << left << setw(10) << printopts[i].name << "  " << printopts[i].descript << endl;
+                                } // for
+                        } else {
+                                cout << description[i] << endl;
+                        } // if
+                } // if
+                if ( optstring[j + 1] == ':' ) j += 1;
+        } // for
+        if ( long_opts[i].name != 0 || optstring[j] != '\0' ) assertf( false, "internal error, mismatch of option flags and names\n" );
+    exit( EXIT_FAILURE );
+} // usage
+static void parse_cmdline( int argc, char * argv[] ) {
         opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
         bool Wsuppress = false, Werror = false;
         int c;
         while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, optstring, long_opts, nullptr )) != -1 ) {
                 switch ( c ) {
+                  case Ast:
+                  case 'a':                                                                             // dump AST
+                        astp = true;
+                        break;
+                  case Bresolver:
+                  case 'b':                                                                             // print before resolver steps
+                        bresolvep = true;
+                        break;
+                  case 'B':                                                                             // print before box steps
+                        bboxp = true;
+                        break;
+                  case CtorInitFix:
+                  case 'c':                                                                             // print after constructors and destructors are replaced
+                        ctorinitp = true;
+                        break;
+                  case 'C':                                                                             // print before code generation
+                        bcodegenp = true;
+                        break;
+                  case DeclStats:
+                  case 'd':
+                    declstatsp = true;
+                        break;
+                  case Expr:
+                  case 'e':                                                                             // dump AST after expression analysis
+                        exprp = true;
+                        break;
+                  case ExprAlt:
+                  case 'f':                                                                             // print alternatives for expressions
+                        expraltp = true;
+                        break;
+                  case Grammar:
+                  case 'g':                                                                             // bison debugging info (grammar rules)
+                        yydebug = true;
+                        break;
+                  case 'G':                                                                             // dump AST after instantiate generics
+                        genericsp = true;
+                        break;
+                  case LibCFA:
+                  case 'h':                                                                             // help message
+                        usage( argv );                                                          // no return
+                        break;
                   case 'l':                                                                             // generate libcfa.c
                         libcfap = true;
                         break;
+                  case Linemarks:
+                  case 'L':                                                                             // print lines marks
+                  case 'L':                                                                             // generate line marks
                         linemarks = true;
                         break;
+                  case Nopreamble:
+                  case 'n':                                                                             // do not read preamble
+                  case 'm':                                                                             // do not replace main
+                        nomainp = true;
+                        break;
+                  case 'N':                                                                             // do not generate line marks
+                        linemarks = false;
+                        break;
+                  case 'n':                                                                             // do not read prelude
                         nopreludep = true;
                         break;
+                  case Nolinemarks:
+                  case 'N':                                                                             // suppress line marks
+                        linemarks = false;
+                        break;
+                  case Prototypes:
+                  case 'p':                                                                             // generate prototypes for preamble functions
+                        noprotop = true;
+                        break;
+                  case 'm':                                                                             // don't replace the main
+                        nomainp = true;
+                        break;
+                  case Parse:
+                  case 'q':                                                                             // dump parse tree
+                        parsep = true;
+                        break;
+                  case Resolver:
+                  case 'r':                                                                             // print resolver steps
+                        resolvep = true;
+                        break;
+                  case Symbol:
+                  case 's':                                                                             // print symbol table events
+                        symtabp = true;
+                        break;
+                  case Tree:
+                  case 't':                                                                             // build in tree
+                  case 'p':                                                                             // generate prototypes for prelude functions
+                        genproto = true;
+                        break;
+                  case 'P':                                                                             // print options
+                        for ( int i = 0;; i += 1 ) {
+                                if ( i == printoptsSize ) {
+                                        cout << "Unknown --print option " << optarg << endl;
+                                        goto Default;
+                                } // if
+                                if ( strcmp( optarg, printopts[i].name ) == 0 ) {
+                                        printopts[i].flag = printopts[i].val;
+                                        break;
+                                } // if
+                        } // for
+                        break;
+                  case PreludeDir:                                                              // prelude directory for debug/nodebug, hidden
+                        PreludeDirector = optarg;
+                        break;
+                  case 'S':                                                                             // enable profiling information, argument comma separated list of names
+                        Stats::parse_params( optarg );
+                        break;
+                  case 't':                                                                             // building cfa stdlib
                         treep = true;
                         break;
+                  case TupleExpansion:
+                  case 'T':                                                                             // print after tuple expansion
+                        tuplep = true;
+                        break;
+                  case 'v':                                                                             // dump AST after decl validation pass
+                        validp = true;
+                        break;
+                  case 'w':
+                  case 'g':                                                                             // wait for gdb
+                        waiting_for_gdb = true;
+                        break;
+                  case 'w':                                                                             // suppress all warnings, hidden
                         Wsuppress = true;
                         break;
                   case 'W':
+                  case 'W':                                                                             // coordinate gcc -W with CFA, hidden
                         if ( strcmp( optarg, "all" ) == 0 ) {
                                 SemanticWarning_EnableAll();
 …
                         } // if
                         break;
+                  case 'y':                                                                             // dump AST on error
+                        errorp = true;
+                        break;
+                  case 'z':                                                                             // dump as codegen rather than AST
+                        codegenp = true;
+                        break;
+                        case 'Z':                                                                       // prettyprint during codegen (i.e. print unmangled names, etc.)
+                        prettycodegenp = true;
+                        break;
+                  case 'D':                                                                             // ignore -Dxxx
+                        break;
+                  case 'F':                                                                             // source file-name without suffix
+                        filename = optarg;
+                        break;
+                  case '?':
+                  case 'D':                                                                             // ignore -Dxxx, forwarded by cpp, hidden
+                        break;
+                  case '?':                                                                             // unknown option
                         if ( optopt ) {                                                         // short option ?
                                 assertf( false, "Unknown option: -%c\n", (char)optopt );
+                                cout << "Unknown option -" << (char)optopt << endl;
                         } else {
+                                assertf( false, "Unknown option: %s\n", argv[optind - 1] );
+                        } // if
+                        #if defined(__GNUC__) && __GNUC__ >= 7
+                                __attribute__((fallthrough));
+                        #endif
+                                cout << "Unknown option " << argv[optind - 1] << endl;
+                        } // if
+                        goto Default;
+                  case ':':                                                                             // missing option
+                        if ( optopt ) {                                                         // short option ?
+                                cout << "Missing option for -" << (char)optopt << endl;
+                        } else {
+                                cout << "Missing option for " << argv[optind - 1] << endl;
+                        } // if
+                        goto Default;
+                  Default:
                   default:
                         abort();
+                        usage( argv );                                                          // no return
                 } // switch
         } // while
 …
         list< Declaration * > decls;
         if ( noprotop ) {
+        if ( genproto ) {
                 filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), notPrelude );
         } else {
 …
         // depending on commandline options, either generate code or dump the AST
         if ( codegenp ) {
                 CodeGen::generate( decls, out, ! noprotop, prettycodegenp );
+                CodeGen::generate( decls, out, ! genproto, prettycodegenp );
         } else {
                 printAll( decls, out );
+        }
+        } // if
         deleteAll( translationUnit );
 } // dump

tools/Makefile.am

-              r7951100
+              rb067d9b
 ###############################################################################
+CC = @BACKEND_CC@
+CFLAGS = -Wall -Wextra -O2 -g
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS  = -I automake
+noinst_PROGRAMS = busy catchsig repeat
+AM_CFLAGS = -Wall -Wextra -O2 -g
+noinst_PROGRAMS = busy catchsig repeat watchdog
 busy_SOURCES     = busy.c
 …
 catchsig_SOURCES = catchsig.c
 repeat_SOURCES   = repeat.c
+watchdog_SOURCES = watchdog.c

tools/Makefile.in

-              r7951100
+              rb067d9b
 build_triplet = @build@
 host_triplet = @host@
+noinst_PROGRAMS = busy$(EXEEXT) catchsig$(EXEEXT) repeat$(EXEEXT)
+noinst_PROGRAMS = busy$(EXEEXT) catchsig$(EXEEXT) repeat$(EXEEXT) \
+        watchdog$(EXEEXT)
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
+        $(top_srcdir)/automake/ltoptions.m4 \
+        $(top_srcdir)/automake/ltsugar.m4 \
+        $(top_srcdir)/automake/ltversion.m4 \
+        $(top_srcdir)/automake/lt~obsolete.m4 \
+        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 …
 busy_OBJECTS = $(am_busy_OBJECTS)
 busy_LDADD = $(LDADD)
+busy_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(busy_LDFLAGS) $(LDFLAGS) \
+        -o $@
+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 =
+busy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(busy_LDFLAGS) $(LDFLAGS) -o $@
 am_catchsig_OBJECTS = catchsig.$(OBJEXT)
 catchsig_OBJECTS = $(am_catchsig_OBJECTS)
 …
 repeat_OBJECTS = $(am_repeat_OBJECTS)
 repeat_LDADD = $(LDADD)
+am_watchdog_OBJECTS = watchdog.$(OBJEXT)
+watchdog_OBJECTS = $(am_watchdog_OBJECTS)
+watchdog_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 …
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 …
 am__v_CC_1 =
 CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
+SOURCES = $(busy_SOURCES) $(catchsig_SOURCES) $(repeat_SOURCES)
+DIST_SOURCES = $(busy_SOURCES) $(catchsig_SOURCES) $(repeat_SOURCES)
+SOURCES = $(busy_SOURCES) $(catchsig_SOURCES) $(repeat_SOURCES) \
+        $(watchdog_SOURCES)
+DIST_SOURCES = $(busy_SOURCES) $(catchsig_SOURCES) $(repeat_SOURCES) \
+        $(watchdog_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
 …
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
 CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+CC = @CC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 …
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = -Wall -Wextra -O2 -g
+CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
+HAS_DISTCC = @HAS_DISTCC@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 …
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MACHINE_TYPE = @MACHINE_TYPE@
+MAINT = @MAINT@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 …
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
 …
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 …
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS = -I automake
+AM_CFLAGS = -Wall -Wextra -O2 -g
 busy_SOURCES = busy.c
 busy_LDFLAGS = -pthread
 catchsig_SOURCES = catchsig.c
 repeat_SOURCES = repeat.c
+watchdog_SOURCES = watchdog.c
 all: all-am
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
 …
         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):
 clean-noinstPROGRAMS:
+        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+        @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+        echo " rm -f" $$list; \
+        rm -f $$list || exit $$?; \
+        test -n "$(EXEEXT)" || exit 0; \
+        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+        echo " rm -f" $$list; \
+        rm -f $$list
 busy$(EXEEXT): $(busy_OBJECTS) $(busy_DEPENDENCIES) $(EXTRA_busy_DEPENDENCIES)
 …
         $(AM_V_CCLD)$(LINK) $(repeat_OBJECTS) $(repeat_LDADD) $(LIBS)
+watchdog$(EXEEXT): $(watchdog_OBJECTS) $(watchdog_DEPENDENCIES) $(EXTRA_watchdog_DEPENDENCIES)
+        @rm -f watchdog$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(watchdog_OBJECTS) $(watchdog_LDADD) $(LIBS)
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catchsig.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repeat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watchdog.Po@am__quote@
 .c.o:
 …
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+.c.lo:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+mostlyclean-libtool:
+        -rm -f *.lo
+clean-libtool:
+        -rm -rf .libs _libs
 ID: $(am__tagged_files)
 …
 clean: clean-am
+clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+        mostlyclean-am
 distclean: distclean-am
 …
 mostlyclean: mostlyclean-am
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool
 pdf: pdf-am
 …
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+        clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+        distclean-compile distclean-generic distclean-tags distdir dvi \
+        dvi-am html html-am info info-am install install-am \
+        install-data install-data-am install-dvi install-dvi-am \
+        install-exec install-exec-am install-html install-html-am \
+        install-info install-info-am install-man install-pdf \
+        install-pdf-am install-ps install-ps-am install-strip \
+        installcheck installcheck-am installdirs maintainer-clean \
+        clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+        ctags-am distclean distclean-compile distclean-generic \
+        distclean-libtool distclean-tags distdir dvi dvi-am html \
+        html-am info info-am install install-am install-data \
+        install-data-am install-dvi install-dvi-am install-exec \
+        install-exec-am install-html install-html-am install-info \
+        install-info-am install-man install-pdf install-pdf-am \
+        install-ps install-ps-am install-strip installcheck \
+        installcheck-am installdirs maintainer-clean \
         maintainer-clean-generic mostlyclean mostlyclean-compile \
         mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
         uninstall-am
+        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+        tags tags-am uninstall uninstall-am
 .PRECIOUS: Makefile

tools/cfa.nanorc

-              r7951100
+              rb067d9b
 ## WIP
 syntax "cfa" "\.cfa"
+syntax "cfa" "\.(c|h)fa"
 # Macros
 …
 # Types
 color green "\<(forall|trait|(o|d|f|t)type|mutex|_Bool|volatile|virtual)\>"
 color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto)\>"
 color green "\<(static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<(float|double|bool|char|int|short|long|enum|void|auto)\>"
+color green "\<(static|const|extern|(un)?signed|inline)\>" "\<(sizeof)\>"
 color green "\<((s?size)|one|zero|((u_?)?int(8|16|32|64|ptr)))_t\>"
 …
 # Control Flow Structures
 color brightyellow "\<(if|else|while|do|for|switch|choose|case|default)\>"
+color brightyellow "\<(disable|enable|waitfor|when|timeout)\>"
 color brightyellow "\<(try|catch(Resume)?|finally)\>"
 # Control Flow Statements
 color magenta "\<(goto|return|break|continue|fallthr(u|ough)|throw(Resume)?)\>"
+# Escaped Keywords, now Identifiers.
+color white "`\w+`"
 # Operator Names

tools/prettyprinter/Makefile.am

-              r7951100
+              rb067d9b
 ######################## -*- Mode: Makefile-Automake -*- ######################
 ##
+##
 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
 ##
 ## The contents of this file are covered under the licence agreement in the
 ## file "LICENCE" distributed with Cforall.
 ##
 ## Makefile.am --
 ##
+##
+## Makefile.am --
+##
 ## Author           : Peter A. Buhr
 ## Created On       : Wed Jun 28 12:07:10 2017
 …
 ## Update Count     : 20
 ###############################################################################
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS  = -I automake
 BUILT_SOURCES = parser.hh

tools/prettyprinter/Makefile.in

-              r7951100
+              rb067d9b
 subdir = tools/prettyprinter
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
+        $(top_srcdir)/automake/ltoptions.m4 \
+        $(top_srcdir)/automake/ltsugar.m4 \
+        $(top_srcdir)/automake/ltversion.m4 \
+        $(top_srcdir)/automake/lt~obsolete.m4 \
+        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 …
 am__DEPENDENCIES_1 =
 pretty_DEPENDENCIES = $(am__DEPENDENCIES_1)
+pretty_LINK = $(CXXLD) $(pretty_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+        $(LDFLAGS) -o $@
+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 =
+pretty_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pretty_CXXFLAGS) \
+        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 …
 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 =
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 …
 am__v_CXX_1 =
 CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+        -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 =
-@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
 AM_V_LEX = $(am__v_LEX_@AM_V@)
 am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
 …
 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/
 YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
 AM_V_YACC = $(am__v_YACC_@AM_V@)
 am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
 …
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 …
 am__v_CC_1 =
 CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 …
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @CC@
 CCAS = @CCAS@
 …
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 …
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
+HAS_DISTCC = @HAS_DISTCC@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 …
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MACHINE_TYPE = @MACHINE_TYPE@
+MAINT = @MAINT@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 …
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
 …
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 …
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS = -I automake
 BUILT_SOURCES = parser.hh
 AM_YFLAGS = -d -t -v
 …
 .SUFFIXES:
 .SUFFIXES: .cc .ll .o .obj .yy
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+.SUFFIXES: .cc .ll .lo .o .obj .yy
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
 …
         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):
 …
         sed 's/$(EXEEXT)$$//' | \
         while read p p1; do if test -f $$p \
+         || test -f $$p1 \
           ; then echo "$$p"; echo "$$p"; else :; fi; \
         done | \
 …
             if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
             test -z "$$files" || { \
               echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tools_prettyprinterdir)$$dir'"; \
               $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tools_prettyprinterdir)$$dir" || exit $$?; \
+            echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tools_prettyprinterdir)$$dir'"; \
+            $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tools_prettyprinterdir)$$dir" || exit $$?; \
             } \
         ; done
 …
 clean-tools_prettyprinterPROGRAMS:
+        -test -z "$(tools_prettyprinter_PROGRAMS)" || rm -f $(tools_prettyprinter_PROGRAMS)
+        @list='$(tools_prettyprinter_PROGRAMS)'; test -n "$$list" || exit 0; \
+        echo " rm -f" $$list; \
+        rm -f $$list || exit $$?; \
+        test -n "$(EXEEXT)" || exit 0; \
+        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+        echo " rm -f" $$list; \
+        rm -f $$list
 parser.hh: parser.cc
         @if test ! -f $@; then rm -f parser.cc; else :; fi
 …
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+.cc.lo:
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 pretty-lex.o: lex.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pretty_CXXFLAGS) $(CXXFLAGS) -MT pretty-lex.o -MD -MP -MF $(DEPDIR)/pretty-lex.Tpo -c -o pretty-lex.o `test -f 'lex.cc' || echo '$(srcdir)/'`lex.cc
 …
 .yy.cc:
         $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+mostlyclean-libtool:
+        -rm -f *.lo
+clean-libtool:
+        -rm -rf .libs _libs
 ID: $(am__tagged_files)
 …
 clean: clean-am
 clean-am: clean-generic clean-tools_prettyprinterPROGRAMS \
         mostlyclean-am
+clean-am: clean-generic clean-libtool \
+        clean-tools_prettyprinterPROGRAMS mostlyclean-am
 distclean: distclean-am
 …
 mostlyclean: mostlyclean-am
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool
 pdf: pdf-am
 …
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+        clean-tools_prettyprinterPROGRAMS cscopelist-am ctags ctags-am \
+        distclean distclean-compile distclean-generic distclean-tags \
+        distdir dvi dvi-am html html-am info info-am install \
+        install-am install-data install-data-am install-dvi \
+        install-dvi-am install-exec install-exec-am install-html \
+        install-html-am install-info install-info-am install-man \
+        install-pdf install-pdf-am install-ps install-ps-am \
+        install-strip install-tools_prettyprinterPROGRAMS installcheck \
+        clean-libtool clean-tools_prettyprinterPROGRAMS cscopelist-am \
+        ctags ctags-am distclean distclean-compile distclean-generic \
+        distclean-libtool distclean-tags distdir dvi dvi-am html \
+        html-am info info-am install install-am install-data \
+        install-data-am install-dvi install-dvi-am install-exec \
+        install-exec-am install-html install-html-am install-info \
+        install-info-am install-man install-pdf install-pdf-am \
+        install-ps install-ps-am install-strip \
+        install-tools_prettyprinterPROGRAMS installcheck \
         installcheck-am installdirs maintainer-clean \
         maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+        uninstall-am uninstall-tools_prettyprinterPROGRAMS
+        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+        tags tags-am uninstall uninstall-am \
+        uninstall-tools_prettyprinterPROGRAMS
 .PRECIOUS: Makefile

tools/stat.py

-              r7951100
+              rb067d9b
                 content = f.readlines()
                 content = [x.strip() for x in content]
                 content = [int(x) for x in content]
                 content.remove(max(content))
                 content.remove(min(content))
                 med = numpy.around( numpy.median(content), decimals=1)
                 avg = numpy.around( numpy.mean  (content), decimals=2)
                 std = numpy.around( numpy.std   (content), decimals=2)
                 print "median {0} avg {1} stddev {2}".format( med, avg, std )
+                content = [float(x) for x in content]   # expect floating-point strings
+                content.remove(max(content))            # need at least 4 data values because
+                content.remove(min(content))            # the max and min values are removed
+                med = numpy.median(content)
+                avg = numpy.mean  (content)
+                std = numpy.std   (content)
+                print "median {0:.1f} avg {1:.1f} stddev {2:.2f}".format( med, avg, std )

Context Navigation

Changes in / [7951100:b067d9b]

Legend: